[Fmsystem-commits] [13569] controller: add status

[Sigurd Nes]

Revision: 13569
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13569
Author:   sigurdne
Date:     2015-07-07 13:13:44 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------
controller: add status

Modified Paths:
--------------
    trunk/controller/templates/base/case/add_case.xsl
    trunk/controller/templates/base/case/case_row.xsl

Modified: trunk/controller/templates/base/case/add_case.xsl
===================================================================
--- trunk/controller/templates/base/case/add_case.xsl   2015-07-06 23:00:41 UTC 
(rev 13568)
+++ trunk/controller/templates/base/case/add_case.xsl   2015-07-07 13:13:44 UTC 
(rev 13569)
@@ -90,7 +90,14 @@
                                                                                
        <xsl:when test="type = 'control_item_type_1'">
                                                                                
                        <input type="hidden" name="status" value="0" />
                                                                                
        <input type="hidden" name="type" value="control_item_type_1" />
-                                                                               
                    
+                                                                               
                        <div class="row">
+                                                                               
                                <label>Status</label>
+                                                                               
                                <select name="status">
+                                                                               
                                        <option value="0" 
SELECTED="SELECTED">Åpen</option>
+                                                                               
                                        <option value="1" >Lukket</option>
+                                                                               
                                        <option value="2" >Venter på 
tilbakemelding</option>
+                                                                               
                                </select>
+                                                                               
                   </div>
                                                                                
                        <div>
                                                                                
                    <label class="comment">Beskrivelse av sak</label>
                                                                                
                          <textarea name="case_descr" >

Modified: trunk/controller/templates/base/case/case_row.xsl
===================================================================
--- trunk/controller/templates/base/case/case_row.xsl   2015-07-06 23:00:41 UTC 
(rev 13568)
+++ trunk/controller/templates/base/case/case_row.xsl   2015-07-07 13:13:44 UTC 
(rev 13569)
@@ -48,8 +48,7 @@
                     </xsl:choose>
 
                   <!-- STATUS -->
-                  <xsl:if test="$control_item_type = 'control_item_type_2' or 
$control_item_type = 'control_item_type_3' or $control_item_type = 
'control_item_type_4'">
-               
+               
                     <div class="row first">
                       <label>Status:</label>
                       <span class="case_status">
@@ -60,7 +59,9 @@
                         </xsl:choose>
                       </span>
                     </div>
-                    
+
+                                       <xsl:if test="$control_item_type = 
'control_item_type_2' or $control_item_type = 'control_item_type_3' or 
$control_item_type = 'control_item_type_4'">
+                 
                     <!--  MEASUREMENT -->
                     <div class="row">
                       <label>Måleverdi:</label> 
@@ -131,8 +132,7 @@
                    <xsl:attribute name="value"><xsl:value-of 
select="//control_item/type" /></xsl:attribute>
                        </input>
                        
-                  <xsl:if test="$control_item_type = 'control_item_type_2' or 
$control_item_type = 'control_item_type_3' or $control_item_type = 
'control_item_type_4'">
-                    <!--  STATUS -->
+                   <!--  STATUS -->
                     <div class="row first">
                       <label>Status:</label> 
                       <select name="case_status">
@@ -152,7 +152,8 @@
                         </xsl:choose>
                       </select>
                     </div>
-                    <xsl:choose>
+                  <xsl:if test="$control_item_type = 'control_item_type_2' or 
$control_item_type = 'control_item_type_3' or $control_item_type = 
'control_item_type_4'">
+                     <xsl:choose>
                       <xsl:when test="$control_item_type = 
'control_item_type_2'">
                         <!--  MEASUREMENT -->
                         <div class="row">