[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11872] controller: modify homescreen and fix acciden
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11872] controller: modify homescreen and fix accidental complete status |
|
Date: |
Wed, 26 Mar 2014 12:54:35 +0000 |
Revision: 11872
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11872
Author: sigurdne
Date: 2014-03-26 12:54:34 +0000 (Wed, 26 Mar 2014)
Log Message:
-----------
controller: modify homescreen and fix accidental complete status
Modified Paths:
--------------
trunk/controller/inc/class.hook_helper.inc.php
trunk/controller/inc/class.socase.inc.php
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/setup/phpgw_no.lang
Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php 2014-03-26 10:15:16 UTC
(rev 11871)
+++ trunk/controller/inc/class.hook_helper.inc.php 2014-03-26 12:54:34 UTC
(rev 11872)
@@ -445,7 +445,8 @@
ksort($my_undone_controls);
$my_undone_controls_HTML .= "<ul>";
-
+
+ $lang_planned_date = lang('planned date');
foreach($my_undone_controls as $date_ts =>
$controls_on_date)
{
// If number of controls on a date exceeds 1 it
will be put in expand list
@@ -464,6 +465,10 @@
$control_area_name =
$this->get_control_area_name( $my_control["control_area_id"] );
$date_str = date($dateformat,
$deadline_ts);
+ if($my_control['planned_date'])
+ {
+ $date_str_planned =
$lang_planned_date . ': ' . date($dateformat, $my_control['planned_date']);
+ }
if($check_list_status == "add")
{
@@ -479,14 +484,14 @@
$link = "";
$link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts));
-
$my_undone_controls_HTML .= "<li><a href='{$link}'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
+
$my_undone_controls_HTML .= "<li><a href='{$link}' title =
'{$date_str_planned}'><div class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
}
else
{
$link = "";
$link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "location", 'control_id' =>
$my_control['id'], 'location_code' => $location_code, 'deadline_ts' =>
$deadline_ts));
-
$my_undone_controls_HTML .= "<a href='{$link}'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a>";
+
$my_undone_controls_HTML .= "<a href='{$link} title =
'{$date_str_planned}''><div class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a>";
}
}
@@ -501,14 +506,14 @@
$link = "";
$link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts));
-
$my_undone_controls_HTML .= "<li><a href='{$link}'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_descr}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
+
$my_undone_controls_HTML .= "<li><a href='{$link}' title =
'{$date_str_planned}'><div class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_descr}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
}
else
{
$link = "";
$link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.add_check_list', 'type' => "component", 'control_id'
=> $my_control['id'], 'location_id' => $location_id, 'component_id' =>
$component_id, 'deadline_ts' => $deadline_ts));
-
$my_undone_controls_HTML .= "<a href='{$link}'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_descr}</div><div
class='control-area'>{$control_area_name}</div></a>";
+
$my_undone_controls_HTML .= "<a href='{$link}' title =
'{$date_str_planned}'><div class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_descr}</div><div
class='control-area'>{$control_area_name}</div></a>";
}
}
}
@@ -536,14 +541,14 @@
$link = "";
$link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
-
$my_undone_controls_HTML .= "<li><a href='{$link}'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
+
$my_undone_controls_HTML .= "<li><a href='{$link}' title =
'{$date_str_planned}'><div class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
}
else
{
$link = "";
$link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
-
$my_undone_controls_HTML .= "<li><a href='$link'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
+
$my_undone_controls_HTML .= "<li><a href='$link' title =
'{$date_str_planned}'><div class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
}
}
}
Modified: trunk/controller/inc/class.socase.inc.php
===================================================================
--- trunk/controller/inc/class.socase.inc.php 2014-03-26 10:15:16 UTC (rev
11871)
+++ trunk/controller/inc/class.socase.inc.php 2014-03-26 12:54:34 UTC (rev
11872)
@@ -290,10 +290,10 @@
'num_pending_cases' => $num_pending_cases,
);
- if($num_open_cases > 0)
- {
- $values['status'] =
controller_check_list::STATUS_DONE;
- }
+// if($num_open_cases > 0)
+// {
+// $values['status'] =
controller_check_list::STATUS_DONE;
+// }
$value_set = $this->db->validate_update($values);
return $this->db->query("UPDATE controller_check_list
SET {$value_set} WHERE id = '{$check_list_id}'",__LINE__,__FILE__);
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2014-03-26 10:15:16 UTC
(rev 11871)
+++ trunk/controller/inc/class.socontrol.inc.php 2014-03-26 12:54:34 UTC
(rev 11872)
@@ -148,9 +148,11 @@
//FIXME
if($completed)
{
- $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 ";
+ $sql .= " AND ( planned_date < $to_date 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
{
@@ -227,9 +229,11 @@
//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 ";
+ $sql .= " AND ( planned_date < $to_date AND
controller_check_list.completed_date IS NULL) ";
+
+// $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
{
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2014-03-26 10:15:16 UTC (rev
11871)
+++ trunk/controller/setup/phpgw_no.lang 2014-03-26 12:54:34 UTC (rev
11872)
@@ -369,3 +369,4 @@
Show message controller no Vis melding
Status not done controller no Status: Ikke utført
Status done controller no Status: Utført
+planned date controller no Planlagt Dato
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11872] controller: modify homescreen and fix accidental complete status,
Sigurd Nes <=