[Fmsystem-commits] [9123] property: formatting

[Sigurd Nes]

Revision: 9123
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9123
Author:   sigurdne
Date:     2012-04-11 14:15:32 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
property: formatting

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/js/portico/ajax_invoice.js
    trunk/property/templates/base/invoice2.xsl

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2012-04-11 12:47:42 UTC (rev 
9122)
+++ trunk/property/inc/class.soinvoice.inc.php  2012-04-11 14:15:32 UTC (rev 
9123)
@@ -1762,8 +1762,13 @@
 
                        if($data['janitor_lid'])
                        {
-                               $data['janitor_lid'] = 
ltrim($data['janitor_lid'],'*');
-                               $filtermethod = "$where oppsynsmannid = 
'{$data['janitor_lid']}'";
+                               if( stripos($data['janitor_lid'],'*') === 0)
+                               {
+                                       $data['janitor_lid'] = 
ltrim($data['janitor_lid'],'*');
+                                       $filtermethod .= " $where 
oppsynsigndato IS NULL";
+                                       $where = 'AND';
+                               }
+                               $filtermethod .= " $where oppsynsmannid = 
'{$data['janitor_lid']}'";
                                $where = 'AND';
                        }
 
@@ -1772,7 +1777,7 @@
                                if( stripos($data['supervisor_lid'],'*') === 0)
                                {
                                        $data['supervisor_lid'] = 
ltrim($data['supervisor_lid'],'*');
-                                       $filtermethod .= " $where 
oppsynsigndato IS NOT NULL";
+                                       $filtermethod .= " $where 
oppsynsigndato IS NOT NULL AND saksigndato IS NULL";
                                        $where = 'AND';
                                }
 
@@ -1785,7 +1790,7 @@
                                if( 
stripos($data['budget_responsible_lid'],'*') === 0)
                                {
                                        $data['budget_responsible_lid'] = 
ltrim($data['budget_responsible_lid'],'*');
-                                       $filtermethod .= " $where saksigndato 
IS NOT NULL";
+                                       $filtermethod .= " $where saksigndato 
IS NOT NULL AND budsjettsigndato IS NULL";
                                        $where = 'AND';
                                }
                                $filtermethod .= " $where budsjettansvarligid = 
'{$data['budget_responsible_lid']}'";

Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js   2012-04-11 12:47:42 UTC (rev 
9122)
+++ trunk/property/js/portico/ajax_invoice.js   2012-04-11 14:15:32 UTC (rev 
9123)
@@ -368,7 +368,7 @@
                                                        }
                                                        else
                                                        {
-                                                               var htmlString 
= "<select name=\"values[forward][" + role_sign + "]\">";
+                                                               var htmlString 
= "<select id=\"_" + role_sign + "\" name=\"values[forward][" + role_sign + 
"]\">";
                                                                var obj = 
data['generic']['approved_list'][i]['user_list'].options;
                                                                $.each(obj, 
function(i) {
                                                                        var 
selected = '';

Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl  2012-04-11 12:47:42 UTC (rev 
9122)
+++ trunk/property/templates/base/invoice2.xsl  2012-04-11 14:15:32 UTC (rev 
9123)
@@ -20,6 +20,22 @@
 <!-- separate tabs and  inline tables-->
 
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<style type="text/css">
+#box { width: 200px; height: 5px; background: blue; }
+//select { width: 200px; }
+#voucher_id_filter { width: 800px; }
+#dim_b { width: 200px; }
+#period { width: 200px; }
+#periodization { width: 200px; }
+#periodization_start { width: 200px; }
+#process_code { width: 200px; }
+#tax_code { width: 200px; }
+#approve_as { width: 200px; }
+#_oppsynsmannid { width: 200px; }
+#_saksbehandlerid { width: 200px; }
+#_budsjettansvarligid { width: 200px; }
+
+</style>
 <div class="yui-navset yui-navset-top" id="pending_for_approval_tabview">
        <div class="identifier-header">
                <h1><xsl:value-of select="php:function('lang', 
'invoice')"/></h1>
@@ -482,13 +498,10 @@
                                <xsl:value-of select="php:function('lang', 
'approve as')"/>
                        </td>
                        <td class="th_text" valign="top" align="left">
-                               <select id = "approve_as" 
name="values[approve]">
+                               <select id = "approve_as" 
name="values[approve]" with="40">
                                        <xsl:attribute name="title">
                                                <xsl:value-of 
select="php:function('lang', 'approve as')"/>
                                        </xsl:attribute>
-                                       <option value="">
-                                               <xsl:value-of 
select="php:function('lang', 'select')"/>
-                                       </option>
                                        <xsl:apply-templates 
select="voucher_info/generic/approve_list/options"/>
                                </select>
                        </td>
@@ -512,7 +525,7 @@
                                                        <xsl:value-of 
select="date"/>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                               <select 
name="values[forward][{role_sign}]">
+                                                               <select id 
="_{role_sign}" name="values[forward][{role_sign}]">
                                                                        
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="role"/>
                                                                        
</xsl:attribute>