[Fmsystem-commits] [9709]

[Torstein]

Revision: 9709
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9709
Author:   vator
Date:     2012-07-03 10:34:24 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_list.inc.php
    trunk/controller/inc/class.uicalendar.inc.php

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2012-07-03 10:22:25 UTC 
(rev 9708)
+++ trunk/controller/inc/class.socheck_list.inc.php     2012-07-03 10:34:24 UTC 
(rev 9709)
@@ -416,7 +416,7 @@
                    $sql .= "WHERE cl.location_code = 
'{$cl_criteria->get_location_code()}' ";
                }
                
-               $sql .= "AND c.id = $control_id ";
+               $sql .= "AND c.id = $cl_criteria->get_control_id ";
                $sql .= "AND cl.control_id = c.id ";
                $sql .= "AND cl.deadline >= $from_date_ts AND $to_date_ts > 
cl.deadline ";
                $sql .= "GROUP BY c.id";

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-07-03 10:22:25 UTC 
(rev 9708)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-07-03 10:34:24 UTC 
(rev 9709)
@@ -610,8 +610,8 @@
                        // Fetches aggregate value for open cases in each month 
in time period
                        for($from_month; $from_month <= $to_month; 
$from_month++)
                        {
-                               $month_start_ts = 
$this->get_month_start_date_ts($year, $from_month);
-                               $month_end_ts   = 
$this->get_month_start_date_ts($year, $from_month+1);
+                               $month_start_ts = 
$this->get_month_start_ts($year, $from_month);
+                               $month_end_ts   = 
$this->get_month_start_ts($year, $from_month+1);
                                
                                $num_open_cases_for_control_array = array();