[Fmsystem-commits] [10916] controller: update status at backend

[Sigurd Nes]

Revision: 10916
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10916
Author:   sigurdne
Date:     2013-02-18 13:35:53 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
controller: update status at backend

Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/js/controller/check_list.js
    
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2013-02-18 13:31:53 UTC 
(rev 10915)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2013-02-18 13:35:53 UTC 
(rev 10916)
@@ -611,35 +611,28 @@
          * 
          * @return json encoded array with status saved or not saved
          */
-        public function update_status()
-        {
-            $check_list_id = phpgw::get_var('check_list_id');
-            $check_list_status = phpgw::get_var('status');
+               public function update_status()
+               {
+                       $check_list_id = phpgw::get_var('check_list_id');
+                       $check_list_status = phpgw::get_var('status');
 
-            $check_list = $this->so->get_single($check_list_id);
+                       $check_list = $this->so->get_single($check_list_id);
+                       
+                       $check_list->set_status( $check_list_status );
 
-            $check_list->set_status($check_list_status);
+                       if($this->so->store($check_list))
+                       {
+                               return json_encode( array( 'status' => 
$check_list_status) );
+                       }
+                       else
+                       {
+                               return json_encode( array( "status" => 
'not_saved') );
+                       }
+               }
 
-            if($check_list->validate())
-            {
-                $save_status = $this->so->store($check_list);
-
-                if($save_status > 0)
-                {
-                    return json_encode(array("status" => "saved"));
-                } else
-                {
-                    return json_encode(array("status" => "not_saved"));
-                }
-            } else
-            {
-                return json_encode(array("status" => "not_saved"));
-            }
-        }
-
         public function query()
         {
             
         }
 
-    }
\ No newline at end of file
+    }

Modified: trunk/controller/js/controller/check_list.js
===================================================================
--- trunk/controller/js/controller/check_list.js        2013-02-18 13:31:53 UTC 
(rev 10915)
+++ trunk/controller/js/controller/check_list.js        2013-02-18 13:35:53 UTC 
(rev 10916)
@@ -76,11 +76,13 @@
        $("#update-check-list-status").live("submit", function(e){
     e.preventDefault();
     
-               var thisForm = $(this);
+       var thisForm = $(this);
     
-    var statusClass = $(thisForm).attr("class");
+       var statusClass = $(thisForm).attr("class");
                
-               var requestUrl = $(thisForm).attr("action");
+       var requestUrl = $(thisForm).attr("action");
+
+       var submitBnt = $(thisForm).find("input[type='submit']");
                
      $.ajax({
                          type: 'POST',
@@ -88,18 +90,27 @@
                           success: function(data) {
                                  if(data){
                                  var jsonObj = jQuery.parseJSON(data);
-                               
-                                 if(jsonObj.status == "saved"){
-                if(statusClass == "done"){
-                  $("#update-check-list-status.not_done").show();
-                  $("#update-check-list-status.done").hide();
-                }else{
-                  $("#update-check-list-status.not_done").hide();
-                  $("#update-check-list-status.done").show();
-                }
-              }
+
+                                 if(jsonObj.status == 'not_saved')
+                                 {
+                                               $(submitBnt).val("feil ved 
lagring");
+                                 }
+                                 else if(jsonObj.status == '1')
+                                 {
+                                       $(submitBnt).val("Utført");
+                                       
$("#update-check-list-status-value").val(0);
+                 //          
$("#update-check-list-status-icon.not_done").hide();
+             //                
$("#update-check-list-status-icon-done.done").show();
+                             }
+                             else
+                             {
+                                       $(submitBnt).val("Ikke utført");
+                                       
$("#update-check-list-status-value").val(1);
+                      //         
$("#update-check-list-status-icon.not_done").show();
+                  //         
$("#update-check-list-status-icon-done.done").hide();
+                             }
                                  }
                                }
                });     
        });
-});
\ No newline at end of file
+});

Modified: 
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl
===================================================================
--- 
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl 
    2013-02-18 13:31:53 UTC (rev 10915)
+++ 
trunk/controller/templates/base/check_list/fragments/check_list_top_section.xsl 
    2013-02-18 13:35:53 UTC (rev 10916)
@@ -27,6 +27,46 @@
             <xsl:call-template name="nav_control_plan" />
                </div>
                
+    <!-- ==================  CHANGE STATUS FOR CHECKLIST  
===================== -->
+               <xsl:choose>
+                       <xsl:when test="check_list/id != 0">
+                     <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicheck_list.update_status,phpgw_return_as:json')" 
/></xsl:variable>
+                             <form id="update-check-list-status" class="done" 
action="{$action_url}" method="post">
+                                       <input type="hidden" 
name="check_list_id" value="{check_list/id}" /> 
+                                               <xsl:choose>
+                                                       <xsl:when 
test="check_list/status = 0">
+                                                       <input 
id='update-check-list-status-value' type="hidden" name="status" value="1" />
+                                                       <input 
id="status_submit" type="submit" class="btn">
+                                                         <xsl:attribute 
name="value">
+                                                           <xsl:value-of 
select="php:function('lang', 'Status not done')" />
+                                                         </xsl:attribute>
+                                                       </input>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                       <input 
id='update-check-list-status-value' type="hidden" name="status" value="0" />
+                                                       <input type="submit" 
class="btn">
+                                                         <xsl:attribute 
name="value">
+                                                           <xsl:value-of 
select="php:function('lang', 'Status done')" />
+                                                         </xsl:attribute>
+                                                       </input>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+<!--
+                                                <div id 
='update-check-list-status-icon' class="not_done">
+                                                       <div class="icon">
+                                                               <img 
src="controller/images/red_ring.png" />
+                                                       </div>
+                                               </div>
+                                               <div id 
='update-check-list-status-icon-done' class="done">
+                                                       <div class="icon">
+                                                               <img 
src="controller/images/green_ring.png" />
+                                                       </div>
+                                               </div>
+-->
+                             </form>
+                               </xsl:when>
+                       </xsl:choose>
+      
                <!-- ==================  CHECKLIST TAB MENU  
===================== -->
         <xsl:choose>
         <xsl:when test="count(check_list_type) = 0 or check_list_type != 
'add_check_list'">

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2013-02-18 13:31:53 UTC 
(rev 10915)
+++ trunk/controller/templates/base/css/base.css        2013-02-18 13:35:53 UTC 
(rev 10916)
@@ -2323,4 +2323,25 @@
   margin:20px 0;
   background:#EEEEEE;
   padding:10px;
-}
\ No newline at end of file
+}
+
+#update-check-list-status {
+  float: right;
+  width: 180px;
+}
+
+
+#update-check-list-status .btn {
+  float:left;
+}
+
+#update-check-list-status .icon {
+  float: right;
+  margin: 0 4px;
+  vertical-align: middle;
+  width: 23px;
+}
+
+#update-check-list-status .icon img{
+  width: 100%;
+}