[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10877] Overwrited function edit_check_list in mobile
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10877] Overwrited function edit_check_list in mobilefrontend |
|
Date: |
Sat, 16 Feb 2013 12:05:31 +0000 |
Revision: 10877
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10877
Author: vator
Date: 2013-02-16 12:05:31 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Overwrited function edit_check_list in mobilefrontend
Modified Paths:
--------------
trunk/controller/inc/class.hook_helper.inc.php
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/templates/mobilefrontend/css/base.css
Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php 2013-02-16 11:53:01 UTC
(rev 10876)
+++ trunk/controller/inc/class.hook_helper.inc.php 2013-02-16 12:05:31 UTC
(rev 10877)
@@ -64,7 +64,6 @@
*/
public function home($url_correction = '')
{
-
$location_array = array();
$component_short_desc = array();
@@ -265,7 +264,8 @@
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";
-
+ if($url_correction != 'mobilefrontend')
+ {
/* ======================================= UNDONE
ASSIGNED CONTROLS FOR CURRENT USER ================================= */
// from date is set to 3 months back in time
@@ -695,7 +695,7 @@
}
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
======================================== */
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2013-02-16 11:53:01 UTC
(rev 10876)
+++ trunk/controller/inc/class.socheck_item.inc.php 2013-02-16 12:05:31 UTC
(rev 10877)
@@ -147,7 +147,8 @@
* @param $check_item_id id to check item to be fetched
from database
* @return check item object
*/
- public function get_single_with_cases($check_item_id,
$return_type = "return_object")
+ /*
+ public function get_single_with_cases($check_item_id)
{
$check_item_id = (int) $check_item_id;
@@ -178,15 +179,8 @@
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$control_item->set_type($this->db->f('type', true), 'string');
-
- if($return_type == "return_array")
- {
-
$check_item->set_control_item($control_item->toArray());
- }
- else
- {
-
$check_item->set_control_item($control_item);
- }
+
+
$check_item->set_control_item($control_item);
$cases_array = array();
}
@@ -204,15 +198,7 @@
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
-
- if($return_type == "return_array")
- {
- $cases_array[] =
$case->toArray();
- }
- else
- {
- $cases_array[] = $case;
- }
+ $cases_array[] = $case;
}
$check_item_id = $check_item->get_id();
@@ -222,21 +208,14 @@
if($check_item != null)
{
$check_item->set_cases_array($cases_array);
-
- if($return_type == "return_array")
- {
- return $check_item->toArray();
- }
- else
- {
- return $check_item;
- }
+ return $check_item;
}
else
{
return null;
}
}
+ */
/**
* Get single check item object from database including related
control item
@@ -432,10 +411,9 @@
* Get check item objects from database including related
control item and cases
*
* @param $message_ticket_id get check items and cases
for this message
- * @param $returnType data returned as objects or arrays
* @return check item objects
*/
- public function
get_check_items_with_cases_by_message($message_ticket_id, $return_type =
"return_object")
+ public function
get_check_items_with_cases_by_message($message_ticket_id)
{
$message_ticket_id = (int) $message_ticket_id;
@@ -459,14 +437,7 @@
{
$check_item->set_cases_array($cases_array);
- if($return_type ==
"return_array")
- {
- $check_items_array[] =
$check_item->toArray();
- }
- else
- {
- $check_items_array[] =
$check_item;
- }
+ $check_items_array[] =
$check_item;
}
$check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id'), 'int'));
@@ -480,16 +451,9 @@
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
$control_item->set_control_group_id($this->db->f('control_group_id'), 'int');
$control_item->set_type($this->db->f('type', true), 'string');
-
- if($return_type == "return_array")
- {
-
$check_item->set_control_item($control_item->toArray());
- }
- else
- {
-
$check_item->set_control_item($control_item);
- }
+
$check_item->set_control_item($control_item);
+
$cases_array = array();
}
@@ -506,15 +470,7 @@
$case->set_modified_date($this->unmarshal($this->db->f('modified_date'),
'int'));
$case->set_modified_by($this->unmarshal($this->db->f('modified_by'), 'int'));
-
- if($return_type == "return_array")
- {
- $cases_array[] =
$case->toArray();
- }
- else
- {
- $cases_array[] = $case;
- }
+ $cases_array[] = $case;
}
$check_item_id = $check_item->get_id();
@@ -523,16 +479,8 @@
if($check_item != null)
{
$check_item->set_cases_array($cases_array);
+ $check_items_array[] = $check_item;
- if($return_type == "return_array")
- {
- $check_items_array[] =
$check_item->toArray();
- }
- else
- {
- $check_items_array[] = $check_item;
- }
-
return $check_items_array;
}
else
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2013-02-16
11:53:01 UTC (rev 10876)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2013-02-16
12:05:31 UTC (rev 10877)
@@ -160,10 +160,9 @@
* Get control item objects from database as objects or as
arrays
*
* @param $control_group_id control group id
- * @param $return_type return data as objects or as arrays
* @return array with control items
*/
- function get_control_items($control_group_id, $return_type =
"return_object")
+ function get_control_items($control_group_id)
{
$control_group_id = (int) $control_group_id;
@@ -184,14 +183,7 @@
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id'),
'int'));
- if($return_type == "return_object")
- {
- $results[] = $control_item;
- }
- else
- {
- $results[] = $control_item->toArray();
- }
+ $results[] = $control_item;
}
return $results;
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2013-02-16
11:53:01 UTC (rev 10876)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2013-02-16
12:05:31 UTC (rev 10877)
@@ -13,4 +13,7 @@
#check_list_menu {
margin: 20px 0;
+}
+#view_cases .tab_menu {
+ display: none;
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10877] Overwrited function edit_check_list in mobilefrontend,
Torstein <=