[Fmsystem-commits] [14765] Merge 14760:14764 from trunk

[Sigurd Nes]

Revision: 14765
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14765
Author:   sigurdne
Date:     2016-02-22 09:17:13 +0000 (Mon, 22 Feb 2016)
Log Message:
-----------
Merge 14760:14764 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.bodocument.inc.php
    branches/Version-2_0-branch/property/inc/class.sodocument.inc.php
    branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764

Modified: branches/Version-2_0-branch/property/inc/class.bodocument.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bodocument.inc.php   
2016-02-22 09:13:07 UTC (rev 14764)
+++ branches/Version-2_0-branch/property/inc/class.bodocument.inc.php   
2016-02-22 09:17:13 UTC (rev 14765)
@@ -155,7 +155,7 @@
                                'order' => $data['order'],
                                'allrows' => $data['allrows'],
                                'results' => $data['results'],
-                               'filter' => $this->filter,
+                               'status_id' => $this->status_id,
                                'cat_id' => $this->cat_id,
                                'entity_id' => $this->entity_id,
                                'doc_type' => $this->doc_type,

Modified: branches/Version-2_0-branch/property/inc/class.sodocument.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sodocument.inc.php   
2016-02-22 09:13:07 UTC (rev 14764)
+++ branches/Version-2_0-branch/property/inc/class.sodocument.inc.php   
2016-02-22 09:17:13 UTC (rev 14765)
@@ -123,7 +123,7 @@
                        {
                                $start = isset($data['start']) && 
$data['start'] ? $data['start'] : 0;
                                $results = isset($data['results']) && 
$data['results'] ? $data['results'] : 0;
-                               $filter = isset($data['filter']) ? 
$data['filter'] : '';
+                               $status_id = isset($data['status_id']) && 
$data['status_id'] ? $data['status_id'] : '';
                                $query = isset($data['query']) ? $data['query'] 
: '';
                                $sort = isset($data['sort']) && $data['sort'] ? 
$data['sort'] : 'DESC';
                                $order = isset($data['order']) ? $data['order'] 
: '';
@@ -138,9 +138,8 @@
 
                        $sql = $this->bocommon->fm_cache('sql_document_' . 
$entity_id);
 
-                       if (true)
+                       if (!$sql)
                        {
-
                                $document_table = 'fm_document';
                                $uicols = array();
                                $joinmethod = '';
@@ -265,9 +264,10 @@
                                $where = 'AND';
                        }
 
-                       if ($filter != 'all' && $filter)
+                       if ($status_id)
                        {
-                               $filtermethod .= " $where 
fm_document.user_id='$filter' ";
+                               $filtermethod .= "  $where 
fm_document.status='$status_id' ";
+                               $where = 'AND';
                        }
 
                        $querymethod = '';
@@ -1047,4 +1047,4 @@
                        }
                        return $file_list;
                }
-       }
\ No newline at end of file
+       }

Modified: branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php
===================================================================
--- branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php  
2016-02-22 09:13:07 UTC (rev 14764)
+++ branches/Version-2_0-branch/property/inc/soap_client/bra5/soap.php  
2016-02-22 09:17:13 UTC (rev 14765)
@@ -189,10 +189,27 @@
 //             _debug_array($bra5ServiceSearch->getResult());die();
                $_result = 
$bra5ServiceSearch->getResult()->getsearchAndGetDocumentsResult()->getExtendedDocument()->getsearchAndGetDocumentsResult()->ExtendedDocument;
        }
+       $css = file_get_contents(PHPGW_SERVER_ROOT . 
"/phpgwapi/templates/pure/css/pure-min.css");
+       $css .= file_get_contents(PHPGW_SERVER_ROOT . 
"/phpgwapi/templates/pure/css/pure-extension.css");
 
-       $html = <<<HTML
-       <table>
+       $header = <<<HTML
+<!DOCTYPE HTML>
+<html>
+       <head>
+               <meta charset="utf-8">
+               <style TYPE="text/css">
+                       <!--{$css}-->
+               </style>
+       </head>
+               <body>
+                       <div class="pure-form pure-form-aligned">
 HTML;
+
+       $footer = <<<HTML
+                       </div>
+       </body>
+</html>
+HTML;
        $bra5ServiceLogout = new Bra5ServiceLogout();
        $bra5ServiceLogout->Logout(new Bra5StructLogout($secKey));
 
@@ -216,10 +233,14 @@
                'BrukerID',
                'Team'
        );
+       $content = <<<HTML
+       <table class="pure-table pure-table-bordered">
+               <thead>
+HTML;
 
-       $html .='<th>';
-       $html .='Last ned';
-       $html . '</th>';
+       $content .='<th>';
+       $content .='Last ned';
+       $content . '</th>';
 
        $location_id = phpgw::get_var('location_id', 'int');
        $section = phpgw::get_var('section', 'string');
@@ -236,14 +257,15 @@
                {
                        continue;
                }
-               $html .='<th>';
-               $html .=$attribute->Name;
-               $html . '</th>';
+               $content .='<th>';
+               $content .=$attribute->Name;
+               $content . '</th>';
        }
 
+       $content .='</thead>';
        foreach ($_result as $document)
        {
-               $attributes = $document->getAttributes()->Attribute;
+//             $attributes = $document->getAttributes()->Attribute;
        }
 
        $case_array = array();
@@ -308,13 +330,13 @@
 //_debug_array($case_array);
        foreach ($case_array as $case)
        {
-               $html .= implode('', $case);
+               $content .= implode('', $case);
        }
 
-       $html .=<<<HTML
+       $content .=<<<HTML
        </table>
 HTML;
 
-       echo $html;
+       echo $header . $content . $footer;
 
        $GLOBALS['phpgw']->common->phpgw_exit();