[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7733] Merge 7719:7732 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7733] Merge 7719:7732 from trunk |
|
Date: |
Tue, 27 Sep 2011 10:45:25 +0000 |
Revision: 7733
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7733
Author: sigurdne
Date: 2011-09-27 10:45:25 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Merge 7719:7732 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control_item_list.inc.php
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/templates/base/control.xsl
branches/Version-1_0-branch/controller/templates/base/control_groups.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/frontend/inc/class.uihelpdesk.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/controller/images/
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
branches/Version-1_0-branch/controller/js/controller/
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
+
/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
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -21,7 +21,7 @@
}
/**
- * Function for adding a new activity to the database. Updates the
activity object.
+ * Function for adding a new control to the database. Updates the
control object.
*
* @param activitycalendar_activity $activity the party to be added
* @return bool true if successful, false otherwise
@@ -35,8 +35,10 @@
$result = $this->db->query($sql, __LINE__,__FILE__);
if(isset($result)) {
- // Set the new party ID
+
+ // Set the new control ID
$control->set_id($this->db->get_last_insert_id('controller_control', 'id'));
+
// Forward this request to the update method
return $this->update($control);
}
@@ -53,31 +55,40 @@
* @param $activity the activity to be updated
* @return boolean true if successful, false otherwise
*/
-
-
function update($control)
{
$id = intval($control->get_id());
-
+
$values = array(
'title = ' . $this->marshal($control->get_title(),
'string'),
'description = ' .
$this->marshal($control->get_description(), 'string'),
'start_date = ' .
$this->marshal($control->get_start_date(), 'int'),
'end_date = ' .
$this->marshal($control->get_end_date(), 'int'),
- 'repeat_day = ' .
$this->marshal($control->get_repeat_day(), 'int'),
- 'repeat_type = ' .
$this->marshal($control->get_repeat_type(), 'int'),
- 'repeat_interval = ' .
$this->marshal($control->get_repeat_interval(), 'int'),
-
+ 'repeat_type = ' .
$this->marshal($control->get_repeat_type(), 'string'),
+ 'repeat_interval = ' .
$this->marshal($control->get_repeat_interval(), 'string'),
+ 'procedure_id = ' .
$this->marshal($control->get_procedure_id(), 'int')
);
- //var_dump('UPDATE activity_activity SET ' . join(',', $values)
. " WHERE id=$id");
$result = $this->db->query('UPDATE controller_control SET ' .
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
- return isset($result);
+ if( isset($result) ){
+ return $id;
+ }else{
+ return 0;
+ }
+
+ // Kommenterte denne ut midlertidig.
+ //Trenger id-en som ble lagret når controllen blir lagret.
+ //return isset($result);
}
+
+
+
+
+
function get_procedure_list(){
@@ -86,22 +97,7 @@
function get_id_field_name($extended_info = false)
{
- /*
- if(!$extended_info)
- {
- $ret = 'id';
- }
- else
- {
- $ret = array
- (
- 'table' => 'activity', // 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)
@@ -112,30 +108,8 @@
function populate(int $control_id, &$control)
{
- /*
- if($control == null) {
- $control = new activitycalendar_activity((int)
$activity_id);
-
-
$control->set_title($this->unmarshal($this->db->f('title'), 'string'));
-
$control->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
-
$control->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
-
$control->set_district($this->unmarshal($this->db->f('district'), 'int'));
-
$control->set_office($this->unmarshal($this->db->f('office'), 'int'));
-
$control->set_category($this->unmarshal($this->db->f('category'), 'int'));
-
$control->set_state($this->unmarshal($this->db->f('state'), 'int'));
-
$control->set_target($this->unmarshal($this->db->f('target'), 'string'));
-
$control->set_description($this->unmarshal($this->db->f('description'),
'string'));
-
$control->set_arena($this->unmarshal($this->db->f('arena'), 'string'));
-
$control->set_internal_arena($this->unmarshal($this->db->f('internal_arena'),
'string'));
-
$control->set_time($this->unmarshal($this->db->f('time'), 'string'));
-
$control->set_last_change_date($this->unmarshal($this->db->f('last_change_date'),
'int'));
-
$control->set_special_adaptation($this->unmarshal($this->db->f('special_adaptation',
'bool')));
-
$control->set_secret($this->unmarshal($this->db->f('secret'), 'string'));
-
-
- }
- */
- return $control;
+
}
+
}
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-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -253,6 +253,52 @@
return $results;
}
+ function get_control_items_by_control_id($control_id)
+ {
+ $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);
+
+ 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_control_items_by_control_id_and_group($control_id,
$control_group_id)
+ {
+ $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 AND ci.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->toArray();
+ }
+
+ return $results;
+ }
+
function populate(int $control_item_id, &$control_item)
{
Copied:
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
(from rev 7732, trunk/controller/inc/class.socontrol_item_list.inc.php)
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
(rev 0)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -0,0 +1,285 @@
+<?php
+phpgw::import_class('controller.socommon');
+
+include_class('controller', 'control_item', 'inc/model/');
+
+class controller_socontrol_item_list extends controller_socommon
+{
+ protected static $so;
+
+ /**
+ * Get a static reference to the storage object associated with this
model object
+ *
+ * @return controller_soparty the storage object
+ */
+ public static function get_instance()
+ {
+ if (self::$so == null) {
+ self::$so =
CreateObject('controller.socontrol_item_list');
+ }
+ return self::$so;
+ }
+
+ /**
+ * Function for adding a new activity to the database. Updates the
activity object.
+ *
+ * @param activitycalendar_activity $activity the party to be added
+ * @return bool true if successful, false otherwise
+ */
+ function add(&$control_item_list)
+ {
+ $cols = array(
+ 'control_id',
+ 'control_item_id',
+ );
+
+ $values = array(
+ $this->marshal($control_item_list->get_control_id(),
'int'),
+
$this->marshal($control_item_list->get_control_item_id(), 'int')
+ );
+
+
+ var_dump("INSERT INTO controller_control_item_list (' .
join(',', $cols) . ') VALUES (' . join(',', $values) . ')' ");
+
+ $result = $this->db->query( 'INSERT INTO
controller_control_item_list (' . join(',', $cols) . ') VALUES (' . join(',',
$values) . ')', __LINE__,__FILE__);
+ $result = $this->db->query($sql, __LINE__,__FILE__);
+
+ if(isset($result)) {
+ // return the new control item ID
+ return
$this->db->get_last_insert_id('controller_control_item_list', 'id');
+ // Forward this request to the update method
+ //return $this->update($control_item);
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ /**
+ * Update the database values for an existing activity object.
+ *
+ * @param $activity the activity to be updated
+ * @return boolean true if successful, false otherwise
+ */
+
+ function update($control_item_list)
+ {
+ /*
+ $id = intval($control_item->get_id());
+
+ $values = array(
+ '$purpose = ' .
$this->marshal($control_item->get_purpose(), 'string'),
+ 'responsibility = ' .
$this->marshal($control_item->get_responsibility(), 'int'),
+ 'description = ' .
$this->marshal($control_item->get_description(), 'int'),
+ 'reference = ' .
$this->marshal($control_item->get_reference(), 'int'),
+ 'attachment = ' .
$this->marshal($control_item->get_attachment(), 'int')
+ );
+
+ //var_dump('UPDATE activity_activity SET ' . join(',', $values)
. " WHERE id=$id");
+ $result = $this->db->query('UPDATE controller_control_item SET
' . join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
+
+ return isset($result);
+ */
+ }
+
+ /**
+ * Get single procedure
+ *
+ * @param $id id of the control_item to return
+ * @return a controller_control_item
+ */
+ function get_single($id)
+ {
+ /*
+ $id = (int)$id;
+
+ $sql = "SELECT p.* FROM controller_control_item p WHERE p.id =
" . $id;
+ $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $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),
'bool'));
+
$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;
+
+ */
+ }
+
+ /**
+ * Get a list of procedure objects matching the specific filters
+ *
+ * @param $start search result offset
+ * @param $results number of results to return
+ * @param $sort field to sort by
+ * @param $query LIKE-based query string
+ * @param $filters array of custom filters
+ * @return list of rental_composite objects
+ */
+ 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 ": '';
+
+ //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}");
+ //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.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -5,10 +5,12 @@
phpgw::import_class('controller.socontrol_group');
phpgw::import_class('controller.socontrol_area');
phpgw::import_class('controller.socontrol_item');
+ phpgw::import_class('controller.socontrol_item_list');
phpgw::import_class('controller.soprocedure');
include_class('controller', 'control', 'inc/model/');
include_class('controller', 'control_area', 'inc/model/');
+ include_class('controller', 'control_item_list', 'inc/model/');
class controller_uicontrol extends controller_uicommon
{
@@ -17,7 +19,8 @@
private $so_proc;
private $so_control_group;
private $so_control_area;
- private $so_control_item;
+ private $so_control_item;
+ private $so_control_item_list;
public $public_functions = array
(
@@ -34,6 +37,7 @@
$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');
self::set_active_menu('controller::control');
}
@@ -52,6 +56,10 @@
{
$this->edit_control_items();
}
+ else if( isset($_POST['show_receipt']) )
+ {
+ $this->show_receipt();
+ }
else{
$this->view_control();
}
@@ -109,8 +117,8 @@
'control_items' => array('label' =>
lang('Control_items'), 'link' => '#control_items')
);
- $control_area_id = phpgw::get_var('control_area_id');
-
+ $control_area_id = phpgw::get_var('control_area_id',
'int');
+
if(isset($control)) // Edit control
{
$control = $this->populate($control);
@@ -118,7 +126,7 @@
}else{
$new_control = new controller_control();
$control = $this->populate($new_control);
- //$this->so->add($control);
+ $saved_control_id = $this->so->add($control);
}
$control_group_array =
$this->so_control_group->get_control_groups($control_area_id);
@@ -138,7 +146,8 @@
'value_id'
=> !empty($control) ? $control->get_id() : 0,
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
'editable'
=> true,
- 'title'
=> $control_area->get_title(),
+ 'control_id' =>
$saved_control_id,
+ 'control_area' =>
$control_area->toArray(),
'control_groups' =>
$control_groups
);
@@ -150,16 +159,19 @@
$tabs = array
(
- 'details' => array('label' =>
lang('Details'), 'link' => '#details'),
- 'control_groups' =>
array('label' => lang('Control_groups'), 'link' => '#control_groups'),
+ 'details' =>
array('label' => lang('Details'), 'link' => '#details'),
+ 'control_groups' => array('label' =>
lang('Control_groups'), 'link' => '#control_groups'),
'control_items' => array('label' =>
lang('Control_items'), 'link' => '#control_items')
);
+ $control_id = phpgw::get_var('control_id', 'int');
+
$control_group_ids = array();
$control_group_ids =
phpgw::get_var('control_group_ids');
$control_items_2D = array();
+ // Fetching control items for each control group and
populate array that is sent to xslt template
foreach ($control_group_ids as $control_group_id)
{
$control_items_array =
$this->so_control_item->get_control_items($control_group_id);
@@ -173,7 +185,7 @@
$control_group =
$this->so_control_group->get_single($control_group_id);
- $control_items_2D[] = array("group_name" =>
$control_group->get_group_name(), "control_item" => $control_items);
+ $control_items_2D[] = array("control_group" =>
$control_group->toArray(), "control_item" => $control_items);
}
phpgwapi_yui::tabview_setup('control_tabview');
@@ -183,30 +195,152 @@
'tabs' =>
phpgwapi_yui::tabview_generate($tabs, 'control_items'),
'value_id' =>
!empty($control) ? $control->get_id() : 0,
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
- 'editable' => true,
+ 'choose_control_items' => true,
+ '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', 'control_groups', 'control_items'), $data);
}
+ public function edit_control_items(){
+
+ //Setting up tab menu
+ $tabs = array
+ (
+ 'details' =>
array('label' => lang('Details'), 'link' => '#details'),
+ 'control_groups' => array('label' =>
lang('Control_groups'), 'link' => '#control_groups'),
+ 'control_items' => array('label' =>
lang('Control_items'), 'link' => '#control_items')
+ );
+
+ $control_id = phpgw::get_var('control_id');
+
+ $control_item_ids = array();
+ // Fetching selected control items
+ $control_tag_ids = phpgw::get_var('control_tag_ids');
+
+ // Saving control items
+ foreach ($control_tag_ids as $control_item_tag)
+ {
+ $control_item_id = substr($control_item_tag, 2,
2);
+
+ $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_id);
+
+
$this->so_control_item_list->add($control_item_list);
+ }
+
+ $control_group_ids = array();
+
+ //Putting control_group_ids in array
+ foreach ($control_tag_ids as $control_tag)
+ {
+ $control_group_id = substr($control_tag, 0, 1);
+
+ if(!in_array($control_group_id,
$control_group_ids))
+ $control_group_ids[] =
$control_group_id;
+ }
+
+ $control_receipt_items = array();
+
+ //Populating array that is displayed as receipe
+ foreach ($control_group_ids as $control_group_id)
+ {
+ $saved_control_items =
$this->so_control_item->get_control_items_by_control_id_and_group($control_id,
$control_group_id);
+
+ $control_group =
$this->so_control_group->get_single($control_group_id);
+
+ $control_item =
$this->so_control_item->get_single($control_item_id);
+
+ $control_receipt_items[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
+ }
+
+ var_dump("Skriver ut control_receipt");
+ print_r($control_receipt_items);
+
+ phpgwapi_yui::tabview_setup('control_tabview');
+
+ $data = array
+ (
+ 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, 'control_items'),
+ 'value_id' =>
!empty($control) ? $control->get_id() : 0,
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'control_id' => $control_id,
+ 'control_receipt_items' =>
$control_receipt_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', 'control_groups', 'control_items'), $data);
+
+ }
+ public function show_receipt(){
+
+ $tabs = array
+ (
+ 'details' =>
array('label' => lang('Details'), 'link' => '#details'),
+ 'control_groups' => array('label' =>
lang('Control_groups'), 'link' => '#control_groups'),
+ 'control_items' => array('label' =>
lang('Control_items'), 'link' => '#control_items')
+ );
+
+ $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);
+ }
+
+ phpgwapi_yui::tabview_setup('control_tabview');
+
+ $data = array
+ (
+ 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, 'control_items'),
+ 'value_id' =>
!empty($control) ? $control->get_id() : 0,
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'edit_control_items' => false,
+ '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', 'control_groups', 'control_items'), $data);
+
+ }
+
+
public function query()
{
- var_dump("Er i uicontrol");
-
+
}
public function populate($control){
-
- $control->set_title(phpgw::get_var('title'));
-
$control->set_description(phpgw::get_var('description'));
- $control->set_start_date( strtotime(
phpgw::get_var('start_date') ) );
- $control->set_end_date( strtotime(
phpgw::get_var('end_date') ) );
- $control->set_repeat_day( strtotime(
phpgw::get_var('repeat_day') ) );
- $control->set_repeat_type( strtotime(
phpgw::get_var('repeat_type') ) );
- $control->set_repeat_interval( strtotime(
phpgw::get_var('repeat_interval') ) );
+
+ $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/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -10,9 +10,9 @@
protected $description;
protected $start_date;
protected $end_date;
- protected $repeat_day;
protected $repeat_type;
protected $repeat_interval;
+ protected $procedure_uid;
protected $enabled;
/**
@@ -82,6 +82,13 @@
public function get_repeat_interval() { return
$this->repeat_interval; }
+ public function set_procedure_id($procedure_id)
+ {
+ $this->procedure_id = $procedure_id;
+ }
+
+ public function get_procedure_id() { return
$this->procedure_id; }
+
public function set_enabled($enabled)
{
$this->enabled = $enabled;
Modified:
branches/Version-1_0-branch/controller/inc/model/class.control_item_list.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/model/class.control_item_list.inc.php
2011-09-27 10:43:38 UTC (rev 7732)
+++
branches/Version-1_0-branch/controller/inc/model/class.control_item_list.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -1,7 +1,7 @@
<?php
include_class('controller', 'model', 'inc/model/');
- class controller_control_item extends controller_model
+ class controller_control_item_list extends controller_model
{
public static $so;
@@ -49,7 +49,7 @@
public static function get_so()
{
if (self::$so == null) {
- self::$so =
CreateObject('controller.sopurpose');
+ self::$so =
CreateObject('controller.socontrol_item_list');
}
return self::$so;
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-09-27
10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-09-27
10:45:25 UTC (rev 7733)
@@ -232,8 +232,10 @@
Control item title controller no Tittel
Control_group controller no Kontrollgruppe
Control group controller no Kontrollgruppe
+Control_groups controller no Kontrollgrupper
Control_area controller no Kontrollområde
Control area controller no Kontrollområde
+Control_areas controller no Kontrollområder
Control item what to do controller no Hva skal gjøres
Not selected controller no Ingen valgt
searchfield controller no Søkefelt
Modified: branches/Version-1_0-branch/controller/templates/base/control.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/templates/base/control.xsl
2011-09-27 10:45:25 UTC (rev 7733)
@@ -32,7 +32,7 @@
<label>Prosedyre</label>
</dt>
<dd>
- <select id="procedure" name="procedure">
+ <select id="procedure_id"
name="procedure_id">
<xsl:for-each
select="procedure_options/options">
<option value="{id}">
<xsl:if
test="selected != 0">
@@ -84,7 +84,7 @@
<label>Frekvens</label>
</dt>
<dd>
- <input size="2" type="text"
name="repeat_interval" value="" />
+ <input size="2" type="text"
name="repeat_interval" value="2" />
</dd>
</dl>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/templates/base/control_groups.xsl
2011-09-27 10:45:25 UTC (rev 7733)
@@ -12,9 +12,15 @@
<div class="yui-content">
<div id="details">
- <h1><xsl:value-of select="title"/></h1>
+ <h1><xsl:value-of select="control_area/title"/></h1>
- <form action="#" method="post">
+ <form action="#" 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}" />
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id" value="{control_id}" />
+
<ul>
<xsl:for-each select="//control_groups">
<xsl:variable name="control_group_id"><xsl:value-of
select="id"/></xsl:variable>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_items.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control_items.xsl
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/templates/base/control_items.xsl
2011-09-27 10:45:25 UTC (rev 7733)
@@ -9,23 +9,80 @@
<div class="yui-content">
<div id="details">
+
+ <xsl:choose>
+ <xsl:when test="boolean(choose_control_items)">
+
+ <!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
+ <h2>Velg dine kontrollpunkt</h2>
<form action="#" method="post">
- <xsl:for-each select="//control_items">
- <ul>
- <h4><xsl:value-of select="group_name"/></h4>
- <xsl:for-each select="control_item">
- <xsl:variable
name="control_items_id"><xsl:value-of select="id"/></xsl:variable>
- <li><input type="checkbox"
name="control_items_ids[]" value="{$control_items_id}" /><xsl:value-of
select="title"/></li>
- </xsl:for-each>
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id" value="{control_id}" />
+
+ <ul class="control_items">
+ <xsl:for-each select="//control_items">
+ <ul class="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="control_item">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+
+ <li><input type="checkbox"
name="control_tag_ids[]" value="{$control_group_id}:{$control_item_id}"
/><xsl:value-of select="title"/></li>
+ </xsl:for-each>
+ </ul>
+ </li>
</ul>
- </xsl:for-each>
+ </xsl:for-each>
+ </ul>
<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_items"
value="{$lang_save}" title = "{$lang_save}" />
</div>
- </form>
+ </form>
+
+ </xsl:when>
+
+ <!-- =========================== SHOW RECEIPT
=============================== -->
+ <xsl:otherwise>
+
+ <h2>Kvittering</h2>
+ <form action="#" method="post">
+
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id"
value="{control_id}" />
+
+ <ul class="control_items">
+ <xsl:for-each select="control_receipt_items">
+ <ul>
+ <li>
+ <h4><xsl:value-of
select="control_group/group_name"/></h4>
+ <ul>
+ <xsl:for-each
select="control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+ <li><xsl:number/>.
<xsl:value-of select="title"/></li>
+ </xsl:for-each>
+ </ul>
+ </li>
+ </ul>
+ </xsl:for-each>
+ </ul>
+
+ <div class="form-buttons">
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
+ <input type="submit" name="show_receipt"
value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+
+ </xsl:otherwise>
+ </xsl:choose>
+
+
+
+
</div>
</div>
-</xsl:template>
+</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-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/templates/base/control_tabs.xsl
2011-09-27 10:45:25 UTC (rev 7733)
@@ -15,8 +15,8 @@
</div>
</div>
</div>
- <script type="text/javascript">
+ <!-- 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>
+ </script-->
</xsl:template>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2011-09-27 10:45:25 UTC (rev 7733)
@@ -469,4 +469,27 @@
dd ul li {
list-style: disc;
list-style-position: inside;
+}
+
+ul.expand_list{
+
+}
+ul.expand_list h4 {
+ cursor: pointer;
+ font-size: 17px;
+ margin-bottom: 6px;
+}
+
+ul.expand_list li ul {
+ display:none;
+ margin-left:21px;
+}
+
+ul.expand_list li ul li{
+ margin-bottom: 3px;
+}
+
+ul.expand_list h4 span {
+ padding-left: 5px;
+ vertical-align: middle;
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2011-09-27 10:43:38 UTC (rev 7732)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2011-09-27 10:45:25 UTC (rev 7733)
@@ -549,11 +549,14 @@
if(!$missingfields && !phpgw::get_var('added'))
{
- $location = array
- (
- 'loc1' =>
$location_details['loc1'],
- 'loc2' =>
$location_details['loc2']
- );
+ $location = array();
+ $_location_arr = explode('-',
$this->location_code);
+ $i = 1;
+ foreach($_location_arr as $_loc)
+ {
+ $location["loc{$i}"] = $_loc;
+ $i++;
+ }
$assignedto =
execMethod('property.boresponsible.get_responsible', array('location' =>
$location, 'cat_id' => $default_cat));
@@ -579,6 +582,7 @@
'apply' => lang('Apply'),
'contact_id'=> 0,
'location' => $location,
+ 'location_code' =>
$this->location_code,
'street_name' =>
$location_details['street_name'],
'street_number' =>
$location_details['street_number'],
'location_name' =>
$location_details['loc1_name'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7733] Merge 7719:7732 from trunk,
Sigurd Nes <=