[Fmsystem-commits] [11865] controller: list jobs at homescreen

[Sigurd Nes]

Revision: 11865
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11865
Author:   sigurdne
Date:     2014-03-25 21:27:19 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
controller: list jobs at homescreen

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2014-03-25 14:30:57 UTC 
(rev 11864)
+++ trunk/controller/inc/class.socontrol.inc.php        2014-03-25 21:27:19 UTC 
(rev 11865)
@@ -145,15 +145,17 @@
 //                             $sql .= "AND controller_control.repeat_type = 
$repeat_type ";
                        }
 
-                       
-                       $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 ";                   
+                               $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 ))";
+                               $sql .= " AND 
controller_check_list.completed_date IS NULL ";
                        }
+                       else
+                       {
+                               $sql .= " AND (planned_date > $from_date AND 
planned_date <= $to_date AND controller_control.end_date IS NULL) ";
+                       }
                        
 //_debug_array($sql);
                        $this->db->query($sql);
@@ -225,11 +227,15 @@
                        //FIXME
                        if($completed)
                        {
+                               $sql .= " AND ((deadline <= $to_date AND 
controller_control.end_date IS NULL) ";
+                               $sql .= " OR (deadline <= $to_date AND deadline 
> $from_date ))";
                                $sql .= " AND 
controller_check_list.completed_date IS NULL ";                   
                        }
+                       else
+                       {
+                               $sql .= " AND (planned_date > $from_date AND 
planned_date <= $to_date AND controller_control.end_date IS NULL) ";
+                       }
 
-                       $sql .= " AND ((deadline <= $to_date AND 
controller_control.end_date IS NULL) ";
-                       $sql .= " OR (deadline <= $to_date AND deadline > 
$from_date ))";
 
                        $this->db->query($sql);