[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8042] Merge 7993:8041 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8042] Merge 7993:8041 from trunk |
|
Date: |
Mon, 07 Nov 2011 19:45:21 +0000 |
Revision: 8042
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8042
Author: sigurdne
Date: 2011-11-07 19:45:21 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Merge 7993:8041 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php
branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
branches/Version-1_0-branch/controller/js/yahoo/datatable.js
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/setup/tables_update.inc.php
branches/Version-1_0-branch/controller/templates/base/control.xsl
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/control_group_items.xsl
branches/Version-1_0-branch/controller/templates/base/control_group_tabs.xsl
branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
branches/Version-1_0-branch/controller/templates/base/control_item.xsl
branches/Version-1_0-branch/controller/templates/base/control_items.xsl
branches/Version-1_0-branch/controller/templates/base/control_tabs.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/controller/templates/base/datatable.xsl
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/rental/templates/base/css/base.css
branches/Version-1_0-branch/rental/templates/base/party.php
Added Paths:
-----------
branches/Version-1_0-branch/controller/images/status_icon_blue.png
branches/Version-1_0-branch/controller/images/status_icon_blue.psd
branches/Version-1_0-branch/controller/images/status_icon_dark_green.png
branches/Version-1_0-branch/controller/images/status_icon_light_green.png
branches/Version-1_0-branch/controller/images/status_icon_light_green.psd
branches/Version-1_0-branch/controller/images/status_icon_red.png
branches/Version-1_0-branch/controller/images/status_icon_red.psd
branches/Version-1_0-branch/controller/images/status_icon_yellow.png
branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
branches/Version-1_0-branch/controller/templates/base/app_data.xsl
branches/Version-1_0-branch/controller/templates/base/choose_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/view_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/view_control_item_list.xsl
Removed Paths:
-------------
branches/Version-1_0-branch/controller/templates/base/app_data.xsl
branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/control_items_receipt.xsl
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
branches/Version-1_0-branch/controller/templates/base/example_edit.xsl
branches/Version-1_0-branch/controller/templates/base/example_normal_tabs.xsl
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -456,14 +456,17 @@
$values = array();
if($district_id != null)
{
- $sql = "SELECT name FROM fm_part_of_town where
part_of_town_id in ($district_id)";
+ $sql = "SELECT district_id, name FROM fm_part_of_town
where part_of_town_id in ($district_id)";
$this->db->query($sql, __LINE__, __FILE__);
while($this->db->next_record()){
- $values[] = $this->db->f('name');
+ $name = $this->db->f('name');
+ $values[] = $name;
+ //$result .= $name . ',';
}
+ $result = implode(", ",$values);
+ return $result;
}
- $result = implode(",",$values);
- return $result;
+ return "";
}
function get_districts()
Modified: branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -296,5 +296,18 @@
$result = implode(' ' , $result_arr);
return $result;
}
+
+ public function get_arena_id_by_name($arena_name)
+ {
+ $result = 0;
+ if(isset($arena_name) && $arena_name != ''){
+ $q1="SELECT id FROM activity_arena WHERE UPPER(arena_name) =
UPPER('{$arena_name}')";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('id');
+ }
+ }
+ return $result;
+ }
}
?>
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -232,21 +232,30 @@
$arena_name = $this->decode($data[8]);
$arena_address =
$this->decode($data[10]);
$curr_arena_id = 0;
+ $existing_arena_id = 0;
$internal_arena_id = "";
if($arena_name){
-
$arena->set_arena_name($arena_name);
-
$arena->set_address($arena_address);
-
- // All is good, store
notification
- if ($soarena->store($arena)) {
- $this->messages[] =
"Successfully imported arena: Name ({$arena_name})";
- $curr_arena_id =
$arena->get_id();
- } else {
- $this->errors[] =
"Error importing arena: Name ({$arena_name})";
- $curr_arena_id = 0;
- $arenaOK = false;
+ $existing_arena_id =
$soarena->get_arena_id_by_name($arena_name);
+ if($existing_arena_id > 0)
+ {
+ $curr_arena_id =
$existing_arena_id;
}
+ else
+ {
+
$arena->set_arena_name($arena_name);
+
$arena->set_address($arena_address);
+
+ // All is good, store
notification
+ if
($soarena->store($arena)) {
+
$this->messages[] = "Successfully imported arena: Name ({$arena_name})";
+ $curr_arena_id
= $arena->get_id();
+ } else {
+ $this->errors[]
= "Error importing arena: Name ({$arena_name})";
+ $curr_arena_id
= 0;
+ $arenaOK =
false;
+ }
+ }
}
else
{
Modified:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -284,7 +284,7 @@
$arena_name =
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena());
}
- $activity_district =
activitycalendar_soactivity::get_instance()->get_district_name($this->get_district());
+ $activity_district =
$this->get_so()->get_district_name($this->get_district());
return array(
'id' => $this->get_id(),
Copied: branches/Version-1_0-branch/controller/images/status_icon_blue.png
(from rev 8041, trunk/controller/images/status_icon_blue.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/status_icon_blue.psd
(from rev 8041, trunk/controller/images/status_icon_blue.psd)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/status_icon_dark_green.png (from
rev 8041, trunk/controller/images/status_icon_dark_green.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/status_icon_light_green.png (from
rev 8041, trunk/controller/images/status_icon_light_green.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/status_icon_light_green.psd (from
rev 8041, trunk/controller/images/status_icon_light_green.psd)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/status_icon_red.png (from
rev 8041, trunk/controller/images/status_icon_red.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/status_icon_red.psd (from
rev 8041, trunk/controller/images/status_icon_red.psd)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/images/status_icon_yellow.png
(from rev 8041, trunk/controller/images/status_icon_yellow.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
(from rev 8041, trunk/controller/inc/class.socheck_item.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_item.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -0,0 +1,67 @@
+<?php
+phpgw::import_class('controller.socommon');
+
+include_class('controller', 'check_item', 'inc/model/');
+
+class controller_socheck_item extends controller_socommon
+{
+ protected static $so;
+
+ /**
+ * Get a static reference to the storage object associated with this
model object
+ *
+ * @return controller_socontrol_group the storage object
+ */
+ public static function get_instance()
+ {
+ if (self::$so == null) {
+ self::$so = CreateObject('controller.socheck_item');
+ }
+ return self::$so;
+ }
+
+ function get_query(string $sort_field, boolean $ascending, string
$search_for, string $search_type, array $filters, boolean $return_count){}
+
+ function populate(int $object_id, &$object){}
+
+ function add(&$check_item)
+ {
+ $cols = array(
+ 'control_item_id',
+ 'status',
+ 'comment',
+ 'check_list_id'
+ );
+
+ $values = array(
+ $this->marshal($check_item->get_control_item_id(),
'int'),
+ $this->marshal($check_item->get_status(), 'bool'),
+ $this->marshal($check_item->get_comment(), 'string'),
+ $this->marshal($check_item->get_check_list_id(), 'int')
+ );
+
+ $result = $this->db->query('INSERT INTO controller_check_item
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
+
+ return isset($result) ?
$this->db->get_last_insert_id('controller_check_item', 'id') : 0;
+ }
+
+
+ function update($object){
+ $values = array(
+ 'control_item_id = ' .
$this->marshal($check_item->set_control_item_id(), 'int'),
+ 'status = ' . $this->marshal($check_item->set_status(),
'string'),
+ 'comment = ' .
$this->marshal($check_item->set_comment(), 'string'),
+ 'check_list_id = ' .
$this->marshal($check_item->set_check_list_id(), 'int')
+ );
+
+ $result = $this->db->query('UPDATE controller_check_item SET '
. join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
+
+ if( isset($result) ){
+ return $id;
+ }else{
+ return 0;
+ }
+ }
+
+ function get_id_field_name(){}
+}
Modified: branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,7 +1,7 @@
<?php
phpgw::import_class('controller.socommon');
-//include_class('controller', 'control_group_list', 'inc/model/');
+include_class('controller', 'check_list', 'inc/model/');
class controller_socheck_list extends controller_socommon
{
@@ -20,6 +20,79 @@
return self::$so;
}
+ public function get_single($check_list_id){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.id = $check_list_id
AND cl.id = ci.check_list_id;";
+ $this->db->query($sql);
+
+ $counter = 0;
+ $check_list = null;
+ while ($this->db->next_record()) {
+
+ if($counter == 0){
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+ }
+
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
+ $check_items_array[] = $check_item->toArray();
+
+ $counter++;
+ }
+
+ if($check_list != null){
+ $check_list->set_check_item_array($check_items_array);
+ return $check_list->toArray();
+ }else {
+ return null;
+ }
+ }
+
+ public function get_single_with_control_item($check_list_id){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id, coi.title as
control_item_title FROM controller_check_list cl, controller_check_item ci,
controller_control_item as coi WHERE cl.id = $check_list_id AND cl.id =
ci.check_list_id AND ci.control_item_id=coi.id;";
+ $this->db->query($sql);
+
+ $counter = 0;
+ $check_list = null;
+ while ($this->db->next_record()) {
+
+ if($counter == 0){
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+ }
+
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('control_item_id', true),
'int'));
+
$control_item->set_title($this->db->f('control_item_title', true), 'string');
+
+ $check_item->set_control_item($control_item->toArray());
+
+ $check_items_array[] = $check_item->toArray();
+
+ $counter++;
+ }
+
+ if($check_list != null){
+ $check_list->set_check_item_array($check_items_array);
+ return $check_list->toArray();
+ }else {
+ return null;
+ }
+ }
+
public function get_check_list(){
$current_time = time();
@@ -33,21 +106,102 @@
while ($this->db->next_record()) {
$start_date = date("d.m.Y",
$this->db->f('start_date'));
+ $end_date = date("d.m.Y", $this->db->f('end_date'));
- $result[] = array(
- 'title' =>
$this->db->f('title'),
- 'start_date' =>
$start_date
- );
+ $control = new
controller_control($this->unmarshal($this->db->f('id', true), 'int'));
+
+
$control->set_title($this->unmarshal($this->db->f('title', true), 'string'));
+
$control->set_description($this->unmarshal($this->db->f('description', true),
'boolean'));
+ $control->set_start_date($start_date);
+ $control->set_end_date($end_date);
+
$control->set_procedure_id($this->unmarshal($this->db->f('procedure_id', true),
'int'));
+
$control->set_procedure_name($this->unmarshal($this->db->f('procedure_name',
true), 'string'));
+
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id',
true), 'int'));
+
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
true), 'int'));
+
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
+
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
+
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
true), 'int'));
+
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true),
'int'));
+
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'int'));
+
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
+
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
+
+ $results[] = $control->toArray();
}
+
+ return $results;
+ }
- return $result;
+ function get_check_lists_for_control($control_id){
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.control_id =
$control_id AND cl.id = ci.check_list_id ORDER BY cl.id;";
+ $this->db->query($sql);
+
+ $check_list_id = 0;
+ $check_list = null;
+ while ($this->db->next_record()) {
+
+ if( $this->db->f('cl_id', true) != $check_list_id ){
+
+ if($check_list_id != 0){
+
$check_list->set_check_item_array($check_items_array);
+ $check_list_array[] =
$check_list->toArray();
+ }
+
+ $check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
+
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+
+ $check_items_array = array();
+ }
+
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
+ $check_items_array[] = $check_item->toArray();
+
+ $check_list_id = $check_list->get_id();
+ }
+
+ if($check_list != null){
+ $check_list->set_check_item_array($check_items_array);
+ $check_list_array[] = $check_list->toArray();
+
+ return $check_list_array;
+ }else {
+ return null;
+ }
+
}
function get_query(string $sort_field, boolean $ascending, string
$search_for, string $search_type, array $filters, boolean $return_count){}
function populate(int $object_id, &$object){}
- function add(&$object){}
+ function add(&$check_list)
+ {
+ $cols = array(
+ 'control_id',
+ 'status',
+ 'comment',
+ 'deadline'
+ );
+
+ $values = array(
+ $this->marshal($check_list->get_control_id(), 'int'),
+ $this->marshal($check_list->get_status(), 'bool'),
+ $this->marshal($check_list->get_comment(), 'string'),
+ $this->marshal($check_list->get_deadline(), 'int')
+ );
+
+ $result = $this->db->query('INSERT INTO controller_check_list
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
+
+ return isset($result) ?
$this->db->get_last_insert_id('controller_check_list', 'id') : 0;
+ }
function update($object){}
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -84,18 +84,8 @@
//return isset($result);
}
+ function get_procedure_list(){}
-
-
-
-
-
- function get_procedure_list(){
-
-
- }
-
-
function get_id_field_name($extended_info = false)
{
if(!$extended_info)
@@ -253,20 +243,7 @@
return $control;
}
-/* public function populate($control){
-
- $control->set_title(phpgw::get_var('title', 'string'));
- $control->set_description(phpgw::get_var('description',
'string'));
- $control->set_start_date( strtotime(
phpgw::get_var('start_date_hidden', 'int')));
- $control->set_end_date( strtotime(
phpgw::get_var('end_date_hidden', 'int')));
- $control->set_repeat_type(
phpgw::get_var('repeat_type', 'string'));
- $control->set_repeat_interval(
phpgw::get_var('repeat_interval', 'string'));
- $control->set_procedure_id(
phpgw::get_var('procedure_id', 'int'));
- $control->set_enabled( true );
-
- return $control;
-
- }*/
+
}
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -176,7 +176,7 @@
return $results;
}
- function get_control_groups($control_area_id, $limit)
+ function get_control_groups_as_objects($control_area_id, $limit)
{
$results = array();
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -2,6 +2,7 @@
phpgw::import_class('controller.socommon');
include_class('controller', 'control_group_list', 'inc/model/');
+include_class('controller', 'control_group', 'inc/model/');
class controller_socontrol_group_list extends controller_socommon
{
@@ -122,6 +123,27 @@
}
}
+ function get_control_groups_by_control_id($control_id)
+ {
+ $this->db->query("SELECT cg.*, cgl.order_nr FROM
controller_control_group_list cgl, controller_control_group cg WHERE
cgl.control_id=$control_id AND cgl.control_group_id=cg.id ORDER BY
cgl.order_nr", __LINE__, __FILE__);
+
+ $control_group_list = array();
+
+ while($this->db->next_record()){
+
+ $control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
+
$control_group->set_group_name($this->unmarshal($this->db->f('group_name',
true), 'string'));
+
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
+
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
+
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'int'));
+
+ $control_group_list[] = $control_group;
+ }
+
+ return $control_group_list;
+ }
+
+
protected function get_query(string $sort_field, boolean $ascending,
string $search_for, string $search_type, array $filters, boolean
$return_count){}
function get_id_field_name($extended_info = false){}
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -33,8 +33,7 @@
'required',
'what_to_do',
'how_to_do',
- 'control_group_id',
- 'control_area_id'
+ 'control_group_id'
);
$values = array(
@@ -42,8 +41,7 @@
$this->marshal(($control_item->get_required() ? 'true'
: 'false'), 'bool'),
$this->marshal($control_item->get_what_to_do(),
'string'),
$this->marshal($control_item->get_how_to_do(),
'string'),
- $this->marshal($control_item->get_control_group_id(),
'int'),
- $this->marshal($control_item->get_control_area_id(),
'int')
+ $this->marshal($control_item->get_control_group_id(),
'int')
);
$result = $this->db->query('INSERT INTO controller_control_item
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
@@ -77,8 +75,7 @@
'required = ' .
$this->marshal(($control_item->get_required() ? 'true' : 'false'), 'bool'),
'what_to_do = ' .
$this->marshal($control_item->get_what_to_do(), 'string'),
'how_to_do = ' .
$this->marshal($control_item->get_how_to_do(), 'string'),
- 'control_group_id = ' .
$this->marshal($control_item->get_control_group_id(), 'int'),
- 'control_area_id = ' .
$this->marshal($control_item->get_control_area_id(), 'int')
+ 'control_group_id = ' .
$this->marshal($control_item->get_control_group_id(), 'int')
);
//var_dump('UPDATE controller_control_item SET ' . join(',',
$values) . " WHERE id=$id");
@@ -97,8 +94,7 @@
{
$id = (int)$id;
$joins = " {$this->left_join} controller_control_group ON
(p.control_group_id = controller_control_group.id)";
- $joins .= " {$this->left_join} controller_control_area ON
(p.control_area_id = controller_control_area.id)";
- $sql = "SELECT p.*, controller_control_group.group_name AS
control_group_name, controller_control_area.title AS control_area_name FROM
controller_control_item p {$joins} WHERE p.id = " . $id;
+ $sql = "SELECT p.*, controller_control_group.group_name AS
control_group_name FROM controller_control_item p {$joins} WHERE p.id = " . $id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
@@ -109,8 +105,6 @@
$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',
true), 'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
return $control_item;
}
@@ -144,7 +138,6 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$results[] = $control_item;
}
@@ -210,11 +203,7 @@
{
$filter_clauses[] =
"controller_control_item.control_group_id =
{$this->marshal($filters['control_groups'],'int')}";
}
- if(isset($filters['control_areas']))
- {
- $filter_clauses[] =
"controller_control_item.control_area_id =
{$this->marshal($filters['control_areas'],'int')}";
- }
-
+
if(count($filter_clauses))
{
$clauses[] = join(' AND ', $filter_clauses);
@@ -225,7 +214,6 @@
$tables = "controller_control_item";
$joins = " {$this->left_join} controller_control_group ON
(controller_control_item.control_group_id = controller_control_group.id)";
- $joins .= " {$this->left_join} controller_control_area ON
(controller_control_item.control_area_id = controller_control_area.id)";
if($return_count)
{
@@ -233,7 +221,7 @@
}
else
{
- $cols = 'controller_control_item.id,
controller_control_item.title, required, what_to_do, how_to_do,
controller_control_item.control_group_id,
controller_control_item.control_area_id, controller_control_group.group_name AS
control_group_name, controller_control_area.title AS control_area_name';
+ $cols = 'controller_control_item.id,
controller_control_item.title, required, what_to_do, how_to_do,
controller_control_item.control_group_id,
controller_control_item.control_area_id, controller_control_group.group_name AS
control_group_name';
}
$dir = $ascending ? 'ASC' : 'DESC';
@@ -263,10 +251,10 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$results[] = $control_item;
}
+
return $results;
}
@@ -284,7 +272,6 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$results[] = $control_item->toArray();
}
@@ -297,8 +284,8 @@
$results = array();
$sql = "SELECT ci.* FROM controller_control_item ci,
controller_control_item_list cl, controller_control c ";
- $sql .= "WHERE c.id=$control_id AND c.id=cl.control_id AND
cl.control_item_id=ci.id GROUP BY ";
- $this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
+ $sql .= "WHERE c.id=$control_id AND c.id=cl.control_id AND
cl.control_item_id=ci.id";
+ $this->db->query($sql);
while ($this->db->next_record()) {
$control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
@@ -307,11 +294,10 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$results[] = $control_item;
}
-
+
return $results;
}
@@ -331,8 +317,6 @@
$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',
true), 'int'));
//$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
//$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
$results[] = $control_item->toArray();
}
@@ -351,8 +335,6 @@
$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',
true), 'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
}
return $control_item;
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -106,7 +106,7 @@
function get_single_2($control_id, $control_item_id)
{
- $sql = "SELECT p.* FROM controller_control_item_list p WHERE
p.control_id = " . $control_id . " AND p.control_item_id = " . $control_item_id;
+ $sql = "SELECT cil.* FROM controller_control_item_list cil
WHERE cil.control_id = " . $control_id . " AND cil.control_item_id = " .
$control_item_id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
$this->db->next_record();
@@ -139,162 +139,26 @@
*/
function get_control_item_array($start = 0, $results = 1000, $sort =
null, $dir = '', $query = null, $search_option = null, $filters = array())
{
- /*
- $results = array();
-
- //$condition = $this->get_conditions($query,
$filters,$search_option);
- $order = $sort ? "ORDER BY $sort $dir ": '';
-
- //$sql = "SELECT * FROM controller_procedure WHERE $condition
$order";
- $sql = "SELECT * FROM controller_control_item $order";
- $this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
-
- while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
-
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
- $results[] = $control_item;
- }
-
- return $results;
-
- */
}
function get_id_field_name($extended_info = false)
{
- /*
- if(!$extended_info)
- {
- $ret = 'id';
- }
- else
- {
- $ret = array
- (
- 'table' => 'controller', //
alias
- 'field' => 'id',
- 'translated' => 'id'
- );
- }
-
- return $ret;
- */
}
protected function get_query(string $sort_field, boolean $ascending,
string $search_for, string $search_type, array $filters, boolean $return_count)
{
- /*
- $clauses = array('1=1');
- $filter_clauses = array();
-
- // Search for based on search type
- if($search_for)
- {
- $search_for = $this->marshal($search_for,'field');
- $like_pattern = "'%".$search_for."%'";
- $like_clauses = array();
- switch($search_type){
- default:
- $like_clauses[] =
"controller_control_item.title $this->like $like_pattern";
- $like_clauses[] =
"controller_control_item.what_to_do $this->like $like_pattern";
- $like_clauses[] =
"controller_control_item.how_to_do $this->like $like_pattern";
- break;
- }
-
- if(count($like_clauses))
- {
- $clauses[] = '(' . join(' OR ', $like_clauses)
. ')';
- }
- }
-
- if(isset($filters[$this->get_id_field_name()]))
- {
- $filter_clauses[] = "controller_control_item.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
- }
-
- if(count($filter_clauses))
- {
- $clauses[] = join(' AND ', $filter_clauses);
- }
-
-
- $condition = join(' AND ', $clauses);
-
- $tables = "controller_control_item";
- //$joins = " {$this->left_join} rental_document_types ON
(rental_document.type_id = rental_document_types.id)";
-
- if($return_count)
- {
- $cols = 'COUNT(DISTINCT(controller_control_item.id)) AS
count';
- }
- else
- {
- $cols = 'id, title, required, what_to_do, how_to_do,
control_group_id, control_area_id';
- }
-
- $dir = $ascending ? 'ASC' : 'DESC';
- if($sort_field == 'title')
- {
- $sort_field = 'controller_control_item.title';
- }
- $order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
-
- //return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
-
- return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
-
- */
}
function get_control_items($control_group_id)
{
- /*
- $results = array();
- $sql = "SELECT * FROM controller_control_item WHERE
control_group_id=$control_group_id";
- $this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
-
- while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
-
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
-
- $results[] = $control_item;
- }
-
- return $results;
-
- */
}
function populate(int $control_item_id, &$control_item)
{
- /*
- if($control_item == null) {
- $control_item = new controller_control_item((int)
$control_item_id);
-
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
-
$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',
true), 'int'));
-
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
- }
- return $control_item;
- */
}
}
Modified: branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -143,7 +143,9 @@
$order = $sort ? "ORDER BY $sort $dir ": '';
//$sql = "SELECT * FROM controller_procedure WHERE $condition
$order";
- $sql = "SELECT * FROM controller_procedure $order";
+
+ $condition = "WHERE end_date IS NULL";
+ $sql = "SELECT * FROM controller_procedure $condition $order";
$this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
while ($this->db->next_record()) {
@@ -174,7 +176,9 @@
$order = $sort ? "ORDER BY $sort $dir ": '';
//$sql = "SELECT * FROM controller_procedure WHERE $condition
$order";
- $sql = "SELECT * FROM controller_procedure $order";
+
+ $condition = "WHERE end_date IS NULL";
+ $sql = "SELECT * FROM controller_procedure $condition $order";
$this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
while ($this->db->next_record()) {
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -2,25 +2,44 @@
phpgw::import_class('controller.uicommon');
phpgw::import_class('controller.socheck_list');
+ include_class('controller', 'check_list', 'inc/model/');
+ include_class('controller', 'check_item', 'inc/model/');
+
class controller_uicheck_list extends controller_uicommon
{
private $so;
+ private $so_control;
+ private $so_control_group;
+ private $so_control_group_list;
+ private $so_control_item;
+ private $so_check_list;
+ private $so_check_item;
public $public_functions = array
(
- 'index' => true
+ 'index' => true,
+ 'view_check_lists_for_control' => true,
+ 'save_check_list' => true,
+ 'view_check_list' => true
);
public function __construct()
{
parent::__construct();
+
$this->so = CreateObject('controller.socheck_list');
+ $this->so_control =
CreateObject('controller.socontrol');
+ $this->so_control_group =
CreateObject('controller.socontrol_group');
+ $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
+ $this->so_control_item =
CreateObject('controller.socontrol_item');
+ $this->so_check_list =
CreateObject('controller.socheck_list');
+ $this->so_check_item =
CreateObject('controller.socheck_item');
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::check_list";
}
public function index()
{
-
$check_list_array = $this->so->get_check_list();
$data = array
@@ -28,9 +47,109 @@
'check_list_array' => $check_list_array
);
-
self::render_template_xsl('control_check_lists', $data);
}
+ public function view_check_list()
+ {
+ $check_list_id = phpgw::get_var('check_list_id');
+ $check_list =
$this->so_check_list->get_single_with_control_item($check_list_id);
+
+ $data = array
+ (
+ 'check_list' => $check_list
+ );
+
+ //print_r($check_list);
+
+ self::render_template_xsl('view_check_list', $data);
+ }
+
+ public function view_check_lists_for_control()
+ {
+ $control_id = phpgw::get_var('control_id');
+ $control = $this->so_control->get_single($control_id);
+
+
+ $check_list_array =
$this->so->get_check_lists_for_control( $control_id );
+
+ $data = array
+ (
+ 'control_as_array' => $control->toArray(),
+ 'check_list_array' =>
$check_list_array
+ );
+
+ self::render_template_xsl('view_check_lists', $data);
+ }
+
+ public function view_control_items_for_control()
+ {
+ $control_id = phpgw::get_var('control_id');
+ $control = $this->so_control->get_single($control_id);
+
+ $control_groups_array =
$this->so_control_group_list->get_control_groups_by_control_id( $control_id );
+
+ $saved_groups_with_items_array = array();
+
+ foreach ($control_groups_array as $control_group)
+ {
+ $control_group_id = $control_group->get_id();
+ $saved_control_items =
$this->so_control_item->get_control_items_by_control_id_and_group($control_id,
$control_group_id);
+
+ $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
+ }
+
+ $data = array
+ (
+ 'control_as_array'
=> $control->toArray(),
+ 'saved_groups_with_items_array' =>
$saved_groups_with_items_array
+ );
+
+ self::render_template_xsl('view_check_list', $data);
+ }
+
+ public function save_check_list(){
+ $control_id = phpgw::get_var('control_id');
+ $control = $this->so_control->get_single($control_id);
+
+ $start_date = $control->get_start_date();
+ $end_date = $control->get_end_date();
+ $repeat_type = $control->get_repeat_type();
+ $repeat_interval = $control->get_repeat_interval();
+
+ $status = true;
+ $comment = "Kommentar for sjekkliste";
+ $deadline = $start_date;
+
+ // Saving check_list
+ $new_check_list = new controller_check_list();
+ $new_check_list->set_control_id( $control_id );
+ $new_check_list->set_status( $status );
+ $new_check_list->set_comment( $comment );
+ $new_check_list->set_deadline( $deadline );
+
+ $check_list_id = $this->so_check_list->store(
$new_check_list );
+
+ $control_items_list =
$this->so_control_item->get_control_items_by_control_id($control_id);
+
+ foreach($control_items_list as $control_item){
+
+ $status = true;
+ $comment = "Kommentar for sjekk item";
+
+ // Saving check_items for a list
+ $new_check_item = new controller_check_item();
+ $new_check_item->set_check_list_id(
$check_list_id );
+
+ $new_check_item->set_control_item_id(
$control_item->get_id() );
+ $new_check_item->set_status( $status );
+ $new_check_item->set_comment( $comment );
+
+ $saved_check_item =
$this->so_check_item->store( $new_check_item );
+ }
+
+ $this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list_for_control',
'control_id'=>$control_id));
+ }
+
public function query(){}
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -518,6 +518,13 @@
{ type:
'push', label: 'HTML Lenke CTRL + SHIFT + L', value: 'createlink', disabled:
true },
{ type:
'push', label: 'Sett inn bilde', value: 'insertimage' }
]
+ },
+ { type: 'separator' },
+ { group: 'undoredo', label:
'Angre/Gjenopprett',
+ buttons: [
+ { type:
'push', label: 'Angre', value: 'undo' },
+ { type:
'push', label: 'Gjenopprett', value: 'redo' }
+ ]
}
]
},
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -11,35 +11,45 @@
include_class('controller', 'control', 'inc/model/');
include_class('controller', 'control_area', 'inc/model/');
include_class('controller', 'control_item_list', 'inc/model/');
+ include_class('controller', 'control_group_list', 'inc/model/');
class controller_uicontrol extends controller_uicommon
{
private $bo;
- private $so_control;
+ private $so;
private $so_procedure;
private $so_control_group;
private $so_control_area;
private $so_control_item;
private $so_control_item_list;
+ private $so_control_group_list;
public $public_functions = array
(
'index' => true,
'control_list' => true,
- 'view' => true
+ 'view' => true,
+ 'view_control_details' => true,
+ 'save_control_details' => true,
+ 'view_control_groups' => true,
+ 'save_control_groups' => true,
+ 'view_control_items' => true,
+ 'save_control_items' => true,
+ 'view_check_list' => true
);
public function __construct()
{
parent::__construct();
- $this->so_control =
CreateObject('controller.socontrol');
- $this->so_procedure =
CreateObject('controller.soprocedure');
+ $this->so = CreateObject('controller.socontrol');
$this->bo = CreateObject('property.boevent',true);
+ $this->so_procedure =
CreateObject('controller.soprocedure');
$this->so_control_group =
CreateObject('controller.socontrol_group');
$this->so_control_area =
CreateObject('controller.socontrol_area');
$this->so_control_item =
CreateObject('controller.socontrol_item');
$this->so_control_item_list =
CreateObject('controller.socontrol_item_list');
+ $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
self::set_active_menu('controller::control');
}
@@ -57,11 +67,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol.index'))
- ),
array('type' =>
'filter',
'name' =>
'status',
'text' => lang('Status').':',
@@ -107,6 +112,12 @@
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('New control'),
+ 'href' =>
self::link(array('menuaction' => 'controller.uicontrol.view_control_details')),
+ 'class' =>
'new_item'
+ ),
),
),
),
@@ -121,7 +132,7 @@
),
array(
'key' => 'title',
- 'label' =>
lang('Title'),
+ 'label' =>
lang('Control title'),
'sortable' =>
false
),
array(
@@ -135,11 +146,6 @@
'sortable' => false
),
array(
- 'key' =>
'procedurename',
- 'label' =>
lang('Procedure'),
- 'sortable' => false
- ),
- array(
'key' => 'link',
'hidden' => true
)
@@ -151,75 +157,26 @@
self::render_template_xsl('datatable', $data);
}
- public function index()
- {
- $add_document_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uiexample.index') );
-
- // Show tab control details
- if(phpgw::get_var('view') == "view_control")
- {
- $this->view_control();
- }
- // Save or update control details and show tab control
groups
- else if( isset($_POST['save_control']) ||
phpgw::get_var('view') == "view_control_groups")
- {
- $this->edit_control();
- }
- // Save control groups and show tab control items
- else if( isset($_POST['save_control_groups']) ||
phpgw::get_var('view') == "view_control_items")
- {
- $this->edit_control_groups();
- }
- // Save locations and show tab control items
- else if( isset($_POST['save_control_locations']) ||
phpgw::get_var('view') == "view_control_locations")
- {
- $this->edit_control_locations();
- }
- // Save equipment and show tab control items
- else if( isset($_POST['save_control_equipment']) ||
phpgw::get_var('view') == "view_control_equipment")
- {
- $this->edit_control_equipment();
- }
- // Save control items and show tab receipt
- else if( isset($_POST['save_control_items']) )
- {
- $this->edit_control_items();
- }
- // Save receipt
- else if( isset($_POST['save_receipt']) )
- {
- $this->save_receipt();
- }
- else{
- $this->view_control();
- }
- }
-
- public function view_control()
+ public function view_control_details()
{
$control_id = phpgw::get_var('control_id');
- // view control details
if(isset($control_id) && $control_id > 0)
{
- $control =
$this->so_control->get_single($control_id);
+ $control = $this->so->get_single($control_id);
}
$procedures_array =
$this->so_procedure->get_procedures_as_array();
$control_areas_array =
$this->so_control_area->get_control_areas_as_array();
$tabs = array( array(
- 'label' =>
lang('Details')
+ 'label' => "1: " .
lang('Details')
), array(
- 'label' =>
lang('Control_groups')
+ 'label' => "2: " .
lang('Control_groups')
), array(
- 'label' =>
lang('Control_locations')
+ 'label' => "3: " .
lang('Control_items')
), array(
- 'label' =>
lang('Control_equipment')
- ), array(
- 'label' =>
lang('Control_items')
- ), array(
- 'label' =>
lang('Receipt')
+ 'label' => "4: " .
lang('Check_list')
));
$data = array
@@ -236,50 +193,56 @@
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::render_template_xsl(array('control_tabs',
'control'), $data);
-
$GLOBALS['phpgw']->richtext->replace_element('description');
- $GLOBALS['phpgw']->richtext->generate_script();
+
+ $this->use_yui_editor(array('description'));
}
+ public function save_control_details(){
- public function edit_control()
- {
$control_id = phpgw::get_var('control_id');
- if(phpgw::get_var('view') == "view_control_groups"){
- $control =
$this->so_control->get_single($control_id);
- }
- // update control details
- else if(isset($control_id) && $control_id > 0 )
+ // Update control details
+ if(isset($control_id) && $control_id > 0 )
{
- $control =
$this->so_control->get_single($control_id);
- $control->populate();
- $this->so_control->store($control);
+ $control = $this->so->get_single($control_id);
}
- // add control details
+ // Add details for control
else {
$control = new controller_control();
- $control->populate();
- $control_id =
$this->so_control->store($control);
}
+
+ $control->populate();
+ $control_id = $this->so->store($control);
+ $control_title = $control->get_title();
+
+ $this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_groups', 'control_id'=>$control_id,
'control_area_id'=>$control->get_control_area_id(),
'control_title'=>$control_title));
+ }
- $control_area =
$this->so_control_area->get_single($control->get_control_area_id());
+ // Displays control groups based on which chosen control area
+ public function view_control_groups(){
+
+ $control_id = phpgw::get_var('control_id');
+ $control_area_id = phpgw::get_var('control_area_id');
+ $control_title = phpgw::get_var('control_title');
+
+ $control_area = $this->so_control_area->get_single(
$control_area_id );
- $control_groups_as_array =
$this->so_control_group->get_control_groups_as_array($control->get_control_area_id());
+ $control_groups_as_array =
$this->so_control_group->get_control_groups_as_array($control_area->get_id(),
25);
$tabs = array(
array(
- 'label' =>
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control", 'control_id' =>
$control_id))
- ), array(
- 'label' =>
lang('Control_groups')
- ), array(
- 'label' =>
lang('Control_locations')
- ), array(
- 'label' =>
lang('Control_equipment')
- ), array(
- 'label' =>
lang('Control_items')
- ), array(
- 'label' =>
lang('Receipt')
+ 'label' => "1: " .
lang('Details'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details', 'view' => "view_control_details",
+
'control_id' => $control_id))
+ ),
+ array(
+ 'label' => "2: " .
lang('Control_groups')
+ ),
+ array(
+ 'label' => "3: " .
lang('Control_items')
+ ),
+ array(
+ 'label' => "4: " .
lang('Check_list')
)
);
@@ -289,6 +252,7 @@
'view'
=> "control_groups",
'editable'
=> true,
'control_id' =>
$control_id,
+ 'control_title' =>
$control_title,
'control_area' =>
$control_area->toArray(),
'control_groups' =>
$control_groups_as_array
);
@@ -297,16 +261,18 @@
self::render_template_xsl(array('control_tabs',
'control_groups'), $data);
}
- public function edit_control_groups(){
-
+ // Gets a comma separated list of control groups, and displays
control items for these groups
+ public function view_control_items(){
$control_id = phpgw::get_var('control_id', 'int');
+ $control = $this->so->get_single($control_id);
+ $control_title = $control->get_title();
$control_group_ids = array();
$control_group_ids =
phpgw::get_var('control_group_ids');
$groups_with_control_items = array();
- // Fetching control items for each control group and
populates array
+ // Fetching control items for each control group and
populates array that contains groups with chosen items
foreach ($control_group_ids as $control_group_id)
{
$group_control_items_array =
$this->so_control_item->get_control_items_as_array($control_group_id);
@@ -318,49 +284,59 @@
$tabs = array(
array(
- 'label' =>
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control", 'control_id' =>
$control_id))
+ 'label' => "1: " .
lang('Details'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details', 'view' => "view_control_details",
+
'control_id' => $control_id))
),
array(
- 'label' =>
lang('Control_groups'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_groups",
-
'control_id' => $control_id, 'control_group_ids' => $control_group_ids))
- ), array(
- 'label' =>
lang('Control_locations')
- ), array(
- 'label' =>
lang('Control_equipment')
- ), array(
- 'label' =>
lang('Control_items')
- ), array(
- 'label' =>
lang('Receipt')
- )
+ 'label' => "2: " .
lang('Control_groups'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups', 'view' => "view_control_groups",
+
'control_id' => $control_id, 'control_group_ids' => $control_group_ids,
+
'control_area_id' => $control->get_control_area_id()))
+ ),
+ array('label' => "3: " .
lang('Control_items')),
+ array('label' => "4: " .
lang('Check_list'))
);
-
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 4),
+ 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 2),
'view'
=> 'control_items',
'control_group_ids' =>
implode($control_group_ids, ","),
'control_id' =>
$control_id,
+ 'control_title' =>
$control_title,
'groups_with_control_items' =>
$groups_with_control_items
);
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::render_template_xsl(array('control_tabs',
'control_items'), $data);
+ self::render_template_xsl(array('control_tabs',
'choose_control_items'), $data);
}
- public function edit_control_items()
- {
+ // Saves chosen control items through receiving a comma
separated list of control tags (1:2, control_group_id:control_item_id)
+ public function save_control_items(){
$control_id = phpgw::get_var('control_id');
- $control_group_ids =
phpgw::get_var('control_group_ids');
+ $control_title = phpgw::get_var('control_title');
+ $control_group_ids = explode(",",
phpgw::get_var('control_group_ids'));
- // Fetching selected control items
+ // Fetching selected control items. Tags are on the
format 1:2 (group:item).
$control_tag_ids = phpgw::get_var('control_tag_ids');
- $control_item_ids = array();
+ $group_order_nr = 1;
+
+ // Saving control groups
+ foreach ($control_group_ids as $control_group_id)
+ {
+ //var_dump("control_group_id: " .
$control_group_id);
+ $control_group_list = new
controller_control_group_list();
+
$control_group_list->set_control_id($control_id);
+
$control_group_list->set_control_group_id($control_group_id);
+
$control_group_list->set_order_nr($group_order_nr);
+
+
$this->so_control_group_list->add($control_group_list);
+ $group_order_nr++;
+ }
// Saving control items if submit save control items is
clicked
foreach ($control_tag_ids as $control_item_tag)
@@ -375,11 +351,25 @@
$this->so_control_item_list->add($control_item_list);
}
+ $this->redirect(array('menuaction' =>
'controller.uicontrol.view_check_list', 'control_id'=>$control_id,
'control_title'=>$control_title, 'control_group_ids'=>$control_group_ids,
'control_tag_ids'=>$control_tag_ids ));
+ }
+
+ public function view_check_list(){
+ $control_id = phpgw::get_var('control_id');
+ $control = $this->so->get_single($control_id);
+ $control_title = $control->get_title();
+
+ $control_group_ids =
phpgw::get_var('control_group_ids');
+
+ // Fetching selected control tag items. Tags are on the
format 1:2 (control_group_id:control_item_id)
+ $control_tag_ids = phpgw::get_var('control_tag_ids');
+
$control_group_ids = array();
//Putting control_group_ids in array control_group_ids
foreach ($control_tag_ids as $control_tag)
{
+ // Fetching group id from tag
$control_group_id = substr($control_tag, 0,
strpos($control_tag, ":"));
if(!in_array($control_group_id,
$control_group_ids))
@@ -400,191 +390,50 @@
$saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
- unset($_POST['save_control_items']);
-
$tabs = array(
array(
- 'label' =>
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control", 'control_id' =>
$control_id))
+ 'label' => "1: " .
lang('Details'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
+
'view' => "view_control_details", 'control_id' => $control_id))
),
array(
- 'label' =>
lang('Control_groups'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_groups",
-
'control_id' => $control_id, 'control_group_ids' => $control_group_ids))
- ), array(
- 'label' =>
lang('Control_locations'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_locations",
-
'control_id' => $control_id, 'location_ids' => $location_ids))
- ), array(
- 'label' =>
lang('Control_equipment'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_equipment",
-
'control_id' => $control_id, 'location_ids' => $euqipment_ids))
- ), array(
- 'label' =>
lang('Control_items'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_items",
-
'control_id' => $control_id, 'control_group_ids' => $control_group_ids))
- ), array(
- 'label' =>
lang('Receipt')
- )
- );
-
- $data = array
- (
- 'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($tabs, 5),
- 'view' =>
"receipt",
- 'control_id' => $control_id,
- 'control_receipt_items' =>
$saved_groups_with_items_array
- );
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'yui_min_3_4_3.js');
- self::add_javascript('controller', 'controller',
'custom_drag_drop.js');
- self::render_template_xsl(array('control_tabs',
'control_items_receipt'), $data);
- }
-
- public function save_receipt(){
-
- $control_id = phpgw::get_var('control_id');
-
- $control_item_ids = array();
- $control_item_ids = phpgw::get_var('control_item_ids');
-
- foreach ($control_item_ids as $control_item_id)
- {
- $control_item =
$this->so_control_item->get_single($control_item_id);
-
- $control_item_list = new
controller_control_item_list();
- $control_item_list->set_control_id($control_id);
-
$control_item_list->set_control_item_id($control_item->get_id());
-
-
$this->so_control_item_list->add($control_item_list);
- }
-
- $data = array
- (
- 'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($this->getTabMenu(), 3),
- 'control_id' => $control_id,
- 'control_items' =>
$control_items_2D
- );
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::render_template_xsl(array('control_tabs',
'control_items_receipt'), $data);
- }
-
- public function edit_control_locations(){
-
- $control_id = phpgw::get_var('control_id', 'int');
-
- $control_group_ids = array();
- $control_group_ids =
phpgw::get_var('control_group_ids');
-
- $groups_with_control_items = array();
-
- // Fetching control items for each control group and
populates array
- foreach ($control_group_ids as $control_group_id)
- {
- $group_control_items_array =
$this->so_control_item->get_control_items_as_array($control_group_id);
-
- $control_group =
$this->so_control_group->get_single($control_group_id);
-
- $groups_with_control_items[] =
array("control_group" => $control_group->toArray(), "group_control_items" =>
$group_control_items_array);
- }
-
- $tabs = array(
- array(
- 'label' =>
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control", 'control_id' =>
$control_id))
+ 'label' => "2: " .
lang('Control_groups'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups',
+
'view' => "view_control_groups", 'control_id' => $control_id,
+
'control_group_ids' => $control_group_ids,
+
'control_area_id' => $control->get_control_area_id()))
),
array(
- 'label' =>
lang('Control_groups'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_groups",
-
'control_id' => $control_id, 'control_group_ids' => $control_group_ids))
- ), array(
- 'label' =>
lang('Control_locations'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_locations",
-
'control_id' => $control_id, 'location_ids' => $location_ids))
- ), array(
- 'label' =>
lang('Control_equipment')
- ), array(
- 'label' =>
lang('Control_items')
- ), array(
- 'label' =>
lang('Receipt')
- )
- );
-
-
- $data = array
- (
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 4),
- 'view'
=> 'control_items',
- 'control_group_ids' =>
implode($control_group_ids, ","),
- 'control_id' =>
$control_id,
- 'location_ids' =>
implode($location_ids, ","),
- );
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::render_template_xsl(array('control_tabs',
'control_items'), $data);
- }
-
- public function edit_control_equipment(){
-
- $control_id = phpgw::get_var('control_id', 'int');
-
- $equipment_ids = array();
- $equipment_ids = phpgw::get_var('equipment_ids');
-
- $groups_with_control_items = array();
-
- $tabs = array(
- array(
- 'label' =>
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control", 'control_id' =>
$control_id))
+ 'label' => "3: " .
lang('Control_items'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
+
'view' => "view_control_items", 'control_id' => $control_id,
+
'control_group_ids' => $control_group_ids))
),
array(
- 'label' =>
lang('Control_groups'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_groups",
-
'control_id' => $control_id, 'control_group_ids' => $control_group_ids))
- ), array(
- 'label' =>
lang('Control_locations'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_locations",
-
'control_id' => $control_id, 'location_ids' => $location_ids))
- ), array(
- 'label' =>
lang('Control_equipment'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_euqipment",
-
'control_id' => $control_id, 'equipmentids' => $equipment_ids))
- ), array(
- 'label' =>
lang('Control_items')
- ), array(
- 'label' =>
lang('Receipt')
+ 'label' => "4: " .
lang('Check_list')
)
);
-
$data = array
(
- 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 4),
- 'view'
=> 'control_items',
- 'control_group_ids' =>
implode($control_group_ids, ","),
- 'control_id' =>
$control_id,
- 'groups_with_control_items' =>
$groups_with_control_items
+ 'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($tabs, 3),
+ 'view' =>
"check_list",
+ 'control_id' => $control_id,
+ 'control_title' =>
$control_title,
+ 'saved_groups_with_items_array' =>
$saved_groups_with_items_array
);
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::render_template_xsl(array('control_tabs',
'control_items'), $data);
+ self::add_javascript('controller', 'controller',
'yui_min_3_4_3.js');
+ self::add_javascript('controller', 'controller',
'custom_drag_drop.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+ self::render_template_xsl(array('control_tabs',
'sort_check_list'), $data);
}
public function query()
{
- $filters = array();
$params = array(
'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
@@ -593,7 +442,7 @@
'dir' => phpgw::get_var('dir'),
'filters' => $filters
);
- //var_dump(phpgw::get_var('control_areas'));
+
$ctrl_area = phpgw::get_var('control_areas');
if(isset($ctrl_area) && $ctrl_area > 0)
{
@@ -626,11 +475,11 @@
$control_id = phpgw::get_var('control_id');
if(isset($control_id))
{
- $control =
$this->so_control->get_single($control_id);
+ $control = $this->so->get_single($control_id);
}
- $result_objects = $this->so_control->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
- $object_count =
$this->so_control->get_count($search_for, $search_type, $filters);
+ $result_objects = $this->so->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
+ $object_count = $this->so->get_count($search_for,
$search_type, $filters);
//var_dump($result_objects);
$results = array();
@@ -645,93 +494,8 @@
$results['sort'] = $params['sort'];
$results['dir'] = $params['dir'];
- array_walk($results["results"], array($this,
"_add_links"), "controller.uicontrol.view");
+ array_walk($results["results"], array($this,
"_add_links"), "controller.uicontrol.view_control");
return $this->yui_results($results);
}
-
- public function view()
- {
- $GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('view');
- //Retrieve the procedure object
- $control_id = (int)phpgw::get_var('id');
- if(isset($_POST['edit_control']))
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'controller.uicontrol.edit_control', 'id' =>
$control_id));
- }
- else
- {
- if(isset($control_id) && $control_id > 0)
- {
- $control =
$this->so_control->get_single($control_id);
- }
- else
- {
-
$this->render('permission_denied.php',array('error' =>
lang('invalid_request')));
- return;
- }
-
- $control_array = $control->toArray();
- //var_dump($control);
-
- $tabs = array(
- array(
- 'label' =>
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control", 'control_id' =>
$control_id))
- ),
- array(
- 'label' =>
lang('Control_groups'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_groups",
-
'control_id' => $control->get_id(), 'control_group_ids' => $control_group_ids))
- ), array(
- 'label' =>
lang('Control_locations')
- ), array(
- 'label' =>
lang('Control_equipment')
- ), array(
- 'label' =>
lang('Control_items'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.index', 'view' => "view_control_items",
-
'control_id' => $control->get_id(), 'control_group_ids' => $control_group_ids))
- )
- );
-
- $add_document_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uiexample.index') );
-
- $procedure_array =
$this->so_procedure->get_procedures();
-
- foreach ($procedure_array as $procedure)
- {
- $procedure_options[] =
$procedure->toArray();
- }
-
- $control_area_array =
$this->so_control_area->get_control_area_array();
-
- foreach ($control_area_array as $control_area)
- {
- $control_area_options[] =
$control_area->toArray();
- }
-
- if($control->get_start_date() &&
$control->get_start_date() != null)
- $control_start_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$control->get_start_date());
- if($control->get_end_date() &&
$control->get_end_date() != null)
- $control_end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$control->get_end_date());
-
- phpgwapi_yui::tabview_setup('control_tabview');
-
- $data = array
- (
- 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, 'details'),
- 'view'
=> 'control_details',
- 'start_date'
=> $control_start_date,
- 'end_date'
=> $control_end_date,
- 'value_id'
=> !empty($control) ? $control->get_id() : 0,
- 'img_go_home'
=> 'rental/templates/base/images/32x32/actions/go-home.png',
- 'control'
=> $control_array,
- 'control_area_options' =>
array('options' => $control_area_options),
- 'procedure_options'
=> array('options' => $procedure_options)
- );
-
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
- self::render_template_xsl(array('control_tabs',
'control', 'control_groups', 'control_items'), $data);
- }
- }
- }
\ No newline at end of file
+ }
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -50,11 +50,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control group'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add'))
- ),
array('type' =>
'filter',
'name' =>
'status',
'text' => lang('Status').':',
@@ -100,6 +95,12 @@
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('New control group'),
+ 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add')),
+ 'class' =>
'new_item'
+ ),
),
),
),
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -52,11 +52,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control item'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_item.add'))
- ),
array('type' =>
'filter',
'name' =>
'status',
'text' => lang('Status').':',
@@ -107,6 +102,12 @@
'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('New control item'),
+ 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_item.add')),
+ 'class' =>
'new_item'
+ ),
),
),
),
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -43,11 +43,6 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array(
- 'type' =>
'link',
- 'value' =>
lang('f_new_procedure'),
- 'href' =>
self::link(array('menuaction' => 'controller.uiprocedure.add'))
- ),
array('type' =>
'filter',
'name' =>
'control_areas',
'text' => lang('Control_area').':',
@@ -62,6 +57,12 @@
'name' =>
'search',
'value' =>
lang('Search')
),
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('t_new_procedure'),
+ 'href' =>
self::link(array('menuaction' => 'controller.uiprocedure.add')),
+ 'class' =>
'new_item'
+ ),
),
),
),
@@ -134,6 +135,16 @@
$procedure->set_revision_date(strtotime(phpgw::get_var('revision_date_hidden')));
$procedure->set_control_area_id(phpgw::get_var('control_area'));
+ $revision =
(int)$procedure->get_revision_no();
+ if($revision && is_numeric($revision)
&& $revision > 0)
+ {
+
$procedure->set_revision_no($revision);
+ }
+ else
+ {
+ $procedure->set_revision_no(1);
+ }
+
if(isset($procedure_id) &&
$procedure_id > 0)
{
$proc_id = $procedure_id;
@@ -174,7 +185,7 @@
}
else
{
- $procedure->set_revision_no(1);
+ $procedure->set_revision_no(2);
}
$procedure->set_title(phpgw::get_var('title'));
$procedure->set_purpose(phpgw::get_var('purpose','html'));
@@ -265,15 +276,8 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Procedure');
+
$this->use_yui_editor(array('responsibility','description'));
-
//$GLOBALS['phpgw']->richtext->replace_element('purpose');
-
$this->use_yui_editor(array('purpose','description'));
-
//$GLOBALS['phpgw']->richtext->replace_element('description');
-
//$GLOBALS['phpgw']->richtext->generate_script(true);
-
//$GLOBALS['phpgw']->richtext->generate_script();
-
- // $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'controller.item', 'controller' );
-
self::render_template_xsl('procedure_item',
$data);
}
}
@@ -348,9 +352,7 @@
'value_id'
=> !empty($procedure) ? $procedure->get_id() : 0,
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
'procedure'
=> $procedure_array,
- 'start_date' =>
$procedure_start_date,
- 'end_date'
=> $procedure_end_date,
- 'revision_date' =>
$procedure_revision_date,
+ 'dateformat' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
'values'
=> $table_values,
'table_header' =>
$table_header,
);
Modified:
branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/model/class.check_item.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -8,7 +8,9 @@
protected $id;
protected $control_item_id;
protected $status;
+ protected $comment;
protected $check_list_id;
+ protected $control_item;
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -42,12 +44,26 @@
public function get_status() { return $this->status; }
+ public function set_comment($comment)
+ {
+ $this->comment = $comment;
+ }
+
+ public function get_comment() { return $this->comment; }
+
public function set_check_list_id($check_list_id)
{
$this->check_list_id = $check_list_id;
}
public function get_check_list_id() { return
$this->check_list_id; }
+
+ public function set_control_item($control_item)
+ {
+ $this->control_item = $control_item;
+ }
+
+ public function get_control_item() { return
$this->control_item; }
/**
Modified:
branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/model/class.check_list.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,16 +1,18 @@
<?php
include_class('controller', 'model', 'inc/model/');
- class controller_check_item extends controller_model
+ class controller_check_list extends controller_model
{
public static $so;
protected $id;
protected $control_id;
- protected $check_list_id;
protected $status;
protected $comment;
protected $deadline;
+ protected $planned_date;
+ protected $completed_date;
+ protected $check_item_array = array();
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -37,13 +39,6 @@
public function get_control_id() { return $this->control_id; }
- public function set_check_list_id($check_list_id)
- {
- $this->check_list_id = $check_list_id;
- }
-
- public function get_check_list_id() { return
$this->check_list_id; }
-
public function set_status($status)
{
$this->status = $status;
@@ -65,6 +60,36 @@
public function get_deadline() { return $this->deadline; }
+ public function set_check_item_array($check_item_array)
+ {
+ $this->check_item_array = $check_item_array;
+ }
+ public function get_check_item_array() { return
$this->check_item_array; }
+
+ public function set_planned_date($planned_date)
+ {
+ $this->planned_date = $planned_date;
+ }
+
+ public function get_planned_date() { return
$this->planned_date; }
+
+ public function set_completed_date($completed_date)
+ {
+ $this->completed_date = $completed_date;
+ }
+
+ public function get_completed_date() { return
$this->completed_date; }
+
+ public function serialize()
+ {
+ return array(
+ 'id' => $this->get_id(),
+ 'control_id' => $this->get_control_id(),
+ 'status' => $this->get_status(),
+ 'comment' => $this->get_comment(),
+ 'deadline' => $this->get_deadline()
+ );
+ }
}
?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -24,14 +24,6 @@
protected $control_area_id;
protected $control_area_name;
- /*
- var $validate = array(
- 'title' => array(
- 'rule' => array('minLength', 0),
- 'message' => 'Kontrollen må ha en tittel'
- ));
- */
-
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
* the database the ID should be empty so the database can add
one according to its logic.
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2011-11-07 19:45:21 UTC (rev 8042)
@@ -27,6 +27,9 @@
window.setTimeout(function() {
$(this_submit_btn).val('Lagre
rekkefølge');
}, 1000);
+
+ $(this_submit_btn).css({opacity: 0.5 });
+ $(this_submit_btn).attr('disabled',
'disabled');
}
});
});
Modified:
branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
2011-11-07 19:45:21 UTC (rev 8042)
@@ -27,6 +27,27 @@
start_drag();
});
+ // Drag row is clicked
+ $(".drag_group h3").mousedown(function(e){
+ placeholder = $(this).parent();
+
+ adj_y = e.pageY - $(placeholder).position().top;
+
+ next_elem = $(placeholder).next();
+ prev_elem = $(placeholder).prev();
+ drag_elem = $(placeholder).clone();
+
+ $(drag_elem).addClass("drag_elem");
+ $(drag_elem).removeClass("list_item");
+
+ $(drag_elem).insertAfter(placeholder);
+
+ $(drag_elem).css("left", $(placeholder).position().left + "px");
+ $(drag_elem).css("top", $(placeholder).position().top + "px");
+
+ start_drag_group();
+ });
+
// Delete a control item list
$(".delete").click(function(){
var clickElem = $(this);
@@ -89,14 +110,80 @@
});
}
+function start_drag_group(){
+ $(document).bind("mouseup", stop_drag_group);
+
+ $(document).bind("mousemove", function(e){
+
+ var x = 0;
+ var y = e.pageY - adj_y;
+
+ $(drag_elem).css("left", x + "px");
+ $(drag_elem).css("top", y + "px");
+
+ // Move drag element over next element
+ if( $(next_elem).length > 0 && e.pageY >
$(next_elem).offset().top ){
+ $(placeholder).insertAfter(next_elem);
+ next_elem = $(placeholder).next();
+ prev_elem = $(placeholder).prev();
+
+ // Updating order number for drag element and previous
element
+ update_group_order_nr(placeholder, "+");
+ update_group_order_nr(prev_elem, "-");
+ }
+ // Move drag element over previous element
+ else if( $(prev_elem).length > 0 && e.pageY <
$(prev_elem).offset().top + $(prev_elem).height()/2 ){
+ $(placeholder).insertBefore(prev_elem);
+ prev_elem = $(placeholder).prev();
+ next_elem = $(placeholder).next();
+
+ // Updating order number for drag element and next
element
+ update_group_order_nr(placeholder, "-");
+ update_group_order_nr(next_elem, "+");
+ }
+ });
+}
+
+
+
// Release binding for mouse events
function stop_drag(){
$(drag_elem).remove();
$(document).unbind("mousemove");
$(document).unbind("mouseup");
+
+ var thisForm = $(this);
+ var this_submit_btn = $(thisForm).find("input[type='submit']");
+ $(this_submit_btn).css({opacity: 1 });
+ $(this_submit_btn).removeAttr('disabled');
}
+//Release binding for mouse events
+function stop_drag_group(){
+ $(drag_elem).remove();
+
+ $('li.drag_group').each(function() {
+ var group_order_nr = $(this).find("span.group_order_nr").text();
+ var control_group_id =
$(this).find("input[name='control_group_id']").val();
+ var control_id = $("#control_id").val();
+
+ var requestUrl =
"index.php?menuaction=controller.uicontrol_group.save_group_order";
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl + "&control_id=" + control_id +
"&control_group_id=" + control_group_id + "&group_order_nr=" + group_order_nr,
+ success: function() {
+
+ }
+ });
+
+ });
+
+ $(document).unbind("mousemove");
+ $(document).unbind("mouseup");
+}
+
// Updates order number for hidden field and number in front of row
function update_order_nr(element, sign){
var hidden_order_nr = $(element).find("input");
@@ -119,4 +206,18 @@
// Updating order number in front of row
$(span_order_nr).text(updated_order_nr);
+}
+
+//Updates order number for hidden field and number in front of row
+function update_group_order_nr(element, sign){
+ var span_order_nr = $(element).find("span.group_order_nr");
+ var order_nr = $(span_order_nr).text();
+
+ if(sign == "+")
+ var updated_order_nr = parseInt(order_nr) + 1;
+ else
+ var updated_order_nr = parseInt(order_nr) - 1;
+
+ // Updating order number in front of row
+ $(span_order_nr).text(updated_order_nr);
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/js/yahoo/datatable.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/datatable.js
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/js/yahoo/datatable.js
2011-11-07 19:45:21 UTC (rev 8042)
@@ -13,7 +13,7 @@
if(type == 'link') {
new YAHOO.widget.Button(items[i],
{type: 'link',
- href: items[i].getAttribute('href')});
+ href:
items[i].getAttribute('href')}).addClass(items[i].getAttribute('class'));
}
else if(type == 'submit') {
new YAHOO.widget.Button(items[i], {type: 'submit'});
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2011-11-07
19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2011-11-07
19:45:21 UTC (rev 8042)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.5';
+ $setup_info['controller']['version'] = '0.1.6';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -68,10 +68,11 @@
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'control_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
- 'check_list_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'status' => array('type' =>
'varchar','precision' => '255','nullable' => false),
'comment' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'deadline' => array('type' => 'int',
'precision' => 8, 'nullable' => True)
+ 'deadline' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
+ 'planned_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
+ 'completed_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -65,15 +65,14 @@
$test[] = '0.1.3';
function controller_upgrade0_1_3()
{
- $GLOBALS['phpgw_setup']->oProc->query("ALTER TABLE
controller_control_group DROP COLUMN order_nr");
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_control_group', array(),
'order_nr');
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.4';
return $GLOBALS['setup_info']['controller']['currentver'];
}
- /* Update Controller from v 0.1.4 to 0.1.5
- */
-
+ /* Update Controller from v 0.1.4 to 0.1.5 */
+
$test[] = '0.1.4';
function controller_upgrade0_1_4()
{
@@ -86,4 +85,27 @@
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.5';
return $GLOBALS['setup_info']['controller']['currentver'];
}
+
+ /* Update Controller from v 0.1.5 to 0.1.6 */
+
+ $test[] = '0.1.5';
+ function controller_upgrade0_1_5()
+ {
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_check_list', array(),
'check_list_id');
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_list','planned_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => True
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_list','completed_date',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => True
+ ));
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.6';
+ return $GLOBALS['setup_info']['controller']['currentver'];
+ }
?>
\ No newline at end of file
Deleted: branches/Version-1_0-branch/controller/templates/base/app_data.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/app_data.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/app_data.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,3 +0,0 @@
- <xsl:template name="dummy">
- </xsl:template>
-
Copied: branches/Version-1_0-branch/controller/templates/base/app_data.xsl
(from rev 8041, trunk/controller/templates/base/app_data.xsl)
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/app_data.xsl
(rev 0)
+++ branches/Version-1_0-branch/controller/templates/base/app_data.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -0,0 +1,3 @@
+ <xsl:template name="dummy">
+ </xsl:template>
+
Deleted: branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/check_lists.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,9 +0,0 @@
-<xsl:template name="check_lists" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
-
-</div>
-</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/choose_control_items.xsl
(from rev 8041, trunk/controller/templates/base/choose_control_items.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/choose_control_items.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/choose_control_items.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -0,0 +1,43 @@
+<xsl:template name="control_items" xmlns:php="http://php.net/xsl";>
+
+<div class="yui-content tab_content">
+ <div>
+
+ <!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
+ <h2>Velg dine kontrollpunkt</h2>
+
+ <h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
+ <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.save_control_items"
method="post">
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id"
value="{control_id}" />
+
+ <xsl:variable name="control_group_ids"><xsl:value-of
select="control_group_ids"/></xsl:variable>
+ <input type="hidden" name="control_group_ids"
value="{control_group_ids}" />
+
+ <ul class="control_items">
+ <xsl:for-each
select="groups_with_control_items">
+ <ul class="itemlist expand_list">
+ <li>
+ <h4><img
src="controller/images/arrow_left.png" width="14"/><span><xsl:value-of
select="control_group/group_name"/></span></h4>
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <ul>
+ <xsl:for-each
select="group_control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+
+ <li><xsl:number/>.
<input type="checkbox" id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="title"/></li>
+ </xsl:for-each>
+ </ul>
+ </li>
+ </ul>
+ </xsl:for-each>
+ </ul>
+
+ <div>
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
+ <input type="submit" name="save_control_items"
value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+
+ </div>
+</div>
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/control.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -6,7 +6,7 @@
<div class="yui-content">
<div id="control_details">
- <form action="index.php?menuaction=controller.uicontrol.index"
method="post">
+ <form
action="index.php?menuaction=controller.uicontrol.save_control_details"
method="post">
<input type="hidden" name="control_id"
value="{$control_id}" />
<dl class="proplist-col">
Deleted:
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/control_check_list.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,59 +0,0 @@
-<xsl:template name="control_check_list" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <ul class="groups">
- <xsl:for-each select="saved_groups_with_items_array">
- <li class="drag_group list_item">
- <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
-
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
-
- <ul id="list">
- <xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable
name="order_tag">
-
<xsl:choose>
-
<xsl:when test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:number/>
-
</xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li class="list_item">
- <span
class="drag">
- <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
- </li>
- </xsl:for-each>
- </ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
- </li>
- </xsl:for-each>
- </ul>
-</div>
-</xsl:template>
\ No newline at end of file
Modified:
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/control_check_lists.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -6,12 +6,26 @@
</div>
<div class="yui-content">
- <div id="details">
-
+ <div id="view_check_lists">
+
+ <ul
class="th"><li>Tittel</li><li>Startdato</li><li>Planlagtdato</li><li>Utførtdato</li></ul>
<ul class="check_list">
<xsl:for-each select="check_list_array">
<li>
- <span>Tittel:<xsl:value-of
select="title"/></span><span>Start dato:<xsl:value-of
select="start_date"/></span>
+ <ul class="row">
+ <li>
+ <a>
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_lists_for_control</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="id"/>
+ </xsl:attribute>
+
<span><xsl:value-of select="title"/></span>
+ </a>
+ </li>
+ <li><xsl:value-of
select="start_date"/></li>
+ <li><xsl:value-of
select="end_date"/></li>
+ </ul>
</li>
</xsl:for-each>
</ul>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_group_items.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_group_items.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/control_group_items.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,4 +1,4 @@
-<xsl:template name="control_items" xmlns:php="http://php.net/xsl";>
+<xsl:template name="control_group_items" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="yui_booking_i18n"/>
<div class="identifier-header">
Modified:
branches/Version-1_0-branch/controller/templates/base/control_group_tabs.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_group_tabs.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/control_group_tabs.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -8,7 +8,7 @@
<xsl:call-template name="control_group" />
</div>
<div id="control_items">
- <xsl:call-template name="control_items" />
+ <xsl:call-template name="control_group_items" />
</div>
</div>
</div>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,11 +1,11 @@
<xsl:template name="control_groups" xmlns:php="http://php.net/xsl";>
-<div class="yui-content">
+<div class="yui-content tab_content">
<div id="control_groups">
<h2><xsl:value-of select="control_area/title"/></h2>
- <form action="index.php?menuaction=controller.uicontrol.index"
method="post">
+ <form
action="index.php?menuaction=controller.uicontrol.view_control_items"
method="post">
<xsl:variable name="control_area_id"><xsl:value-of
select="control_area/id"/></xsl:variable>
<input type="hidden" name="control_area_id"
value="{$control_area_id}" />
Modified: branches/Version-1_0-branch/controller/templates/base/control_item.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control_item.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/control_item.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -9,7 +9,15 @@
</h1>
</div>
-<div class="yui-content">
+<ul class="check_list">
+ <xsl:for-each select="check_list_array">
+ <li>
+ <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ <div class="yui-content">
<div id="details">
<form action="#" method="post">
<input type="hidden" name="id" value =
"{value_id}">
Modified:
branches/Version-1_0-branch/controller/templates/base/control_items.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control_items.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/control_items.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,18 +1,18 @@
<xsl:template name="control_items" xmlns:php="http://php.net/xsl";>
-<div class="yui-content">
+<div class="yui-content tab_content">
<div>
<!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
<h2>Velg dine kontrollpunkt</h2>
<h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
- <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.index" method="post">
+ <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.save_control_items"
method="post">
<xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
<input type="hidden" name="control_id"
value="{control_id}" />
<xsl:variable name="control_group_ids"><xsl:value-of
select="control_group_ids"/></xsl:variable>
- <input type="hidden" name="control_group_ids[]"
value="{control_group_ids}" />
+ <input type="hidden" name="control_group_ids"
value="{control_group_ids}" />
<ul class="control_items">
<xsl:for-each
select="groups_with_control_items">
Deleted:
branches/Version-1_0-branch/controller/templates/base/control_items_receipt.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_items_receipt.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/control_items_receipt.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,63 +0,0 @@
-<xsl:template name="control_items_receipt" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content">
- <div>
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <ul>
- <xsl:for-each select="control_receipt_items">
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
- <ul class="itemlist control_items">
- <li>
- <h3><xsl:value-of
select="control_group/group_name"/></h3>
-
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
-
- <ul id="list">
- <xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable
name="order_tag">
-
<xsl:choose>
-
<xsl:when test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:number/>
-
</xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li class="list_item">
- <span
class="drag">
- <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
- </li>
- </xsl:for-each>
- </ul>
- </li>
- </ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit" id="save_order"
name="save_order" value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
- </xsl:for-each>
- </ul>
- </div>
-</div>
-</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/control_tabs.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control_tabs.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/control_tabs.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -13,38 +13,38 @@
</xsl:when>
<xsl:when test="view = 'control_groups'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Control_groups')"/> for <xsl:value-of select="group_name" /></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Control_groups')"/> for <xsl:value-of select="control_title" /></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="control_groups" />
</xsl:when>
<xsl:when test="view = 'control_locations'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Control_locations')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Control_locations')"/> for <xsl:value-of select="control_title" /></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="control_locations" />
</xsl:when>
<xsl:when test="view = 'control_equipment'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Control_equipment')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Control_equipment')"/> for <xsl:value-of select="control_title" /></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="control_equipment" />
</xsl:when>
<xsl:when test="view = 'control_items'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Control_items')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Control_items')"/> for <xsl:value-of select="control_title" /></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="control_items" />
</xsl:when>
- <xsl:when test="view = 'receipt'">
+ <xsl:when test="view = 'check_list'">
<div class="identifier-header">
- <h1><xsl:value-of select="php:function('lang',
'Receipt')"/></h1>
+ <h1><xsl:value-of select="php:function('lang',
'Check_list')"/> for <xsl:value-of select="control_title" /></h1>
</div>
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
- <xsl:call-template name="control_items_receipt" />
+ <xsl:call-template name="sort_check_list" />
</xsl:when>
</xsl:choose>
</div>
Deleted:
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/controller_check_lists.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,16 +0,0 @@
-<xsl:template name="heck_lists" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CHECK LIST
=============================== -->
-<h3>dsfdsfdsfdsfdsfds</h3>
- <ul class="check_list">
- <xsl:for-each select="check_list_array">
- <li>
-
- <span>Tittel:</span><xsl:value-of
select="title"/><span>Start dato:</span><xsl:value-of select="start_date"/>
- </li>
- </xsl:for-each>
- </ul>
-</div>
-</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2011-11-07 19:45:21 UTC (rev 8042)
@@ -92,7 +92,7 @@
}
.breadcrumbs{
- margin-left: 10px;
+ margin-left: 20px;
}
ul.pathway {
@@ -196,7 +196,7 @@
background-color: #eee;
border: 1px solid #bbb;
margin-bottom: 0em;
- padding: .3em;
+ padding: 10px 30px;
}
#datatableToolbar {
@@ -420,7 +420,7 @@
div.info, div.error, div.warning {
font-weight: normal;
- margin:10px;
+ margin:20px;
padding:5px;
font-size:1.1em;
text-align: left;
@@ -491,13 +491,9 @@
padding-left: 5px;
vertical-align: middle;
}
-#play ul li{
- cursor: move;
- width:600px;
-}
.yui-content input[type="submit"] {
- margin: 0 0 15px 15px;
+ margin: 15px 0 0;
padding: 1px 15px;
}
h1 img{
@@ -512,9 +508,12 @@
padding-left:0;
}
+#control_tabview .yui-content{
+ padding:20px;
+}
+
ul.itemlist {
- margin: 1em 0;
- padding-left: 20px;
+ position: relative;
}
ul.itemlist li {
padding: 3px 0;
@@ -529,9 +528,28 @@
margin: 0 0 5px;
}
+ul.groups {
+ position: relative;
+}
+ul.groups li {
+ padding: 3px 0;
+}
+
+ul.groups li.odd{
+ background: none repeat scroll 0 0 #DBE7F5;
+}
+
+ul.groups h3 {
+ font-size: 18px;
+ margin: 0 0 5px;
+}
+
+.drag_group {
+ width: 650px;
+}
+
.yui-content h2{
- margin: 1em 0;
- padding-left: 20px;
+ margin:0 0 10px;
}
#frm_control_items{
@@ -567,8 +585,8 @@
}
dl.proplist, dl.proplist-col {
- margin: 5px 0;
- padding-left: 15px;
+ margin: 0;
+ padding-left: 0;
}
.drag_elem{
@@ -592,15 +610,131 @@
left: 0px;
}
-.list_item:hover{
+.list_item:hover, .drag_group:hover{
cursor: move;
}
.frm_save_order input[type='submit']{
- margin: 0 0 15px 15px;
+ margin: 10px 0 15px 0;
width: 120px;
-}
+}
.delete {
cursor: pointer;
margin-left: 5px;
-}
\ No newline at end of file
+}
+.yui-navset .yui-content.tab_content {
+ padding: 20px;
+}
+
+#datatable-container {
+ margin: 20px;
+}
+
+#paginator {
+ margin: 20px;
+}
+
+#paginator.top {
+ margin: 20px 0 0 20px;
+}
+
+.yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a, .yui-skin-sam
.yui-button a:visited {
+ height: 24px;
+}
+
+#toolbar {
+ padding: 10px 20px;
+}
+
+#innertoolbar-button{
+ /*background: none repeat scroll 0 0 #CCCCCC;*/
+ color: #111111;
+}
+
+.yui-button.yui-link-button.new_button{
+ margin-left:30px;
+}
+
+#view_check_lists {
+ padding: 30px;
+ width: 600px;
+}
+
+ul.th {
+ font-weight: bold;
+ overflow:hidden;
+}
+
+ul.th li {
+ float: left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
+}
+
+ul.row{
+ overflow: hidden;
+}
+
+ul.row li{
+ float:left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
+}
+
+#main_content {
+ padding:20px;
+}
+
+#main_content.groups{
+ cursor: default;
+}
+#main_content fieldset{
+ padding:0;
+ margin:0;
+}
+
+#main_content h1{
+ margin-top:0;
+}
+
+.check_list li div{
+ margin:3px;
+ width:200px;
+ float:left;
+ padding:2px;
+ text-align:center;
+}
+.check_list li.heading{
+ font-weight:bold;
+ padding-left:25px;
+ background:
url("../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png") repeat-x
scroll 0 -100px #D8D8DA;
+}
+.check_list li.heading div{
+ padding:1px;
+}
+.check_list li div.order_nr{
+ width:15px;
+}
+.check_list li div.status {
+ padding-left: 10px;
+ width: 50px;
+}
+.check_list li div.title{
+ width: 600px;
+ text-align:left;
+}
+.check_list li.heading div.title{
+ text-align:center;
+}
+.check_list li{
+ overflow:hidden;
+}
+fieldset.control_details label{
+ font-weight:bold;
+}
+.new_item a#innertoolbar-button{
+ background: grey;
+ font-weight: bold;
+}
Modified: branches/Version-1_0-branch/controller/templates/base/datatable.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/datatable.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/datatable.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -172,6 +172,7 @@
<xsl:attribute
name="onclick"><xsl:value-of select="phpgw:conditional(not(onClick), '',
onClick)"/></xsl:attribute>
<xsl:attribute
name="value"><xsl:value-of select="phpgw:conditional(not(value), '',
value)"/></xsl:attribute>
<xsl:attribute
name="href"><xsl:value-of select="phpgw:conditional(not(href), '',
href)"/></xsl:attribute>
+ <xsl:attribute
name="class"><xsl:value-of select="phpgw:conditional(not(class), '',
class)"/></xsl:attribute>
</input>
</td>
</xsl:otherwise>
Deleted: branches/Version-1_0-branch/controller/templates/base/example_edit.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/example_edit.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/example_edit.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,80 +0,0 @@
-<!-- item -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<xsl:call-template name="yui_booking_i18n"/>
-<div class="identifier-header">
-<h1><img src="{img_go_home}" />
- <xsl:value-of select="php:function('lang', 'Control_item')" />
-</h1>
-</div>
-
-<div class="yui-content">
- <div id="details">
- <form action="#" method="post">
- <input type="hidden" name="id" value =
"{value_id}">
- </input>
- <dl class="proplist-col">
- <dt>
- <label
for="title">Tittel</label>
- </dt>
- <dd>
- <input type="text" name="title"
id="title" value="" />
- </dd>
- <dt>
- <label
for="required">Obligatorisk</label>
- </dt>
- <dd>
- <input type="checkbox" value=""
/>
- </dd>
- <dt>
- <label for="what_to_do">Hva
skal utføres</label>
- </dt>
- <dd>
- <textarea id="what_to_do"
rows="5" cols="60"></textarea>
- </dd>
- <dt>
- <label
for="how_to_do">Utførelsesbeskrivelse</label>
- </dt>
- <dd>
- <textarea id="how_to_do"
rows="5" cols="60"></textarea>
- </dd>
- <dt>
- <label
for="control_group">Kontrollgruppe</label>
- </dt>
- <dd>
- <select id="control_group"
name="control_group">
- <xsl:apply-templates
select="control_group/options"/>
- </select>
- </dd>
- <dt>
- <label
for="control_area">Kontrolltype</label>
- </dt>
- <dd>
- <select id="control_area"
name="control_area">
- <xsl:apply-templates
select="control_area/options"/>
- </select>
- </dd>
- </dl>
-
- <div class="form-buttons">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <input type="submit"
name="save_control" value="{$lang_save}" title = "{$lang_save}">
- </input>
- </div>
-
- </form>
-
- </div>
- </div>
-</xsl:template>
-
-<xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected" value="selected" />
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
-</xsl:template>
-
Deleted:
branches/Version-1_0-branch/controller/templates/base/example_normal_tabs.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/example_normal_tabs.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/example_normal_tabs.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,33 +0,0 @@
-<!-- separate tabs and inline tables-->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset yui-navset-top" id="example_tabview">
- <xsl:value-of disable-output-escaping="yes" select="tabs" />
- <div class="yui-content">
- <div id="general">
- <h4><xsl:value-of select="php:function('lang',
'Documents')" /></h4>
- <div id="documents_container"/>
- <a class='button'>
- <xsl:attribute
name="href"><xsl:value-of select="resource/add_document_link"/></xsl:attribute>
- <xsl:if
test="resource/permission/write">
- <xsl:value-of
select="php:function('lang', 'Add Document')" />
- </xsl:if>
- </a>
- <h4><xsl:value-of select="php:function('lang',
'Permissions')" /></h4>
- <div id="permissions_container"/>
- </div>
- <div id="list">
- <h4><xsl:value-of select="php:function('lang',
'list')" /></h4>
- </div>
- <div id="list">
- <h4><xsl:value-of select="php:function('lang',
'dates')" /></h4>
- <xsl:value-of disable-output-escaping="yes"
select="date"/>
- </div>
- </div>
- </div>
- <script type="text/javascript">
- var resource_id = <xsl:value-of select="resource/id"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'Name', 'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
- </script>
-</xsl:template>
-
Deleted:
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,25 +0,0 @@
-<!-- separate tabs and inline tables-->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <xsl:value-of disable-output-escaping="yes" select="tabs"/>
-
- <div id="content">
- <h4><xsl:value-of select="php:function('lang', 'Documents')"
/></h4>
- <div id="documents_container"/>
- <a class='button'>
- <xsl:attribute name="href"><xsl:value-of
select="resource/add_document_link"/></xsl:attribute>
- <xsl:if test="resource/permission/write">
- <xsl:value-of select="php:function('lang', 'Add
Document')" />
- </xsl:if>
- </a>
- <h4><xsl:value-of select="php:function('lang', 'Permissions')"
/></h4>
- <div id="permissions_container"/>
- </div>
-
-<script type="text/javascript">
-var resource_id = <xsl:value-of select="resource/id"/>;
- var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
-</script>
-
-</xsl:template>
-
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -3,6 +3,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:call-template name="yui_booking_i18n"/>
+<xsl:variable name="dateformat"><xsl:value-of select="dateformat"
/></xsl:variable>
<div class="identifier-header">
<h1><img src="{img_go_home}" />
<xsl:value-of select="php:function('lang', 'Procedure')" />
@@ -21,7 +22,7 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <input type="text"
name="title" id="title" value="{procedure/title}" />
+ <input type="text"
name="title" id="title" value="{procedure/title}" size="100"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="procedure/title" />
@@ -35,80 +36,106 @@
<xsl:value-of
select="procedure/revision_no" />
</dd>
<dt>
- <label
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')"
/></label>
+ <label
for="control_area"><xsl:value-of select="php:function('lang','Control area')"
/></label>
</dt>
<dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea id="purpose"
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose"
disable-output-escaping="yes"/></textarea>
+ <select
id="control_area" name="control_area">
+ <option
value="0">Ingen valgt</option>
+
<xsl:apply-templates select="control_area/options"/>
+ </select>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
+ <xsl:value-of
select="procedure/control_area_name" />
</xsl:otherwise>
</xsl:choose>
</dd>
<dt>
- <label
for="responsibility"><xsl:value-of select="php:function('lang','Procedure
responsibility')" /></label>
+ <label
for="start_date"><xsl:value-of select="php:function('lang','Procedure start
date')" /></label>
</dt>
<dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea
id="responsibility" name="responsibility" rows="5" cols="60"><xsl:value-of
select="procedure/responsibility" /></textarea>
+ <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/responsibility" />
+ <xsl:variable
name="startdate"><xsl:value-of select="procedure/start_date" /></xsl:variable>
+ <xsl:value-of
select="php:function('date', $dateformat, $startdate)" />
</xsl:otherwise>
</xsl:choose>
</dd>
<dt>
- <label
for="control_area"><xsl:value-of select="php:function('lang','Control area')"
/></label>
+ <label
for="revision_date"><xsl:value-of select="php:function('lang','Procedure
revision date')" /></label>
</dt>
<dd>
<xsl:choose>
<xsl:when test="editable">
- <select
id="control_area" name="control_area">
- <option
value="0">Ingen valgt</option>
-
<xsl:apply-templates select="control_area/options"/>
- </select>
+ <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/control_area_name" />
+ <xsl:if
test="procedure/revision_date != 0">
+ <xsl:variable
name="revisiondate"><xsl:value-of select="procedure/revision_date"
/></xsl:variable>
+ <xsl:value-of
select="php:function('date', $dateformat, $revisiondate)" />
+ </xsl:if>
</xsl:otherwise>
</xsl:choose>
</dd>
+ <xsl:if test="procedure/end_date != 0">
<dt>
- <label
for="description"><xsl:value-of select="php:function('lang','Procedure
description')" /></label>
+ <label
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')"
/></label>
</dt>
<dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="procedure/description" disable-output-escaping="yes"/></textarea>
+ <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/description" disable-output-escaping="yes"/>
+ <xsl:variable
name="enddate"><xsl:value-of select="procedure/end_date" /></xsl:variable>
+ <xsl:value-of
select="php:function('date', $dateformat, $enddate)" />
</xsl:otherwise>
</xsl:choose>
</dd>
+ </xsl:if>
<dt>
- <label
for="start_date"><xsl:value-of select="php:function('lang','Procedure start
date')" /></label>
+ <label
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')"
/></label>
</dt>
<dd>
- <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea id="purpose"
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose"
disable-output-escaping="yes"/></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
- <label
for="revision_date"><xsl:value-of select="php:function('lang','Procedure
revision date')" /></label>
+ <label
for="responsibility"><xsl:value-of select="php:function('lang','Procedure
responsibility')" /></label>
</dt>
<dd>
- <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea
id="responsibility" name="responsibility" rows="5" cols="60"><xsl:value-of
select="procedure/responsibility" /></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/responsibility" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
- <xsl:if test="end_date != ''">
<dt>
- <label
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')"
/></label>
+ <label
for="description"><xsl:value-of select="php:function('lang','Procedure
description')" /></label>
</dt>
<dd>
- <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="procedure/description" disable-output-escaping="yes"/></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="procedure/description" disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
- </xsl:if>
<dt>
<label
for="reference"><xsl:value-of select="php:function('lang','Procedure
Reference')" /></label>
</dt>
Modified:
branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/sort_check_list.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -49,7 +49,7 @@
</ul>
<div>
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
+ <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}"
style="opacity: 0.5;" disabled="disabled"/>
</div>
</form>
</li>
Deleted:
branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -1,59 +0,0 @@
-<xsl:template name="view_check_list" xmlns:php="http://php.net/xsl";>
-
-<div class="yui-content tab_content">
-
- <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
-
- <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
- <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
-
- <ul class="groups">
- <xsl:for-each select="saved_groups_with_items_array">
- <li class="drag_group list_item">
- <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
-
- <form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
-
- <ul id="list">
- <xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
- <xsl:variable
name="order_tag">
-
<xsl:choose>
-
<xsl:when test="order_nr > 0">
-
<xsl:value-of select="order_nr"/>
-
</xsl:when>
-
<xsl:otherwise>
-
<xsl:number/>
-
</xsl:otherwise>
-
</xsl:choose>:<xsl:value-of select="id"/>
- </xsl:variable>
-
- <li class="list_item">
- <span
class="drag">
- <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
- </span>
- <a
class="delete">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicontrol_item.delete_item_list</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="//control_id"/>
-
<xsl:text>&control_item_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<span>x</span>
- </a>
- </li>
- </xsl:for-each>
- </ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit"
id="save_order" name="save_order" value="{$lang_save}" title = "{$lang_save}" />
- </div>
- </form>
- </li>
- </xsl:for-each>
- </ul>
-</div>
-</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl (from
rev 8041, trunk/controller/templates/base/view_check_list.xsl)
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
(rev 0)
+++ branches/Version-1_0-branch/controller/templates/base/view_check_list.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -0,0 +1,46 @@
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+ <h1>Sjekkliste</h1>
+ <fieldset class="control_details">
+ <label>Tittel</label><xsl:value-of
select="check_list/status"/><br/>
+ <label>Startdato</label><xsl:value-of
select="check_list/comment"/><br/>
+ <label>Sluttdato</label><xsl:value-of
select="check_list/deadline"/><br/>
+ </fieldset>
+
+ <h2>Sjekkpunkter</h2>
+ <ul class="check_list">
+ <li class="heading">
+ <div class="status">Status</div>
+ <div class="title">Tittel for
kontrollpunkt</div>
+ <div>Kommentar</div>
+ </li>
+
+ <xsl:choose>
+ <xsl:when
test="check_list/check_item_array/child::node()">
+ <xsl:for-each
select="check_list/check_item_array">
+ <li>
+ <div
class="order_nr"><xsl:number/>.</div>
+ <div class="status">
+ <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="status = 1">
+ <img
height="15" src="controller/images/status_icon_light_green.png" />
+ </xsl:when>
+ </xsl:choose>
+ </div>
+ <div class="title"><xsl:value-of
select="control_item/title"/></div>
+ <div><xsl:value-of
select="comment"/></div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/view_check_lists.xsl
(from rev 8041, trunk/controller/templates/base/view_check_lists.xsl)
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/view_check_lists.xsl
(rev 0)
+++ branches/Version-1_0-branch/controller/templates/base/view_check_lists.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -0,0 +1,65 @@
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
+
+ <h1>Sjekklister for kontroll</h1>
+ <fieldset class="control_details">
+ <label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
+ <label>Startdato</label><xsl:value-of
select="control_as_array/start_date"/><br/>
+ <label>Sluttdato</label><xsl:value-of
select="control_as_array/end_date"/><br/>
+ <label>Syklustype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
+ <label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
+ </fieldset>
+
+ <h2>Sjekklister</h2>
+ <ul class="check_list">
+ <li class="heading">
+ <div class="status">Status</div>
+ <div>Skal utføres innen dato</div>
+ <div>Planlagt utført dato</div>
+ <div>Ble utført dato</div>
+ <div>Kommentar</div>
+ </li>
+ <xsl:choose>
+ <xsl:when test="check_list_array/child::node()">
+ <xsl:for-each select="check_list_array">
+ <li>
+ <div
class="order_nr"><xsl:number/>.</div>
+ <div class="status">
+ <xsl:variable
name="status"><xsl:value-of select="status"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="status = 1">
+ <img
height="15" src="controller/images/status_icon_light_green.png" />
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen
sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ <div>
+ <a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<xsl:value-of select="deadline"/>
+ </a>
+ </div>
+ <div><xsl:value-of
select="planned_date"/></div>
+ <div><xsl:value-of
select="completed_date"/></div>
+ <div><xsl:value-of
select="comment"/></div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+</div>
+</xsl:template>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/templates/base/view_control_item_list.xsl
(from rev 8041, trunk/controller/templates/base/view_control_item_list.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/view_control_item_list.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/view_control_item_list.xsl
2011-11-07 19:45:21 UTC (rev 8042)
@@ -0,0 +1,61 @@
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
+
+<div id="main_content">
+
+ <!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
+
+ <fieldset>
+ <label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
+ <label>Startdato</label><xsl:value-of
select="control_as_array/start_date"/><br/>
+ <label>Sluttdato</label><xsl:value-of
select="control_as_array/end_date"/><br/>
+ <label>Syklustype</label><xsl:value-of
select="control_as_array/repeat_type"/><br/>
+ <label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
+ </fieldset>
+
+ <ul class="check_list">
+ <xsl:for-each select="saved_groups_with_items_array">
+ <li>
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
+
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
+
+ <ul id="list">
+ <xsl:for-each
select="control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <xsl:variable
name="order_tag">
+ <xsl:choose>
+
<xsl:when test="order_nr > 0">
+
<xsl:value-of select="order_nr"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:number/>
+
</xsl:otherwise>
+
</xsl:choose>:<xsl:value-of select="id"/>
+ </xsl:variable>
+
+ <li>
+ <span class="drag">
+ <span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
+ </span>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </li>
+ </xsl:for-each>
+ </ul>
+ <div style="margin:20px 0;">
+ <a
style="text-decoration:underline;font-size:20px;color:#333;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="control_as_array/id"/>
+ </xsl:attribute>
+ Lag sjekkliste for kontroll
+ </a>
+ </div>
+</div>
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2011-11-07 19:45:21 UTC (rev 8042)
@@ -660,7 +660,7 @@
$values_combo_box[$i][]
= array
(
'id' => '',
- 'name' =>
$attrib['input_text'],
+ 'name' =>
lang('select') . " '{$attrib['input_text']}'"
);
Modified: branches/Version-1_0-branch/rental/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/css/base.css
2011-11-07 19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/rental/templates/base/css/base.css
2011-11-07 19:45:21 UTC (rev 8042)
@@ -46,7 +46,7 @@
margin-top: 0.5em;
}
-input[type="submit"], input[type="button"]{
+input[type="submit"], input[type="button"], button{
padding:2px 4px;
}
@@ -171,10 +171,6 @@
float: left;
}
-dl.proplist-col input[type="text"]{
- width:200px;
-}
-
dl.proplist-col input.postcode{
width:50px;
}
@@ -192,6 +188,14 @@
margin-bottom: 1em;
}
+.identifier-header button {
+ margin-bottom: 10px;
+}
+
+.identifier-header h1 img {
+ margin-right: 5px;
+}
+
div.identifier-header label {
font-weight: bold;
}
@@ -489,4 +493,12 @@
display:none;
color:red;
margin-bottom: 10px;
+}
+
+#date_start, #date_end{
+ width: 68px;
+}
+
+input.email, input.url, #unit_leader{
+ width: 225px;
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/rental/templates/base/party.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/party.php 2011-11-07
19:34:01 UTC (rev 8041)
+++ branches/Version-1_0-branch/rental/templates/base/party.php 2011-11-07
19:45:21 UTC (rev 8042)
@@ -197,7 +197,39 @@
</dd>
</dl>
<dl class="proplist-col">
+ <?php if($editable) {?>
+ <dt>
+ <label
for="is_inactive"><?php echo lang('inactive_party') ?></label>
+ </dt>
+ <dd>
+ <input type="checkbox"
name="is_inactive" id="is_inactive" <?php if($party->is_inactive()) { echo
"checked='checked'";} ?>/>
+ </dd>
+ <?php
+ }else{
+ ?>
+ <dt><label><?php
if($party->is_inactive()){?><font style="color: red;"><?php echo
lang('inactive_party');?></font><?php }else{ ?><font style="color:
green;"><?php echo lang('active_party');?></font><?php } ?></label></dt>
+ <dd> </dd>
+ <?php }?>
<dt>
+ <?php
if($party->get_account_number () || $editable) { ?>
+ <label
for="account_number"><?php echo lang('account_number') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <input type="text"
class="medium_number" name="account_number" id="account_number" value="<?php
echo $party->get_account_number() ?>" />
+ <?php
+ }
+ else
+ {
+ echo
$party->get_account_number();
+ }
+ ?>
+ </dd>
+ <dt>
<?php if($party->get_phone() ||
$editable) { ?>
<label for="phone"><?php echo
lang('phone') ?></label>
<?php } ?>
@@ -264,7 +296,7 @@
if ($editable)
{
?>
- <input type="text"
name="email" id="email" value="<?php echo $party->get_email() ?>" />
+ <input type="text"
name="email" class="email" id="email" value="<?php echo $party->get_email() ?>"
/>
<?php
$validator =
CreateObject('phpgwapi.EmailAddressValidator');
$email =
$party->get_email();
@@ -289,7 +321,7 @@
if ($editable)
{
?>
- <input type="text"
name="url" id="url" value="<?php echo $party->get_url() ?>" />
+ <input type="text"
class="url" name="url" id="url" value="<?php echo $party->get_url() ?>" />
<?php
}
else
@@ -299,39 +331,6 @@
?>
</dd>
<dt>
- <?php
if($party->get_account_number () || $editable) { ?>
- <label
for="account_number"><?php echo lang('account_number') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- if ($editable)
- {
- ?>
- <input type="text"
name="account_number" id="account_number" value="<?php echo
$party->get_account_number() ?>" />
- <?php
- }
- else
- {
- echo
$party->get_account_number();
- }
- ?>
- </dd>
- <?php if($editable) {?>
- <dt>
- <label
for="is_inactive"><?php echo lang('inactive_party') ?></label>
- </dt>
- <dd>
- <input type="checkbox"
name="is_inactive" id="is_inactive" <?php if($party->is_inactive()) { echo
"checked='checked'";} ?>/>
- </dd>
- <?php
- }else{
- ?>
- <dt><label><?php
if($party->is_inactive()){?><font style="color: red;"><?php echo
lang('inactive_party');?></font><?php }else{ ?><font style="color:
green;"><?php echo lang('active_party');?></font><?php } ?></label></dt>
- <dd> </dd>
- <?php }?>
-
- <dt>
<?php
if($party->get_unit_leader() || $editable) { ?>
<label for="unit_leader"><?php
echo lang('unit_leader') ?></label>
<?php } ?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8042] Merge 7993:8041 from trunk,
Sigurd Nes <=