[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8651] 8646:8650 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8651] 8646:8650 from trunk |
|
Date: |
Mon, 23 Jan 2012 10:40:57 +0000 |
Revision: 8651
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8651
Author: sigurdne
Date: 2012-01-23 10:40:56 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
8646:8650 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/templates/base/control/control.xsl
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
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
+
/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
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-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -639,6 +639,7 @@
function get_activities()
{
+ //fromdate -> innparam for uthenting av delta - timestamp
$activities = array();
$sql = "SELECT * FROM activity_activity where state=3";
$this->db->query($sql, __LINE__, __FILE__);
@@ -1224,10 +1225,11 @@
{
$sql = "SELECT * FROM activity_activity WHERE new_org
AND organization_id={$org_id}";
}
+ //var_dump($sql);
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
- $activity = new activitycalendar_activity((int) $activity_id);
+ $activity = new activitycalendar_activity((int)
$this->db->f('id'));
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
@@ -1261,6 +1263,10 @@
$contacts =
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
$activity->set_contact_persons($contacts);
}
+
+ $activities[] = $activity;
}
+
+ return $activities;
}
}
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -314,7 +314,8 @@
$message = lang('messages_saved_form');
//get affected activities and update
with new org id
- $update_activities =
$so_activity->get_activities_for_update($new_org_id);
+ $update_activities =
$so_activity->get_activities_for_update($id);
+ //var_dump($update_activities);
foreach($update_activities as $act)
{
$act->set_organization_id($new_org_id);
Modified: branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -242,7 +242,7 @@
}
}
- function get_procedures_by_control_area_id($control_area_id)
+ function get_procedures_by_control_area($control_area_id)
{
$results = array();
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-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -50,14 +50,14 @@
public $public_functions = array
(
'index' => true,
- 'view_check_lists_for_control' => true,
+ // 'view_check_lists_for_control' => true,
// 'save_check_list'
=> true,
- 'view_check_list'
=> true,
+ // 'view_check_list'
=> true,
// 'edit_check_list'
=> true,
'save_check_items'
=> true,
'save_check_item'
=> true,
'get_check_list_info' =>
true,
- 'control_calendar_status_overview' => true,
+ // 'control_calendar_status_overview' => true,
'add_check_item_to_list' =>
true,
'update_check_list'
=> true,
'view_control_items' =>
true,
@@ -241,8 +241,8 @@
$completed_date = phpgw::get_var('completed_date');
$planned_date = phpgw::get_var('planned_date');
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date );
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date );
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
// Fetches check_list from DB
$update_check_list =
$this->so_check_list->get_single($check_list_id);
@@ -331,7 +331,7 @@
}
// END as categories
$control_area_id = $control_areas_array2[1]['id'];
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area_id($control_area_id);
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
$role_array = $this->so_control->get_roles();
$data = array
Modified:
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++
branches/Version-1_0-branch/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -218,13 +218,13 @@
$completed_date = phpgw::get_var('completed_date',
'string');
if($planned_date != '')
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date );
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
if($deadline_date != '')
- $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date );
+ $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date, "d/m-Y" );
if($completed_date != '')
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date );
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
$check_list = new controller_check_list();
$check_list->set_location_code($location_code);
@@ -295,7 +295,7 @@
// Fetches prosedures that are related to first control
area in list
$control_area_id = $control_areas_array2[1]['id'];
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area_id($control_area_id);
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
$role_array = $this->so_control->get_roles();
$location_code = $check_list->get_location_code();
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-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -247,8 +247,8 @@
$cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
$cats->supress_info = true;
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
- array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control->get_control_area_id(),'globals' => true,'use_acl' =>
$this->_category_acl));
+
$control_areas_array2 = array();
foreach($control_areas['cat_list'] as $cat_list)
{
@@ -259,13 +259,40 @@
);
}
// END as categories
-
- echo "Control area id: " .
$control->get_control_area_id();
-
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area_id($control->get_control_area_id());
+
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control->get_control_area_id());
$role_array = $this->so->get_roles();
- $tabs = array( array(
+ $repeat_type_array = array(
+
array('id' => "0", 'value' => "Dag"),
+
array('id' => "1", 'value' => "Uke"),
+
array('id' => "2", 'value' => "Måned"),
+
array('id' => "3", 'value' => "År")
+ );
+
+ if( $control != null )
+ {
+ $tabs = array(
+ array(
+ 'label' => "1: " .
lang('Details'),
+ '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',
+
'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')
+ )
+
+ );
+ }
+ else
+ {
+ $tabs = array( array(
'label' => "1: " .
lang('Details')
), array(
'label' => "2: " .
lang('Choose_control_groups')
@@ -273,7 +300,8 @@
'label' => "3: " .
lang('Choose_control_items')
), array(
'label' => "4: " .
lang('Sort_check_list')
- ));
+ ));
+ }
$data = array
(
@@ -281,9 +309,10 @@
'view'
=> "control_details",
'editable'
=> true,
'control'
=> $control->toArray(),
- 'control_areas_array2' =>
array('options' => $control_areas_array2),
+ 'control_areas_array2' =>
$control_areas_array2,
'procedures_array' =>
$procedures_array,
- 'role_array' =>
$role_array
+ 'role_array' =>
$role_array,
+ 'repeat_type_array' =>
$repeat_type_array
);
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
@@ -336,7 +365,7 @@
$saved_control_group_ids[] =
$control_group->get_id();
}
- // Fetches control groups based on selected control
area
+ // Fetches control groups based on selected control
area
$control_area = $this->so_control_area->get_single(
$control->get_control_area_id );
$control_groups_as_array =
$this->so_control_group->get_control_groups_as_array($control->get_control_area_id());
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -377,7 +377,7 @@
{
$control_area_id = phpgw::get_var('control_area_id');
- $procedures_array =
$this->so->get_procedures_by_control_area_id($control_area_id);
+ $procedures_array =
$this->so->get_procedures_by_control_area($control_area_id);
if(count($procedures_array)>0)
return json_encode( $procedures_array );
Modified:
branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/inc/helper/class.date_helper.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -3,16 +3,22 @@
public function __construct(){}
- public static function get_timestamp_from_date( $date_string ){
- $pos_day = strpos($date_string, "/");
- $day = substr($date_string, 0, $pos_day);
+ public static function get_timestamp_from_date( $date_string, $format
){
- $pos_month = strpos($date_string, "-");
- $len_month = $pos_month - $pos_day -1;
- $month = substr($date_string, $pos_day+1, $len_month);
-
- $year = substr($date_string, $pos_month + $len_month-1,
strlen($date_string)-1);
-
- return mktime(0, 0, 0, $month, $day, $year);
+ if( $format == "d/m-Y" ){
+ $pos_day = strpos($date_string, "/");
+ $day = date_helper::substring($date_string, 0,
$pos_day);
+
+ $pos_month = strpos($date_string, "-");
+ $month = date_helper::substring($date_string,
$pos_day+1, $pos_month);
+
+ $year = date_helper::substring($date_string,
$pos_month+1, strlen($date_string));
+
+ return mktime(0, 0, 0, $month, $day, $year);
+ }
}
+
+ public function substring($string, $from, $to){
+ return substr($string, $from, $to - $from);
+ }
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -29,6 +29,7 @@
*/
include_class('controller', 'model', 'inc/model/');
+ include_class('controller', 'date_helper', 'inc/helper/');
class controller_control extends controller_model
{
@@ -228,12 +229,21 @@
{
$this->set_title(phpgw::get_var('title','string'));
$this->set_description(phpgw::get_var('description','html'));
- $this->set_start_date(strtotime(
phpgw::get_var('start_date_hidden','string') ));
- $this->set_end_date(strtotime(
phpgw::get_var('end_date_hidden','string') ));
+
+ $start_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'),
"d/m-Y" );
+ $this->set_start_date($start_date_ts);
+
+ if( phpgw::get_var('end_date','string') != ""){
+ $end_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('end_date','string'),
"d/m-Y" );
+ $this->set_end_date( $end_date_ts );
+ }else{
+ $this->set_end_date( 0 );
+ }
+
+
$this->set_repeat_type(phpgw::get_var('repeat_type','int'));
+
$this->set_repeat_interval(phpgw::get_var('repeat_interval','int'));
$this->set_procedure_id(phpgw::get_var('procedure_id','int'));
$this->set_control_area_id(phpgw::get_var('control_area_id','int'));
-
$this->set_repeat_type(phpgw::get_var('repeat_type','int'));
-
$this->set_repeat_interval(phpgw::get_var('repeat_interval','int'));
$this->set_responsibility_id(phpgw::get_var('responsibility_id','int'));
}
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-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/controller/templates/base/control/control.xsl
2012-01-23 10:40:56 UTC (rev 8651)
@@ -4,6 +4,8 @@
<xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
<xsl:variable name="control_area_id"><xsl:value-of
select="control/control_area_id"/></xsl:variable>
<xsl:variable name="control_procedure_id"><xsl:value-of
select="control/procedure_id"/></xsl:variable>
+<xsl:variable name="control_repeat_type"><xsl:value-of
select="control/repeat_type"/></xsl:variable>
+<xsl:variable name="control_role"><xsl:value-of
select="control/responsibility_id"/></xsl:variable>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
<script>
@@ -34,7 +36,21 @@
<xsl:choose>
<xsl:when test="editable">
<select id="control_area_id"
name="control_area_id">
- <xsl:apply-templates
select="control_areas_array2/options"/>
+ <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:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
</select>
</xsl:when>
<xsl:otherwise>
@@ -49,6 +65,7 @@
<xsl:choose>
<xsl:when test="editable">
<select id="procedure_id"
name="procedure_id">
+ <option value="">Velg
prosedyre</option>
<xsl:for-each
select="procedures_array">
<xsl:choose>
<xsl:when test="id != $control_procedure_id">
@@ -87,10 +104,7 @@
<label
for="start_date">Startdato</label>
</dt>
<dd>
- <input>
- <xsl:attribute
name="id">start_date</xsl:attribute>
- <xsl:attribute
name="name">start_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <input id="start_date"
name="start_date" type="text">
<xsl:if test="control/start_date != ''">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
</xsl:if>
@@ -100,10 +114,7 @@
<label for="end_date">Sluttdato</label>
</dt>
<dd>
- <input>
- <xsl:attribute
name="id">end_date</xsl:attribute>
- <xsl:attribute
name="name">end_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <input id="end_date" name="end_date"
type="text">
<xsl:if test="control/end_date != 0">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
</xsl:if>
@@ -114,11 +125,21 @@
</dt>
<dd>
<select id="repeat_type"
name="repeat_type">
- <option value="0">Ikke
angitt</option>
- <option value="1">Dag</option>
- <option value="2">Uke</option>
- <option value="3">Måned</option>
- <option value="5">År</option>
+ <option value="">Velg
frekvenstype</option>
+ <xsl:for-each
select="repeat_type_array">
+ <xsl:choose>
+ <xsl:when
test="id = $control_repeat_type">
+ <option
value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="value"/>
+
</option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="value"/>
+
</option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
</select>
</dd>
<dt>
@@ -141,10 +162,20 @@
<xsl:choose>
<xsl:when test="editable">
<select id="responsibility_id"
name="responsibility_id">
+ <option value="">Velg
rolle</option>
<xsl:for-each
select="role_array">
- <option
value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
+ <xsl:choose>
+
<xsl:when test="id = $control_role">
+
<option value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</option>
+
</xsl:otherwise>
+ </xsl:choose>
</xsl:for-each>
</select>
</xsl:when>
@@ -183,14 +214,4 @@
</form>
</div>
</div>
-</xsl:template>
-
-<xsl:template match="options">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected" value="selected" />
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
-</xsl:template>
-
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-01-23 10:40:56 UTC (rev 8651)
@@ -97,11 +97,11 @@
{
if(isset($this->config->config_data['common']['invoice_approval']) &&
$this->config->config_data['common']['invoice_approval']== 1)
{
- $sql= 'SELECT DISTINCT bilagsnr from
fm_ecobilag WHERE budsjettsigndato IS NOT NULL AND utbetalingsigndato IS NOT
NULL ORDER BY bilagsnr asc';
+ $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr =
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR
(budsjettsigndato IS NOT NULL AND utbetalingsigndato IS NOT NULL) ORDER BY
bilagsnr ASC";
}
else
{
- $sql= 'SELECT DISTINCT bilagsnr from
fm_ecobilag WHERE budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR
oppsynsigndato IS NOT NULL) AND utbetalingsigndato IS NOT NULL ORDER BY
bilagsnr asc';
+ $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr =
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR (
budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR oppsynsigndato IS
NOT NULL) AND utbetalingsigndato IS NOT NULL ) ORDER BY bilagsnr ASC";
}
$this->db->query($sql,__LINE__,__FILE__);
$vouchers = array();
Modified: branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/property/js/yahoo/workorder.edit.js
2012-01-23 10:40:56 UTC (rev 8651)
@@ -51,28 +51,12 @@
YAHOO.util.Event.addListener(window, "load", function()
{
- YAHOO.util.Dom.removeClass("dialog1", "yui-pe-content");
-
lightbox = new YAHOO.widget.Dialog("manual_invoice_lightbox",
{ width : "700px",
context:["ctx","tl","bl", ["beforeShow",
"windowResize"]],
visible : false
- // constraintoviewport : true,
- // buttons : [ { text:"Submit",
handler:handleSubmit, isDefault:true },
- // { text:"Cancel",
handler:handleCancel } ]
} );
-/*
- lightbox = new YAHOO.widget.Dialog("manual_invoice_lightbox",
- {
- width : "600px",
- fixedcenter : true,
- visible : false,
- modal : false,
- draggable: true
- //constraintoviewport : true
- });
-*/
lightbox.render();
YAHOO.util.Dom.setStyle('manual_invoice_lightbox', 'display',
'block');
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-01-23
10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-01-23
10:40:56 UTC (rev 8651)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.632';
+ $setup_info['property']['version'] = '0.9.17.633';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-01-23 10:38:33 UTC (rev 8650)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-01-23 10:40:56 UTC (rev 8651)
@@ -5796,6 +5796,28 @@
}
/**
+ * Update property version from 0.9.17.632 to 0.9.17.633
+ * Add view on fm_ecobilag
+ */
+ $test[] = '0.9.17.632';
+ function property_upgrade0_9_17_632()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+ $sql = 'CREATE OR REPLACE VIEW fm_ecobilag_sum_view AS'
+ . ' SELECT DISTINCT bilagsnr, sum(godkjentbelop) AS
approved_amount, sum(belop) AS amount FROM fm_ecobilag GROUP BY bilagsnr ORDER
BY bilagsnr ASC';
+
+ $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.633';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+ /**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
*
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8651] 8646:8650 from trunk,
Sigurd Nes <=