[Fmsystem-commits] [10899] Deleted function view_cases_for_check_list

[Torstein]

Revision: 10899
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10899
Author:   vator
Date:     2013-02-17 16:27:42 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Deleted function view_cases_for_check_list

Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/inc/model/class.check_item_case.inc.php
    trunk/controller/inc/model/class.control.inc.php
    trunk/controller/js/controller/case.js
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2013-02-17 15:55:02 UTC (rev 
10898)
+++ trunk/controller/inc/class.uicase.inc.php   2013-02-17 16:27:42 UTC (rev 
10899)
@@ -258,23 +258,30 @@
                        $case->set_measurement($measurement);
                        $case->set_status($case_status);
                        
-                       $case_id = $this->so->store($case);
-                       $case = $this->so->get_single($case_id);
-                       
-                       if($case_id > 0){
-                               $cl_status_updater = new 
check_list_status_updater();
-                               $cl_status_updater->update_check_list_status( 
$check_list_id );
-                                               
-                               $check_item = 
$this->so_check_item->get_single($case->get_check_item_id());
-                               $control_item = 
$this->so_control_item->get_single($check_item->get_control_item_id());
-                               
-                               $type = $control_item->get_type();
-                               
-                               return json_encode( array( "status" => "saved", 
"type" => $type, "caseObj" => $case->toArray() ) );
-                       }
-                       else{
-                               return json_encode( array( "status" => 
"not_saved" ) );
-                       }
+      if($case->validate())
+      {
+        $case_id = $this->so->store($case);
+        $case = $this->so->get_single($case_id);
+
+        if($case_id > 0){
+          $cl_status_updater = new check_list_status_updater();
+          $cl_status_updater->update_check_list_status( $check_list_id );
+
+          $check_item = 
$this->so_check_item->get_single($case->get_check_item_id());
+          $control_item = 
$this->so_control_item->get_single($check_item->get_control_item_id());
+
+          $type = $control_item->get_type();
+
+          return json_encode( array( "status" => "saved", "type" => $type, 
"caseObj" => $case->toArray() ) );
+        }
+        else{
+          return json_encode( array( "status" => "not_saved" ) );
+        }
+      }
+      else
+      {
+        return json_encode( array( "status" => "error" ) );
+      }
                }
                
                function create_case_message(){
@@ -680,7 +687,9 @@
                                'open_check_items_and_cases'        => 
$open_check_items_and_cases,
         'cases_view'                        => 'open_cases',
                        );
-                             
+                            
+      self::add_javascript('controller', 'controller', 'case.js');
+      
                        self::render_template_xsl( 
array('check_list/fragments/check_list_menu', 'case/cases_tab_menu', 
'case/view_open_cases', 'case/case_row', 
                                        
'check_list/fragments/nav_control_plan', 
'check_list/fragments/check_list_top_section', 
                                        
'check_list/fragments/select_buildings_on_property'), $data );                  
@@ -749,6 +758,8 @@
         'cases_view'                        => 'closed_cases'
                        );
                        
+      self::add_javascript('controller', 'controller', 'case.js');
+      
       self::render_template_xsl( array('check_list/fragments/check_list_menu', 
'case/cases_tab_menu', 'case/view_closed_cases', 'case/case_row', 
                                        
'check_list/fragments/nav_control_plan', 
'check_list/fragments/check_list_top_section', 
                                        
'check_list/fragments/select_buildings_on_property'), $data );                  

Modified: trunk/controller/inc/model/class.check_item_case.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_item_case.inc.php    2013-02-17 
15:55:02 UTC (rev 10898)
+++ trunk/controller/inc/model/class.check_item_case.inc.php    2013-02-17 
16:27:42 UTC (rev 10899)
@@ -146,4 +146,41 @@
                {
                        $this->location_code = $location_code;
                }
+    
+    public function validate()
+               {
+                       $status = true;
+       
+                       // Validate DESCRIPTION
+                       if( empty( $this->descr ) )
+                 {
+                       $status = false;
+                       $this->error_msg_array['descr'] = "error_msg_1";
+                 }
+                 
+                 // Validate STATUS                              
+                       if( empty( $this->status ) && ( (intval($this->status) 
== self::STATUS_OPEN) || (intval($this->status) == self::STATUS_CLOSED) || 
(intval($this->status) == self::STATUS_PENDING)) )
+                 {
+                       $status = false;
+                       $this->error_msg_array['status'] = "error_msg_1";
+                 }
+                       
+                 // Validate LOCATION CODE
+                 if( empty($this->location_code) )
+                 {
+                       $status = false;
+                       $this->error_msg_array['location_code'] = "error_msg_1";
+                 }
+                                 
+                 // Validate CHECK ITEM ID
+                       if( empty($this->check_item_id) )
+                 {
+                       $status = false;
+                       $this->error_msg_array['check_item_id'] = "error_msg_4";
+                 }
+
+                 //to do: return $status;
+      
+      return true;
+               }    
        }

Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php    2013-02-17 15:55:02 UTC 
(rev 10898)
+++ trunk/controller/inc/model/class.control.inc.php    2013-02-17 16:27:42 UTC 
(rev 10899)
@@ -354,7 +354,6 @@
                        $this->error_msg_array['responsibility_id'] = 
"error_msg_2";
                  }
                  
-                 
                  return $status;
                }
        }

Modified: trunk/controller/js/controller/case.js
===================================================================
--- trunk/controller/js/controller/case.js      2013-02-17 15:55:02 UTC (rev 
10898)
+++ trunk/controller/js/controller/case.js      2013-02-17 16:27:42 UTC (rev 
10899)
@@ -112,7 +112,8 @@
        });
        
        $("a.quick_edit_case").live("click", function(e){
-               var clickElem = $(this);
+    e.preventDefault();
+    console.log("sdfsdfsd");
                var clickRow = $(this).closest("li");
                                                                        
                $(clickRow).find(".case_info").hide();
@@ -122,7 +123,6 @@
        });
        
        $(".frm_update_case .cancel").live("click", function(e){
-               var clickElem = $(this);
                var clickRow = $(this).closest("li");
                                
                

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2013-02-17 15:55:02 UTC 
(rev 10898)
+++ trunk/controller/templates/base/css/base.css        2013-02-17 16:27:42 UTC 
(rev 10899)
@@ -1782,7 +1782,23 @@
   overflow: hidden;
 }
 
+li.check_item_case ul li.quick_edit_case {
+  padding: 0;
+}
+
+li.check_item_case .quick_edit_case h4 {
+  color: #000000;
+  margin: 0;
+  padding: 2px 10px;
+}
+
 li.check_item_case ul li .col_1 {
+    font-size: 15px;
+    font-weight: bold;
+    text-align: center;
+}
+
+li.check_item_case ul li .col_1 {
   float: left;
   padding: 2em 0;
   text-align: center;
@@ -1805,34 +1821,6 @@
   width: 14.7333%;
 }
 
-li.check_item_case ul li.quick_edit_case {
-  padding: 0;
-}
-
-li.check_item_case .quick_edit_case h4 {
-  color: #000000;
-  margin: 0;
-  padding: 2px 10px;
-}
-
-li.check_item_case .col_1 {
-  display: inline-block;
-  padding: 2em 2%;
-  vertical-align: top;
-}
-
-li.check_item_case .col_2 {
-  border-left: 1px solid #DDDDDD;
-  border-right: 1px solid #DDDDDD;
-  display: inline-block;
-  padding: 1em 2%;
-  width: 73%;
-}
-li.check_item_case .col_3 {
-  display: inline-block;
-  padding: 3%;
-  vertical-align: top;
-}
 #main_content .quick_edit_case fieldset {
   padding: 5px;
 }