[Fmsystem-commits] [11224] condtion survey

[Sigurd Nes]

Revision: 11224
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11224
Author:   sigurdne
Date:     2013-07-02 12:34:02 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
condtion survey

Modified Paths:
--------------
    trunk/property/inc/class.socommon_core.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.socommon_core.inc.php
===================================================================
--- trunk/property/inc/class.socommon_core.inc.php      2013-07-02 12:02:08 UTC 
(rev 11223)
+++ trunk/property/inc/class.socommon_core.inc.php      2013-07-02 12:34:02 UTC 
(rev 11224)
@@ -208,7 +208,7 @@
 
                        if(isset($data['location_name']) && 
$data['location_name'])
                        {
-                               $_address[] = $data['location_name'];
+                               $_address[] = 
ucfirst(strtolower($data['location_name']));
                        }
 
                        if(isset($data['additional_info']) && 
$data['additional_info'])

Modified: trunk/property/inc/class.socondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.socondition_survey.inc.php 2013-07-02 12:02:08 UTC 
(rev 11223)
+++ trunk/property/inc/class.socondition_survey.inc.php 2013-07-02 12:34:02 UTC 
(rev 11224)
@@ -89,9 +89,11 @@
                                $querymethod    = " {$where} {$table}.title 
{$this->_like} '%{$query}%'";
                        }
 
-                       $groupmethod = "GROUP BY 
$table.id,$table.title,$table.descr,$table.address,$table.entry_date,$table.user_id";
-                       $sql = "SELECT DISTINCT 
$table.id,$table.title,$table.descr,$table.address,$table.entry_date,$table.user_id
 , count(condition_survey_id) AS cnt"
-                       . " FROM {$table} {$this->_left_join} fm_request ON 
{$table}.id =fm_request.condition_survey_id {$filtermethod} {$querymethod} 
{$groupmethod}";
+                       $groupmethod = "GROUP BY 
$table.id,$table.title,$table.descr,$table.address,$table.entry_date,$table.user_id,
 org_name";
+                       $sql = "SELECT DISTINCT 
$table.id,$table.title,$table.descr,$table.address,$table.entry_date,$table.user_id,"
+                       . " count(condition_survey_id) AS cnt, org_name as 
vendor FROM {$table} "
+                       . " {$this->_join} fm_vendor ON {$table}.vendor_id = 
fm_vendor.id"
+                       . " {$this->_left_join} fm_request ON {$table}.id 
=fm_request.condition_survey_id {$filtermethod} {$querymethod} {$groupmethod}";
 
        
                        $this->_db->query($sql,__LINE__,__FILE__);
@@ -115,6 +117,7 @@
                                        'title'                 => 
$this->_db->f('title',true),
                                        'descr'                 => 
$this->_db->f('descr',true),
                                        'address'               => 
$this->_db->f('address',true),
+                                       'vendor'                => 
$this->_db->f('vendor',true),
                                        'entry_date'    => 
$this->_db->f('entry_date'),
                                        'user'                  => 
$this->_db->f('user_id'),
                                        'cnt'                   => 
$this->_db->f('cnt'),
@@ -170,7 +173,7 @@
 
                        $this->_db->transaction_begin();
 
-                       $value_set                                              
= $this->_get_value_set( $data );
+                       $value_set      = $this->_get_value_set( $data );
 
                        $id = $this->_db->next_id($table);
 

Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2013-07-02 12:02:08 UTC 
(rev 11223)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2013-07-02 12:34:02 UTC 
(rev 11224)
@@ -173,7 +173,7 @@
                                                        'sortable' => true,
                                                        'formatter' => 
'YAHOO.portico.formatLink'
                                                ),
-                                               array(
+               /*                              array(
                                                        'key' => 'title',
                                                        'label' => 
lang('title'),
                                                        'sortable' => true,
@@ -183,13 +183,18 @@
                                                        'key' => 'descr',
                                                        'label' => 
lang('description'),
                                                        'sortable' => false,
-                                               ),
+                                               ),*/
                                                array(
                                                        'key' => 'address',
                                                        'label' => 
lang('buildingname'),
                                                        'sortable' => true
                                                ),
                                                array(
+                                                       'key' => 'vendor',
+                                                       'label' => 
lang('vendor'),
+                                                       'sortable' => true
+                                               ),
+                                               array(
                                                        'key' => 'year',
                                                        'label' => lang('year'),
                                                        'sortable' => true,

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2013-07-02 12:02:08 UTC (rev 11223)
+++ trunk/property/setup/phpgw_no.lang  2013-07-02 12:34:02 UTC (rev 11224)
@@ -925,11 +925,11 @@
 interval       property        no      intervall
 inventory      common  no      Beholdning
 add inventory  common  no      Legg til beholdning
-investment     property        no      investering
+investment     property        no      Investering
 investment added !     property        no      Investering er lagt til
 investment history     property        no      Investerings historie
-investment id  property        no      investering ID
-investment id: property        no      investering ID:
+investment id  property        no      Investering ID
+investment id: property        no      Investering ID:
 investment value       property        no      Avskrivning
 invoice        property        no      Faktura
 invoice address        property        no      Fakturaadresse