[Fmsystem-commits] [8835]

[Torstein]

Revision: 8835
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8835
Author:   vator
Date:     2012-02-13 08:53:23 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/check_list/view_open_cases.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2012-02-13 07:51:42 UTC (rev 
8834)
+++ trunk/controller/inc/class.uicase.inc.php   2012-02-13 08:53:23 UTC (rev 
8835)
@@ -147,12 +147,13 @@
                        $case->set_status($case_status);
                        
                        $case_id = $this->so->store($case);
+                       $case = $this->so->get_single($case_id);
                        
                        if($case_id > 0){
                                $status_checker = new status_checker();
                                $status_checker->update_check_list_status( 
$check_list_id );
                                                
-                               return json_encode( array( "status" => "saved" 
) );
+                               return json_encode( array( "status" => "saved", 
"case" => $case->toArray() ) );
                        }
                        else
                                return json_encode( array( "status" => 
"not_saved" ) );

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-02-13 07:51:42 UTC (rev 
8834)
+++ trunk/controller/js/controller/ajax.js      2012-02-13 08:53:23 UTC (rev 
8835)
@@ -445,7 +445,6 @@
                e.preventDefault();
 
                var thisForm = $(this);
-               //var submitBnt = $(thisForm).find("input[type='submit']");
                var requestUrl = $(thisForm).attr("action");
                
                $.ajax({
@@ -456,8 +455,12 @@
                                  var jsonObj = jQuery.parseJSON(data);
                                
                                  if(jsonObj.status == "saved"){
-                                         
-                                         alert("SAVED");
+                                         var case_id = "#case_" + 
jsonObj.case.id; 
+                                         var case_descr = jsonObj.case.descr;
+                                         
+                                         $(case_id).show();
+                                         
$(case_id).find(".case_descr").text(case_descr);
+                                         $(thisForm).parents("li").remove();   
  
                                          }
                                  }
                                }
@@ -466,19 +469,23 @@
        
        $("a.quick_edit").live("click", function(e){
                var clickElem = $(this);
-               var clickRow = $(this).closest("li");
+               var clickRow = $(this).parents("li.check_item_case");
                                
                var case_info = $(clickRow).find(".case_info");
-               var case_id = $(clickRow).find(".case_id").text();
-               var case_descr = $(clickRow).find(".case_descr").text();
-               var case_status = $(clickRow).find(".case_status").text();
-               var case_measurement = 
$(clickRow).find(".case_measurement").text();
+               var case_id = $(case_info).find(".case_id").text();
+               var case_descr = $(case_info).find(".case_descr").text();
+               var case_status = $(case_info).find(".case_status").text();
+               var case_measurement = 
$(case_info).find(".case_measurement").text();
+               var case_type = $(case_info).find(".case_type").text();
                var requestUrl = $(clickElem).attr('href');
                
                $(clickRow).hide();
                
+               $(clickRow).attr("id", "case_" + case_id);
                
-               var quickEditRowTagStr = "<li 
class='quick_edit'><h3>Hurtigendring</h3><fieldset><form 
class='frm_update_case' action='" + requestUrl + "'>";
+               var quickEditRowTagStr = "<li class='quick_edit 
check_item_case'><h3>Hurtigendring</h3><fieldset><form class='frm_update_case' 
action='" + requestUrl + "'>";
+                       
+               if(case_type == "control_item_type_2")
                        quickEditRowTagStr += "<label>Måleverdi</label><input 
type='text' name='case_measurement'>" + case_measurement + "</input>";
                
                if(case_status == 1)
@@ -498,10 +505,6 @@
                return false;   
        });
        
-       
-       
-       
-       
        // Delete a case item from list
        $(".delete_case").live("click", function(){
                var clickElem = $(this);

Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-02-13 07:51:42 UTC (rev 8834)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl      
2012-02-13 08:53:23 UTC (rev 8835)
@@ -80,6 +80,7 @@
                                                                                
                <div class="case_descr"><xsl:value-of select="descr"/></div>
                                                                                
                <div class="case_status"><xsl:value-of select="status"/></div>
                                                                                
                <div class="case_measurement"><xsl:value-of 
select="measurement"/></div>
+                                                                               
                <div class="case_type"><xsl:value-of 
select="control_item/type"/></div>
                                                                                
        </div>
                                                                                
</li>
                                                                        
</xsl:for-each>
@@ -108,7 +109,7 @@
                                                                <ul>
                                                                        
<xsl:for-each select="cases_array">
                                                                                
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-                                                                               
<li><span class="order_nr"><xsl:number /></span>. <xsl:value-of select="descr"/>
+                                                                               
<li><span class="order_nr"><xsl:number /></span>. <span 
class="case_descr"><xsl:value-of select="descr"/></span>
                                                                                
        <xsl:choose>
                                                                                
                <xsl:when test="location_item_id > 0">
                                                                                
                        <div style="float:right;">
@@ -158,7 +159,7 @@
                                                                                
                <div class="case_id"><xsl:value-of select="id"/></div>
                                                                                
                <div class="case_descr"><xsl:value-of select="descr"/></div>
                                                                                
                <div class="case_status"><xsl:value-of select="status"/></div>
-                                                                               
                <div class="case_measurement"><xsl:value-of 
select="measurement"/></div>
+                                                                               
                <div class="case_type"><xsl:value-of 
select="control_item/type"/></div>
                                                                                
        </div>
                                                                                
</li>
                                                                        
</xsl:for-each>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-02-13 07:51:42 UTC 
(rev 8834)
+++ trunk/controller/templates/base/css/base.css        2012-02-13 08:53:23 UTC 
(rev 8835)
@@ -1277,7 +1277,7 @@
 li.check_item_case ul{
     margin-bottom: 20px;
 }
-li.check_item_case ul li {
+li.check_item_case ul li, li.quick_edit fieldset {
     border: 1px solid #AAAAAA;
     margin: 5px 0 0;
     padding: 5px;