[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8662] 8651:8661 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8662] 8651:8661 from trunk |
|
Date: |
Tue, 24 Jan 2012 10:36:07 +0000 |
Revision: 8662
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8662
Author: sigurdne
Date: 2012-01-24 10:36:07 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
8651:8661 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.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.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.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/component/class.calendar_builder.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/templates/base/check_list/edit_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/control/control.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/sort_check_list.xsl
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
branches/Version-1_0-branch/property/js/yahoo/invoice.list_sub.js
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,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650
+
/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,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -637,11 +637,17 @@
return isset($result);
}
- function get_activities()
+ function get_activities($parameters = array())
{
//fromdate -> innparam for uthenting av delta - timestamp
+ $whereclause_date = "";
+ if($parameters['fromdate'])
+ {
+ $from_date = (int)$parameters['fromdate'];
+ $whereclause_date = "AND last_change_date >
{$from_date}";
+ }
$activities = array();
- $sql = "SELECT * FROM activity_activity where state=3";
+ $sql = "SELECT * FROM activity_activity where state=3
{$whereclause_date}";
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -405,6 +405,9 @@
$value['ajax'][] = false;
$value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiactivities.view', 'id' => $value['id'])));
$value['labels'][] = lang('show');
+ $value['ajax'][] = true;
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiactivities.send_mail', 'activity_id' =>
$value['id'],'message_type' => 'update')));
+ $value['labels'][] = lang('send_mail');
break;
}
}
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
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -168,7 +168,13 @@
function get_control_groups_by_control($control_id, $returnType
= "object")
{
- $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__);
+ $sql = "SELECT cg.*, cgl.order_nr ";
+ $sql .= "FROM controller_control_group_list cgl,
controller_control_group cg ";
+ $sql .= "WHERE cgl.control_id=$control_id ";
+ $sql .= "AND cgl.control_group_id=cg.id ";
+ $sql .= "ORDER BY cgl.order_nr";
+
+ $this->db->query($sql);
$control_group_list = array();
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
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -267,81 +267,8 @@
return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
}
- function get_control_items($control_group_id, $return_type =
"return_object")
- {
- $results = array();
+
- $sql = "SELECT * FROM controller_control_item WHERE
control_group_id={$control_group_id}";
- $this->db->query($sql);
-
- 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'));
-
- if($return_type == "return_object")
- $results[] = $control_item;
- else
- $results[] = $control_item->toArray();
- }
-
- return $results;
- }
-
- function get_control_items_by_control($control_id, $returnType
= "return_object")
- {
- $results = array();
-
- $sql = "SELECT ci.* ";
- $sql .= "FROM controller_control_item ci,
controller_control_item_list cl ";
- $sql .= "WHERE cl.control_id=$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'));
-
$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_type($this->unmarshal($this->db->f('type', true), 'string'));
-
- if($returnType == "return_array")
- $results[] = $control_item->toArray();
- else
- $results[] = $control_item;
- }
-
- return $results;
- }
-
- function get_control_items_by_control_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_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
-
- $results[] = $control_item->toArray();
- }
-
- return $results;
- }
-
function populate(int $control_item_id, &$control_item)
{
if($control_item == null) {
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
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -132,7 +132,92 @@
return $control_item_list;
}
+
+ function get_control_items($control_group_id, $return_type =
"return_object")
+ {
+ $results = array();
+ $sql = "SELECT * ";
+ $sql .= "FROM controller_control_item ";
+ $sql .= "WHERE control_group_id={$control_group_id}";
+
+ $this->db->query($sql);
+
+ 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'));
+
+ if($return_type == "return_object")
+ $results[] = $control_item;
+ else
+ $results[] = $control_item->toArray();
+ }
+
+ return $results;
+ }
+
+ function get_control_items_by_control($control_id, $returnType
= "return_object")
+ {
+ $results = array();
+
+ $sql = "SELECT ci.* ";
+ $sql .= "FROM controller_control_item ci,
controller_control_item_list cl ";
+ $sql .= "WHERE cl.control_id=$control_id ";
+ $sql .= "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'));
+
$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_type($this->unmarshal($this->db->f('type', true), 'string'));
+
+ if($returnType == "return_array")
+ $results[] = $control_item->toArray();
+ else
+ $results[] = $control_item;
+ }
+
+ return $results;
+ }
+
+ function get_control_items_by_control_and_group($control_id,
$control_group_id)
+ {
+ $results = array();
+
+ $sql = "SELECT ci.* ";
+ $sql .= "FROM controller_control_item ci,
controller_control_item_list cl, controller_control c ";
+ $sql .= "WHERE c.id=$control_id ";
+ $sql .= "AND c.id=cl.control_id ";
+ $sql .= "AND cl.control_item_id=ci.id ";
+ $sql .= "AND ci.control_group_id=$control_group_id ";
+ $sql .= "ORDER BY cl.order_nr";
+
+ $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_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
+
+ $results[] = $control_item->toArray();
+ }
+
+ return $results;
+ }
+
function delete($control_id, $control_item_id)
{
$result = $this->db->query("DELETE FROM
controller_control_item_list WHERE control_id = $control_id AND control_item_id
= $control_item_id", __LINE__,__FILE__);
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -115,6 +115,8 @@
$location_code =
$my_locations[0]["location_code"];
}
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year) ;
+
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
$control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
@@ -122,16 +124,16 @@
$controls_with_check_list =
$this->populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array);
$controls_calendar_array = array();
- $controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$controls_with_check_list, 31, "view_days" );
+ $controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_calendar_array,
$controls_with_check_list, $num_days_in_month, "view_days" );
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
- for($i=1;$i<=31;$i++){
+ for($i=1;$i<=$num_days_in_month;$i++){
$heading_array[$i] = "$i";
}
-
+
$data = array
(
'my_locations' =>
$my_locations,
@@ -142,7 +144,7 @@
'date_format' =>
$date_format,
'period' =>
$month_array[ $month - 1],
'month_nr' =>
$month,
- 'year' =>
$year
+ 'year' =>
$year,
);
self::add_javascript('controller', 'controller',
'jquery.js');
@@ -311,7 +313,7 @@
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_and_group($control_id,
$control_group_id);
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
$control_group_id);
$saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
@@ -369,7 +371,7 @@
$check_list_id = $this->so_check_list->store(
$new_check_list );
- $control_items_list =
$this->so_control_item->get_control_items_by_control($control_id);
+ $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
foreach($control_items_list as $control_item){
@@ -415,7 +417,7 @@
$check_list_id = $this->so_check_list->store(
$new_check_list );
- $control_items_list =
$this->so_control_item->get_control_items_by_control($control_id);
+ $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
foreach($control_items_list as $control_item){
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
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -293,7 +293,7 @@
//Populating array with saved control items for each
group
foreach ($control_groups as $control_group)
{
- $saved_control_items =
$this->so_control_item->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
$control_item =
$this->so_control_item->get_single($control_item_id);
@@ -356,7 +356,7 @@
//Populating array with saved control items for each
group
foreach ($control_groups as $control_group)
{
- $saved_control_items =
$this->so_control_item->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
$control_item =
$this->so_control_item->get_single($control_item_id);
@@ -381,7 +381,7 @@
// Fetches all control items for check list
$control_items_for_check_list = array();
- $control_items =
$this->so_control_item->get_control_items_by_control($check_list->get_control_id());
+ $control_items =
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
$check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
$remove_control_item_ids_array = array();
@@ -499,7 +499,7 @@
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_and_group($control_id,
$control_group_id);
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
$control_group_id);
$saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
@@ -613,7 +613,7 @@
$check_list_id = $this->so_check_list->store(
$new_check_list );
- $control_items_list =
$this->so_control_item->get_control_items_by_control($control_id);
+ $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
foreach($control_items_list as $control_item){
@@ -659,7 +659,7 @@
$check_list_id = $this->so_check_list->store(
$new_check_list );
- $control_items_list =
$this->so_control_item->get_control_items_by_control($control_id);
+ $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
foreach($control_items_list as $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
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -240,15 +240,15 @@
if(isset($control_id) && $control_id > 0)
{
- $control = $this->so->get_single($control_id);
+ $control = $this->so->get_single($control_id);
}
// Sigurd: START as categories
$cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
$cats->supress_info = true;
-
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control->get_control_area_id(),'globals' => true,'use_acl' =>
$this->_category_acl));
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
$control_areas_array2 = array();
foreach($control_areas['cat_list'] as $cat_list)
{
@@ -260,7 +260,9 @@
}
// END as categories
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control->get_control_area_id());
+ if($control != null)
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control->get_control_area_id());
+
$role_array = $this->so->get_roles();
$repeat_type_array = array(
@@ -285,9 +287,10 @@
'label' => "3: " .
lang('Choose_control_items'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
'control_id' => $control->get_id()))
- ),array('label' => "4: " .
lang('Sort_check_list')
+ ),array('label' => "4: " .
lang('Sort_check_list'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_check_list',
+
'control_id' => $control->get_id()))
)
-
);
}
else
@@ -308,7 +311,7 @@
'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
'view'
=> "control_details",
'editable'
=> true,
- 'control'
=> $control->toArray(),
+ 'control'
=> ($control != null) ? $control->toArray() : null,
'control_areas_array2' =>
$control_areas_array2,
'procedures_array' =>
$procedures_array,
'role_array' =>
$role_array,
@@ -328,27 +331,39 @@
}
public function save_control_details(){
- $control_id = phpgw::get_var('control_id');
+ $control_id = phpgw::get_var('control_id');
// Update control details
if(isset($control_id) && $control_id > 0 )
{
$control = $this->so->get_single($control_id);
}
- // Add details for control
+ // Add control details
else {
$control = new controller_control();
}
+ $control_area_id_in_db =
$control->get_control_area_id();
+
$control->populate();
-
- if( $control->get_title() == "" ){
- $this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_details', 'control_id'=>$control_id,
'control_area_id'=>$control->get_control_area_id()));
+
+ $control_area_id_from_req =
$control->get_control_area_id();
+
+ if($control_area_id_in_db != $control_area_id_from_req
){
+
+ // Deleting earlier saved control groups
+
$this->so_control_group_list->delete_control_groups($control_id);
+
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control($control_id);
+
+ foreach($saved_control_items as $control_item){
+
$this->so_control_item_list->delete($control->get_id(),
$control_item->get_id());
+ }
}
else
{
$control_id = $this->so->store($control);
- $this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_groups', 'control_id'=>$control_id,
'control_area_id'=>$control->get_control_area_id()));
+ $this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_groups', 'control_id' => $control_id));
}
}
@@ -386,17 +401,20 @@
array(
'label' => "1: " .
lang('Details'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
-
'view' => "view_control_details", 'id' => $control_id))
- ),
- array(
- 'label' => "2: " .
lang('Choose_control_groups')
- ),
- array(
- 'label' => "3: " .
lang('Choose_control_items')
- ),
- array(
- 'label' => "4: " .
lang('Sort_check_list')
- ));
+
'id' => $control->get_id()))
+ ),array(
+ 'label' => "2: " .
lang('Choose_control_groups'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups',
+
'control_id' => $control->get_id()))
+ ),array(
+ 'label' => "3: " .
lang('Choose_control_items'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
+
'control_id' => $control->get_id()))
+ ),array('label' => "4: " .
lang('Sort_check_list'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_check_list',
+
'control_id' => $control->get_id()))
+ )
+ );
$data = array
(
@@ -419,6 +437,9 @@
// Deleting earlier saved control groups
$this->so_control_group_list->delete_control_groups($control_id);
+ // Deleting earlier saved control items
+
$this->so_control_item_list->delete_control_items($control_id);
+
$group_order_nr = 1;
// Saving control groups
@@ -434,8 +455,7 @@
}
// Redirect: view_control_items
- $this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_items',
-
'control_id'=>$control_id, 'control_group_ids'=>$control_group_ids));
+ $this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_items', 'control_id'=>$control_id));
}
// Gets a comma separated list of control groups, and displays
control items for these groups
@@ -443,10 +463,8 @@
$control_id = phpgw::get_var('control_id', 'int');
$control = $this->so->get_single($control_id);
- $control_group_ids =
phpgw::get_var('control_group_ids');
-
// Fetches saved control items from db
- $saved_control_items =
$this->so_control_item->get_control_items_by_control($control_id);
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control($control_id);
$saved_control_item_ids = array();
foreach($saved_control_items as $control_item){
@@ -456,10 +474,12 @@
// Array with selected control groups and items
$groups_with_control_items = array();
+ $saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
+
// Fetches control items for control group and
populates groups_with_control_items with groups and chosen control items
- foreach ($control_group_ids as $control_group_id)
+ foreach ($saved_control_groups as $control_group)
{
- $group_control_items_array =
$this->so_control_item->get_control_items($control_group_id, "return_array");
+ $group_control_items_array =
$this->so_control_item_list->get_control_items($control_group->get_id(),
"return_array");
$control_items_for_group_array = array();
@@ -475,29 +495,27 @@
}
}
- $control_group =
$this->so_control_group->get_single($control_group_id);
-
$groups_with_control_items[] =
array("control_group" => $control_group->toArray(), "group_control_items" =>
$control_items_for_group_array);
}
- //print_r( $groups_with_control_items[0] );
-
$tabs = array(
array(
'label' => "1: " .
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details', 'view' => "view_control_details",
-
'id' => $control_id))
- ),
- array(
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
+
'id' => $control->get_id()))
+ ),array(
'label' => "2: " .
lang('Choose_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('Choose_control_items')),
- array(
- 'label' => "4: " .
lang('Sort_check_list')
- ));
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_groups',
+
'control_id' => $control->get_id()))
+ ),array(
+ 'label' => "3: " .
lang('Choose_control_items'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_items',
+
'control_id' => $control->get_id()))
+ ),array('label' => "4: " .
lang('Sort_check_list'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_check_list',
+
'control_id' => $control->get_id()))
+ )
+ );
$data = array
(
@@ -517,31 +535,13 @@
// 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 = explode(",",
phpgw::get_var('control_group_ids'));
// Fetching selected control items. Tags are on the
format 1:2 (group:item).
$control_tag_ids = phpgw::get_var('control_tag_ids');
- // Deleting earlier saved control groups
-
$this->so_control_group_list->delete_control_groups($control_id);
-
// Deleting earlier saved control items
$this->so_control_item_list->delete_control_items($control_id);
-
- $group_order_nr = 1;
-
- // Saving control groups
- foreach ($control_group_ids as $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)
{
@@ -555,60 +555,39 @@
$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 ));
+ $this->redirect(array('menuaction' =>
'controller.uicontrol.view_check_list', 'control_id'=>$control_id ));
}
public function view_check_list(){
$control_id = phpgw::get_var('control_id');
$control = $this->so->get_single($control_id);
- $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))
- $control_group_ids[] =
$control_group_id;
- }
-
+ $saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
+
$saved_groups_with_items_array = array();
//Populating array with saved control items for each
group
- foreach ($control_group_ids as $control_group_id)
+ foreach ($saved_control_groups as $control_group)
{
- $saved_control_items =
$this->so_control_item->get_control_items_by_control_and_group($control_id,
$control_group_id);
+ $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
$control_group->get_id());
- $control_group =
$this->so_control_group->get_single($control_group_id);
-
- $control_item =
$this->so_control_item->get_single($control_item_id);
-
- $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
+ if(count($saved_control_items) > 0)
+ $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
$tabs = array(
array(
'label' => "1: " .
lang('Details'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
-
'view' => "view_control_details", 'id' => $control_id))
+
'id' => $control_id))
),array(
'label' => "2: " .
lang('Choose_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()))
+
'control_id' => $control_id))
),array(
'label' => "3: " .
lang('Choose_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))
+
'control_id' => $control_id))
),array('label' => "4: " .
lang('Sort_check_list')
)
@@ -631,7 +610,8 @@
self::render_template_xsl(array('control/control_tabs',
'control_item/sort_check_list'), $data);
}
-
+ /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
+ *
public function generate_check_lists_for_control(){
$control_id = phpgw::get_var('control_id');
$control = $this->so->get_single($control_id);
@@ -654,7 +634,7 @@
$check_list_id = $this->so_check_list->store(
$new_check_list );
- $control_items_list =
$this->so_control_item->get_control_items_by_control($control_id);
+ $control_items_list =
$this->so_control_item_list->get_control_items_by_control($control_id);
foreach($control_items_list as $control_item){
@@ -675,8 +655,7 @@
$this->redirect(array('menuaction' =>
'controller.uicontrol.view_check_lists_for_control', 'control_id'=>$control_id
));
}
- /* Kommentert ut av Torstein 21.01.2012 - Tror ikke vi bruker
denne... Kanskje den bør slettes...
- *
+
public function view_check_lists_for_control()
{
$control_id = phpgw::get_var('control_id');
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
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -337,7 +337,7 @@
$control_items[] =
$control_item->serialize();
}
- $selected_control_items_array =
controller_socontrol_item::get_instance()->get_control_items($control_group->get_id());
+ $selected_control_items_array =
controller_socontrol_item_list::get_instance()->get_control_items($control_group->get_id());
$selected_control_items = array();
@@ -454,7 +454,7 @@
$control_items[] =
$control_item->serialize();
}
- $selected_control_items_array =
controller_socontrol_item::get_instance()->get_control_items($control_group->get_id());
+ $selected_control_items_array =
controller_socontrol_item_list::get_instance()->get_control_items($control_group->get_id());
$selected_control_items = array();
@@ -503,9 +503,6 @@
$control_group_list =
$this->so_control_group_list->get_single_2($control_id, $control_group_id);
- var_dump("Skriver ut control_group_list");
- var_dump($control_group_list);
-
if( $control_group_list == null ){
$control_group_list = new
controller_control_group_list();
$control_group_list->set_control_id($control_id);
@@ -630,7 +627,7 @@
$control_group_array =
$control_group->toArray();
//var_dump($control_group_array);
- $control_items_array =
$this->so_control_item->get_control_items($control_group_id);
+ $control_items_array =
$this->so_control_item_list->get_control_items($control_group_id);
$control_items = array();
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
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -193,15 +193,23 @@
$control_id = phpgw::get_var('control_id');
$control_group_id = phpgw::get_var('control_group_id');
- $order_nr = phpgw::get_var('order_nr');
+ $order_tags = phpgw::get_var('order_tags');
+ echo "Order tags : ";
+ print_r($order_tags);
+
+
$status = true;
- foreach($order_nr as $order_tag){
+ foreach($order_tags as $order_tag){
$control_item_id = substr($order_tag,
strpos($order_tag, ":")+1, strlen($order_tag));
$order_nr = substr($order_tag, 0,
strpos($order_tag, ":"));
$control_item_list =
$this->so_control_item_list->get_single_2($control_id, $control_item_id);
+ echo "Order nr : " . $order_nr;
+ echo "Control item list : ";
+ print_r( $control_item_list );
+
if($order_nr !=
$control_item_list->get_order_nr() ){
$control_item_list->set_order_nr($order_nr);
@@ -211,7 +219,13 @@
}
}
- return status;
+ return $status;
+
+ if($status)
+ return json_encode( array( "status" =>
"order_updated" ) );
+ else
+ return json_encode( array( "status" =>
"order_not_updated" ) );
+
}
public function delete_item_list(){
Modified:
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -17,7 +17,7 @@
foreach($control_array as $control){
- $calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
+ $calendar_array = $this->init_calendar( $control,
$calendar_array, $num_days_in_month, $period_type );
// Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
@@ -106,8 +106,6 @@
$twelve_month_array[$i-1]["status"] = $status;
}
-
- print_r($twelve_month_array);
for($from_month;$from_month<=$to_month;$from_month++){
@@ -136,10 +134,10 @@
return $controls_calendar_array;
}
- function init_calendar( $control, $calendar_array, $num, $period_type ){
+ function init_calendar( $control, $calendar_array, $num_days_in_month,
$period_type ){
// Initialises twelve_months_array
- for($i=1;$i<=$num;$i++){
+ for($i=1;$i<=$num_days_in_month;$i++){
$calendar_array[$i] = null;
}
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-01-24 10:36:07 UTC (rev 8662)
@@ -121,7 +121,7 @@
var order_nr_array;
var requestUrl = $(thisForm).attr("action");
- $(this).find("input[name='order_nr[]']").each(function() {
+ $(this).find("input[name='order_tags[]']").each(function() {
order_nr_array += $(this).val() + ",";
});
@@ -145,6 +145,23 @@
});
});
+ $("#frm_save_control_details").submit(function(e){
+
+ var thisForm = $(this);
+
+ var hidden_control_area_id =
$(thisForm).find("input[name='control_area_id_hidden']").val();
+ var control_area_id = $("#control_area_id").val();
+
+ if(hidden_control_area_id != control_area_id)
+ {
+ var answer = confirm("Du har endret kontrollområde til
kontrollen. " +
+ "Hvis du
lagrer vil kontrollgrupper og kontrollpunkter til kontrollen bli slettet.")
+ if (!answer){
+ e.preventDefault();
+ }
+ }
+ });
+
// file: view_check_lists_for_location.xsl
// Fetches info about a check list on hover status image icon
$('a.view_check_list').bind('contextmenu', function(){
@@ -354,7 +371,7 @@
// Updating order numbers for
rows below deleted row
while( $(next_row).length > 0){
-
update_order_nr(next_row, "-");
+
update_order_nr_for_row(next_row, "-");
next_row =
$(next_row).next();
}
}else{
@@ -403,7 +420,7 @@
//Updates order number for hidden field and number in front of row
-function update_order_nr(element, sign){
+function update_order_nr_for_row(element, sign){
var span_order_nr = $(element).find("span.order_nr");
var order_nr = $(span_order_nr).text();
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
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/js/controller/custom_drag_drop.js
2012-01-24 10:36:07 UTC (rev 8662)
@@ -188,7 +188,7 @@
function update_order_nr(element, sign){
var hidden_order_nr = $(element).find("input");
var order_value = $(hidden_order_nr).attr("value");
-
+
var span_order_nr = $(element).find("span.order_nr");
var order_nr = order_value.substring( 0, order_value.indexOf(":") );
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2012-01-24 10:36:07 UTC (rev 8662)
@@ -25,8 +25,8 @@
});
</script>
- <h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
- <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
+ <h1>Kontroll: <xsl:value-of select="control/title"/></h1>
+ <h2>Bygg: <xsl:value-of select="location_array/loc1_name"/></h2>
<xsl:call-template name="check_list_tab_menu">
<xsl:with-param
name="active_tab">view_details</xsl:with-param>
Modified:
branches/Version-1_0-branch/controller/templates/base/control/control.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/control/control.xsl
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/controller/templates/base/control/control.xsl
2012-01-24 10:36:07 UTC (rev 8662)
@@ -25,8 +25,9 @@
<div class="yui-content">
<div id="control_details">
- <form
action="index.php?menuaction=controller.uicontrol.save_control_details"
method="post">
- <input type="hidden" name="control_id"
value="{$control_id}" />
+ <form id="frm_save_control_details"
action="index.php?menuaction=controller.uicontrol.save_control_details"
method="post">
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="control_area_id_hidden"
value="{$control_area_id}" />
<dl class="proplist-col">
<dt>
@@ -39,13 +40,13 @@
<option value="">Velg
kontrollområde</option>
<xsl:for-each
select="control_areas_array2">
<xsl:choose>
-
<xsl:when test="id != control/control_area_id">
-
<option value="{id}">
+
<xsl:when test="id = $control_area_id">
+
<option value="{id}" selected="selected">
<xsl:value-of disable-output-escaping="yes" select="name"/>
</option>
</xsl:when>
<xsl:otherwise>
-
<option value="{id}" selected="selected">
+
<option value="{id}">
<xsl:value-of disable-output-escaping="yes" select="name"/>
</option>
</xsl:otherwise>
@@ -68,13 +69,13 @@
<option value="">Velg
prosedyre</option>
<xsl:for-each
select="procedures_array">
<xsl:choose>
-
<xsl:when test="id != $control_procedure_id">
-
<option value="{id}">
+
<xsl:when test="id = $control_procedure_id">
+
<option value="{id}" selected="selected">
<xsl:value-of disable-output-escaping="yes" select="title"/>
</option>
</xsl:when>
<xsl:otherwise>
-
<option value="{id}" selected="selected">
+
<option value="{id}">
<xsl:value-of disable-output-escaping="yes" select="title"/>
</option>
</xsl:otherwise>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
2012-01-24 10:36:07 UTC (rev 8662)
@@ -7,7 +7,7 @@
<h2>Velg dine kontrollpunkt</h2>
<!-- ==== CHOOSE NONE/ALL ===== -->
- <h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
+ <div class="expand_menu"><div class="expand_all">Vis
alle</div><div class="collapse_all focus">Skjul alle</div></div>
<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>
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/sort_check_list.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/sort_check_list.xsl
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/sort_check_list.xsl
2012-01-24 10:36:07 UTC (rev 8662)
@@ -1,59 +1,69 @@
<!-- $Id$ -->
<xsl:template name="sort_check_list" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
+
<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}" />
+ <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}" />
+ <xsl:choose>
+ <xsl:when test="control_items/child::node()">
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
- <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}"
style="opacity: 0.5;" disabled="disabled"/>
- </div>
- </form>
- </li>
+ <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_tags[]" 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}" style="opacity: 0.5;" disabled="disabled"/>
+ </div>
+ </form>
+ </li>
+ </xsl:when>
+ <xsl:otherwise>
+ <li class="drag_group list_item">
+ <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
+ <div>Ingen kontrollpunkt for
denne gruppen</div>
+ </li>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:for-each>
</ul>
</div>
Modified: branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -62,16 +62,36 @@
$district_id =
phpgw::get_var('district_id', 'int');
$b_account =
phpgw::get_var('b_account');
- $this->start = $start ? $start : 0;
+ // $this->start = $start ? $start :
(int)$this->start;
+
+ $this->start =
isset($_REQUEST['start']) ? $start :
$this->start;
+
+ if(phpgw::get_var('workorder_id', 'int'))
+ {
+ $this->start = 0;
+ }
+
+ $this->query = isset($query) ?
$query : $query;
+
+ if(!phpgw::get_var('paid', 'bool'))
+ {
+ $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
+ }
+
+ if($voucher_id)
+ {
+ $this->start = 0;
+ }
+
+
$this->b_account = isset($b_account) ?
$b_account : $b_account;
$this->district_id = isset($district_id) ?
$district_id : $district_id;
$this->b_account_class = isset($b_account_class) ?
$b_account_class : $b_account_class;
- $this->query = isset($query) ?
$query : $query;
$this->filter = isset($filter) ?
$filter : $filter;
$this->sort = isset($sort)
? $sort : $sort;
$this->order = isset($order) ?
$order : $order;
$this->cat_id = isset($cat_id) ?
$cat_id : $cat_id;
- $this->user_lid = isset($user_lid) ?
$user_lid : $user_lid;
+ $this->user_lid = $user_lid ? $user_lid
: $this->user_lid;
$this->allrows = isset($allrows) ?
$allrows : $allrows;
}
@@ -88,7 +108,7 @@
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data','invoice');
- // _debug_array($data);
+//_debug_array($data);
$this->start =
isset($data['start'])?$data['start']:'';
$this->query =
isset($data['query'])?$data['query']:'';
@@ -96,15 +116,20 @@
$this->sort =
isset($data['sort'])?$data['sort']:'';
$this->order =
isset($data['order'])?$data['order']:'';
$this->cat_id =
isset($data['cat_id'])?$data['cat_id']:'';
- $this->user_lid =
isset($data['user_lid'])?$data['user_lid']:'';
+ $this->user_lid =
$data['user_lid']?$data['user_lid']:'';
$this->sub =
isset($data['sub'])?$data['sub']:'';
$this->allrows =
isset($data['allrows'])?$data['allrows']:'';
$this->b_account_class =
isset($data['b_account_class'])?$data['b_account_class']:'';
$this->district_id =
isset($data['district_id'])?$data['district_id']:'';
}
- function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id='')
+ function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id=0)
{
+ if(!phpgw::get_var('paid', 'bool'))
+ {
+ $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
+ }
+
$start_date =
$this->bocommon->date_to_timestamp($start_date);
$end_date =
$this->bocommon->date_to_timestamp($end_date);
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -54,7 +54,6 @@
function read_invoice($data)
{
-
$valid_order = array
(
'bilagsnr' => true,
Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -96,17 +96,17 @@
function save_sessiondata()
{
$data = array
- (
- 'start' => $this->start,
- 'query' => $this->query,
- 'sort' => $this->sort,
- 'order' => $this->order,
- 'filter' =>
$this->filter,
- 'cat_id' =>
$this->cat_id,
- 'user_lid' =>
$this->user_lid,
- 'allrows' =>
$this->allrows,
- 'district_id' =>
$this->district_id
- );
+ (
+ 'start' => $this->start,
+ 'query' => $this->query,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id,
+ 'user_lid' => $this->user_lid,
+ 'allrows' => $this->allrows,
+ 'district_id' => $this->district_id
+ );
$this->bo->save_sessiondata($data);
}
@@ -211,6 +211,8 @@
$voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : phpgw::get_var('voucher_id', 'int');
$b_account_class= phpgw::get_var('b_account_class',
'int');
+ $this->save_sessiondata();
+
//-- ubica focus del menu derecho
if ( $paid )
{
@@ -277,7 +279,7 @@
'cat_id'
=> $this->cat_id,
'user_lid'
=> $this->user_lid,
'sub'
=> $this->sub,
- 'query'
=> $this->query,
+ // 'query'
=> $this->query,
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
'workorder_id' =>
$workorder_id,
@@ -294,7 +296,7 @@
."cat_id: '{$this->cat_id}',"
."user_lid:'{$this->user_lid}',"
."sub:'{$this->sub}',"
- ."query:'{$this->query}',"
+ // ."query:'{$this->query}',"
."paid:'{$paid}',"
."vendor_id:'{$vendor_id}',"
."workorder_id:'{$workorder_id}',"
@@ -628,8 +630,8 @@
'cat_id'
=> $this->cat_id,
'user_lid'
=> $this->user_lid,
'sub'
=> $this->sub,
- 'query'
=> $this->query,
- 'start'
=> $this->start,
+ // 'query'
=> $this->query,
+ // 'start'
=> $this->start,
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
'workorder_id'
=> $workorder_id,
@@ -1511,11 +1513,11 @@
'cat_id' =>
$this->cat_id,
'user_lid' =>
$this->user_lid,
'sub' =>
$this->sub,
- 'query' =>
$this->query,
- 'start' =>
$this->start,
+ // 'query' =>
$this->query,
+ // 'start' =>
$this->start,
'paid' =>
$paid,
'voucher_id' => $voucher_id,
- 'query' =>
$voucher_id
+ // 'query' =>
$voucher_id
));
$datatable['config']['allow_allrows'] = false;
@@ -1526,11 +1528,11 @@
."cat_id: '{$this->cat_id}',"
."user_lid:'{$this->user_lid}',"
."sub:'{$this->sub}',"
- ."query:'{$this->query}',"
- ."start:'{$this->start}',"
+ // ."query:'{$this->query}',"
+ // ."start:'{$this->start}',"
."paid:'{$paid}',"
- ."voucher_id:'{$voucher_id}',"
- ."query:'{$voucher_id}'";
+ ."voucher_id:'{$voucher_id}'";
+ // ."query:'{$voucher_id}'";
$field_invoice = array
(array
@@ -2649,7 +2651,7 @@
(
'menuaction' =>
'property.uiinvoice.index',
'paid'
=> true,
- 'user_lid'
=> 'all',
+ // 'user_lid'
=> 'all',
'district_id' =>
$district_id,
'b_account_class' =>
$b_account_class,
'start_date' =>
$start_date,
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-01-24 10:32:55 UTC (rev 8661)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-01-24 10:36:07 UTC (rev 8662)
@@ -301,11 +301,19 @@
if(fclose($fp))
{
- echo
"File remote: ".$file_remote." was copied to local: $file_local<br/>";
+ echo
"File remote: {$file_remote} was copied to local: $file_local<br/>";
if(
ssh2_sftp_rename ($sftp, $file_remote,
"{$directory_remote}/archive/{$file_name}" ))
{
-
echo "File remote: ".$file_remote." was moved to remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
echo "File remote: {$file_remote} was moved to remote:
{$directory_remote}/archive/{$file_name}<br/>";
}
+ else
+ {
+
echo "ERROR! File remote: {$file_remote} failed to move to remote:
{$directory_remote}/archive/{$file_name}<br/>";
+
if(unlink($file_local))
+
{
+
echo "Lokal file was deleted: {$file_local}<br/>";
+
}
+ }
}
}
}
Modified: branches/Version-1_0-branch/property/js/yahoo/invoice.list_sub.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/invoice.list_sub.js
2012-01-24 10:32:55 UTC (rev 8661)
+++ branches/Version-1_0-branch/property/js/yahoo/invoice.list_sub.js
2012-01-24 10:36:07 UTC (rev 8662)
@@ -252,7 +252,7 @@
CreateRowChecked("transfer_idClass");
td_empty(4);
td_sum(values_ds.sum);
- td_empty(7);
+ td_empty(8);
//Add to Table
myfoot = tableYUI.createTFoot();
myfoot.setAttribute("id","myfoot");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8662] 8651:8661 from trunk,
Sigurd Nes <=