[Fmsystem-commits] [9976]

[Torstein]

Revision: 9976
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9976
Author:   vator
Date:     2012-09-06 10:50:57 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/check_list/case_row.xsl

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-09-06 10:35:33 UTC (rev 
9975)
+++ trunk/controller/js/controller/ajax.js      2012-09-06 10:50:57 UTC (rev 
9976)
@@ -644,7 +644,9 @@
                                        var type = 
$(thisForm).find("input[name=control_item_type]").val();
                                        
                                        if(type == "control_item_type_1"){
+                                               var case_status = 
$(thisForm).find("select[name='case_status'] option:selected").text();
                                                
+                                               $(clickRow).find(".case_info 
.case_status").empty().text( case_status );
                                        }
                                        else if(type == "control_item_type_2"){
                                                var case_status = 
$(thisForm).find("select[name='case_status'] option:selected").text();
@@ -654,7 +656,7 @@
                                                var measurement_text = 
$(thisForm).find("input[name='measurement']").val();
                                                $(clickRow).find(".case_info 
.measurement").text(measurement_text);
                                        }
-                                       else if(type == "control_item_type_3" | 
type == "control_item_type_4"){
+                                       else if(type == "control_item_type_3"){
                                                var case_status = 
$(thisForm).find("select[name='case_status'] option:selected").text();
                                                
                                                $(clickRow).find(".case_info 
.case_status").empty().text( case_status );
@@ -662,6 +664,14 @@
                                                var measurement_text = 
$(thisForm).find("select[name='measurement'] option:selected").val();
                                                $(clickRow).find(".case_info 
.measurement").text(measurement_text);
                                        }
+                                       else if(type == "control_item_type_4"){
+                                               var case_status = 
$(thisForm).find("select[name='case_status'] option:selected").text();
+                                               
+                                               $(clickRow).find(".case_info 
.case_status").empty().text( case_status );
+                                               
+                                               var measurement_text = 
$(thisForm).find("input:radio[name='measurement']:checked").val();
+                                               $(clickRow).find(".case_info 
.measurement").text(measurement_text);
+                                       }
                                        
                                        // Text from forms textarea
                                        var desc_text = 
$(thisForm).find("textarea").val();

Modified: trunk/controller/templates/base/check_list/case_row.xsl
===================================================================
--- trunk/controller/templates/base/check_list/case_row.xsl     2012-09-06 
10:35:33 UTC (rev 9975)
+++ trunk/controller/templates/base/check_list/case_row.xsl     2012-09-06 
10:50:57 UTC (rev 9976)
@@ -145,7 +145,7 @@
                           </input>
                         </div>
                       </xsl:when>
-                      <xsl:when test="$control_item_type = 
'control_item_type_3' or $control_item_type = 'control_item_type_4'">
+                      <xsl:when test="$control_item_type = 
'control_item_type_3'">
                         <!--  MEASUREMENT -->
                         <div class="row">
                           <label class="comment">Velg verdi fra liste</label>
@@ -161,6 +161,20 @@
                           </select>
                         </div>
                       </xsl:when>
+                      <xsl:when test="$control_item_type = 
'control_item_type_4'">
+                        <!--  MEASUREMENT -->
+                        <div class="row">
+                          <label class="comment">Velg verdi fra liste</label>
+                            <xsl:for-each 
select="../control_item/options_array">
+                                       <input type="radio" name="measurement" 
value="female">
+                                        <xsl:attribute name="value">
+                                  <xsl:value-of select="option_value"/>
+                                </xsl:attribute>
+                                </input>
+                                       <xsl:value-of select="option_value"/>
+                            </xsl:for-each>
+                        </div>
+                      </xsl:when>
                     </xsl:choose>
                   </xsl:if>