[Fmsystem-commits] [9589] property: invoice::radiobox

[Sigurd Nes]

Revision: 9589
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9589
Author:   sigurdne
Date:     2012-06-13 20:17:45 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
property: invoice::radiobox

Modified Paths:
--------------
    trunk/property/inc/class.uiinvoice2.inc.php
    trunk/property/js/portico/ajax_invoice.js
    trunk/property/setup/phpgw_no.lang
    trunk/property/templates/base/invoice2.xsl

Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2012-06-13 18:37:02 UTC (rev 
9588)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2012-06-13 20:17:45 UTC (rev 
9589)
@@ -470,7 +470,7 @@
                                        $_checked = 'checked="checked"';
                                }
 
-                               $entry['approve_line'] = "<input 
id=\"approve_line\" type =\"radio\" {$_checked} name=\"values[approve]\" 
value=\"{$entry['id']}\">";
+                               $entry['approve_line'] = "<input 
id=\"approve_line\" type =\"radio\" {$_checked} name=\"values[approve_line]\" 
value=\"{$entry['id']}\">";
                                $entry['split'] = "<input type =\"text\" 
name=\"values[split_amount][{$entry['id']}]\" value=\"\" size=\"8\">";
                                $entry['approved_amount_hidden'] = 
$entry['approved_amount'];
                                $entry['approved_amount'] = "<input type 
=\"text\" name=\"values[approved_amount][{$entry['id']}]\" 
value=\"{$entry['approved_amount']}\" size=\"8\">";
@@ -658,7 +658,7 @@
                                }
 
                                $voucher_info['generic']['approve_list'] = 
array('options' => $approve_list);
-                               array_unshift 
($voucher_info['generic']['approve_list']['options'],array 
('id'=>'','name'=>lang('select')));
+                               array_unshift 
($voucher_info['generic']['approve_list']['options'],array 
('id'=>'','name'=>lang('reset approval')));
 //---------end forward
 
                                $voucher_info['generic']['approved_amount'] = 0;

Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js   2012-06-13 18:37:02 UTC (rev 
9588)
+++ trunk/property/js/portico/ajax_invoice.js   2012-06-13 20:17:45 UTC (rev 
9589)
@@ -501,19 +501,28 @@
                                
if(typeof(data['generic']['approve_list']['options']) != 'undefined')
                                {
                                        var htmlString = "";
+                                       var htmlString2 = "<table><tr>";
 
                                        var obj = 
data['generic']['approve_list']['options'];
-
                                        $.each(obj, function(i) {
+                                               htmlString2  += "<td 
align=\"center\">" + obj[i].name + "</td>";
+                               });
+                                        htmlString2 += "</tr><tr>";
+                                       $.each(obj, function(i) {
+                                               var checked = '';
                                                var selected = '';
                                                if(typeof(obj[i].selected) != 
'undefined' && obj[i].selected == 1)
                                                {
                                                        selected = ' selected';
+                                                       checked = "checked = 
\"checked\"";
                                                }
                                                htmlString  += "<option 
value='" + obj[i].id + "'" + selected + ">" + obj[i].name + "</option>";
-                                       });
+                                               htmlString2  += "<td 
align=\"center\"><input type =\"radio\" name=\"values[approve]\" value='" + 
obj[i].id + "'" + checked + "></input></td>";
+                               });
 
-                                       $("#approve_as").html( htmlString );
+                                       htmlString2 += "</tr></table>";
+                                       $("#approve_as2").html( htmlString2 );
+                       //              $("#approve_as").html( htmlString );
                                }
                        }
                        else

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2012-06-13 18:37:02 UTC (rev 9588)
+++ trunk/property/setup/phpgw_no.lang  2012-06-13 20:17:45 UTC (rev 9589)
@@ -1330,6 +1330,7 @@
 repeat type    property        no      type serie
 repeat day     property        no      gjenta dag
 request        property        no      Behov
+reset approval property        no      Nullstill
 project.request        property        no      Behov
 request attributes     property        no      Behov::attributter
 request an email receipt       property        no      Be om kvittering

Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl  2012-06-13 18:37:02 UTC (rev 
9588)
+++ trunk/property/templates/base/invoice2.xsl  2012-06-13 20:17:45 UTC (rev 
9589)
@@ -491,12 +491,15 @@
                                <xsl:value-of select="php:function('lang', 
'approve as')"/>
                        </td>
                        <td class="th_text" valign="top" align="left">
+                               <div id = "approve_as2"> </div>
+                               <!--
                                <select id = "approve_as" 
name="values[approve]" with="40">
                                        <xsl:attribute name="title">
                                                <xsl:value-of 
select="php:function('lang', 'approve as')"/>
                                        </xsl:attribute>
                                        <xsl:apply-templates 
select="voucher_info/generic/approve_list/options"/>
                                </select>
+                               -->
                        </td>
                </tr>
                <tr class ='row_off'>