[Fmsystem-commits] [11082] condition survey

[Sigurd Nes]

Revision: 11082
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11082
Author:   sigurdne
Date:     2013-04-26 12:43:35 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
condition survey

Modified Paths:
--------------
    trunk/property/inc/class.bocondition_survey.inc.php
    trunk/property/inc/class.socondition_survey.inc.php
    trunk/property/inc/class.uicondition_survey.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.bocondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.bocondition_survey.inc.php 2013-04-26 11:36:01 UTC 
(rev 11081)
+++ trunk/property/inc/class.bocondition_survey.inc.php 2013-04-26 12:43:35 UTC 
(rev 11082)
@@ -185,6 +185,11 @@
                public function read($data = array())
                {
                        $values = $this->so->read($data);
+                       foreach($values as & $entry)
+                       {
+                               $entry['year'] = date('Y', 
$entry['entry_date']);
+                       }
+
                        $this->total_records = $this->so->total_records;
                        return $values;
                }

Modified: trunk/property/inc/class.socondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.socondition_survey.inc.php 2013-04-26 11:36:01 UTC 
(rev 11081)
+++ trunk/property/inc/class.socondition_survey.inc.php 2013-04-26 12:43:35 UTC 
(rev 11082)
@@ -56,6 +56,15 @@
                        $table = 'fm_condition_survey';
                        if ($sort)
                        {
+                               switch($sort)
+                               {
+                                       case 'year':
+                                               $sort = 'entry_date';
+                                               break;
+                                       default:
+                                       //
+                               }
+                               
                                $metadata = $this->_db->metadata($table);
                                if(isset($metadata[$sort]))
                                {

Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2013-04-26 11:36:01 UTC 
(rev 11081)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2013-04-26 12:43:35 UTC 
(rev 11082)
@@ -184,10 +184,15 @@
                                                ),
                                                array(
                                                        'key' => 'address',
-                                                       'label' => 
lang('address'),
+                                                       'label' => 
lang('buildingname'),
                                                        'sortable' => true
                                                ),
                                                array(
+                                                       'key' => 'year',
+                                                       'label' => lang('year'),
+                                                       'sortable' => true,
+                                               ),
+                                               array(
                                                        'key' => 'cnt',
                                                        'label' => 
lang('count'),
                                                        'sortable' => false,

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2013-04-26 11:36:01 UTC (rev 11081)
+++ trunk/property/setup/phpgw_no.lang  2013-04-26 12:43:35 UTC (rev 11082)
@@ -255,6 +255,7 @@
 building common        property        no      Bygnings felles
 building has been edited       property        no      Bygning er endret
 building has been saved        property        no      Bygning er lagret
+buildingname   property        no      BygningsNavn
 building id    property        no      bygnings ID
 building part  property        no      Bygningsdel
 building_part  property        no      Bygningsdel