[Fmsystem-commits] [15443] property: show order info

[sigurdne]

Revision: 15443
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15443
Author:   sigurdne
Date:     2016-08-10 11:07:08 +0000 (Wed, 10 Aug 2016)
Log Message:
-----------
property: show order info

Modified Paths:
--------------
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/js/portico/wo_hour.index.js
    trunk/property/templates/base/wo_hour.index.xsl

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2016-08-10 09:33:18 UTC (rev 
15442)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2016-08-10 11:07:08 UTC (rev 
15443)
@@ -1006,7 +1006,7 @@
 
                        unset($parameters);
 
-                       $common_data = $this->common_data();
+                       $common_data = $this->common_data($workorder_id);
 
                        $data['datatable']['table_sum'] = 
$common_data['table_sum'][0];
                        $data['datatable']['workorder_data'] = 
$common_data['workorder_data'];
@@ -2354,8 +2354,7 @@
 
                        unset($parameters);
 
-                       $common_data = $this->common_data();
-
+                       $common_data = $this->common_data($workorder_id);
                        $data['datatable']['table_sum'] = 
$common_data['table_sum'][0];
                        $data['datatable']['workorder_data'] = 
$common_data['workorder_data'];
 
@@ -2703,7 +2702,7 @@
 
                        unset($parameters);
 
-                       $common_data = $this->common_data();
+                       $common_data = $this->common_data($workorder_id);
 
                        $data['datatable']['table_sum'] = 
$common_data['table_sum'][0];
                        $data['datatable']['workorder_data'] = 
$common_data['workorder_data'];

Modified: trunk/property/js/portico/wo_hour.index.js
===================================================================
--- trunk/property/js/portico/wo_hour.index.js  2016-08-10 09:33:18 UTC (rev 
15442)
+++ trunk/property/js/portico/wo_hour.index.js  2016-08-10 11:07:08 UTC (rev 
15443)
@@ -15,16 +15,4 @@
 
        $('#value_total_sum').html($.number(data.table_sum.value_total_sum, 2, 
',', '.'));
 
-
-       var project_id = data.workorder_data.project_id;
-       var link_project = data.workorder_data.link_project;
-       $('#project_id').html('<a href="' + link_project + '">' + project_id + 
'</a>')
-
-       var workorder_id = data.workorder_data.workorder_id;
-       var link_workorder = data.workorder_data.link_workorder;
-       $('#workorder_id').html('<a href="' + link_workorder + '">' + 
workorder_id + '</a>')
-
-       $('#workorder_title').html(data.workorder_data.workorder_title);
-
-       $('#vendor_name').html(data.workorder_data.vendor_name);
 };
\ No newline at end of file

Modified: trunk/property/templates/base/wo_hour.index.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.index.xsl     2016-08-10 09:33:18 UTC 
(rev 15442)
+++ trunk/property/templates/base/wo_hour.index.xsl     2016-08-10 11:07:08 UTC 
(rev 15443)
@@ -47,16 +47,33 @@
 
 <xsl:template match="workorder_data">
        <div>
-               <xsl:value-of select="lang_project_id"/>:<span 
id="project_id"></span>
+               <xsl:value-of select="lang_project_id"/>:
+               <span>
+                       <a  href="{link_project}" >
+                               <xsl:value-of select="project_id"/>
+                       </a>
+               </span>
        </div>
        <div>
-               <xsl:value-of select="lang_workorder_id"/>:<span 
id="workorder_id"></span>
+               <xsl:value-of select="lang_workorder_id"/>:
+               <span>
+                       <a  href="{link_workorder}" >
+                               <xsl:value-of select="workorder_id"/>
+                       </a>
+               </span>
        </div>
        <div>
-               <xsl:value-of select="lang_workorder_title"/>:<span 
id="workorder_title"></span>
+               <xsl:value-of select="lang_workorder_title"/>:
+               <span>
+                       <xsl:value-of select="workorder_title"/>
+               </span>
        </div>
        <div>
-               <xsl:value-of select="lang_vendor_name"/>:<span 
id="vendor_name"></span>
+               <xsl:value-of select="lang_vendor_name"/>:
+               <span>
+                       <xsl:value-of select="vendor_name"/>
+
+               </span>
        </div>
 </xsl:template>