[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7657] Merge 7637:7656 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7657] Merge 7637:7656 from trunk |
|
Date: |
Tue, 20 Sep 2011 06:36:19 +0000 |
Revision: 7657
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7657
Author: sigurdne
Date: 2011-09-20 06:36:18 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Merge 7637:7656 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.menu.inc.php
branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_area.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol_item2.inc.php
branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-1_0-branch/controller/js/yahoo/common.js
branches/Version-1_0-branch/controller/js/yahoo/controller.item.js
branches/Version-1_0-branch/controller/js/yahoo/datatable.js
branches/Version-1_0-branch/controller/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/controller/templates/base/datatable.xsl
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
branches/Version-1_0-branch/demo/templates/base/images/navbar.png
branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php
branches/Version-1_0-branch/property/js/yahoo/property.js
Added Paths:
-----------
branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control_area.inc.php
branches/Version-1_0-branch/controller/js/yahoo/example_separate_tabs.js
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
Removed Paths:
-------------
branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
branches/Version-1_0-branch/controller/templates/base/procedure.php
branches/Version-1_0-branch/controller/templates/base/procedure_list.php
branches/Version-1_0-branch/controller/templates/base/procedure_list_partial.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
+
/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
Modified: branches/Version-1_0-branch/controller/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -27,33 +27,27 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicontrol.index') ),
'image' => array('property', 'location_1'),
),
- 'control_item' => array
+ 'control_item2' => array
(
'text' => lang('Control_item'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicontrol_item.index') ),
'image' => array('property', 'location_1'),
'children' => array(
-
'control_item_list' => array
+
'control_item_list2' => array
+
(
- 'text'
=> lang('control_item_list'),
+ 'text'
=> lang('control_item_list') . 2,
'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_item.display_control_items', 'appname' => 'controller') ),
'image'
=> array('rental', 'x-office-spreadsheet')
- )
- )
- ),
- 'control_item2' => array
- (
- 'text' => lang('Control_item') . 2,
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicontrol_item2.index') ),
- 'image' => array('property', 'location_1'),
- 'children' => array(
-
'control_item_list2' => array
+ ),
+ 'separate_tabs'
=> array
(
- 'text'
=> lang('control_item_list') . 2,
- 'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_item2.display_control_items', 'appname' => 'controller')
),
+ 'text'
=> 'example::separate_tabs',
+ 'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_item.separate_tabs') ),
'image'
=> array('rental', 'x-office-spreadsheet')
- )
+ ),
+
)
),
'procedure' => array
Modified: branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.socommon.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -182,14 +182,15 @@
$db2 = clone($this->db);
$sql = $this->get_query($sort_field, $ascending, $search_for,
$search_type, $filters, false);
+
$sql_parts = explode('1=1',$sql); // Split the query to insert
extra condition on test for break
$this->db->query($sql,__LINE__, __FILE__, false, true);
-
+
while ($this->db->next_record()) // Runs through all of the
results
{
$should_populate_object = false; // Default value - we
won't populate object
$result_id =
$this->unmarshal($this->db->f($id_field_name), 'int'); // The id of object
-
+
if(in_array($result_id, $added_object_ids)) // Object
with this id already added
{
$should_populate_object = true; // We should
populate this object as we already have it in our result array
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_area.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_area.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_area.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -119,6 +119,19 @@
return $results;
}
+ function get_control_area_select_array()
+ {
+ $results = array();
+ $results[] = array('id' => 0,'name' => lang('Not
selected'));
+ $this->db->query("SELECT id, title as name FROM
controller_control_area ORDER BY name ASC", __LINE__, __FILE__);
+ while ($this->db->next_record())
+ {
+ $results[] = array('id' => $this->db->f('id',
false),
+ 'name' =>
$this->db->f('name', false));
+ }
+ return $results;
+ }
+
function get_id_field_name($extended_info = false)
{
/*
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_group.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -117,8 +117,21 @@
}
return $results;
- }
+ }
+ function get_control_group_select_array()
+ {
+ $results = array();
+ $results[] = array('id' => 0,'name' => lang('Not
selected'));
+ $this->db->query("SELECT id, group_name as name FROM
controller_control_group ORDER BY name ASC", __LINE__, __FILE__);
+ while ($this->db->next_record())
+ {
+ $results[] = array('id' => $this->db->f('id',
false),
+ 'name' =>
$this->db->f('name', false));
+ }
+ return $results;
+ }
+
function get_id_field_name($extended_info = false)
{
/*
Modified:
branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol_item.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -221,7 +221,7 @@
}
else
{
- $cols = 'id, title, required,
controller_control_item.what_to_do, how_to_do, control_group_id,
control_area_id';
+ $cols = 'id, title, required, what_to_do, how_to_do,
control_group_id, control_area_id';
}
$dir = $ascending ? 'ASC' : 'DESC';
Modified: branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.soprocedure.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -71,6 +71,7 @@
$id = intval($procedure->get_id());
$values = array(
+ 'title = ' . $this->marshal($procedure->get_title(),
'string'),
'purpose = ' .
$this->marshal($procedure->get_purpose(), 'string'),
'responsibility = ' .
$this->marshal($procedure->get_responsibility(), 'string'),
'description = ' .
$this->marshal($procedure->get_description(), 'string'),
Modified: branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.uicommon.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -75,7 +75,10 @@
{
$keys = func_get_args();
$strings = array();
- foreach($keys as $key) { $strings[$key] = is_string($key) ?
lang($key) : call_user_func_array('lang', $key); }
+ foreach($keys as $key)
+ {
+ $strings[$key] = is_string($key) ? lang($key) :
call_user_func_array('lang', $key);
+ }
return json_encode($strings);
}
@@ -85,7 +88,10 @@
function lang_array()
{
$keys = func_get_args();
- foreach($keys as &$key) $key = lang($key);
+ foreach($keys as &$key)
+ {
+ $key = lang($key);
+ }
return $keys;
}
@@ -461,10 +467,11 @@
$results['total_records'] = 0;
$result['results'] = array();
}
-
+
return array(
'ResultSet' => array(
- 'totalResultsAvailable' =>
$results['total_records'],
+ 'totalResultsAvailable' =>
$results['total_records'],
+ 'recordsReturned' =>
count($results['results']),
'startIndex' => $results['start'],
'sortKey' => $results['sort'],
'sortDir' => $results['dir'],
Deleted: branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -1,176 +0,0 @@
-<?php
- phpgw::import_class('controller.uicommon');
- phpgw::import_class('property.boevent');
- phpgw::import_class('controller.socontrol');
- phpgw::import_class('controller.socontrol_item');
- phpgw::import_class('controller.socontrol_group');
- phpgw::import_class('controller.socontrol_area');
-
- include_class('controller', 'control', 'inc/model/');
-
- class controller_uicontrol_item extends controller_uicommon
- {
- private $bo;
- private $so;
- private $so_proc;
- private $so_control_item;
- private $so_control_group;
- private $so_control_area;
-
- public $public_functions = array
- (
- 'index' => true,
- 'query' => true,
- 'display_control_items' => true
- );
-
- public function __construct()
- {
- parent::__construct();
-
- $this->so = CreateObject('controller.socontrol');
- $this->so_control_item =
CreateObject('controller.socontrol_item');
- $this->so_control_group =
CreateObject('controller.socontrol_group');
- $this->so_control_area =
CreateObject('controller.socontrol_area');
- $this->bo = CreateObject('property.boevent',true);
- }
-
- public function index()
- {
- $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::control_item";
-
- $repeat_type = $this->bo->get_rpt_type_list();
- $repeat_day = $this->bo->get_rpt_day_list();
-
- if(isset($_POST['save_control_item'])) // The user has
pressed the save button
- {
- if(isset($control_item)) // Edit control
- {
-
$control_item->set_title(phpgw::get_var('title'));
-
$control_item->set_required(phpgw::get_var('required'));
- $control_item->set_what_to_desc(
strtotime( phpgw::get_var('what_to_desc') ) );
- $control_item->set_how_to_desc(
strtotime( phpgw::get_var('how_to_desc') ) );
- $control_item->set_control_group_id(
strtotime( phpgw::get_var('control_group_id') ) );
- $control_item->set_control_area_id(
strtotime( phpgw::get_var('control_area_id') ) );
-
- $this->so->add($control_item);
- }
- else // Add new control
- {
-
- $control_item = new
controller_control();
-
-
$control_item->set_title(phpgw::get_var('title'));
-
$control_item->set_required(phpgw::get_var('required'));
- $control_item->set_what_to_desc(
strtotime( phpgw::get_var('what_to_desc') ) );
- $control_item->set_how_to_desc(
strtotime( phpgw::get_var('how_to_desc') ) );
- $control_item->set_control_group_id(
strtotime( phpgw::get_var('control_group_id') ) );
- $control_item->set_control_area_id(
strtotime( phpgw::get_var('control_area_id') ) );
-
- $this->so->add($control_item);
- }
- }
-
- $control_area_array =
$this->so_control_area->get_control_area_array();
- $control_group_array =
$this->so_control_group->get_control_group_array();
-
- $this->render('control_item.php', array
- (
- 'editable' => true,
- 'control_area_array' =>
$control_area_array,
- 'control_group_array' =>
$control_group_array
- )
- );
- }
-
- public function display_control_items()
- {
- $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::control_item_list";
-
-
- $this->render('control_item_list.php');
- }
-
- public function query()
- {
-
- $user_rows_per_page = 10;
-
- // YUI variables for paging and sorting
- $start_index = phpgw::get_var('startIndex', 'int');
- $num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
- $sort_field = phpgw::get_var('sort');
- if($sort_field == null)
- {
- $sort_field = 'control_item_id';
- }
- $sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
- //Create an empty result set
- $records = array();
-
- //Retrieve a contract identifier and load corresponding
contract
- $control_item_id = phpgw::get_var('control_item_id');
- if(isset($control_item_id))
- {
- $control_item =
rental_socontract::get_instance()->get_single($control_item_id);
- }
-
- /*
- //Retrieve the type of query and perform type specific
logic
- $type = phpgw::get_var('type');
- switch($type)
- {
- case 'included_price_items':
- if(isset($contract))
- {
- $filters = array('contract_id'
=> $contract->get_id());
- $result_objects =
rental_socontract_price_item::get_instance()->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
- $object_count =
rental_socontract_price_item::get_instance()->get_count($search_for,
$search_type, $filters);
- }
- break;
- case 'not_included_price_items': // We want to
show price items in the source list even after they've been added to a contract
- $filters = array('price_item_status' =>
'active','responsibility_id' => phpgw::get_var('responsibility_id'));
- $result_objects =
rental_soprice_item::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
- $object_count =
rental_soprice_item::get_instance()->get_count($search_for, $search_type,
$filters);
- break;
- case 'manual_adjustment':
- $filters = array('price_item_status' =>
'active','is_adjustable' => 'false');
- $result_objects =
rental_soprice_item::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
- $object_count =
rental_soprice_item::get_instance()->get_count($search_for, $search_type,
$filters);
- break;
- default:
- //$filters = array('price_item_status'
=> 'active','responsibility_id' => phpgw::get_var('responsibility_id'));
- $result_objects =
rental_soprice_item::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
- $object_count =
rental_soprice_item::get_instance()->get_count($search_for, $search_type,
$filters);
- break;
- }
- */
-
- $result_objects =
controller_socontrol_item::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
-
- // Create an empty row set
- $rows = array();
- foreach ($result_objects as $record) {
- if(isset($record))
- {
- // ... add a serialized record
- $rows[] = $record->serialize();
- }
- }
- $data = array('results' => $rows, 'total_records' =>
$object_count);
-
- $editable = phpgw::get_var('editable') == 'true' ? true
: false;
-
- //Add action column to each row in result table
- array_walk(
- $data['results'],
- array($this, 'add_actions'),
- array(
- $control_item_id,
- $type,
- $editable
- )
- );
- return $this->yui_results($data, 'total_records',
'results');
- }
-}
\ No newline at end of file
Copied: branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
(from rev 7656, trunk/controller/inc/class.uicontrol_item.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -0,0 +1,303 @@
+<?php
+ phpgw::import_class('controller.uicommon');
+ phpgw::import_class('property.boevent');
+ phpgw::import_class('controller.socontrol');
+ phpgw::import_class('controller.socontrol_item');
+ phpgw::import_class('controller.socontrol_group');
+ phpgw::import_class('controller.socontrol_area');
+
+ include_class('controller', 'control', 'inc/model/');
+
+ class controller_uicontrol_item2 extends controller_uicommon
+ {
+ private $bo;
+ private $so;
+ private $so_control_item;
+ private $so_proc;
+
+ public $public_functions = array
+ (
+ 'index' => true,
+ 'query' => true,
+ 'display_control_items' => true
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+ $this->so = CreateObject('controller.socontrol');
+ $this->so_control_item =
CreateObject('controller.socontrol_item');
+ $this->so_control_group =
CreateObject('controller.socontrol_group');
+ $this->so_control_area =
CreateObject('controller.socontrol_area');
+ $this->bo = CreateObject('property.boevent',true);
+ }
+
+ public function index()
+ {
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::control_item";
+
+ self::set_active_menu('controller::control_item2');
+ $repeat_type = $this->bo->get_rpt_type_list();
+ $repeat_day = $this->bo->get_rpt_day_list();
+
+ if(isset($_POST['save_control_item'])) // The user has
pressed the save button
+ {
+ if(isset($control_item)) // Edit control
+ {
+
$control_item->set_title(phpgw::get_var('title'));
+
$control_item->set_required(phpgw::get_var('required'));
+ $control_item->set_what_to_desc(
strtotime( phpgw::get_var('what_to_desc') ) );
+ $control_item->set_how_to_desc(
strtotime( phpgw::get_var('how_to_desc') ) );
+ $control_item->set_control_group_id(
strtotime( phpgw::get_var('control_group_id') ) );
+ $control_item->set_control_area_id(
strtotime( phpgw::get_var('control_area_id') ) );
+
+ $this->so->add($control_item);
+ }
+ else // Add new control
+ {
+
+ $control_item = new
controller_control();
+
+
$control_item->set_title(phpgw::get_var('title'));
+
$control_item->set_required(phpgw::get_var('required'));
+ $control_item->set_what_to_desc(
strtotime( phpgw::get_var('what_to_desc') ) );
+ $control_item->set_how_to_desc(
strtotime( phpgw::get_var('how_to_desc') ) );
+ $control_item->set_control_group_id(
strtotime( phpgw::get_var('control_group_id') ) );
+ $control_item->set_control_area_id(
strtotime( phpgw::get_var('control_area_id') ) );
+
+ $this->so->add($control_item);
+ }
+ }
+
+ $control_area_array =
$this->so_control_area->get_control_area_array();
+ $control_group_array =
$this->so_control_group->get_control_group_array();
+
+
+ if($this->flash_msgs)
+ {
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+ }
+
+ foreach ($control_area_array as $control_area)
+ {
+ $control_area_options = array
+ (
+ 'id' => $control_area->get_id(),
+ 'name' => $control_area->get_name()
+
+ );
+ }
+
+ foreach ($control_group_array as $control_group)
+ {
+ $control_group_options = array
+ (
+ 'id' => $control_group->get_id(),
+ 'name' => $control_group->get_name()
+
+ );
+ }
+
+ $data = array
+ (
+ 'value_id' =>
!empty($control) ? $control->get_id() : 0,
+ 'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
+ 'editable' => true,
+ 'control_item' =>
array('options' => $control_area_options),
+ 'control_group' =>
array('options' => $control_group_options),
+ );
+
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('controller') . '::' . lang('Control_item');
+
+/*
+
$GLOBALS['phpgw']->richtext->replace_element('what_to_do');
+
$GLOBALS['phpgw']->richtext->replace_element('how_to_do');
+ $GLOBALS['phpgw']->richtext->generate_script();
+*/
+
+// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'controller.item', 'controller' );
+
+ self::render_template_xsl('control_item', $data);
+ }
+
+ public function display_control_items()
+ {
+ $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::control_item_list";
+
+
self::set_active_menu('controller::control_item2::control_item_list2');
+ if(phpgw::get_var('phpgw_return_as') == 'json') {
+ return $this->display_control_items_json();
+ }
+ $this->bo = CreateObject('booking.boapplication');
+ $GLOBALS['phpgw_info']['apps']['manual']['section'] =
'booking_manual';
+ self::add_javascript('controller', 'yahoo',
'datatable.js');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('paginator');
+
+ $data = array(
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array(
+ array(
+ 'type' =>
'link',
+ 'value' =>
lang('New application'),
+ 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_item2.index'))
+ ),
+ array('type' =>
'filter',
+ 'name' =>
'status',
+ 'text' => lang('Status').':',
+ 'list' => array(
+ array(
+ 'id' => 'none',
+ 'name' => lang('Not selected')
+ ),
+ array(
+ 'id' => 'NEW',
+ 'name' => lang('NEW')
+ ),
+ array(
+ 'id' => 'PENDING',
+ 'name' => lang('PENDING')
+ ),
+ array(
+ 'id' => 'REJECTED',
+ 'name' => lang('REJECTED')
+ ),
+ array(
+ 'id' => 'ACCEPTED',
+ 'name' => lang('ACCEPTED')
+ )
+ )
+ ),
+ array('type' =>
'filter',
+ 'name' =>
'control_groups',
+ 'text' => lang('Control_group').':',
+ 'list' =>
$this->so_control_group->get_control_group_select_array(),
+ ),
+ array('type' =>
'filter',
+ 'name' =>
'control_areas',
+ 'text' => lang('Control_area').':',
+ 'list' =>
$this->so_control_area->get_control_area_select_array(),
+ ),
+ array('type' => 'text',
+ 'text' => lang('searchfield'),
+ 'name' =>
'query'
+ ),
+ array(
+ 'type' =>
'submit',
+ 'name' =>
'search',
+ 'value' =>
lang('Search')
+ ),
+ array(
+ 'type' =>
'link',
+ 'value' =>
$_SESSION['showall'] ? lang('Show only active') : lang('Show all'),
+ 'href' =>
self::link(array('menuaction' => $this->url_prefix.'.toggle_show_inactive'))
+ ),
+ ),
+ ),
+ ),
+ 'datatable' => array(
+ 'source' =>
self::link(array('menuaction' =>
'controller.uicontrol_item2.display_control_items', 'phpgw_return_as' =>
'json')),
+ 'field' => array(
+ array(
+ 'key' => 'id',
+ 'label' => lang('ID'),
+ 'sortable' => true,
+ 'formatter' =>
'YAHOO.portico.formatLink'
+ ),
+ array(
+ 'key' => 'title',
+ 'label' =>
lang('Title'),
+ 'sortable' => false
+ ),
+ array(
+ 'key' => 'required',
+ 'label' =>
lang('Required'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' => 'what_to_do',
+ 'label' => lang('What
to do'),
+ 'sortable' => false
+ ),
+ array(
+ 'key' => 'how_to_do',
+ 'label' => lang('How to
do'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' =>
'control_group_id',
+ 'label' =>
lang('control_group_id'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' =>
'control_area_id',
+ 'label' =>
lang('control_area_id'),
+ 'sortable' => true
+ ),
+ array(
+ 'key' => 'link',
+ 'hidden' => true
+ )
+ )
+ ),
+ );
+//_debug_array($data);
+
+ self::render_template_xsl('datatable', $data);
+ }
+
+ public function display_control_items_json()
+ {
+ $params = array(
+ 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
+ 'query' => phpgw::get_var('query'),
+ 'sort' => phpgw::get_var('sort'),
+ 'dir' => phpgw::get_var('dir'),
+ 'filters' => $filters
+ );
+
+ $user_rows_per_page = 10;
+
+ // YUI variables for paging and sorting
+ $start_index = phpgw::get_var('startIndex', 'int');
+ $num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
+ $sort_field = phpgw::get_var('sort');
+ if($sort_field == null)
+ {
+ $sort_field = 'control_item_id';
+ }
+ $sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
+ //Create an empty result set
+ $records = array();
+
+ //Retrieve a contract identifier and load corresponding
contract
+ $control_item_id = phpgw::get_var('control_item_id');
+ if(isset($control_item_id))
+ {
+ $control_item =
rental_socontract::get_instance()->get_single($control_item_id);
+ }
+
+ $result_objects =
controller_socontrol_item::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
+
+ $results = array();
+
+ foreach($result_objects as $control_item_obj)
+ {
+ $results['results'][] =
$control_item_obj->serialize();
+ }
+
+ array_walk($results["results"], array($this,
"_add_links"), "controller.uicontrol_item2.index");
+
+ return $this->yui_results($results);
+ }
+
+ public function query()
+ {
+
+ }
+
+ }
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_item2.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_item2.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_item2.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -16,7 +16,10 @@
public $public_functions = array
(
'index' => true,
- 'display_control_items' => true
+ 'display_control_items' => true,
+ 'separate_tabs' => true,
+ 'delete' => true,
+ 'js_poll' => true
);
public function __construct()
@@ -121,6 +124,55 @@
}
+ public function separate_tabs()
+ {
+
self::set_active_menu('controller::control_item2::separate_tabs');
+
+ $type = phpgw::get_var('type', 'string', 'REQUEST', null);
+
+ $tabs = array();
+ $tabs[] = array(
+ 'label' => lang('Your preferences'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_item2.separate_tabs', 'type' => 'user'))
+ );
+ $tabs[] = array(
+ 'label' => lang('Default preferences'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_item2.separate_tabs', 'type' => 'default'))
+ );
+ $tabs[] = array(
+ 'label' => lang('Forced preferences'),
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol_item2.separate_tabs', 'type' => 'forced'))
+ );
+
+ switch($type)
+ {
+ case 'default':
+ $selected = 1;
+ $resource_id = 81;
+ break;
+ case 'forced':
+ $selected = 2;
+ $resource_id = 46;
+ break;
+ case 'user':
+ default:
+ $selected = 0;
+ $resource_id = 80;
+ }
+
+ $add_document_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'controller.uicontrol_item2.index') );
+ $resource = array('id' => $resource_id,
'add_document_link' => $add_document_link, 'permission' => array('write' =>
true ) );
+
+ $data = array
+ (
+ 'tabs' =>
$GLOBALS['phpgw']->common->create_tabs($tabs, $selected),
+ 'resource' => $resource
+ );
+ $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'example_separate_tabs', 'controller' );
+ self::render_template_xsl('example_separate_tabs',
$data);
+ }
+
+
public function display_control_items()
{
self::set_active_menu('controller::control_item2::control_item_list2');
@@ -195,7 +247,8 @@
),
),
),
- 'datatable' => array(
+ 'datatable' => array
+ (
'source' =>
self::link(array('menuaction' =>
'controller.uicontrol_item2.display_control_items', 'phpgw_return_as' =>
'json')),
'field' => array(
array(
@@ -247,7 +300,58 @@
),
);
//_debug_array($data);
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
+ $actions = array
+ (
+ array
+ (
+ 'my_name' => 'view',
+ 'text' => lang('view'),
+ // 'confirm_msg' => lang('do you really
want to view this entry'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'controller.uicontrol_item2.index',
+ )),
+ 'parameters' => $parameters
+ ),
+ array
+ (
+ 'my_name' => 'edit',
+ 'text' => lang('edit'),
+ 'confirm_msg' => lang('do you really
want to edit this entry'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'controller.uicontrol_item2.index',
+ )),
+ 'parameters' => $parameters
+ ),
+ array
+ (
+ 'my_name' => 'delete',
+ 'text' =>
lang('delete'),
+ 'confirm_msg' => lang('do you really
want to delete this entry'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'controller.uicontrol_item2.delete',
+ )),
+ 'parameters' => $parameters
+ )
+ );
+
+ $data['actions'] = json_encode($actions);
+
+//_debug_array($data);die();
self::render_template_xsl('datatable', $data);
}
@@ -352,11 +456,25 @@
}
}
array_walk($applications["results"], array($this,
"_add_links"), "controller.uicontrol_item2.index");
-
+//_debug_array($this->yui_results($applications));
return $this->yui_results($applications);
}
+ public function delete()
+ {
+ return 'deleted';
+ }
+
+ public function js_poll()
+ {
+ if($poll = phpgw::get_var('poll'))
+ {
+ return $poll;
+ }
+ return 'hello world';
+ }
+
public function query()
{
var_dump("Er i uicontrol");
Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -68,10 +68,15 @@
),
array(
'key' => 'title',
- 'label' =>
lang('Title'),
+ 'label' =>
lang('Procedure title'),
'sortable' => false
),
array(
+ 'key' => 'purpose',
+ 'label' =>
lang('Procedure purpose'),
+ 'sortable' => false
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
@@ -83,111 +88,6 @@
self::render_template_xsl('datatable', $data);
}
-/* public function display_control_items_json()
- {
- $this->bo = CreateObject('booking.boapplication');
- $this->resource_bo = CreateObject('booking.boresource');
-
- if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
- $GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'controller') )
- {
- $filters['id'] =
$this->bo->accessable_applications($GLOBALS['phpgw_info']['user']['id']);
- }
- $filters['status'] = 'NEW';
- if(isset($_SESSION['showall']))
- {
- $filters['status'] = array('NEW',
'PENDING','REJECTED', 'ACCEPTED');
- $testdata = phpgw::get_var('buildings', 'int', 'REQUEST',
null);
- if ($testdata != 0)
- {
- $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST',
null));
- }
- else
- {
- unset($filters['building_name']);
- }
- $testdata2 = phpgw::get_var('activities', 'int', 'REQUEST',
null);
- if ($testdata2 != 0)
- {
- $filters['activity_id'] =
$this->bo->so->get_activities(phpgw::get_var('activities', 'int', 'REQUEST',
null));
- }
- else
- {
- unset($filters['activity_id']);
- }
-
- }
- else
- {
- if (phpgw::get_var('status') == 'none')
- {
- $filters['status'] = array('NEW',
'PENDING', 'REJECTED', 'ACCEPTED');
- }
- else
- {
- $filters['status'] = phpgw::get_var('status');
- }
- $testdata = phpgw::get_var('buildings', 'int', 'REQUEST',
null);
- if ($testdata != 0)
- {
- $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST',
null));
- }
- else
- {
- unset($filters['building_name']);
- }
- $testdata2 = phpgw::get_var('activities', 'int', 'REQUEST',
null);
- if ($testdata2 != 0)
- {
- $filters['activity_id'] =
$this->bo->so->get_activities(phpgw::get_var('activities', 'int', 'REQUEST',
null));
- }
- else
- {
- unset($filters['activity_id']);
- }
- }
-
- $params = array(
- 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
- 'results' => phpgw::get_var('results', 'int',
'REQUEST', null),
- 'query' => phpgw::get_var('query'),
- 'sort' => phpgw::get_var('sort'),
- 'dir' => phpgw::get_var('dir'),
- 'filters' => $filters
- );
-
- $applications = $this->bo->so->read($params);
-
- foreach($applications['results'] as &$application)
- {
- if (strstr($application['building_name'],"%"))
- {
- $search = array('%2C','%C3%85',
'%C3%A5', '%C3%98', '%C3%B8', '%C3%86', '%C3%A6');
- $replace = array
(',','Å','å','Ø','ø','Æ','æ');
- $application['building_name'] =
str_replace($search, $replace, $application['building_name']);
- }
-
- $application['status'] =
lang($application['status']);
- $application['created'] =
pretty_timestamp($application['created']);
- $application['modified'] =
pretty_timestamp($application['modified']);
- $application['frontend_modified'] =
pretty_timestamp($application['frontend_modified']);
- $application['resources'] =
$this->resource_bo->so->read(array('filters'=>array('id'=>$application['resources'])));
- $application['resources'] =
$application['resources']['results'];
- if($application['resources'])
- {
- $names = array();
- foreach($application['resources'] as
$res)
- {
- $names[] = $res['name'];
- }
- $application['what'] =
$application['resources'][0]['building_name']. ' ('.join(', ', $names).')';
- }
- }
- array_walk($applications["results"], array($this,
"_add_links"), "controller.uicontrol_item2.index");
-
- return $this->yui_results($applications);
- } */
-
public function edit()
{
$procedure_id = phpgw::get_var('id');
@@ -206,14 +106,15 @@
if(isset($procedure)) // Edit procedure
{
$procedure->set_title(phpgw::get_var('title'));
-
$procedure->set_purpose(phpgw::get_var('purpose'));
+
$procedure->set_purpose(phpgw::get_var('purpose','html'));
$procedure->set_responsibility(phpgw::get_var('responsibility'));
-
$procedure->set_description(phpgw::get_var('description'));
+
$procedure->set_description(phpgw::get_var('description','html'));
$procedure->set_reference(phpgw::get_var('reference'));
$procedure->set_attachment(phpgw::get_var('attachment'));
if(isset($procedure_id) &&
$procedure_id > 0)
{
+ $proc_id = $procedure_id;
if($this->so->store($procedure))
{
$message =
lang('messages_saved_form');
@@ -400,14 +301,10 @@
//Add action column to each row in result table
array_walk(
$result_data['results'],
- array($this, 'add_actions'),
- array(
// Parameters
(non-object pointers)
- $procedure_id,
// [1] The procedure id
- $editable,
// [2] Editable
flag
- )
- );
+ array($this, '_add_links'),
+ "controller.uiprocedure.view");
}
-
+//_debug_array($result_data);
return $this->yui_results($result_data,
'total_records', 'results');
}
Copied:
branches/Version-1_0-branch/controller/inc/model/class.control_area.inc.php
(from rev 7656, trunk/controller/inc/model/class.control_area.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control_area.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/model/class.control_area.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -0,0 +1,50 @@
+<?php
+ include_class('controller', 'model', 'inc/model/');
+
+ class controller_control_area extends controller_model
+ {
+ public static $so;
+
+ protected $id;
+ protected $title;
+
+ /**
+ * Constructor. Takes an optional ID. If a contract is
created from outside
+ * the database the ID should be empty so the database can add
one according to its logic.
+ *
+ * @param int $id the id of this composite
+ */
+ public function __construct(int $id = null)
+ {
+ $this->id = (int)$id;
+ }
+
+ public function set_id($id)
+ {
+ $this->id = $id;
+ }
+
+ public function get_id() { return $this->id; }
+
+ public function set_title($title)
+ {
+ $this->title = $title;
+ }
+
+ public function get_title(){ return $this->title; }
+
+ /**
+ * Get a static reference to the storage object associated with
this model object
+ *
+ * @return the storage object
+ */
+ public static function get_so()
+ {
+ if (self::$so == null) {
+ self::$so =
CreateObject('controller_control_area');
+ }
+
+ return self::$so;
+ }
+ }
+?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/js/yahoo/common.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/common.js 2011-09-20
06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/js/yahoo/common.js 2011-09-20
06:36:18 UTC (rev 7657)
@@ -202,7 +202,7 @@
if(!disablePagination) {
options.paginator =
YAHOO.portico.setupInlineTablePaginator(paginatorContainer);
- url += 'results=' + options.paginator.getRowsPerPage() + '&';
+ url += '&results=' + options.paginator.getRowsPerPage() + '&';
}
var myDataSource = new YAHOO.util.DataSource(url);
myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
Modified: branches/Version-1_0-branch/controller/js/yahoo/controller.item.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/controller.item.js
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/js/yahoo/controller.item.js
2011-09-20 06:36:18 UTC (rev 7657)
@@ -2,4 +2,21 @@
*
*/
-alert('dette er respons fra "controller/js/yahoo/controller.item.js"');
+//alert('dette er respons fra "controller/js/yahoo/controller.item.js"');
+
+ this.get_translations = function()
+ {
+ var callback = {success: function(o){
+ lang =
JSON.parse(o.responseText);
+ // console.log(lang);
+ alert(lang);
+ },
+ failure:
function(o){window.alert('Server or your connection is dead.')},
+ timeout: 10000
+ };
+ var oArgs =
{menuaction:'controller.uicontrol_item2.js_poll',poll:''};
+ var strURL = phpGWLink('index.php', oArgs, true);
+ var request = YAHOO.util.Connect.asyncRequest('POST', strURL,
callback);
+ }
+
+ get_translations();
Modified: branches/Version-1_0-branch/controller/js/yahoo/datatable.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/datatable.js
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/js/yahoo/datatable.js
2011-09-20 06:36:18 UTC (rev 7657)
@@ -80,6 +80,7 @@
fields: fields,
metaFields : {
totalResultsAvailable: "ResultSet.totalResultsAvailable",
+ recordsReturned: "ResultSet.recordsReturned",
startIndex: 'ResultSet.startIndex',
sortKey: 'ResultSet.sortKey',
sortDir: 'ResultSet.sortDir'
@@ -91,6 +92,32 @@
dynamicData: true,
sortedBy: YAHOO.portico.initialSortedBy || {key: fields[0], dir:
YAHOO.widget.DataTable.CLASS_ASC}
});
+
+//------------
+ myContextMenu = new YAHOO.widget.ContextMenu("mycontextmenu",
{trigger:myDataTable.getTbodyEl()});
+ myContextMenu.addItems(YAHOO.portico.GetMenuContext());
+
+ myDataTable.subscribe("rowMouseoverEvent",
myDataTable.onEventHighlightRow);
+ myDataTable.subscribe("rowMouseoutEvent",
myDataTable.onEventUnhighlightRow);
+
+ // myDataTable.subscribe("renderEvent", myRenderEvent);
+
+ /*
+ myDataTable.subscribe("rowClickEvent",function (oArgs)
+
{
+
var elTarget = oArgs.target;
+
var oRecord = this.getRecord(elTarget);
+
Exchange_values(oRecord);
+
}
+ );*/
+
+ myContextMenu.subscribe("beforeShow",
YAHOO.portico.onContextMenuBeforeShow);
+ myContextMenu.subscribe("hide",
YAHOO.portico.onContextMenuHide);
+ //Render the ContextMenu instance to the parent container of
the DataTable
+ myContextMenu.subscribe("click",
YAHOO.portico.onContextMenuClick, myDataTable);
+ myContextMenu.render(myDataTable);
+//--------------
+
var handleSorting = function (oColumn) {
var sDir = this.getColumnSortDir(oColumn);
var newState = getState(oColumn.key, sDir);
@@ -109,6 +136,7 @@
oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
oPayload.pagination = {
rowsPerPage: oResponse.meta.paginationRowsPerPage ||
10,
+ // rowsPerPage: oResponse.meta.recordsReturned || 10,
recordOffset: oResponse.meta.startIndex || 0
}
oPayload.sortedBy = {
@@ -165,6 +193,288 @@
handleHistoryNavigation(state);
});
History.initialize("yui-history-field", "yui-history-iframe");
+
};
+ YAHOO.portico.GetMenuContext = function()
+ {
+ var opts = new Array();
+ var p=0;
+ for(var k =0; k < actions.length; k ++)
+ {
+ opts[p]=[{text: actions[k].text}];
+ p++;
+ }
+ return opts;
+ }
+
+ YAHOO.portico.onContextMenuBeforeShow = function(p_sType, p_aArgs)
+ {
+ var prefixSelected = '';
+ var oTarget = this.contextEventTarget;
+ if (this.getRoot() == this)
+ {
+ if(oTarget.tagName != "TD")
+ {
+ oTarget =
YAHOO.util.Dom.getAncestorByTagName(oTarget, "td");
+ }
+ oSelectedTR =
YAHOO.util.Dom.getAncestorByTagName(oTarget, "tr");
+ oSelectedTR.style.backgroundColor = '#AAC1D8' ;
+ oSelectedTR.style.color = "black";
+ YAHOO.util.Dom.addClass(oSelectedTR, prefixSelected);
+ }
+ }
+
/********************************************************************************
+ *
+ */
+ YAHOO.portico.onContextMenuHide = function(p_sType, p_aArgs)
+ {
+ var prefixSelected = '';
+ if (this.getRoot() == this && oSelectedTR)
+ {
+ oSelectedTR.style.backgroundColor = "" ;
+ oSelectedTR.style.color = "";
+ YAHOO.util.Dom.removeClass(oSelectedTR, prefixSelected);
+ }
+ }
+
+ YAHOO.portico.onContextMenuClick = function(p_sType, p_aArgs,
p_myDataTable)
+ {
+
+ var task = p_aArgs[1];
+ if(task)
+ {
+ if(actions[task.groupIndex].confirm_msg)
+ {
+ confirm_msg =
actions[task.groupIndex].confirm_msg;
+ if(!confirm(confirm_msg))
+ {
+ return false;
+ }
+ }
+
+ // Extract which TR element triggered the
context menu
+ var elRow =
p_myDataTable.getTrEl(this.contextEventTarget);
+ if(elRow)
+ {
+ var oRecord =
p_myDataTable.getRecord(elRow);
+ var url =
actions[task.groupIndex].action;
+ var sUrl = "";
+ var vars2 = "";
+
+
if(actions[task.groupIndex].parameters!=null)
+ {
+ for(f=0;
f<actions[task.groupIndex].parameters.parameter.length; f++)
+ {
+ param_name =
actions[task.groupIndex].parameters.parameter[f].name;
+ param_source =
actions[task.groupIndex].parameters.parameter[f].source;
+ vars2 = vars2 +
"&"+param_name+"=" + oRecord.getData(param_source);
+ }
+ sUrl = url + vars2;
+ }
+
if(actions[task.groupIndex].parameters.parameter.length > 0)
+ {
+ //nothing
+ }
+ else //for New
+ {
+ sUrl = url;
+ }
+ //Convert all HTML entities to their
applicable characters
+
sUrl=YAHOO.portico.html_entity_decode(sUrl);
+
+ // look for the word "DELETE" in URL
+
if(YAHOO.portico.substr_count(sUrl,'delete')>0)
+ {
+ sUrl = sUrl +
"&confirm=yes&phpgw_return_as=json";
+
YAHOO.portico.delete_record(sUrl);
+ }
+ else
+ {
+
if(YAHOO.portico.substr_count(sUrl,'target=_blank')>0)
+ {
+
window.open(sUrl,'_blank');
+ }
+ else
if(YAHOO.portico.substr_count(sUrl,'target=_lightbox')>0)
+ {
+ //have to be defined as
a local function. Example in invoice.list_sub.js
+ //console.log(sUrl); //
firebug
+ showlightbox(sUrl);
+ }
+ else
+ {
+
+
window.open(sUrl,'_self');
+ }
+ }
+ }
+ }
+ };
+
+ YAHOO.portico.html_entity_decode = function(string)
+ {
+ var histogram = {}, histogram_r = {}, code = 0;
+ var entity = chr = '';
+
+ histogram['34'] = 'quot';
+ histogram['38'] = 'amp';
+ histogram['60'] = 'lt';
+ histogram['62'] = 'gt';
+ histogram['160'] = 'nbsp';
+ histogram['161'] = 'iexcl';
+ histogram['162'] = 'cent';
+ histogram['163'] = 'pound';
+ histogram['164'] = 'curren';
+ histogram['165'] = 'yen';
+ histogram['166'] = 'brvbar';
+ histogram['167'] = 'sect';
+ histogram['168'] = 'uml';
+ histogram['169'] = 'copy';
+ histogram['170'] = 'ordf';
+ histogram['171'] = 'laquo';
+ histogram['172'] = 'not';
+ histogram['173'] = 'shy';
+ histogram['174'] = 'reg';
+ histogram['175'] = 'macr';
+ histogram['176'] = 'deg';
+ histogram['177'] = 'plusmn';
+ histogram['178'] = 'sup2';
+ histogram['179'] = 'sup3';
+ histogram['180'] = 'acute';
+ histogram['181'] = 'micro';
+ histogram['182'] = 'para';
+ histogram['183'] = 'middot';
+ histogram['184'] = 'cedil';
+ histogram['185'] = 'sup1';
+ histogram['186'] = 'ordm';
+ histogram['187'] = 'raquo';
+ histogram['188'] = 'frac14';
+ histogram['189'] = 'frac12';
+ histogram['190'] = 'frac34';
+ histogram['191'] = 'iquest';
+ histogram['192'] = 'Agrave';
+ histogram['193'] = 'Aacute';
+ histogram['194'] = 'Acirc';
+ histogram['195'] = 'Atilde';
+ histogram['196'] = 'Auml';
+ histogram['197'] = 'Aring';
+ histogram['198'] = 'AElig';
+ histogram['199'] = 'Ccedil';
+ histogram['200'] = 'Egrave';
+ histogram['201'] = 'Eacute';
+ histogram['202'] = 'Ecirc';
+ histogram['203'] = 'Euml';
+ histogram['204'] = 'Igrave';
+ histogram['205'] = 'Iacute';
+ histogram['206'] = 'Icirc';
+ histogram['207'] = 'Iuml';
+ histogram['208'] = 'ETH';
+ histogram['209'] = 'Ntilde';
+ histogram['210'] = 'Ograve';
+ histogram['211'] = 'Oacute';
+ histogram['212'] = 'Ocirc';
+ histogram['213'] = 'Otilde';
+ histogram['214'] = 'Ouml';
+ histogram['215'] = 'times';
+ histogram['216'] = 'Oslash';
+ histogram['217'] = 'Ugrave';
+ histogram['218'] = 'Uacute';
+ histogram['219'] = 'Ucirc';
+ histogram['220'] = 'Uuml';
+ histogram['221'] = 'Yacute';
+ histogram['222'] = 'THORN';
+ histogram['223'] = 'szlig';
+ histogram['224'] = 'agrave';
+ histogram['225'] = 'aacute';
+ histogram['226'] = 'acirc';
+ histogram['227'] = 'atilde';
+ histogram['228'] = 'auml';
+ histogram['229'] = 'aring';
+ histogram['230'] = 'aelig';
+ histogram['231'] = 'ccedil';
+ histogram['232'] = 'egrave';
+ histogram['233'] = 'eacute';
+ histogram['234'] = 'ecirc';
+ histogram['235'] = 'euml';
+ histogram['236'] = 'igrave';
+ histogram['237'] = 'iacute';
+ histogram['238'] = 'icirc';
+ histogram['239'] = 'iuml';
+ histogram['240'] = 'eth';
+ histogram['241'] = 'ntilde';
+ histogram['242'] = 'ograve';
+ histogram['243'] = 'oacute';
+ histogram['244'] = 'ocirc';
+ histogram['245'] = 'otilde';
+ histogram['246'] = 'ouml';
+ histogram['247'] = 'divide';
+ histogram['248'] = 'oslash';
+ histogram['249'] = 'ugrave';
+ histogram['250'] = 'uacute';
+ histogram['251'] = 'ucirc';
+ histogram['252'] = 'uuml';
+ histogram['253'] = 'yacute';
+ histogram['254'] = 'thorn';
+ histogram['255'] = 'yuml';
+
+ // Reverse table. Cause for maintainability purposes, the
histogram is
+ // identical to the one in htmlentities.
+ for (code in histogram) {
+ entity = histogram[code];
+ histogram_r[entity] = code;
+ }
+
+ return (string+'').replace(/(\&([a-zA-Z]+)\;)/g, function(full,
m1, m2){
+ if (m2 in histogram_r) {
+ return String.fromCharCode(histogram_r[m2]);
+ } else {
+ return m2;
+ }
+ });
+ }
+
+ YAHOO.portico.substr_count = function( haystack, needle, offset, length
)
+ {
+ var pos = 0, cnt = 0;
+
+ haystack += '';
+ needle += '';
+ if(isNaN(offset)) offset = 0;
+ if(isNaN(length)) length = 0;
+ offset--;
+
+ while( (offset = haystack.indexOf(needle, offset+1)) != -1 )
+ {
+ if(length > 0 && (offset+needle.length) > length)
+ {
+ return false;
+ } else
+ {
+ cnt++;
+ }
+ }
+ return cnt;
+ }
+
/********************************************************************************
+ *
+ */
+ YAHOO.portico.delete_record = function(sUrl)
+ {
+ var callback = {success: function(o){
+ message_delete =
o.responseText.toString().replace("\"","").replace("\"","");
+ alert(message_delete);
+
document.getElementById('update_table_dummy').submit();//update table
+ },
+ failure:
function(o){window.alert('Server or your connection is dead.')},
+ timeout: 10000
+ };
+ var request = YAHOO.util.Connect.asyncRequest('POST', sUrl,
callback);
+
+ }
+
+/****************************************************************************************
+*
+*/
+
+
YAHOO.util.Event.addListener(window, "load",
YAHOO.portico.initializeDataTable);
Copied:
branches/Version-1_0-branch/controller/js/yahoo/example_separate_tabs.js (from
rev 7656, trunk/controller/js/yahoo/example_separate_tabs.js)
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/example_separate_tabs.js
(rev 0)
+++ branches/Version-1_0-branch/controller/js/yahoo/example_separate_tabs.js
2011-09-20 06:36:18 UTC (rev 7657)
@@ -0,0 +1,13 @@
+YAHOO.util.Event.addListener(window, "load", function() {
+
+ var oArgs =
{menuaction:'booking.uidocument_resource.index',sort:'name',filter_owner_id:resource_id};
+ var url = phpGWLink('index.php', oArgs, true);
+ var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.portico.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
+ YAHOO.portico.inlineTableHelper('documents_container', url, colDefs);
+
+ var oArgs =
{menuaction:'booking.uipermission_resource.index',sort:'name',filter_object_id:resource_id};
+ var url = phpGWLink('index.php', oArgs, true);
+ var colDefs = [{key: 'subject_name', label: lang['Account']}, {key:
'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
+ YAHOO.portico.inlineTableHelper('permissions_container', url, colDefs);
+});
+
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-09-20
06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2011-09-20
06:36:18 UTC (rev 7657)
@@ -42,378 +42,93 @@
save controller no Lagre
1-6 characters controller no 1-6 tegn
6 characters controller no 6 tegn
-account_in controller no Art/konto inntektsside
-account_in_not_numeric controller no Art/konto inntektsside må være
et tall
-account_number controller no Kontonummer
-account_out controller no Art/konto utgiftsside
-account_out_not_numeric controller no Art/konto utgiftsside
må være et tall
-active_party controller no Kontraktspart er aktiv
-active_plural controller no Aktive
-active_single controller no Aktiv
active controller no Aktiv
-add_area controller no Legg til areal
-added_areas controller no Inkludert areal
add controller no Legg til
-address controller no Adresse
-adjust_price controller no Juster pris
-adjustment controller no Regulering
-adjustable controller no Regulerbar
-adjustment_interval controller no Reguleringsintervall
-adjustment_is_executed controller no Reguleringen er utført
-adjustment_is_not_executed controller no Reguleringen er ikke
utført
-adjustment_list controller no Reguleringer
-adjustment_list_out_of_date controller no Det er kjørt en nyere
regulering for samme utvalg av kontrakter
-adjustment_share controller no Reguleringsandel
-adjustment_type controller no Reguleringstype
-adjustment_year controller no Sist regulert
-adjustment_date controller no Reguleringsdato
-adjustment_type_KPI controller no KPI
-adjustment_type_deflator controller no Kommunal deflator
-advance controller no Forskudd
-agresso_id controller no Agresso-ID
-agresso_gl07 controller no Agresso GL07 - hovedbokstall
-agresso_lg04 controller no Agresso LG04 - salgsordrer
-add_location controller no Legg enhet til leieobjektet
-address1 controller no Adresse 1
-address2 controller no Adresse 2
+add_location controller no Legg enhet til kontrollen
all controller no Alle
all_locations controller no Enheter fra eiendomsregisteret
-and controller no og
annually controller no Årlig
-area_gros controller no Bruttoareal
-area_net controller no Nettoareal
-area_not_found controller no Kunne ikke finne detaljer om arealet
-area controller no Areal
-area decimal places controller no Antall desimaler for arealer
-area suffix controller no Areal suffix
-area_max controller no Max areal
-audience controller no Målgrupper
-availability controller no Tilgjengelighet
-availability_date controller no Dato
-available_areas controller no Tilgjenglig areal
-available_at controller no Ledig på dato
-available_composites controller no Ledige leieobjekt
-available_composites controller no Tilgjengelige leieobjekter
-available_from controller no Tilgjengelig fra
-available_parties controller no Tilgjengelige kontraktsparter
-available_price_items controller no Tilgjengelige priselementer
-available? controller no Kan leies ut?
-available controller no Tilgjengelig
-available_for_pick controller no tilgjengelig
back controller no Tilbake
-bank_guarantee controller no Bankgaranti
-Billing date controller no Fakturadato
-billing time limit controller no Faktura - tidsgrense
-billing_external controller no Ekstern
-billing_internal controller no Intern
-billing_start controller no Fakturastart
-billing_term controller no Termin
-billing_terms controller no Terminer
-billing_unit controller no Ansvar-/tjenestested
-billing_removed_KF_contract controller no Fjernet KF-kontrakt med
id
-billing_removed_contract_part_1 controller no Fjernet kontrakt
-billing_removed_contract_part_2 controller no med total pris
lik 0 kroner
-billing_removed_external_contract controller no Kontrakt med
ansvarsområde eksternleie må ha kontrakttype
-bill controller no Faktura
-bill2 controller no Fakturér
-btn_add controller no Deleger tilgang til bruker
-btn_search controller no Finn bruker
building controller no Bygg
-calculations_internal_investment controller no
Beregningsgrunnlag internleie/investeringer
-calculate_price_apiece controller no Pris regnes per stk.
-calculate_price_per_area controller no Pris regnes ut fra areal
calendar_months controller no
["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"]
calendar_weekdays controller no
["Sø","Ma","Ti","On","To","Fr","Lø"]
cancel controller no Avbryt
-category config move in controller no Kategori for
innflyttingsmeldinger
-category config move out controller no Kategori for
utflyttingsmeldinger
close controller no Lukk
clear controller no Nullstill
-closing_due_date controller no Nær opsjonsfrist
-CSV controller no CSV
comment controller no Kommentar
comments controller no Kommentarer
-Commit controller no Avslutt
-Commited controller no Avsluttet
-company controller no Foretak
-company_name controller no Foretak
-composite_name controller no Navn på leieobjekt
-composite_address controller no Adresse på leieobjekt
-composite controller no Leieobjekt
-composite_back controller no Leieobjektsliste
-composite_has_contract controller no Leieobjekt med aktive kontrakter
-composite_has_no_contract controller no Leieobjekt uten aktive
kontrakter
-contract controller no Kontrakt
-contract_back controller no Kontraktsliste
-contract_id controller no Kontraktsnummer
-contract_not_adjustable controller no Kontrakten er ikke
regulerbar
-contract_number controller no Kontraktnummer
-contract_warning controller no Advarsler
-contracts_containing_this_composite controller no Kontrakter
knyttet til dette leieobjektet
-contracts controller no Kontrakter
-contracts_under_dismissal controller no Kontrakter under
avslutning
-contract_under_dismissal controller no Under avslutning
-contract_notifications controller no Kontraktens varsler
-contract_notification_status controller no Status
-contracts_for_regulation controller no Regulering med
tilhørende kontrakter
-contract_regulation_back controller no Regulering
-contracts_removed controller no Kontrakter som er fjernet fra
fakturakjøringen
-contracts_with_one_time controller no Kontrakter med
engangsbeløp
-contracts_in_cycle controller no Kontrakter som følger vanlig
fakturasyklus
-contracts_out_of_cycle controller no Kontrakter som avviker fra
vanlig faktureringssyklus
-contracts_not_billed_before controller no Kontrakter som ikke er
fakturert tidligere
-contract_status controller no Status
-contract_type_eksternleie controller no Eksternleie
-contract_type_eksternleie_feste controller no Feste (1520)
-contract_type_eksternleie_leilighet controller no Leilighet (1530)
-contract_type_eksternleie_annen controller no Annen (1510)
-contract_type_innleie controller no Innleie
-contract_type_internleie controller no Internleie
-contract_type_internleie_egne controller no Egne
-contract_type_internleie_innleie controller no Innleie
-contract_type_internleie_investeringskontrakt controller no
Investeringskontrakt
-contract_type_internleie_KF controller no KF
-contract_type_internleie_andre controller no Andre
-contract_type_investeringskontrakt controller no
Investeringskontrakt
-contract_type controller no Kontrakttype
-contract_type_id controller no Kontrakttype
-contract_types controller no Kontrakttyper
-contract_type_internleie_1 controller no Utført
internleieregulering av kontrakter som reguleres hvert år
-contract_type_internleie_2 controller no Utført
internleieregulering av kontrakter som reguleres hvert annet år
-contract_type_internleie_10 controller no Utført
internleieregulering av kontrakter som reguleres hvert tiende år
-contract_type_innleie_1 controller no Utført
innleieregulering av kontrakter som reguleres hvert år
-contract_type_innleie_2 controller no Utført
innleieregulering av kontrakter som reguleres hvert annet år
-contract_type_innleie_10 controller no Utført
innleieregulering av kontrakter som reguleres hvert tiende år
-contract_type_eksternleie_1 controller no Utført
eksternleieregulering av kontrakter som reguleres hvert år
-contract_type_eksternleie_2 controller no Utført
eksternleieregulering av kontrakter som reguleres hvert annet år
-contract_type_eksternleie_10 controller no Utført
eksternleieregulering av kontrakter som reguleres hvert tiende år
-contracts_closing_due_date controller no Kontrakter nær
opsjonsfrist
-contract_future_info controller no Fremtidig kontraktsinformasjon
-Could not find specified billing job. controller no Kunne ikke
finne spesifisert fakturering.
-count decimal places controller no Antall desimaler for opptelling
count controller no Antall
count_suffix controller no stk
-count_suffix controller no stk
-create_billing controller no Opprett fakturakjøring
create_shortcut controller no Ny snarvei
-create_contract_contract_type_eksternleie controller no Opprett
eksternleiekontrakt
-create_contract_contract_type_innleie controller no Opprett
innleiekontrakt
-create_contract_contract_type_internleie controller no Opprett
internleiekontrakt
-create_user_based_on_email_link controller no Opprett bruker
basert på e-post
-create user based on email group controller no Velg gruppe nye
brukere blir innmeldt i
-cs15_export controller no Kundefil
-currency decimal places controller no Antall desimaler for
valuta
-currency prefix controller no Valuta prefix
-currency suffix controller no Valuta suffix
-currency_thousands_separator controller no .
-custom_address controller no overstyrt
-dashboard_title controller no Forside - Min arbeidsoversikt
DATATABLE_MSG_EMPTY controller no Ingen data
DATATABLE_MSG_ERROR controller no Datafeil
DATATABLE_MSG_LOADING controller no Laster data
date_end controller no Gjelder til
date controller no Dato
date_start controller no Gjelder fra
-decimal separator controller no Skilletegn for desimaler
-delegates controller no Delegering
-delegate_removed controller no Delegaten ble fjernet.
-delegation_error controller no Feil under delegering
-delegation_successful controller no Velykket delegering
delete controller no Slett
-department controller no Avdeling
-deposit controller no Depositum
description controller no Beskrivelse
details controller no Detaljer
-document_type controller no Dokumenttype
-documents controller no Dokumenter
-Download Agresso import file controller no Last ned
Agresso-importfil (CS15)
-Download as %1 controller no Last tabellen i %1-format
-Download export controller no Last ned eksporten
do_not_exist controller no Eksisterer ikke
-due_date controller no Opsjonsfrist
-economy controller no Økonomi
-edit_contract controller no Redigér kontrakt
edit controller no Redigér
elements_pr_page controller no elementer per side
elements controller no Elementer
-email controller no E-post
-email_create_user_based_on_email_title controller no Tilgang til
Portico Estate
-email_create_user_based_on_email_message controller no Hei %1
%2:<br/>Det er opprettet en tilgang for deg i Portico
Estate<br/><br/>Brukernavnet er e-posten din<br/>Passordet er
%3<br/><br/>Systemet kan nås på adressen %4
-ended controller no Avsluttet
-entity config move out controller no Entitet for utflytting
-entity config move in controller no Entitet for innflytting
-error_create_user_based_on_email controller no En feil oppstod
under opprettelse av bruker
-error_create_user_based_on_email_account_exist controller no En
konto med denne e-posten som brukernavn eksisterer allerede
-error_create_user_based_on_email_not_valid_address controller no
Kan ikke opprette kontoen pga av e-postadressen ikke er gyldig
-error_no_contract_or_party controller no Ingen kontrakt eller
kontraktspart å utføre handlingen på
-events controller no Hendelser
every_second_week controller no Hver 14. dag
-Excel controller no Excel
-execute_adjustments controller no Utfør reguleringer
-executive_officer controller no Saksbehandler
-executive_officer_for controller no Saksbehandler for
export controller no Eksport
-export_contracts controller no Eksporter kontrakter
-export_contract_price_items controller no Eksporter priselementer
på kontrakter
-Export failed. controller no Eksporten feilet.
-Export format controller no Format
-Export generated. controller no Eksporten ble generert.
export_to controller no Eksporter
-external controller no Eksterne kontraktsparter
-facilit_import controller no Import fra Facilit
-failed_removing_delegate controller no Det oppstod en feil
under sletting av delegaten.
-fax controller no Faks
-fellesdata_not_in_use controller no Fellesdata er ikke i bruk
-field_of_responsibility controller no Ansvarsområde
filters controller no Filtre
Finish controller no Avslutt
fire_drawings controller no Branntegninger
-firstname controller no Fornavn
first controller no Første
first_half controller no 1. halvår
first_quarter controller no 1. kvartal
fixed controller no Tidsbestemt
floor controller no Etasje
fourth_quarter controller no 4. kvartal
-f_new_contract controller no Opprett kontrakt
-f_new_party controller no Ny kontraktspart
-f_new_price_item controller no Nytt priselement
-f_new_rc controller no Nytt leieobjekt
from controller no Fra
-from email setting controller no E-post adresse systemmeldinger
(Fra)
-frontpage_was_reset controller no Oppsettet på forsiden ble
nullstilt
-frontpage_reset_setup controller no Nullstill oppsett
f_select_columns controller no Velg kolonner
-furnish_type controller no Møbleringsstatus
-furnish_type_not_specified controller no Ikke spesifisert
-furnish_type_furnished controller no Møblert
-furnish_type_partly_furnished controller no Delvis møblert
-furnish_type_not_furnished controller no Ikke møblert
gab controller no GAB
gab_id controller no GAB
-Generate export controller no Generér eksport
-Generate cs15 controller no Generér kundefil
half-year controller no Halvårig
hidden controller no Skjult
hidden_for_pick controller no skjult
-has_custom_address controller no Er adressen overstyrt?
house_number controller no Husnummer
-http address for external users controller no HTTP adresse
for eksterne brukere
id controller no ID
Identifier controller no Identifikator
-import_log_messages controller no Import log
-import_reset controller no Nullstill importstatus
-in_operation controller no I drift
-inactive_party controller no Kontraktspart er inaktiv
inactive controller no Inaktiv
-internal controller no Interne kontraktsparter
interval controller no Intervall
-Invalid location code for the building. controller no Ugyldig
objektnummer for bygg.
-invoice controller no Faktura
-invoice_run controller no Fakturakjøring
-invoice_menu controller no Faktura
-invoice_header controller no Fakturaoverskrift
is_active controller no Aktiv
-is_area controller no Areal
-is_payer controller no Fakturamottaker
is_inactive controller no Inaktiv
-is_adjustable controller no Indeksreguleres
is_executed controller no Utført
-is_one_time controller no Engangsbeløp
-is_standard controller no Standard priselement
-job_title controller no Stillingstittel
land_title controller no Gnr/Bnr
-lacking_username controller no Brukernavn må fylles ut
-last_edited_by_current_user controller no Din siste endring
lastname controller no Etternavn
last controller no Siste
last_updated controller no Sist oppdatert
level controller no Nivå
link controller no Lenke
-location_code controller no Enhetsnummer
-location_id controller no Intern organisasjonstilknytning
-log_in_to_add_notfications controller no Det er bare mulig å
legge til varlser i redigeringsmodus.
make_pdf controller no Lag PDF for utskrift
-manual_adjust_price_item controller no Manuell regulering av
priselement
-manual_adjust_price_item_select controller no Velg priselement
-manual_adjustment controller no Manuell regulering
-marked_as controller no og er merket
-max_area controller no Areal
message controller no Melding
-messages_agresso_id_length controller no Agresso-ID må inneholde
9 tall eller bokstaver
-messages_fontpage_not_saved controller no Oppsettet ble ikke
lagret
-messages_fontpage_saved controller no Oppsettet ble lagret
messages_form_error controller no Skjemaet inneholder en feil.
messages_general controller no Feil i feltet
messages_isint controller no Feltet må inneholde et heltall
messages_isnumeric controller no Feltet må inneholde et tall
-messages_new_composite controller no Leieobjektet er opprettet
-messages_new_contract controller no Ny kontrakt lagt til
-messages_new_contract_copied controller no Ny kontrakt lagt til
basert på kontrakt
-messages_new_contract_from_composite controller no Ny kontrakt
lagt til basert på leieobjekt
-messages_new_party controller no Kontraktspart er opprettet
messages_not_valid_date controller no Må være en gyldig dato
messages_number_out_of_range controller no Tallet er over eller
under tillatte verdier
messages_required_field controller no Dette feltet er påkrevd
messages_right_click_to_add controller no Høyreklikk for å legge
til
messages_saved_form controller no Informasjonen ble lagret.
messages_string_too_long controller no Teksten er for lang
-Missing account in. controller no Inngående konto mangler.
-Missing account out. controller no Utgående konto mangler.
-Missing billing information. controller no Ufullstendig
konteringsinformasjon for kontrakt med id %1. Dette må rettes for å kunne
fakturere kontrakten.
-Missing contract party. controller no Kontraktspart mangler.
-Missing payer id. controller no Mangler fakturamottaker.
-Missing project id. controller no Prosjektnummer mangler.
Missing responsibility id. controller no Ansvar mangler.
-Missing service id. controller no Tjeneste mangler.
-Missing system setting for project id. controller no
Systeminnstilling for prosjektnummer mangler.
-Missing system setting for responsibility id for the current user.
controller no Systeminnstilling for ansvar mangler.
-missing_agresso_id controller no Agresso Id må fylles ut
mobile_phone controller no Mobiltelefon
-month 1 controller no januar
-month 2 controller no februar
-month 3 controller no mars
-month 4 controller no april
-month 5 controller no mai
-month 6 controller no juni
-month 7 controller no juli
-month 8 controller no august
-month 9 controller no september
-month 10 controller no oktober
-month 11 controller no november
-month 12 controller no desember
-month 0 capitalized controller no Ikke tilgjengelig
-month 1 capitalized controller no Januar
-month 2 capitalized controller no Februar
-month 3 capitalized controller no Mars
-month 4 capitalized controller no April
-month 5 capitalized controller no Mai
-month 6 capitalized controller no Juni
-month 7 capitalized controller no Juli
-month 8 capitalized controller no August
-month 9 capitalized controller no September
-month 10 capitalized controller no Oktober
-month 11 capitalized controller no November
-month 12 capitalized controller no Desember
-monthly controller no Månedlig
month controller no Måned
name controller no Navn
never controller no Aldri
new_notification controller no Nytt varsel
-new_billing controller no Ny fakturering
-new_adjustment controller no Ny regulering
-new_price controller no Ny pris
next controller no Neste
no controller no Nei
none controller no Ingen
nobody controller no Ingen
-No billing jobs found controller no Ingen faktureringer funnet
-no_contracts_found controller no Ingen kontrakter passet til
søkekriteriene
-No contracts were selected. controller no Du må velge minst én
kontrakt for å faktuere.
no_hits controller no Ingen treff
-No invoices were found controller no Ingen fakturaer funnet
-no_name_composite controller no Leieobjekt uten navn
(løpenummer: %1)
-no_party_location controller no Ingen intern
organisasjonstilhørighet
no_value controller no Ingen
not_available controller no Ikke tilgjengelig
notification_status controller no Varsel
@@ -427,98 +142,31 @@
occupied controller no Opptatt
of_total controller no av totalt
ok controller no Ok
-old_contract_id controller no Gammelt kontraktsnummer
ODS controller no ODS
-One or more price items are missing Agresso ids. controller no
Ett eller flere priselementer mangler Agresso-id.
-One or more price items have an invalid Agresso id. Id must consist of one
capital letter and three digits. controller no Ett eller flere
priselementer har en ugyldig Agresso-id. Iden må bestå av én stor bokstav og
tre tall.
only_one_time controller no Status
-only_one_time_yes controller no Avviker fra vanlig
faktureringssyklus, kun engangsbeløp
-only_one_time_no controller no Følger vanlig fakturasyklus
-open_and_exported_exist controller no En fakturakjøring som
ikke er avsluttet med eksportert til Agresso-format eksisterer for dette
ansvarsområdet. Denne må enten slettes eller avsluttes før denne
fakturakjøringen kan eksportes.
-organisation_number controller no Organisasjonsnummer
-organisation_or_ssn_number controller no Org./fødselsnr
-orphan_units controller no Ubrukte arealer
or controller no eller
-org_enhet_id controller no Organisasjonsenhet
-org_unit_name controller no Navn på tilsvarende enhet i Fellesdata
-org_unit_exist controller no Eksisterer
-other_guarantee controller no Annen garanti
others controller no Annet
out_of_operation controller no Ikke i drift
-overridden_address controller no Overstyrt adresse
-override controller no Fakturer fra
panels controller no Vinduer
-part_of_contract controller no Inngår i kontrakt av typen
-parties controller no Kontraktsparter
-party_name controller no Navn til kontraktspart
-party controller no Kontraktspart
-party_back controller no Kontraktspartliste
-party_location controller no Intern organisasjonstilhørighet
-party_type controller no Type kontraktspart
-payer_id controller no Fakturamottaker
-percent controller no Prosent
-period controller no Periode
-permission_denied_edit_contract controller no Du mangler
rettigheter for å legge til å editere kontrakten
-permission_denied_new_contract controller no Du mangler rettigheter
for å legge til å opprette nye kontrakter
-permission_denied_view_contract controller no Du mangler
rettigheter for å legge til å se kontrakten
-permission_denied_add_document controller no Du mangler rettigheter
for å legge til et dokumenent
phone controller no Telefon
postal_code_place controller no Postnummer/-sted
-post_code controller no Postnummer
-post_place controller no Sted
-postal_code controller no Postnummer
-place controller no Sted
previous controller no Forrige
-price_item controller no Priselement
-price_item_id controller no Priselement ID
-price_item_type_apiece controller no Stk.
-price_item_type_area controller no Areal
-price_item_inactive controller no Inaktiv
-price_item_active controller no Aktiv
-price_item_adjustable controller no Ja
-price_item_not_adjustable controller no Nei
-price_list controller no Prisbok
-price_per_unit controller no Pris pr kvm
-price controller no Pris
-price_element_in_use controller no Priselementet er i bruk på en
aktiv kontrakt
-project_id controller no Prosjektnummer
-Project id can not be more than 6 characters. controller no
Prosjektnummer kan ikke være mer enn seks tegn.
propertyident controller no G.nr. / B.nr. / F.nr. / S.nr.
property_id controller no BKB Identifikator
property controller no Eiendom
-publish_comment controller no Kommentar vises i frontend
quarterly controller no Kvartalvis
-rc controller no Leieobjekter
recurrence controller no Gjentakelse
-reference controller no Deres ref
-regulation controller no Regulering
-regulation_back controller no Reguleringsliste
-related_delegates controller no Delegater
remove controller no Fjern
-remove_from_workbench controller no Fjern fra mitt skrivebord
-remove_from_all_workbenches controller no Fjern fra alle
skrivebord
-remove_location controller no Fjern enhet fra leieobjektet
-controller_composite controller no Leieobjekt
controller controller no Kontroll
-rented_area controller no Utleid areal
-rented_area_not_numeric controller no Areal må være et tall
reports controller no Rapporter
-reset_price_item controller no Hent verdier fra prisboken
reset controller no Nullstill
-reskontro controller no Reskontro
responsibility controller no Ansvar
responsibility_id controller no Ansvar
Responsibility id must be 6 characters. controller no Ansvar
må være seks tegn.
responsibility_id_not_numeric controller no Ansvar må være et tall
-result_unit_back controller no Resultatsliste
-result_unit controller no Resultatsenhet
-result_unit_number controller no Resultatsenhet
-Run controller no Kjørt
-run by controller no Utført av
room controller no Rom
running controller no Løpende
save controller no Lagre
-save_setup controller no Lagre oppsett på forsiden
search_for controller no Søk etter
search_options controller no Søkevalg
search controller no Søk
@@ -527,105 +175,47 @@
second_quarter controller no 2. kvartal
section controller no Seksjon
security controller no Sikkerhet
-security_amount controller no Sikkerhetsbeløp
-security_amount_not_numeric controller no Sikkerhetsbeløp må være
et tall
select_all_options controller no <Alle$gt;
select_date controller no Velg dato
select_date_valid_year controller no Vennligst velg et gyldig år
-selected_composites controller no Valgte leieobjekter
-selected_parties controller no Valgte kontraktsparter
-selected_price_items controller no Valgte priselementer
-serial controller no Løpenummer
-serial start controller no Start - ordrenummerserie
-serial stop controller no Slutt - ordrenummerserie
service controller no Tjeneste
service_id controller no Tjeneste
Service id must be 5 characters. controller no Tjeneste må
være fem tegn.
service_id_not_numeric controller no Tjeneste må være et tall
service_exist controller no Eksisterer
-set_payer controller no Sett som fakturamottaker
shortcuts controller no Snarveier
-show_affected_contracts controller no Vis kontrakter relatert
til reguleringen
-show_move_in_reports controller no Vis jasperreport for
innflyttingsmelding
-show_move_out_reports controller no Vis jasperreport for
utflyttingsmelding
-show_in_out_move_reports controller no Vis jasperreports for
inn- og utflyttingsmeldinger
-showing_composite controller no Leieobjekt
-showing_contract controller no Kontrakt
-showing controller no Viser priselement
show controller no Vis
shows_from controller no Viser fra
-ssn controller no Fødselsnummer
started controller no Startet
status_before controller no før
status_date controller no den
status_unknown controller no Ukjent status
status controller no Status
Success controller no Suksess
-success_create_user_based_on_email controller no En brukerkonto
ble opprettet og en e-post ble sendt til brukeren
sum controller no Sum
-sync controller no Synkroniser
-sync_identifier controller no Kun identifikator
-sync_menu controller no Synkronisering
-sync_message controller no Melding
-sync_org_unit controller no Eksisterende kobling
-sync_resp_and_service controller no Ansvar
-sync_res_units controller no Gammelt resultatenhetsnummer
-sync_parties controller no Synkronisér kontraktsparter mot
Fellesdata
-sync_parties_service_and_responsibiity controller no Synkronisering:
Ansvar (Kontrakt)
-sync_parties_result_unit_number controller no Synkronisering:
Resultatenhetsnummer (Kontraktspart)
-sync_parties_identifier controller no Synkronisering:
Identifikator
-sync_parties_fellesdata_id controller no Synkronisering:
Organisasjonsidentifikator
-syncronize_party controller no Synkroniser kontraktspart
-System setting for project id can not be more than 6 characters.
controller no Systeminnstilling for prosjektnummer kan ikke være mer
enn seks tegn.
System setting for responsibility id for the current user must be 6
characters. controller no Systeminnstilling for ansvar må være
seks tegn.
target_me controller no Meg selv
target_none controller no Ingen
-terminated_contract controller no Under opphør
-terminated_contracts controller no Opphørte kontrakter
-the period has been billed before. controller no Denne
kontrakttypen med denne faktureringsterminen har allerede blitt fakturert for
denne perioden.
-thousands separator controller no Skilletegn for tusen
third_quarter controller no 3. kvartal
t_functions controller no Funksjoner
title controller no Tittel
-t_new_composite controller no Opprett nytt leieobjekt
-t_new_contract controller no Ny kontrakt
-t_new_party controller no Opprett ny kontraktspart
-t_new_price_item controller no Opprett nytt priselement
to controller no Til
to_the_top controller no Til toppen
-Total sum controller no Totalt beløp
-total_price controller no Total pris
-total_price_current_year controller no Pris i budsjettperiode
type controller no Type
-under_dismissal controller no Under oppsigelse
-under_planning controller no Under planlegging
units controller no Enheter
unit_id controller no Enhetsid
unit_name controller no Enhetsnavn
-unit_leader_name controller no Navn enhetsleder
-unit_no_of_delegates controller no Antall delegater
update controller no Oppdatér
upload controller no Last opp
url controller no Nettsted
-Unable to get a location code for the building. controller no
Klarte ikke å hente objektnummer for bygget.
username controller no Brukernavn
user_or_group controller no Bruker/Gruppe
-vacant controller no Ledig
-view_contract controller no Vis kontrakt
unable_to_connect_to_database controller no Problemer med å koble
til databasen.
unknown_user controller no Personen finnes ikke.
-user_found_in_Fellesdata controller no Personen finnes i
Fellesdata.
-user_not_in_fellesdata controller no Personen finnes ikke i
Fellesdata.
-user_found_in_PE controller no Personen er bruker av dette
systemet.
-warning_billing_date_between controller no Fakturastart må være
innenfor kontraktens datoer!
-warning_due_date_between controller no Opsjonsfrist må være
innenfor kontraktens datoer!
-warning_lacking_start_date controller no Kontrakten mangler
start-dato!
-warning_price_item_date_between controller no Priselementets
datoer må være innenfor kontraktens datoer!
weekly controller no Ukentlig
working_on controller no Kontrakter under arbeid
year controller no År
yes controller no Ja
-your_notifications controller no Dine varsler
control_items controller no Kontrollpunkt
Control_item controller no Kontrollpunkt
Procedure controller no Prosedyre
@@ -637,4 +227,4 @@
Procedure responsibility controller no Ansvarlig
Procedure description controller no Beskrivelse
Procedure reference controller no Referanse
-Procedure attachment controller no Vedlegg
+Procedure attachment controller no Vedlegg
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -50,16 +50,6 @@
'ix' => array(),
'uc' => array()
),
- 'controller_control_group' => array(
- 'fd' => array(
- 'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
- 'group_name' => array('type' =>
'varchar','precision' => '255','nullable' => false)
- ),
- 'pk' => array('id'),
- 'fk' => array(),
- 'ix' => array(),
- 'uc' => array()
- ),
'controller_check_item' => array(
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
@@ -91,9 +81,9 @@
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'title' => array('type' => 'varchar',
'precision' => 255, 'nullable' => False),
- 'purpose' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
+ 'purpose' => array('type' => 'text', 'nullable'
=> True),
'responsibility' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
- 'description' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
+ 'description' => array('type' => 'text',
'nullable' => True),
'reference' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True),
'attachment' => array('type' => 'varchar',
'precision' => 255, 'nullable' => True)
),
@@ -102,6 +92,17 @@
'ix' => array(),
'uc' => array()
),
+ 'controller_control_group' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
+ 'group_name' => array('type' =>
'varchar','precision' => '255','nullable' => false),
+ 'procedure_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'controller_control_area' => array(
'fd' => array(
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2011-09-20 06:36:18 UTC (rev 7657)
@@ -163,7 +163,7 @@
dl.proplist-col,
dl.form-col {
- width: 18em;
+/* width: 18em; */
float: left;
}
@@ -460,3 +460,8 @@
th.yui-dt-sortable div{
background:
url(../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png) repeat-x scroll
0pt -100px rgb(216, 216, 218);
}
+
+dd ol li {
+ list-style: decimal;
+ list-style-position: inside;
+}
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/datatable.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/datatable.xsl
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/templates/base/datatable.xsl
2011-09-20 06:36:18 UTC (rev 7657)
@@ -90,8 +90,10 @@
oAC.itemSelectEvent.subscribe(itemSelectCallback);
}
-
YAHOO.util.Event.addBlurListener('filter_'+name+'_name', function() {
- if
(YAHOO.util.Dom.get('filter_'+name+'_name').value == "") {
+
YAHOO.util.Event.addBlurListener('filter_'+name+'_name', function()
+ {
+ if
(YAHOO.util.Dom.get('filter_'+name+'_name').value == "")
+ {
YAHOO.util.Dom.get('filter_'+name+'_id').value = "";
if
(onClearSelectionCallback) {
onClearSelectionCallback();
@@ -99,8 +101,10 @@
}
});
-
YAHOO.portico.addPreSerializeQueryFormListener(function(form) {
- if
(YAHOO.util.Dom.get('filter_'+name+'_name').value == "") {
+
YAHOO.portico.addPreSerializeQueryFormListener(function(form)
+ {
+ if
(YAHOO.util.Dom.get('filter_'+name+'_name').value == "")
+ {
YAHOO.util.Dom.get('filter_'+name+'_id').value = "";
}
});
@@ -196,6 +200,10 @@
</xsl:attribute>
<xsl:apply-templates select="toolbar"/>
</form>
+
+ <form id="update_table_dummy" method='POST' action='' >
+ </form>
+
</xsl:template>
<xsl:template match="datatable">
@@ -235,5 +243,15 @@
</xsl:for-each>
];
}
+
+ <xsl:choose>
+ <xsl:when test="//actions != ''">
+ var actions = <xsl:value-of select="//actions"
disable-output-escaping="yes" />;
+ </xsl:when>
+ <xsl:otherwise>
+ var actions = new Array();
+ </xsl:otherwise>
+ </xsl:choose>
+
</script>
</xsl:template>
Copied:
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
(from rev 7656, trunk/controller/templates/base/example_separate_tabs.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/example_separate_tabs.xsl
2011-09-20 06:36:18 UTC (rev 7657)
@@ -0,0 +1,25 @@
+<!-- separate tabs and inline tables-->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+
+ <div id="content">
+ <h4><xsl:value-of select="php:function('lang', 'Documents')"
/></h4>
+ <div id="documents_container"/>
+ <a class='button'>
+ <xsl:attribute name="href"><xsl:value-of
select="resource/add_document_link"/></xsl:attribute>
+ <xsl:if test="resource/permission/write">
+ <xsl:value-of select="php:function('lang', 'Add
Document')" />
+ </xsl:if>
+ </a>
+ <h4><xsl:value-of select="php:function('lang', 'Permissions')"
/></h4>
+ <div id="permissions_container"/>
+ </div>
+
+<script type="text/javascript">
+var resource_id = <xsl:value-of select="resource/id"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role')"/>;
+</script>
+
+</xsl:template>
+
Deleted: branches/Version-1_0-branch/controller/templates/base/procedure.php
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/procedure.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/templates/base/procedure.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -1,62 +0,0 @@
-<?php
- //include common logic for all templates
- include("common.php");
-?>
-
-<div class="identifier-header">
-<h1><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/32x32/actions/go-home.png" /> <?php echo lang('Procedure') ?></h1>
-</div>
-
-<div class="yui-content">
- <div id="details">
- <form action="#" method="post">
- <input type="hidden" name="id" value="<?php
if(!empty($procedure)){ echo $procedure->get_id(); } else { echo '0'; } ?>"/>
- <dl class="proplist-col">
- <dt>
- <label for="title"><?php echo
lang('Title') ?></label>
- </dt>
- <dd>
- <input type="text" name="title"
id="title" value="" />
- </dd>
- <dt>
- <label for="purpose"><?php echo
lang('Purpose') ?></label>
- </dt>
- <dd>
- <textarea id="purpose" rows="5"
cols="60"></textarea>
- </dd>
- <dt>
- <label
for="responsibility"><?php echo lang('Responsibility') ?></label>
- </dt>
- <dd>
- <textarea id="responsibility"
rows="5" cols="60"></textarea>
- </dd>
- <dt>
- <label for="description"><?php
echo lang('Description') ?></label>
- </dt>
- <dd>
- <textarea id="description"
rows="5" cols="60"></textarea>
- </dd>
- <dt>
- <label for="reference"><?php
echo lang('Reference')?></label>
- </dt>
- <dd>
- <input type="text"
name="reference" id="reference" value="" />
- </dd>
- <dt>
- <label for="attachment"><?php echo
lang('Attachment')?></label>
- </dt>
- <dd>
- <input type="text"
name="attachment" id="attachment" value="" />
- </dd>
- </dl>
-
- <div class="form-buttons">
- <?php
- echo '<input type="submit"
name="save_procedure" value="' . lang('save') . '"/>';
- ?>
- </div>
-
- </form>
-
- </div>
-</div>
\ No newline at end of file
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/templates/base/procedure_item.xsl
2011-09-20 06:36:18 UTC (rev 7657)
@@ -34,10 +34,10 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea id="purpose"
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose"
/></textarea>
+ <textarea id="purpose"
name="purpose" rows="5" cols="60"><xsl:value-of select="procedure/purpose"
disable-output-escaping="yes"/></textarea>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/purpose" />
+ <xsl:value-of
select="procedure/purpose" disable-output-escaping="yes"/>
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -60,10 +60,10 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="procedure/description" /></textarea>
+ <textarea
id="description" name="description" rows="5" cols="60"><xsl:value-of
select="procedure/description" disable-output-escaping="yes"/></textarea>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="procedure/description" />
+ <xsl:value-of
select="procedure/description" disable-output-escaping="yes"/>
</xsl:otherwise>
</xsl:choose>
</dd>
Deleted:
branches/Version-1_0-branch/controller/templates/base/procedure_list.php
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/procedure_list.php
2011-09-20 06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/controller/templates/base/procedure_list.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -1,41 +0,0 @@
-<?php
- include("common.php");
-?>
-
-<script>
-
- YAHOO.util.Event.addListener(
- 'ctrl_add_controller_procedure',
- 'click',
- function(e)
- {
- YAHOO.util.Event.stopEvent(e);
- window.location =
'index.php?menuaction=controller.uiprocedure.add';
- }
-);
-</script>
-
-<h1><img src="<?php echo RENTAL_TEMPLATE_PATH ?>images/32x32/go-home.png" />
<?php echo lang('rc') ?></h1>
-
-
-<fieldset>
- <!-- Create new precedure -->
- <h3><?php echo lang('t_new_procedure') ?></h3>
- <input type="submit" name="ctrl_add_controller_procedure"
id="ctrl_add_controller_procedure" value="<?php echo lang('f_new_procedure')
?>" />
-</fieldset>
-
-<?php
-/* TODO: Fix column selector:
-<fieldset>
- <!-- Select table columns -->
- <h3><?php echo lang('t_functions') ?></h3>
- <input type="button" id="dt-options-link" name="dt-options-link"
value="<?php echo lang('f_select_columns') ?>" />
-</fieldset>
-*/
-?>
-<?php
-$list_form = true;
-$list_id = 'all_procedures';
-$url_add_on = '&type=all_procedures';
-include('procedure_list_partial.php');
-?>
\ No newline at end of file
Deleted:
branches/Version-1_0-branch/controller/templates/base/procedure_list_partial.php
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/procedure_list_partial.php
2011-09-20 06:33:23 UTC (rev 7656)
+++
branches/Version-1_0-branch/controller/templates/base/procedure_list_partial.php
2011-09-20 06:36:18 UTC (rev 7657)
@@ -1,135 +0,0 @@
-<?php
- $config = CreateObject('phpgwapi.config','controller');
- $config->read();
-?>
-
-<script type="text/javascript">
-
-//Add listener resetting form: redirects browser to call index again
- YAHOO.util.Event.addListener(
- 'ctrl_reset_button',
- 'click',
- function(e)
- {
- YAHOO.util.Event.stopEvent(e);
- window.location =
'index.php?menuaction=rental.uiprocedure.index';
- }
- );
-
- // Defining columns for datatable
- var columnDefs = [{
- key: "id",
- label: "<?php echo lang('procedure_id') ?>",
- sortable: false,
- hidden: true
- },
- {
- key: "title",
- label: "<?php echo lang('title') ?>",
- sortable: true
- },
- {
- key: "actions",
- hidden: true
- },
- {
- key: "labels",
- hidden: true
- },
- {
- key: "ajax",
- hidden: true
- }];
-
- // Initiating the data source
- setDataSource(
-
'index.php?menuaction=controller.uiprocedure.query&phpgw_return_as=json<?php
echo $url_add_on; ?>&editable=<?php echo isset($editable) && $editable ?
"true" : "false"; ?>',
- columnDefs,
- '<?php echo $list_id ?>_form',
- ['<?php echo $list_id ?>_ctrl_search_query'],
- '<?php echo $list_id ?>_container',
- '<?php echo $list_id ?>_paginator',
- '<?php echo $list_id ?>',
- new Array(<?php
- if(isset($related)){
- $tot_related = count($related);
- $count_related = 0;
- foreach($related as $r){
- $count_related++;
- echo "\"".$r."\"";
- if($count_related <
$tot_related){
- echo ",";
- }
- }
- }
- ?>),
- '<?php echo isset($editor_action) ? $editor_action : '' ?>'
- );
-<!--
- function composite_export(compType) {
- var availabilityselect = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_active_rental_composites');
- var availabilityoption =
availabilityselect.options[availabilityselect.selectedIndex].value;
-
- var furnished_select = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_furnished_status_rental_composites');
- var furnished_status_id =
furnished_select.options[furnished_select.selectedIndex].value;
-
- var query = document.getElementById('<?php echo $list_id
?>_ctrl_search_query').value;
-
- var sSelect = document.getElementById('<?php echo $list_id
?>_ctrl_search_option');
- var sOption = sSelect.options[sSelect.selectedIndex].value;
-
- window.location = 'index.php?menuaction=rental.uicomposite.download'+
- '<?php echo $url_add_on ?>'+
- '&furnished_status='+furnished_status_id+
- '&is_active='+availabilityoption+
- '&type='+compType+
- '&query='+query+
- '&search_option='+sOption+
- '&export=true';
- }
--->
-</script>
-
-<?php
- if($list_form)
- {
-?>
-<form id="<?php echo $list_id ?>_form" method="GET">
-<?php
- $populate = phpgw::get_var('populate_form');
- //Avoid Notices
- $q = false;
- $s_type = false;
- $status = false;
- $status_contract = false;
- if(isset($populate))
- {
- $q = phpgwapi_cache::session_get('controller',
'procedure_query');
- $s_type = phpgwapi_cache::session_get('controller',
'procedure_search_type');
- $status = phpgwapi_cache::session_get('controller',
'procedure_status');
- }
-?>
- <fieldset>
- <!-- Search -->
- <h3><?php echo lang('search_options') ?></h3>
- <label for="ctrl_search_query"><?php echo lang('search_for')
?></label>
- <input id="<?php echo $list_id ?>_ctrl_search_query"
type="text" name="query" autocomplete="off" value="<?php echo isset($q) ? $q :
''?>"/>
- <input type="submit" id="ctrl_search_button" value="<?php echo
lang('search') ?>" />
- <input type="button" id="ctrl_reset_button" value="<?php echo
lang('reset') ?>" />
- </fieldset>
-</form>
-<?php
- } // end if($list_form)
-?>
-<fieldset>
- <h3><?php echo lang('export_to') ?></h3>
- <?php
- $export_format =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['export_format'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['export_format']
? $GLOBALS['phpgw_info']['user']['preferences']['property']['export_format'] :
'csv';
- ?>
- <div id="export">
- <a href="javascript:composite_export('<?php echo $list_id ?>')"
title="<?php echo lang('Download as %1', $export_format) ?>"><img src="<?php
echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-spreadsheet.png"/></a>
- </div>
-</fieldset>
-
-<div id="<?php echo $list_id ?>_paginator" class="paginator"></div>
-<div id="<?php echo $list_id ?>_container" class="datatable_container"></div>
Modified: branches/Version-1_0-branch/demo/templates/base/images/navbar.png
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php 2011-09-20
06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php 2011-09-20
06:36:18 UTC (rev 7657)
@@ -286,7 +286,8 @@
. lang('line') . ': ' . $err->line .
"</p>\n"
. $trace;
- phpgwapi_cache::message_set($message, 'error');
+ echo $message;
+ // phpgwapi_cache::message_set($message, 'error');
if ( isset($GLOBALS['phpgw']->common) &&
is_object($GLOBALS['phpgw']->common) )
{
Modified: branches/Version-1_0-branch/property/js/yahoo/property.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/property.js 2011-09-20
06:33:23 UTC (rev 7656)
+++ branches/Version-1_0-branch/property/js/yahoo/property.js 2011-09-20
06:36:18 UTC (rev 7657)
@@ -910,9 +910,9 @@
generateRequest
: buildQueryString,
dynamicData
: true,
sortedBy
: {key:values_ds.sort,
dir:values_ds.dir/*dir:YAHOO.widget.DataTable.CLASS_DESC*/},
- paginator
: myPaginator,
- width
: "100%",
- height
: tableHeight //"30em",
+ paginator
: myPaginator
+ // width
: "100%",
+ // height
: tableHeight //"30em",
};
//Create DataTable ; Second call JSON (GET)
// myDataTable = new YAHOO.widget.DataTable(container[0],
myColumnDefs, myDataSource, myTableConfig);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7657] Merge 7637:7656 from trunk,
Sigurd Nes <=