[Fmsystem-commits] [11508] adjustment to data for hook_home

[Sigurd Nes]

Revision: 11508
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11508
Author:   sigurdne
Date:     2013-12-05 20:13:48 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
adjustment to data for hook_home

Modified Paths:
--------------
    trunk/controller/inc/class.hook_helper.inc.php
    trunk/controller/inc/class.socheck_list.inc.php
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/property/inc/class.soworkorder.inc.php

Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php      2013-12-05 17:35:53 UTC 
(rev 11507)
+++ trunk/controller/inc/class.hook_helper.inc.php      2013-12-05 20:13:48 UTC 
(rev 11508)
@@ -116,7 +116,6 @@
                        echo $styling;
 
                        //Loaded from home.php
-                       //echo "<script 
src='phpgwapi/js/jquery/js/jquery-1.7.2.min.js'></script>";
 
                        $script = "<script>";
                        $script .= "$(document).ready(function(){";
@@ -183,7 +182,7 @@
 
                // Fetches controls current user is responsible for 1 month 
ahead
                        $my_controls = array();
-                       $my_controls = $this->get_my_controls($my_locations, 
$from_date_ts, $to_date_ts, $repeat_type);
+//                     $my_controls = $this->get_my_controls($my_locations, 
$from_date_ts, $to_date_ts, $repeat_type);
 
                        $my_check_lists = 
$this->get_my_assigned_check_list($from_date_ts, $to_date_ts, $repeat_type);
 

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2013-12-05 17:35:53 UTC 
(rev 11507)
+++ trunk/controller/inc/class.socheck_list.inc.php     2013-12-05 20:13:48 UTC 
(rev 11508)
@@ -835,7 +835,7 @@
                        
                if($num_open_cases > 0)
                {
-                       
$check_list->set_status(controller_check_list::STATUS_DONE);
+//                     
$check_list->set_status(controller_check_list::STATUS_DONE);
                }
          
                $check_list->set_num_open_cases($num_open_cases);

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2013-12-05 17:35:53 UTC 
(rev 11507)
+++ trunk/controller/inc/class.socontrol.inc.php        2013-12-05 20:13:48 UTC 
(rev 11508)
@@ -137,7 +137,7 @@
                                . " FROM controller_check_list"
                                . " {$this->join} controller_control ON 
controller_check_list.control_id = controller_control.id"
                                . " {$this->join} 
controller_control_location_list ON controller_control_location_list.control_id 
= controller_control.id"
-                               . " WHERE assigned_to = {$user_id}";
+                               . " WHERE assigned_to = {$user_id} AND status = 
0";
 
 //_debug_array($sql);
                        if( $repeat_type )
@@ -149,6 +149,7 @@
                        $sql .= " AND ((controller_control.start_date <= 
$to_date AND controller_control.end_date IS NULL) ";
                        $sql .= " OR (controller_control.start_date <= $to_date 
AND controller_control.end_date > $from_date ))";
 
+                       //FIXME
                        if($completed)
                        {
                                $sql .= " AND 
controller_check_list.completed_date IS NULL ";                   
@@ -214,13 +215,14 @@
                                        . " ON 
(controller_control_component_list.control_id = 
controller_check_list.control_id"
                                        . " AND 
controller_control_component_list.location_id = 
controller_check_list.location_id"
                                        . " AND 
controller_control_component_list.component_id = 
controller_check_list.component_id)"
-                               . " WHERE assigned_to = {$user_id}";
+                               . " WHERE assigned_to = {$user_id} AND status = 
0";
 
                        if( $repeat_type )
                        {
 //                             $sql .= "AND controller_control.repeat_type = 
$repeat_type ";
                        }
 
+                       //FIXME
                        if($completed)
                        {
                                $sql .= " AND 
controller_check_list.completed_date IS NULL ";                   

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2013-12-05 17:35:53 UTC 
(rev 11507)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2013-12-05 20:13:48 UTC 
(rev 11508)
@@ -737,6 +737,7 @@
                        }
                        else
                        {
+                               $check_list_status = 
controller_check_list::STATUS_NOT_DONE;
                                $check_list->set_completed_date(0);
                        }
 

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2013-12-05 17:35:53 UTC 
(rev 11507)
+++ trunk/property/inc/class.soworkorder.inc.php        2013-12-05 20:13:48 UTC 
(rev 11508)
@@ -1516,7 +1516,21 @@
                                }
                                if ($this->db->f('delivered') || 
$this->db->f('closed'))
                                {
-                                       //close
+                                       $action_params = array
+                                               (
+                                                       'appname'               
        => 'property',
+                                                       'location'              
        => '.project.workorder',
+                                                       'id'                    
        => $workorder['id'],
+                                                       'responsible'           
=> $this->account,
+                                                       'responsible_type'  => 
'user',
+                                                       'action'                
        => 'approval',
+                                                       'remark'                
        => '',
+                                                       'deadline'              
        => ''
+                                               );
+
+                                       
execMethod('property.sopending_action.close_pending_action', $action_params);
+                                       unset($action_params);
+
                                }
                        }