[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11204] controller: assigned to
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11204] controller: assigned to |
|
Date: |
Tue, 25 Jun 2013 12:22:17 +0000 |
Revision: 11204
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11204
Author: sigurdne
Date: 2013-06-25 12:22:14 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
controller: assigned to
Modified Paths:
--------------
trunk/controller/inc/class.hook_helper.inc.php
Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php 2013-06-25 10:47:28 UTC
(rev 11203)
+++ trunk/controller/inc/class.hook_helper.inc.php 2013-06-25 12:22:14 UTC
(rev 11204)
@@ -288,6 +288,8 @@
$my_planned_controls_HTML .= "</li></ul>";
}
+ $my_planned_controls_HTML .= "</div>"; // home_portal
+
echo "\n".'<!-- BEGIN checklist info -->'."\n <h2
class='heading'>Mine planlagte kontroller</h2><div class='home-box'>" .
$my_planned_controls_HTML . "</div></div>\n".'<!-- END checklist info -->'."\n";
@@ -401,127 +403,128 @@
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
- if(count( $controls_on_date) > 1 )
- {
- $my_undone_controls_HTML .=
"<li>";
- $my_undone_controls_HTML .= "<a
href='#'><h4 class='expand_trigger'><img height='12'
src='controller/images/arrow_right.png' /><span class='deadline'>" .
date($dateformat, $date_ts) . "</span><span class='num_check_lists'>(" .
count($controls_on_date) . " kontroller)</span></h4></a>";
- $my_undone_controls_HTML .=
"<ul class='expand_list'>";
- }
+ if(count( $controls_on_date) > 1 )
+ {
+ $my_undone_controls_HTML .= "<li>";
+ $my_undone_controls_HTML .= "<a
href='#'><h4 class='expand_trigger'><img height='12'
src='controller/images/arrow_right.png' /><span class='deadline'>" .
date($dateformat, $date_ts) . "</span><span class='num_check_lists'>(" .
count($controls_on_date) . " kontroller)</span></h4></a>";
+ $my_undone_controls_HTML .= "<ul
class='expand_list'>";
+ }
- foreach($controls_on_date as
$my_undone_control)
- {
- $check_list_status =
$my_undone_control[0];
- $deadline_ts =
$my_undone_control[1];
- $my_control =
$my_undone_control[2];
+ foreach($controls_on_date as $my_undone_control)
+ {
+ $check_list_status =
$my_undone_control[0];
+ $deadline_ts = $my_undone_control[1];
+ $my_control = $my_undone_control[2];
+ $control_area_name =
$this->get_control_area_name( $my_control["control_area_id"] );
- $control_area_name =
$this->get_control_area_name( $my_control["control_area_id"] );
+ $date_str = date($dateformat,
$deadline_ts);
- $date_str = date($dateformat,
$deadline_ts);
-
- if($check_list_status == "add")
+ if($check_list_status == "add")
+ {
+ $check_list_type =
$my_undone_control[3];
+ if($check_list_type ==
"location")
{
- $check_list_type =
$my_undone_control[3];
+ $location_code =
$my_undone_control[4];
+
if(!isset($location_array[$location_code]) || !$location_array[$location_code])
+ {
+
$location_array[$location_code] = execMethod('property.bolocation.read_single',
array('location_code' => $location_code));
+ }
+ $location_name =
$location_array[$location_code]["loc1_name"];
- if($check_list_type ==
"location")
+ if(count(
$controls_on_date) > 1 )
{
- $location_code
= $my_undone_control[4];
-
if(!isset($location_array[$location_code]) || !$location_array[$location_code])
- {
-
$location_array[$location_code] = execMethod('property.bolocation.read_single',
array('location_code' => $location_code));
- }
- $location_name
= $location_array[$location_code]["loc1_name"];
+ $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));
- if(count(
$controls_on_date) > 1 )
- {
- $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>";
- }
- 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 .= "<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>";
}
- else
if($check_list_type == "component")
+ else
{
- $location_id =
$my_undone_control[4];
- $component_id =
$my_undone_control[5];
+ $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));
-
if(!isset($component_short_desc[$location_id][$component_id]))
- {
-
$component_short_desc[$location_id][$component_id] =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
- }
-
-
if($component_short_desc[$location_id][$component_id])
- {
-
$short_desc_arr = $component_short_desc[$location_id][$component_id];
- }
-
- if(count(
$controls_on_date) > 1 )
- {
- $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_desc_arr}</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_desc_arr}</div><div
class='control-area'>{$control_area_name}</div></a>";
- }
+
$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>";
}
+
}
- else if($check_list_status ==
"edit")
+ else if($check_list_type ==
"component")
{
- $check_list_id =
$my_undone_control[3];
- $location_code =
$my_undone_control[4];
+ $location_id =
$my_undone_control[4];
+ $component_id =
$my_undone_control[5];
-
if(!isset($location_array[$location_code]) || !$location_array[$location_code])
+
if(!isset($component_short_desc[$location_id][$component_id]))
{
-
$location_array[$location_code] = execMethod('property.bolocation.read_single',
array('location_code' => $location_code));
+
$component_short_desc[$location_id][$component_id] =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
}
- $location_name =
$location_array[$location_code]["loc1_name"];
+
if($component_short_desc[$location_id][$component_id])
+ {
+ $short_desc_arr
= $component_short_desc[$location_id][$component_id];
+ }
+
if(count(
$controls_on_date) > 1 )
{
$link = "";
- $link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+ $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'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a></li>";
+
$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_desc_arr}</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));
+ $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'>{$location_name}</div><div
class='control-area'>{$control_area_name}</div></a>";
+
$my_undone_controls_HTML .= "<a href='{$link}'><div
class='date'>{$date_str}</div><div
class='control'>{$my_control['title']}</div><div
class='title'>{$short_desc_arr}</div><div
class='control-area'>{$control_area_name}</div></a>";
}
}
}
-
- if(count( $controls_on_date) > 1 )
+ else if($check_list_status == "edit")
{
- $my_undone_controls_HTML .=
"</ul>";
+ $check_list_id =
$my_undone_control[3];
+ $location_code =
$my_undone_control[4];
+
+
if(!isset($location_array[$location_code]) || !$location_array[$location_code])
+ {
+
$location_array[$location_code] = execMethod('property.bolocation.read_single',
array('location_code' => $location_code));
+ }
+ $location_name =
$location_array[$location_code]["loc1_name"];
+
+ if(count( $controls_on_date) >
1 )
+ {
+ $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>";
+ }
+ 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 .= "</div>"; //
home_portal
+ if(count( $controls_on_date ) > 1 )
+ {
+ $my_undone_controls_HTML .= "</ul>";
+ $my_undone_controls_HTML .= "</li>";
+ }
+ }
- echo "\n".'<!-- BEGIN checklist info -->'."\n
<h2 class='heading'>Mine ugjorte kontroller</h2><div
class='home-box'>".$my_undone_controls_HTML."</div>\n".'<!-- END checklist info
-->'."\n";
+ $my_undone_controls_HTML .= "</ul>";
+ $my_undone_controls_HTML .= "</div>"; // home_portal
- /* ================================ CONTROLS
ASSIGNED TO CURRENT USER ================================= */
+ echo "\n".'<!-- BEGIN checklist info -->'."\n <h2
class='heading'>Mine ugjorte kontroller</h2><div
class='home-box'>".$my_undone_controls_HTML."</div>\n".'<!-- END checklist info
-->'."\n";
- $my_assigned_controls_HTML = "<div
class='home_portal'><h2><div class='date heading'>Fristdato</div><div
class='control heading'>Tittel på kontroll</div><div class='title
heading'>Lokasjonsnavn</div><div class='control-area
heading'>Kontrollområde</div></h2>";
+ /* ================================ CONTROLS ASSIGNED
TO CURRENT USER ================================= */
+ $my_assigned_controls_HTML = "<div
class='home_portal'><h2><div class='date heading'>Fristdato</div><div
class='control heading'>Tittel på kontroll</div><div class='title
heading'>Lokasjonsnavn</div><div class='control-area
heading'>Kontrollområde</div></h2>";
+
+
$from_date_ts = strtotime("now");
$to_date_ts = mktime(0, 0, 0, date("n")+1, date("j"),
date("Y") );
@@ -614,10 +617,6 @@
{
$my_assigned_controls_HTML .= "<li>";
$my_assigned_controls_HTML .= "<a
href='#'><h4 class='expand_trigger'><img height='12'
src='controller/images/arrow_right.png' /><span class='deadline'>" .
date($dateformat, $date_ts) . "</span><span class='num_controls'>(" .
count($assigned_controls_on_date) . " kontroller)</span></h4></a>";
- }
-
- if(count( $assigned_controls_on_date ) > 1 )
- {
$my_assigned_controls_HTML .= "<ul
class='expand_list'>";
}
@@ -700,16 +699,16 @@
if(count( $assigned_controls_on_date ) > 1 )
{
$my_assigned_controls_HTML .= "</li>";
- }
-
- if(count( $assigned_controls_on_date ) > 1 )
- {
$my_assigned_controls_HTML .= "</ul>";
}
+
}
+ $my_assigned_controls_HTML .= "</ul>";
+ $my_assigned_controls_HTML .= "</div>"; // home_portal
+
echo "\n".'<!-- BEGIN checklist info -->'."\n <h2
class='heading'>Mine tildelte kontroller</h2><div class='home-box'>" .
$my_assigned_controls_HTML . "</div></div>\n".'<!-- END checklist info
-->'."\n";
- }
+ }
}
/* ================================ FUNCTIONS
======================================== */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11204] controller: assigned to,
Sigurd Nes <=