[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8934] Merge 8924:8933 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8934] Merge 8924:8933 from trunk |
|
Date: |
Mon, 20 Feb 2012 15:02:53 +0000 |
Revision: 8934
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8934
Author: sigurdne
Date: 2012-02-20 15:02:53 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Merge 8924:8933 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.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/inc/component/class.date_generator.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
branches/Version-1_0-branch/controller/js/yahoo/datatable.js
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/control_item/sort_check_list.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-1_0-branch/property/js/yahoo/property2.js
branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js
branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,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,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923
+
/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,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -224,7 +224,7 @@
}
}
- $reservations =
$this->completed_reservation_so->read(array('filters' => $filters, 'results' =>
'all', 'order' =>
'customer_type,customer_organization_number,customer_ssn,to_', 'dir' => 'asc'));
+ $reservations =
$this->completed_reservation_so->read(array('filters' => $filters, 'results' =>
'all', 'order' =>
'customer_type,customer_identifier_type,customer_organization_number,customer_ssn,to_',
'dir' => 'asc'));
if (count($reservations['results']) > 0) {
return $reservations['results'];
@@ -457,7 +457,6 @@
$columns[] = 'short_info';
$output[] = $this->format_to_csv_line($columns);
-
foreach ($reservations as $reservation) {
if ($this->get_cost_value($reservation['cost'])
<= 0) {
continue; //Don't export costless rows
@@ -640,6 +639,7 @@
$stored_header = array();
$line_no = 0;
+ $header_count = 0;
foreach($reservations as &$reservation) {
if ($this->get_cost_value($reservation['cost'])
<= 0) {
continue; //Don't export costless rows
@@ -650,7 +650,7 @@
{
$order_id =
$sequential_number_generator->increment()->get_current();
$export_info[] =
$this->create_export_item_info($reservation, $order_id);
-
+ $header_count += 1;
//header level
$header =
$this->get_agresso_row_template();
$header['accept_flag'] = '1';
@@ -878,8 +878,8 @@
if (count($export_info) == 0) {
return null;
}
-
- return array('data' => implode("\n", $output), 'info'
=> $export_info);
+
+ return array('data' => implode("\n", $output), 'info'
=> $export_info, 'header_count' => $header_count);
}
protected function get_agresso_row_template() {
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -121,6 +121,9 @@
if
(!is_null($export_result['export'])) {
$export_infos[$export_type][] = $export_result['export']['info'];
}
+ if ($export_type == 'external') {
+
$export_result['total_items'] = $export_result['export']['header_count'];
+ }
$export_configurations[$export_type][$export['id']] = $conf;
$total_items[$export_type] +=
$export_result['total_items'];
Modified: branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.socheck_list.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -200,6 +200,7 @@
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true),
'int'));
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
+
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type',
true), 'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
$results[] = $control->toArray();
@@ -430,6 +431,7 @@
$control->set_start_date($this->unmarshal($this->db->f('start_date', true),
'int'));
$control->set_end_date($this->unmarshal($this->db->f('end_date', true), 'int'));
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
+
if($use_location_inparam)
{
$control->set_location_code($location_code);
@@ -481,9 +483,7 @@
$sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
$sql .= "ORDER BY c.id;";
-
-
$this->db->query($sql);
$control_id = 0;
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -429,6 +429,7 @@
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
+
$control->set_repeat_type_label($control->get_repeat_type());
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
return $control;
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -160,7 +160,7 @@
//$sql = "SELECT * FROM controller_procedure WHERE
$condition $order";
$sql = "SELECT * FROM controller_control_group $order";
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
+ $this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
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-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_group_list.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -133,7 +133,7 @@
}
}
- function get_single_2($control_id, $control_group_id)
+ function get_group_list_by_control_and_group($control_id,
$control_group_id)
{
$sql = "SELECT p.* FROM controller_control_group_list p
WHERE p.control_id=" . $control_id . " AND p.control_group_id=" .
$control_group_id;
$this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
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-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/controller/inc/class.socontrol_item_list.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -218,13 +218,15 @@
return $results;
}
+ // Deletes control list item defines by control id and control
item id
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__);
return isset($result);
}
-
+
+ // Deletes all control items that a control has
function delete_control_items($control_id)
{
$result = $this->db->query("DELETE FROM
controller_control_item_list WHERE control_id = $control_id");
@@ -232,6 +234,20 @@
return isset($result);
}
+ // Deletes all control items that a control has
+ function delete_control_items_for_group_list($control_id,
$control_group_id)
+ {
+ $sql = "DELETE FROM controller_control_item_list ";
+ $sql .= "USING controller_control_item ";
+ $sql .= "WHERE control_id = $control_id ";
+ $sql .= "AND control_item_id =
controller_control_item.id ";
+ $sql .= "AND controller_control_item.control_group_id =
$control_group_id";
+
+ $result = $this->db->query($sql);
+
+ return isset($result);
+ }
+
function get_id_field_name($extended_info = false){}
protected function get_query(string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count){}
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -201,9 +201,11 @@
$controls_calendar_array = array();
- foreach($controls_for_location_array as &$control){
+ foreach($controls_for_location_array as $control){
if($control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1){
- $control =
$this->build_agg_open_cases_for_month_array($control, $location_code, $year);
+ $agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($control, $location_code, $year);
+
+
$control->set_agg_open_cases_pr_month_array( $agg_open_cases_pr_month_array );
}
}
@@ -223,6 +225,9 @@
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_for_location_array,
12, "view_months" );
+
+ print_r($controls_calendar_array);
+
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
@@ -255,30 +260,45 @@
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
}
- $year = date("Y");
-
- $year = intval($year);
+ $year = intval( date("Y") );
$from_date_ts = strtotime("01/01/$year");
$to_year = $year + 1;
- $to_date_ts = strtotime("01/01/$to_year");
+ $to_date_ts = strtotime("01/01/$to_year");
$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
-
- $controls_calendar_array = array();
- foreach($locations_for_control_array as $location)
+
+ $controls_with_check_lists_array = array();
+
+ if( $control->get_repeat_type() == 0 |
$control->get_repeat_type() == 1 )
{
-
$control->set_location_code($location["location_code"]);
- $controls_calendar_array =
$this->calendar_builder->build_agg_calendar_array_2($controls_calendar_array,
$control, $location["location_code"], $year);
- //_debug_array($controls_calendar_array);
- $control_check_list_array =
$this->so->get_check_lists_for_location( $location["location_code"],
$from_date_ts, $to_date_ts, $control->get_repeat_type(), $control->get_id() );
- //_debug_array($controls_check_list_array);
+ foreach($locations_for_control_array as
$location)
+ {
+ $location_code =
$location["location_code"];
+
+ $agg_open_cases_pr_month_array =
$this->build_agg_open_cases_pr_month_array($control, $location_code, $year);
+ $curr_control = clone $control;
+
$curr_control->set_agg_open_cases_pr_month_array(
$agg_open_cases_pr_month_array );
+
$curr_control->set_location_code($location_code);
+
+ $controls_with_check_lists_array[] =
$curr_control;
+ }
}
+ else if($control->get_repeat_type() == 2 |
$control->get_repeat_type() == 3)
+ {
+ foreach($locations_for_control_array as
$location)
+ {
+ $location_code =
$location["location_code"];
+ $curr_control = clone $control;
+ $control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $control->get_repeat_type(), $control->get_id() );
+
$curr_control->set_location_code($location_code);
+
+ $controls_with_check_lists_array[] =
$curr_control;
+ }
+ }
- $controls_calendar_array =
$this->calendar_builder->build_calendar_array_2( $controls_calendar_array,
$control_check_list_array, 12, "view_months" );
-
- //_debug_array($controls_calendar_array);
-
+ $controls_calendar_array =
$this->calendar_builder->build_calendar_array($controls_with_check_lists_array,
12, "view_months" );
+
foreach($controls_calendar_array as &$inst)
{
$curr_control = &$inst['control'];
@@ -288,15 +308,6 @@
if($curr_control["location_code"] ==
$loc1["location_code"])
$curr_control["location_name"]
= $loc1["loc1_name"];
}
-
- if($curr_control['repeat_type'] == 0)
- $curr_control['repeat_type'] = "Dag";
- else if($curr_control['repeat_type'] == 1)
- $curr_control['repeat_type'] = "Uke";
- else if($curr_control['repeat_type'] == 2)
- $curr_control['repeat_type'] = "Måned";
- else if($curr_control['repeat_type'] == 3)
- $curr_control['repeat_type'] = "År";
}
//_debug_array($controls_calendar_array);
@@ -338,7 +349,7 @@
return $controls_with_check_list;
}
- function build_agg_open_cases_for_month_array($control,
$location_code, $year){
+ function build_agg_open_cases_pr_month_array($control,
$location_code, $year){
if( date("Y", $control->get_start_date()) == $year ){
$from_month = date("n",
$control->get_start_date());
}else{
@@ -351,7 +362,7 @@
$to_month = 12;
}
- $agg_open_cases_for_month_array = array();
+ $agg_open_cases_pr_month_array = array();
for($from_month;$from_month<=$to_month;$from_month++){
@@ -367,13 +378,11 @@
$status_agg_month_info = new
status_agg_month_info();
$status_agg_month_info->set_month_nr(date("n", $from_month));
$status_agg_month_info->set_agg_open_cases(
$num_open_cases_for_control_array["count"] );
- $agg_open_cases_for_month_array[] =
$status_agg_month_info;
+ $agg_open_cases_pr_month_array[] =
$status_agg_month_info;
}
}
-
$control->set_agg_open_cases_for_month_array($agg_open_cases_for_month_array);
-
- return $control;
+ return $agg_open_cases_pr_month_array;
}
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -415,28 +415,58 @@
self::render_template_xsl(array('control/control_tabs',
'control_group/control_groups'), $data);
}
+ /**
+ * Public function for saving control groups. Saves
+ * the database and the virtual file system (vfs).
+ *
+ * @param HTTP::id the document id
+ * @return true if successful, false if error, permission
denied message on
+ * not enough privileges
+ */
public function save_control_groups(){
$control_id = phpgw::get_var('control_id');
$control_group_ids =
phpgw::get_var('control_group_ids');
+ // Fetches saved control groups
+ $saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
+
+ // Deletes groups from control that's not among the
chosen groups
+ foreach($saved_control_groups as $group)
+ {
+ // If saved group id not among chosen control
ids, delete the group for the control
+ if( !in_array($group->get_id(),
$saved_control_groups) ){
+
$this->so_control_group_list->delete($control_id, $group->get_id());
+
+ // Deletes control items for
group
+
$this->so_control_item_list->delete_control_items_for_group_list($control_id,
$group->get_id());
+ }
+ }
+
+ /*
// 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);
+ $control_group =
$this->so_control_group_list->get_group_list_by_control_and_group($control_id,
$control_group_id);
+
+ if($control_group == null)
+ {
+ $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++;
+
$this->so_control_group_list->add($control_group_list);
+ $group_order_nr++;
+ }
}
// Redirect: view_control_items
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-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_group.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -537,7 +537,7 @@
$status = true;
- $control_group_list =
$this->so_control_group_list->get_single_2($control_id, $control_group_id);
+ $control_group_list =
$this->so_control_group_list->get_group_list_by_control_and_group($control_id,
$control_group_id);
if( $control_group_list == null ){
$control_group_list = new
controller_control_group_list();
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-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -159,8 +159,8 @@
),
);
+ phpgwapi_yui::load_widget('paginator');
phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
self::add_javascript('controller', 'yahoo',
'datatable.js');
//_debug_array($data);
@@ -293,12 +293,24 @@
$control_area_array = array();
foreach($control_areas['cat_list'] as $cat_list)
{
- $control_area_array[] = array
- (
- 'id' => $cat_list['cat_id'],
- 'name' => $cat_list['name'],
- );
- }
+ if($cat_list['cat_id'] ==
$control_item->get_control_area_id())
+ {
+ $control_area_array[] = array
+ (
+ 'id' =>
$cat_list['cat_id'],
+ 'name' =>
$cat_list['name'],
+ 'selected' => 1,
+ );
+ }
+ else
+ {
+ $control_area_array[] = array
+ (
+ 'id' =>
$cat_list['cat_id'],
+ 'name' =>
$cat_list['name'],
+ );
+ }
+ }
// END as categories
//$control_area_array =
$this->so_control_area->get_control_area_array();
$control_group_array =
$this->so_control_group->get_control_group_array();
@@ -322,12 +334,24 @@
*/
foreach ($control_group_array as $control_group)
{
- $control_group_options[] = array
- (
- 'id' =>
$control_group->get_id(),
- 'name' =>
$control_group->get_group_name()
-
- );
+ if($control_group->get_id() ==
$control_item->get_control_group_id())
+ {
+ $control_group_options[] = array
+ (
+ 'id' =>
$control_group->get_id(),
+ 'name' =>
$control_group->get_group_name(),
+ 'selected' => 1
+ );
+ }
+ else
+ {
+ $control_group_options[] = array
+ (
+ 'id' =>
$control_group->get_id(),
+ 'name' =>
$control_group->get_group_name()
+
+ );
+ }
}
$control_item_array = $control_item->toArray();
@@ -420,8 +444,8 @@
}
$results['total_records'] = $object_count;
- $results['start'] = $params['start'];
- $results['sort'] = $params['sort'];
+ $results['start'] = $start_index;
+ $results['sort'] = $sort_field;
$results['dir'] = $params['dir'];
array_walk($results["results"], array($this,
"_add_links"), "controller.uicontrol_item.view");
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-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/controller/inc/component/class.calendar_builder.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -4,6 +4,10 @@
include_class('controller', 'check_list_status_info', 'inc/helper/');
include_class('controller', 'check_list_status_manager', 'inc/helper/');
+/* This class transforms controls with checklists or controls with aggregated
values for number of open cases,
+* and puts these values in a calendar array for each control
+*/
+
class calendar_builder {
private $period_start_date;
@@ -82,7 +86,7 @@
{
$calendar_array = array();
-
foreach($control->get_agg_open_cases_for_month_array() as
$status_agg_month_info)
+
foreach($control->get_agg_open_cases_pr_month_array() as $status_agg_month_info)
{
$status =
"controls_accomplished_with_errors";
@@ -96,126 +100,4 @@
return $controls_calendar_array;
}
-
- public function build_agg_calendar_array_2($controls_calendar_array,
$control, $location_code, $year){
-
- if( date("Y", $control->get_start_date()) == $year ){
- $from_month = date("n", $control->get_start_date());
- }else{
- $from_month = 1;
- }
-
- if( date("Y", $control->get_end_date()) == $year ){
- $to_month = date("n", $control->get_end_date());
- }else{
- $to_month = 12;
- }
-
- /*
- $todays_date_ts = mktime(0,0,0,date("m"), date("d"), date("Y"));
-
- $twelve_month_array = array();
-
-
- for($i=1;$i<=12;$i++){
- $trail_date_ts = strtotime("$i/01/$year");
-
- if($trail_date_ts > $control->get_start_date() &
$trail_date_ts < $todays_date_ts){
- $status = "controls_not_accomplished";
- }else if($trail_date_ts > $control->get_start_date() &
$trail_date_ts > $todays_date_ts){
- $status = "controls_registered";
- }
-
- $twelve_month_array[$i-1]["status"] = $status;
- }
- */
-
- for($from_month;$from_month<=$to_month;$from_month++){
-
- $trail_from_date_ts = strtotime("$from_month/01/$year");
-
- $trail_to_date_ts = strtotime("$to_month/01/$year");
- $so_check_list =
CreateObject('controller.socheck_list');
-
- $num_open_cases_for_control_array = array();
- $num_open_cases_for_control_array =
$so_check_list->get_num_open_cases_for_control( $control->get_id(),
$location_code, $trail_from_date_ts, $trail_to_date_ts );
-
- if( !empty($num_open_cases_for_control_array) ){
- $status = "controls_accomplished_with_errors";
-
- $twelve_month_array[$from_month-1]["status"] =
$status;
- $twelve_month_array[$from_month-1]["info"] =
$num_open_cases_for_control_array["count"];
- }else if( empty($num_open_cases_for_control_array) &
$todays_date_ts > $trail_to_date_ts){
- $status =
"controls_accomplished_without_errors";
-
- $twelve_month_array[$from_month-1]["status"] =
$status;
- }
- }
-
- $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $twelve_month_array);
-
- return $controls_calendar_array;
- }
-
- public function build_calendar_array_2( $controls_calendar_array,
$control_array, $num, $period_type ){
-
- foreach($control_array as $control){
-
- $calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
-
- foreach($control->get_check_lists_array() as
$check_list){
-
- $check_list_status_info = new
check_list_status_info();
- $check_list_status_info->set_check_list_id(
$check_list->get_id() );
-
- $todays_date_ts = mktime(0,0,0,date("m"),
date("d"), date("Y"));
-
- if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() >
$todays_date_ts)
- {
- $status = "control_planned";
- }
- else if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() <
$todays_date_ts )
- {
- $status =
"control_not_accomplished_with_info";
- }
- else if( $check_list->get_status() == 0 &
$check_list->get_deadline() < $todays_date_ts )
- {
- $status = "control_not_accomplished";
- }
- else if( $check_list->get_status() == 1 &
$check_list->get_completed_date() > $check_list->get_deadline() &
$check_list->get_num_open_cases() == 0)
- {
- $status =
"control_accomplished_over_time_without_errors";
- }
- else if( $check_list->get_status() == 1 &
$check_list->get_completed_date() < $check_list->get_deadline() &
$check_list->get_num_open_cases() == 0)
- {
- $status =
"control_accomplished_in_time_without_errors";
- }
- else if( $check_list->get_status() == 1 &
$check_list->get_num_open_cases() > 0){
- $status =
"control_accomplished_with_errors";
-
$check_list_status_info->set_num_open_cases($check_list->get_num_open_cases());
- }
- else if( $check_list->get_status() == 3 )
- {
- $status = "control_canceled";
- }
-
- $check_list_status_info->set_deadline_date(
date("d/m-Y", $check_list->get_deadline()) );
-
- if($period_type == "view_months")
- {
- $calendar_array[ date("n",
$check_list->get_deadline()) ]["status"] = $status;
- $calendar_array[ date("n",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
- }
- else if( $period_type == "view_days" )
- {
- $calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] = $status;
- $calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
- }
- }
-
- $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
- }
-
- return $controls_calendar_array;
- }
}
\ No newline at end of file
Modified:
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/controller/inc/component/class.date_generator.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -1,5 +1,9 @@
<?php
-
+
+/* This class generates dates based on start date, end date,
+ * repeat type(day, week, month, year) and repeat interval
+ */
+
class date_generator
{
private $start_date;
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
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -64,7 +64,7 @@
// Objects
protected $check_lists_array = array();
// Array that contains open cases for a month
- protected $agg_open_cases_for_month_array = array();
+ protected $agg_open_cases_pr_month_array = array();
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -241,12 +241,12 @@
public function get_check_lists_array() { return
$this->check_lists_array; }
- public function
set_agg_open_cases_for_month_array($agg_open_cases_for_month_array)
+ public function
set_agg_open_cases_pr_month_array($agg_open_cases_pr_month_array)
{
- $this->agg_open_cases_for_month_array =
$agg_open_cases_for_month_array;
+ $this->agg_open_cases_pr_month_array =
$agg_open_cases_pr_month_array;
}
- public function get_agg_open_cases_for_month_array() { return
$this->agg_open_cases_for_month_array; }
+ public function get_agg_open_cases_pr_month_array() { return
$this->agg_open_cases_pr_month_array; }
/**
* Get a static reference to the storage object associated with
this model object
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-02-20 15:02:53 UTC (rev 8934)
@@ -434,25 +434,22 @@
// Show info box with info about check list
var infoBox = $(divWrp).find("#info_box");
$(infoBox).show();
- $(infoBox).html("");
- $(infoBox).html("<h5>Åpne saker</h5>");
-
- var htmlList = "<ul>";
+ var htmlStr = "<h5>Åpne saker</h5><ul>";
$.each(obj, function(i) {
- htmlList += "<li><label>" +
(parseInt(i) + 1) + ": Tittel</label><span>" + obj[i].control_item.title +
"</span>";
- htmlList += "<ul>";
+ htmlStr += "<li><label>" +
(parseInt(i) + 1) + ": Tittel</label><span>" + obj[i].control_item.title +
"</span>";
+ htmlStr += "<ul>";
$(obj[i].cases_array).each(function(j) {
- htmlList += "<li>" + "Sak " +
(parseInt(j) + 1) + ": " + obj[i].cases_array[j].descr + "</li>";
+ htmlStr += "<li>" + "Sak " +
(parseInt(j) + 1) + ": " + obj[i].cases_array[j].descr + "</li>";
});
- htmlList += "</li></ul>";
+ htmlStr += "</ul></li>";
});
- htmlList += "</ul>";
+ htmlStr += "</ul>";
- $(infoBox).append( htmlList );
+ $(infoBox).html( htmlStr );
}
}
});
Modified: branches/Version-1_0-branch/controller/js/yahoo/datatable.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/datatable.js
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/js/yahoo/datatable.js
2012-02-20 15:02:53 UTC (rev 8934)
@@ -79,7 +79,7 @@
resultsList: "ResultSet.Result",
fields: fields,
metaFields : {
- totalResultsAvailable:
"ResultSet.totalResultsAvailable",
+ totalResultsAvailable: "ResultSet.totalRecords",
recordsReturned: "ResultSet.recordsReturned",
startIndex: 'ResultSet.startIndex',
sortKey: 'ResultSet.sortKey',
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-20 15:02:53 UTC (rev 8934)
@@ -141,7 +141,7 @@
<ul id="days_view" class="calendar days">
<li class="heading">
<xsl:for-each
select="heading_array">
- <div><xsl:value-of
select="."/></div>
+ <div
class="cell"><xsl:value-of select="."/></div>
</xsl:for-each>
</li>
<xsl:choose>
@@ -151,7 +151,7 @@
<xsl:for-each
select="calendar_array">
<xsl:choose>
<xsl:when test="status = 'control_registered'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -167,7 +167,7 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_planned'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -179,7 +179,7 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -192,8 +192,8 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
+
<div class="cell" style="position:relative;">
+
<div id="info_box"></div>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -206,8 +206,8 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
-
<div id="info_box"
style="position:absolute;display:none;"></div>
+
<div class="cell" style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+
<div id="info_box"></div>
<a class="view_check_list">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -223,8 +223,8 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_not_accomplished_with_info'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
+
<div class="cell" style="position:relative;">
+
<div id="info_box"></div>
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -237,7 +237,7 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_not_accomplished'">
-
<div>
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
@@ -253,12 +253,12 @@
</div>
</xsl:when>
<xsl:when test="status = 'control_canceled'">
-
<div>
+
<div class="cell">
<img height="15"
src="controller/images/status_icon_red_cross.png" />
</div>
</xsl:when>
<xsl:otherwise>
-
<div></div>
+
<div class="cell"></div>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
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-02-20 14:58:57 UTC (rev 8933)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/sort_check_list.xsl
2012-02-20 15:02:53 UTC (rev 8934)
@@ -37,6 +37,7 @@
<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>
@@ -47,6 +48,7 @@
</xsl:attribute>
<span>x</span>
</a>
+
-->
</li>
</xsl:for-each>
</ul>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-02-20 15:02:53 UTC (rev 8934)
@@ -816,9 +816,9 @@
}
#control_plan .col_2 {
- float:right;
- width:300px;
- margin-top:40px;
+ float: right;
+ margin-top: 40px;
+ width: 330px;
}
ul.calendar li{
@@ -867,7 +867,7 @@
position: relative;
width: 37%;
}
-ul.calendar.days li div {
+ul.calendar.days li div.cell {
height: 17px;
width: 24px;
}
@@ -924,6 +924,8 @@
width: 350px;
z-index: 1;
font-size:12px;
+ position:absolute;
+ display:none;
}
#info_box label{
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -192,7 +192,7 @@
$sql = "SELECT bilagsnr, bilagsnr_ut, count(bilagsnr)
as invoice_count, sum(belop) as belop, sum(godkjentbelop) as
godkjentbelop,spvend_code,fakturadato FROM $table $join_tables $filtermethod
$querymethod GROUP BY periode,
bilagsnr,bilagsnr_ut,spvend_code,fakturadato,oppsynsigndato,saksigndato,budsjettsigndato";
$sql2 = "SELECT DISTINCT bilagsnr FROM $table
$join_tables $filtermethod $querymethod";
- _debug_array($sql);
+//_debug_array($sql);
$this->db->query($sql2,__LINE__,__FILE__);
$this->total_records = $this->db->num_rows();
Modified: branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -150,6 +150,7 @@
}
else
{
+ $query = '';
$allrows=true;
$entity_table = 'fm_s_agreement_detail';
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.s_agreement.detail');
@@ -400,6 +401,7 @@
}
$query_arr[]= "location_code
{$this->like} '$query%'";
+ $query_arr[]= "org_name {$this->like}
'%$query%'";
if (isset($query_arr[0]))
{
Modified: branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2012-02-20 15:02:53 UTC (rev 8934)
@@ -198,17 +198,18 @@
'status_id' =>
$this->status_id
));
- $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index'";
-/*
+ $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
."sort:'{$this->sort}',"
."order:'{$this->order}',"
."cat_id: '{$this->cat_id}',"
+ ."vendor_id: '{$this->vendor_id}',"
+ ."status_id: '{$this->status_id}',"
."filter:'{$this->filter}',"
."query:'{$this->query}',"
."p_num: '{$this->p_num}',"
."role:'{$this->role}',"
."member_id:'{$this->member_id}'";
-*/
+
$datatable['config']['allow_allrows'] = true;
$link_data = array
Modified: branches/Version-1_0-branch/property/js/yahoo/property2.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property2.js 2012-02-20
14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/js/yahoo/property2.js 2012-02-20
15:02:53 UTC (rev 8934)
@@ -529,18 +529,13 @@
this.execute_async = function(datatable, incoming_url)
{
- if(incoming_url !='undfined')
+ if(typeof(incoming_url) != 'undefined')
{
base_java_url = incoming_url;
}
- try {
- ds = phpGWLink('index.php',base_java_url,true);
- //ds = url;
- }
- catch(e)
- {
- alert(e);
- }
+
+ ds = phpGWLink('index.php',base_java_url,true);
+
var callback =
{
success: function(o)
Modified: branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
2012-02-20 15:02:53 UTC (rev 8934)
@@ -139,7 +139,6 @@
break;
}
}
-
if(flag)
{
//asign value to hidden
@@ -149,7 +148,6 @@
YAHOO.util.Connect.setForm(formObject[3]);
execute_async(myDataTable_1);
}
-
}
/********************************************************************************/
Modified: branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/js/yahoo/uisagreement.index.js
2012-02-20 15:02:53 UTC (rev 8934)
@@ -42,6 +42,27 @@
{
if(flag_particular_setting=='init')
{
+ //category
+ index =
locate_in_array_options(0,"value",path_values.member_id);
+ if(index)
+ {
+ oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
+ }
+ index =
locate_in_array_options(1,"value",path_values.cat_id);
+ if(index)
+ {
+ oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
+ }
+ index =
locate_in_array_options(2,"value",path_values.vendor_id);
+ if(index)
+ {
+ oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
+ }
+ index =
locate_in_array_options(3,"value",path_values.status_id);
+ if(index)
+ {
+ oMenuButton_3.set("label", ("<em>" +
array_options[3][index][1] + "</em>"));
+ }
//focus initial
oMenuButton_0.focus();
}
Modified: branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
2012-02-20 14:58:57 UTC (rev 8933)
+++ branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
2012-02-20 15:02:53 UTC (rev 8934)
@@ -613,11 +613,9 @@
<div
id="contextmenu_1"/>
<div
style="height:15px;"/>
<div
id="datatable-buttons_2" class="div-buttons">
- <input
type="text" id="values_date" class="calendar-opt" name="values[date]" size="10"
value="{date}" readonly="readonly" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+ <input
type="text" id="values_date" class="calendar-opt" name="values[date]" size="10"
value="{date}" readonly="readonly">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_date_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
<img
id="values_date-trigger" class="calendar-opt" src="{img_cal}"
alt="{lang_datetitle}" title="{lang_datetitle}" style="cursor:pointer;
cursor:hand;"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8934] Merge 8924:8933 from trunk,
Sigurd Nes <=