[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14073] rental: remove references to old template sty
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14073] rental: remove references to old template style |
|
Date: |
Wed, 30 Sep 2015 12:49:22 +0000 |
Revision: 14073
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14073
Author: sigurdne
Date: 2015-09-30 12:49:21 +0000 (Wed, 30 Sep 2015)
Log Message:
-----------
rental: remove references to old template style
Modified Paths:
--------------
branches/dev-syncromind/rental/inc/class.uiadjustment.inc.php
branches/dev-syncromind/rental/inc/class.uibilling.inc.php
branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
branches/dev-syncromind/rental/inc/class.uicontract.inc.php
branches/dev-syncromind/rental/inc/class.uidelegate.inc.php
branches/dev-syncromind/rental/inc/class.uidocument.inc.php
branches/dev-syncromind/rental/inc/class.uimakepdf.inc.php
branches/dev-syncromind/rental/inc/class.uinotification.inc.php
branches/dev-syncromind/rental/inc/class.uiparty.inc.php
branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
branches/dev-syncromind/rental/inc/class.uiunit.inc.php
Removed Paths:
-------------
branches/dev-syncromind/rental/templates/base/orphan_unit_list.php
Modified: branches/dev-syncromind/rental/inc/class.uiadjustment.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiadjustment.inc.php
2015-09-30 10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uiadjustment.inc.php
2015-09-30 12:49:21 UTC (rev 14073)
@@ -304,7 +304,7 @@
if(!$adjustment->has_permission(PHPGW_ACL_EDIT))
{
unset($adjustment);
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit_adjustment')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit_adjustment'));
}
}
else
@@ -388,7 +388,7 @@
if(!($adjustment &&
$adjustment->has_permission(PHPGW_ACL_EDIT)))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit_adjustment')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit_adjustment'));
}
}
else
@@ -401,7 +401,7 @@
}
else
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_adjustment')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_new_adjustment'));
}
}
@@ -468,7 +468,7 @@
*/
public function view()
{
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_view_adjustment')));
+ phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_view_adjustment'));
}
public function delete()
Modified: branches/dev-syncromind/rental/inc/class.uibilling.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uibilling.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uibilling.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -126,8 +126,7 @@
{
if(!$this->hasPermissionOn($names['location'],PHPGW_ACL_ADD))
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
}
@@ -767,8 +766,7 @@
{
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp']);
}
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('invoice_run');
@@ -993,8 +991,7 @@
{
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$billing_job =
rental_sobilling::get_instance()->get_single((int)phpgw::get_var('id'));
$billing_job->set_deleted(true);
@@ -1041,8 +1038,7 @@
{
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$billing_job =
rental_sobilling::get_instance()->get_single((int)phpgw::get_var('id'));
$billing_job->set_timestamp_commit(time());
@@ -1065,8 +1061,7 @@
{
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{
@@ -1190,8 +1185,7 @@
{
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
//$browser = CreateObject('phpgwapi.browser');
//$browser->content_header('export.txt','text/plain');
Modified: branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
2015-09-30 10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
2015-09-30 12:49:21 UTC (rev 14073)
@@ -20,7 +20,6 @@
'add' => true,
'add_unit' => true,
'remove_unit' => true,
- 'orphan_units' => true,
'query' => true,
'download' => true
);
@@ -278,7 +277,6 @@
return $this->jquery_results($result_data);
- //return $this->yui_results($result_data,
'total_records', 'results');
}
/**
@@ -581,7 +579,7 @@
}
else
{
-
$this->render('permission_denied.php',array('error' =>
lang('invalid_request')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('invalid_request'));
}
if(isset($composite) &&
$composite->has_permission(PHPGW_ACL_READ))
@@ -590,7 +588,7 @@
}
else
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_view_composite')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_view_composite'));
}
}
@@ -608,7 +606,7 @@
{
if(!($this->isExecutiveOfficer() ||
$this->isAdministrator()))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit'));
}
}
@@ -930,7 +928,7 @@
{
if(!($this->isExecutiveOfficer() ||
$this->isAdministrator()))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit'));
}
$composite_id = (int)phpgw::get_var('id');
@@ -982,8 +980,7 @@
{
if(!($this->isExecutiveOfficer() ||
$this->isAdministrator()))
{
- $this->render('permission_denied.php',
array('message' => lang('permission_denied')));
- return;
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied'));
}
$composite_id = (int)phpgw::get_var('composite_id');
@@ -1017,8 +1014,7 @@
{
if(!($this->isExecutiveOfficer() ||
$this->isAdministrator()))
{
- $this->render('permission_denied.php',
array('message' => lang('permission_denied')));
- return;
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied'));
}
$unit_ids = phpgw::get_var('ids');
@@ -1040,30 +1036,6 @@
}
/**
- * Get a list of rental units or areas that are not tied to any
rental composite
- *
- */
- public function orphan_units()
- {
- if(!$this->isExecutiveOfficer())
- {
- $this->render('permission_denied.php',
array('message' => lang('permission_denied')));
- return;
- }
-
-
self::set_active_menu('rental::composites::orphan_units');
-
- $data = array
- (
- 'message' => phpgw::get_var('message'),
- 'error' => phpgw::get_var('error'),
- 'cancel_link' => self::link(array('menuaction'
=> 'rental.uicomposite.orphan_units'))
- );
-
- $this->render('orphan_unit_list.php', $data);
- }
-
- /**
* Stores which columns that should be displayed in index().
The data
* is stored per user.
*
@@ -1080,4 +1052,3 @@
}
}
}
-?>
Modified: branches/dev-syncromind/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -1232,7 +1232,7 @@
if(!($contract &&
$contract->has_permission(PHPGW_ACL_EDIT)))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit_contract')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit_contract'));
}
// Gets responsibility area from db (ex:
eksternleie, internleie)
@@ -1391,7 +1391,7 @@
if(!($contract &&
$contract->has_permission(PHPGW_ACL_READ)))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_view_contract')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_view_contract'));
}
$created = date($this->dateFormat,
$contract->get_last_updated());
$created_by = $contract->get_last_edited_by();
@@ -1648,7 +1648,7 @@
if(!($contract &&
$contract->has_permission(PHPGW_ACL_EDIT)))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit_contract')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit_contract'));
}
$created = date($this->dateFormat,
$contract->get_last_updated());
$created_by = $contract->get_last_edited_by();
@@ -1669,8 +1669,7 @@
}
else
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_contract')));
- return;
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_new_contract'));
}
}
@@ -2155,7 +2154,7 @@
}
// If no executive officer
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_contract')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_new_contract'));
}
/**
@@ -2207,7 +2206,7 @@
}
// If no executive officer
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_contract')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_new_contract'));
}
/**
@@ -2496,12 +2495,18 @@
return $this->jquery_results($result_data);
}
- public function get_max_area(){
+ /**
+ * Note: Used?
+ * @return array
+ */
+ public function get_max_area()
+ {
+ $draw = phpgw::get_var('draw', 'int');
$contract_id = (int)phpgw::get_var('contract_id');
$total_price =
rental_socontract_price_item::get_instance()->get_max_area($contract_id);
$result_array = array('max_area' => $max_area);
- $result_data = array('results' => $result_array,
'total_records' => 1);
- return $this->yui_results($result_data,
'total_records', 'results');
+ $result_data = array('results' => $result_array,
'total_records' => 1, 'draw' => $draw);
+ return $this->jquery_results($result_data,
'total_records', 'results');
}
Modified: branches/dev-syncromind/rental/inc/class.uidelegate.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uidelegate.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uidelegate.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -50,8 +50,9 @@
return $this->jquery_results($result_data);
}
- public function index(){
- $this->render('delegate_list.php');
+ public function index()
+ {
+ /*nothing...*/
}
public function add_actions(&$value, $key, $params)
Modified: branches/dev-syncromind/rental/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uidocument.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uidocument.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -92,15 +92,7 @@
}
}
- //$editable = phpgw::get_var('editable') == '1' ? true
: false;
- //Add context menu columns (actions and labels)
- //array_walk($rows, array($this, 'add_actions'),
array($type, isset($contract) ? $contract->has_permission(PHPGW_ACL_EDIT) :
false, $this->type_of_user, $editable));
-
- //Build a YUI result from the data
- /*$result_data = array('results' => $rows,
'total_records' => $result_count);
- return $this->yui_results($result_data,
'total_records', 'results');*/
-
$result_data = array('results' => $rows);
$result_data['total_records'] = $result_count;
$result_data['draw'] = $draw;
@@ -284,8 +276,7 @@
if(!$this->check_permissions($document,$document_properties))
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$result =
rental_sodocument::get_instance()->delete_document_from_vfs
Modified: branches/dev-syncromind/rental/inc/class.uimakepdf.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uimakepdf.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uimakepdf.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -22,279 +22,34 @@
class rental_uimakepdf extends rental_uicommon
{
- private $pdf_templates = array();
+
+ private $pdf_templates = array();
public $public_functions = array
- (
- 'add' => true,
- 'add_from_composite' => true,
- 'copy_contract' => true,
- 'edit' => true,
- 'index' => true,
- 'query' => true,
- 'view' => true,
- 'add_party' => true,
- 'remove_party' => true,
- 'add_composite' => true,
- 'remove_composite' => true,
- 'set_payer' => true,
- 'add_price_item' => true,
- 'remove_price_item' => true,
- 'reset_price_item' => true,
- 'download' => true,
- 'get_total_price' => true,
- 'makePDF' => true
+ (
+ 'index' => true,
+ 'view' => true,
+ 'makePDF' => true
);
public function __construct()
{
parent::__construct();
self::set_active_menu('rental::contracts');
- $GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('contracts');
+ $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('contracts');
}
public function query()
{
-
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
- {
- $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- }
- else {
- $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');
- $sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
- // Form variables
- $search_for = phpgw::get_var('query');
- $search_type = phpgw::get_var('search_option');
- // Create an empty result set
- $result_objects = array();
- $result_count = 0;
-
- $exp_param = phpgw::get_var('export');
- $export = false;
- if(isset($exp_param)){
- $export=true;
- $num_of_objects = null;
- }
-
- $type = phpgw::get_var('type');
- switch($type)
- {
- case 'contracts_for_adjustment':
- $adjustment_id =
(int)phpgw::get_var('id');
- $adjustment =
rental_soadjustment::get_instance()->get_single($adjustment_id);
- $filters = array('contract_type' =>
$adjustment->get_responsibility_id(), 'adjustment_interval' =>
$adjustment->get_interval(), 'adjustment_year' => $adjustment->get_year(),
'adjustment_is_executed' => $adjustment->is_executed());
- break;
- case 'contracts_part':
// Contracts for this party
- $filters = array('party_id' =>
phpgw::get_var('party_id'),'contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('status_date_hidden'));
- break;
- case 'contracts_for_executive_officer':
// Contracts for this executive officer
- $filters = array('executive_officer' =>
$GLOBALS['phpgw_info']['user']['account_id']);
- break;
- case 'ending_contracts':
- case 'ended_contracts':
- case 'last_edited':
- case 'closing_due_date':
- case 'terminated_contracts':
- // Queries that depend on areas of
responsibility
- $types =
rental_socontract::get_instance()->get_fields_of_responsibility();
- $ids = array();
- $read_access = array();
- foreach($types as $id => $label)
- {
- $names =
$this->locations->get_name($id);
- if($names['appname'] ==
$GLOBALS['phpgw_info']['flags']['currentapp'])
- {
-
if($this->hasPermissionOn($names['location'],PHPGW_ACL_ADD))
- {
- $ids[] = $id;
- }
- else
- {
- $read_access[]
= $id;
- }
- }
- }
-
-
- if(count($ids) > 0)
- {
- $comma_seperated_ids =
implode(',',$ids);
- }
- else
- {
- $comma_seperated_ids =
implode(',',$read_access);
- }
-
- switch($type)
- {
- case 'ending_contracts':
// Contracts that are about to end in areas of responsibility
- $filters =
array('contract_status' => 'under_dismissal', 'contract_type' =>
$comma_seperated_ids);
- break;
- case 'ended_contracts':
// Contracts that are ended in areas of responsibility
- $filters =
array('contract_status' => 'ended', 'contract_type' => $comma_seperated_ids);
- break;
- case 'last_edited':
// Contracts that are last edited in areas of resposibility
- $filters =
array('contract_type' => $comma_seperated_ids);
- $sort_field =
'contract.last_updated';
- $sort_ascending = false;
- break;
- case 'closing_due_date':
//Contracts closing due date in areas of responsibility
- $filters =
array('contract_status' => 'closing_due_date', 'contract_type' =>
$comma_seperated_ids);
- break;
- case 'terminated_contracts':
- $filters =
array('contract_status' => 'terminated_contracts', 'contract_type' =>
$comma_seperated_ids);
- break;
- }
-
- break;
- case 'contracts_for_composite': // ... all
contracts this composite is involved in, filters (status and date)
- $filters = array('composite_id' =>
phpgw::get_var('composite_id'),'contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('date_status_hidden'));
- break;
- case 'get_contract_warnings': //get the
contract warnings
- $contract =
rental_socontract::get_instance()->get_single(phpgw::get_var('contract_id'));
- $contract->check_consistency();
- $rows =
$contract->get_consistency_warnings();
- $result_count = count($rows);
- $export=true;
- break;
- case 'all_contracts':
- default:
- phpgwapi_cache::session_set('rental',
'contract_query', $search_for);
- phpgwapi_cache::session_set('rental',
'contract_search_type', $search_type);
- phpgwapi_cache::session_set('rental',
'contract_status', phpgw::get_var('contract_status'));
- phpgwapi_cache::session_set('rental',
'contract_status_date', phpgw::get_var('date_status'));
- phpgwapi_cache::session_set('rental',
'contract_type', phpgw::get_var('contract_type'));
- $filters = array('contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('date_status_hidden'));
- }
- if($type != 'get_contract_warnings'){
- $result_objects =
rental_socontract::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
- $result_count =
rental_socontract::get_instance()->get_count($search_for, $search_type,
$filters);
-
-
- //Serialize the contracts found
- $rows = array();
- foreach ($result_objects as $result) {
- if(isset($result))
- {
- $rows[] = $result->serialize();
- }
- }
- //var_dump("Usage " .memory_get_usage() . "
bytes after serializing");
- }
-
- if(!$export){
- //Add context menu columns (actions and labels)
- array_walk($rows, array($this, 'add_actions'),
array($type,$ids,$adjustment_id));
- }
- //var_dump("Usage " .memory_get_usage() . " bytes after
menu");
-
-
- //Build a YUI result from the data
- $result_data = array('results' => $rows,
'total_records' => $result_count);
- return $this->yui_results($result_data,
'total_records', 'results');
- }
- /**
- * Add data for context menu
- *
- * @param $value pointer to
- * @param $key ?
- * @param $params [type of query, editable]
- */
- public function add_actions(&$value, $key, $params)
- {
- $value['ajax'] = array();
- $value['actions'] = array();
- $value['labels'] = array();
-
- $type = $params[0];
- $ids = $params[1];
- $adjustment_id = $params[2];
-
- switch($type)
- {
- case 'last_edited_by':
- case 'contracts_for_executive_officer':
- case 'ending_contracts':
- case 'ended_contracts':
- case 'closing_due_date':
- case 'terminated_contracts':
- if(count($ids) > 0)
- {
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.edit',
'id' => $value['id'], 'initial_load' => 'no')));
- $value['labels'][] =
lang('edit_contract');
- }
- else
- {
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
'id' => $value['id'], 'initial_load' => 'no')));
- $value['labels'][] =
lang('show');
- }
- break;
- case 'contracts_for_adjustment':
- if(!isset($ids) || count($ids) > 0)
- {
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.edit',
-
'id' => $value['id'],
-
'initial_load' => 'no',
-
'adjustment_id' => $adjustment_id)));
- $value['labels'][] =
lang('edit');
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uicontract.copy_contract',
-
'id' => $value['id'],
-
'adjustment_id' => $adjustment_id)));
- $value['labels'][] =
lang('copy');
- }
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
-
'id' => $value['id'],
-
'initial_load' => 'no',
-
'adjustment_id' => $adjustment_id)));
- $value['labels'][] = lang('show');
-
-
-
- break;
- default:
- if(!isset($ids) || count($ids) > 0)
- {
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.edit',
'id' => $value['id'], 'initial_load' => 'no')));
- $value['labels'][] =
lang('edit');
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uicontract.copy_contract', 'id' => $value['id'])));
- $value['labels'][] =
lang('copy');
- }
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
'id' => $value['id'], 'initial_load' => 'no')));
- $value['labels'][] = lang('show');
- $value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
'id' => $value['id'], 'initial_load' => 'no')));
- $value['labels'][] = lang('make_pdf');
- }
}
+
/**
* View a list of all contracts
*/
public function index()
{
- $search_for = phpgw::get_var('search_for');
- if($search_for)
- {
- phpgwapi_cache::session_set('rental',
'contract_query', $search_for);
- phpgwapi_cache::session_set('rental',
'contract_search_type', phpgw::get_var('search_type'));
- phpgwapi_cache::session_set('rental',
'contract_status', phpgw::get_var('contract_status'));
- phpgwapi_cache::session_set('rental',
'contract_status_date', phpgw::get_var('date_status'));
- phpgwapi_cache::session_set('rental',
'contract_type', phpgw::get_var('contract_type'));
- }
- $this->render('contract_list.php');
+ self::redirect(array('menuaction' =>
'rental.uicontract.index'));
}
/**
@@ -305,117 +60,100 @@
*/
public function viewedit($editable, $contract_id, $contract =
null, $location_id = null, $notification = null, string $message = null, string
$error = null)
{
-
- $cancel_link = self::link(array('menuaction' =>
'rental.uicontract.index', 'populate_form' => 'yes'));
- $adjustment_id = (int)phpgw::get_var('adjustment_id');
- if($adjustment_id){
- $cancel_link = self::link(array('menuaction' =>
'rental.uiadjustment.show_affected_contracts','id' => $adjustment_id));
+
+ $cancel_link = self::link(array('menuaction' =>
'rental.uicontract.index', 'populate_form' => 'yes'));
+ $adjustment_id = (int)phpgw::get_var('adjustment_id');
+ if($adjustment_id)
+ {
+ $cancel_link = self::link(array('menuaction' =>
'rental.uiadjustment.show_affected_contracts',
+ 'id' => $adjustment_id));
$cancel_text = 'contract_regulation_back';
}
-
-
- if (isset($contract_id) && $contract_id > 0) {
- if($contract == null){
+
+
+ if(isset($contract_id) && $contract_id > 0)
+ {
+ if($contract == null)
+ {
$contract =
rental_socontract::get_instance()->get_single($contract_id);
}
- if ($contract) {
-
+ if($contract)
+ {
+
if($editable &&
!$contract->has_permission(PHPGW_ACL_EDIT))
{
$editable = false;
- $error .=
'<br/>'.lang('permission_denied_edit_contract');
+ $error .= '<br/>' .
lang('permission_denied_edit_contract');
}
-
+
if(!$editable &&
!$contract->has_permission(PHPGW_ACL_READ))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_view_contract')));
- return;
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_view_contract'));
}
-
- $parties =
rental_soparty::get_instance()->get(null, null, null, null, null, null,
array('contract_id' => $contract->get_id()));
- $party = reset($parties); //
-
+
+ $parties =
rental_soparty::get_instance()->get(null, null, null, null, null, null, array(
+ 'contract_id' =>
$contract->get_id()));
+ $party = reset($parties); //
+
$contract_dates =
$contract->get_contract_date();
-
- $composites =
rental_socomposite::get_instance()->get(null, null, null, null, null, null,
array('contract_id' => $contract->get_id()));
- $composite = reset($composites);
-
+
+ $composites =
rental_socomposite::get_instance()->get(null, null, null, null, null, null,
array(
+ 'contract_id' =>
$contract->get_id()));
+ $composite = reset($composites);
+
$units = $composite->get_units();
-
-
- $price_items =
rental_socontract_price_item::get_instance()->get(null, null, null, null, null,
null, array('contract_id' => $contract->get_id()));
- $months =
rental_socontract::get_instance()->get_months_in_term($contract->get_term_id());
-
-
-
- $one_time_price_items = array();
- $termin_price_items = array();
-
- foreach ($price_items as $item){
- if($item->is_one_time()){
+
+
+ $price_items =
rental_socontract_price_item::get_instance()->get(null, null, null, null, null,
null, array(
+ 'contract_id' =>
$contract->get_id()));
+ $months =
rental_socontract::get_instance()->get_months_in_term($contract->get_term_id());
+
+
+
+ $one_time_price_items = array();
+ $termin_price_items =
array();
+
+ foreach($price_items as $item)
+ {
+ if($item->is_one_time())
+ {
array_push($one_time_price_items, $item);
- }else{
+ }
+ else
+ {
array_push($termin_price_items, $item);
}
}
-
+
$data = array
- (
- 'contract' => $contract,
- 'months' => $months,
- 'contract_party' => $party,
- 'contract_dates' =>
$contract_dates,
- 'composite' => $composite,
- 'units' => $units,
- 'price_items' =>$price_items,
- 'one_time_price_items' =>
$one_time_price_items,
- 'termin_price_items' =>
$termin_price_items,
- 'notification' => $notification,
- 'editable' => $editable,
- 'message' => isset($message) ?
$message : phpgw::get_var('message'),
- 'error' => isset($error) ?
$error : phpgw::get_var('error'),
- 'cancel_link' => $cancel_link,
- 'cancel_text' => $cancel_text
-
+ (
+ 'contract'
=> $contract,
+ 'months'
=> $months,
+ 'contract_party'
=> $party,
+ 'contract_dates'
=> $contract_dates,
+ 'composite'
=> $composite,
+ 'units'
=> $units,
+ 'price_items'
=> $price_items,
+ 'one_time_price_items' =>
$one_time_price_items,
+ 'termin_price_items' =>
$termin_price_items,
+ 'notification'
=> $notification,
+ 'editable'
=> $editable,
+ 'message'
=> isset($message) ? $message : phpgw::get_var('message'),
+ 'error'
=> isset($error) ? $error : phpgw::get_var('error'),
+ 'cancel_link'
=> $cancel_link,
+ 'cancel_text'
=> $cancel_text
);
$contract->check_consistency();
-
-
-
+
$this->get_pdf_templates();
- $template_file =
'pdf/'.$this->pdf_templates[$_GET[pdf_template]][1];
+ $template_file = 'pdf/' .
$this->pdf_templates[$_GET[pdf_template]][1];
$this->render($template_file, $data);
-
}
}
else
{
- if($this->isAdministrator() ||
$this->isExecutiveOfficer()){
- if(!isset($contract)){
- $contract = new
rental_contract();
- $fields =
rental_socontract::get_instance()->get_fields_of_responsibility();
-
$contract->set_location_id($location_id);
-
$contract->set_contract_type_title($fields[$location_id]);
- }
- if ($contract) {
- $data = array
- (
- 'contract' =>
$contract,
- 'notification' =>
$notification,
- 'editable' => true,
- 'message' =>
isset($message) ? $message : phpgw::get_var('message'),
- 'error' =>
isset($error) ? $error : phpgw::get_var('error'),
- 'cancel_link' =>
$cancel_link,
- 'cancel_text' =>
$cancel_text
- );
- $this->render('contract.php',
$data);
- }
- }
- else
- {
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_contract')));
- return;
- }
+ phpgwapi_cache::message_set('Missing
contract_id as input', 'error');
+ self::redirect(array('menuaction' =>
'rental.uicontract.index'));
}
}
@@ -424,104 +162,102 @@
*/
public function view()
{
- $GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('view');
+ $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('view');
$contract_id = (int)phpgw::get_var('id');
return $this->viewedit(false, $contract_id);
}
-
+
/**
* Make PDF of a contract
*/
public function makePDF()
- {
- $config = CreateObject('phpgwapi.config','rental');
+ {
+ $config =
CreateObject('phpgwapi.config', 'rental');
$config->read();
- $tmp_dir = $GLOBALS['phpgw_info']['server']['temp_dir'];
- $myFile = $tmp_dir .
"/temp_contract_".strtotime(date('Y-m-d')).".html";
- $fh = fopen($myFile, 'w') or die("can't open file");
- $stringData = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML
4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>';
+ $tmp_dir =
$GLOBALS['phpgw_info']['server']['temp_dir'];
+ $myFile =
$tmp_dir . "/temp_contract_" . strtotime(date('Y-m-d')) . ".html";
+ $fh
= fopen($myFile, 'w') or die("can't open file");
+ $stringData =
'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>';
fwrite($fh, $stringData);
- $stringData = '<html><head><meta
http-equiv="Content-Type" content="text/html;
charset=UTF-8"><title></title></head><body>';
+ $stringData =
'<html><head><meta http-equiv="Content-Type" content="text/html;
charset=UTF-8"><title></title></head><body>';
fwrite($fh, $stringData);
- $stringData = $_SESSION['contract_html'];
+ $stringData =
$_SESSION['contract_html'];
fwrite($fh, $stringData);
- $stringData = '</div></body></html>';
+ $stringData =
'</div></body></html>';
fwrite($fh, $stringData);
fclose($fh);
//echo $_SESSION['contract_html'];
- $_SESSION['contract_html'] = "";
-
- $pdf_file_name = $tmp_dir .
"/temp_contract_".strtotime(date('Y-m-d')).".pdf";
+ $_SESSION['contract_html'] = "";
+ $pdf_file_name = $tmp_dir . "/temp_contract_" .
strtotime(date('Y-m-d')) . ".pdf";
+
//var_dump($config->config_data['path_to_wkhtmltopdf']);
//var_dump($GLOBALS['phpgw_info']);
$wkhtmltopdf_executable =
$config->config_data['path_to_wkhtmltopdf'];
if(!is_file($wkhtmltopdf_executable))
{
- throw new Exception('wkhtmltopdf not configured
correctly');
+ throw new Exception('wkhtmltopdf not configured
correctly');
}
$snappy = new SnappyPdf();
//$snappy->setExecutable('/opt/portico/pe/rental/wkhtmltopdf-i386'); // or
whatever else
$snappy->setExecutable($wkhtmltopdf_executable); // or
whatever else
$snappy->save($myFile, $pdf_file_name);
-
+
$contract_id = phpgw::get_var('id');
-
+
if(!is_file($pdf_file_name))
{
- throw new Exception('pdf-file not produced');
+ throw new Exception('pdf-file not produced');
}
$this->savePDFToContract($pdf_file_name, $contract_id,
'Kontrakt');
}
-
/*
* Store a contract as PDF to VFS
* Add generated PDF to list of contract documents
*/
+
public function savePDFToContract($file, $contract_id, $title)
{
//Create a document object
$document = new rental_document();
$document->set_title($title);
-
$document->set_name("Kontrakt_".strtotime(date('Y-m-d')).".pdf");
+ $document->set_name("Kontrakt_" .
strtotime(date('Y-m-d')) . ".pdf");
$document->set_type_id(1);
$document->set_contract_id($contract_id);
$document->set_party_id(NULL);
-
-
+
+
//Retrieve the document properties
$document_properties =
$this->get_type_and_id($document);
-
+
// Move file from temporary storage to vfs
$result =
rental_sodocument::get_instance()->write_document_to_vfs
(
- $document_properties['document_type'],
- $file,
- $document_properties['id'],
- "Kontrakt_".strtotime(date('Y-m-d')).".pdf"
+ $document_properties['document_type'], $file,
$document_properties['id'], "Kontrakt_" . strtotime(date('Y-m-d')) . ".pdf"
);
-
+
if($result)
{
if(rental_sodocument::get_instance()->store($document))
{
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract_id, 'tab' => 'documents'));
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit',
+ 'id' => $contract_id, 'tab' =>
'documents'));
}
else
{
// Handle failure on storing document
- $this->redirect($document,
$document_properties,'','');
+ $this->redirect($document,
$document_properties, '', '');
}
}
else
{
//Handle vfs failure to store document
- $this->redirect($document,
$document_properties,'','');
+ $this->redirect($document,
$document_properties, '', '');
}
return false;
}
-
+
/**
* Utility method for finding out whether a document is bound
to a
* contract or a party.
@@ -534,490 +270,41 @@
$document_type;
$id;
$contract_id = $document->get_contract_id();
- $party_id = $document->get_party_id();
+ $party_id = $document->get_party_id();
if(isset($contract_id) && $contract_id > 0)
{
- $document_type =
rental_sodocument::$CONTRACT_DOCUMENTS;
- $id = $contract_id;
- }
+ $document_type =
rental_sodocument::$CONTRACT_DOCUMENTS;
+ $id = $contract_id;
+ }
else if(isset($party_id) && $party_id > 0)
{
- $document_type =
rental_sodocument::$PARTY_DOCUMENTS;
- $id = $party_id;
+ $document_type =
rental_sodocument::$PARTY_DOCUMENTS;
+ $id = $party_id;
}
return array
- (
- 'document_type' => $document_type,
- 'id' => $id
+ (
+ 'document_type' => $document_type,
+ 'id' => $id
);
}
/**
- * Edit a contract
+ *
+ * Public function scans the contract template directory for
pdf contract templates
*/
- public function edit()
+ public function get_pdf_templates()
{
- $GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('edit');
- $contract_id = (int)phpgw::get_var('id');
- $location_id = (int)phpgw::get_var('location_id');
- $update_price_items = false;
-
- $message = null;
- $error = null;
- $add_default_price_items = false;
-
- if(isset($_POST['save_contract']))
+ $get_template_config = true;
+ $files =
scandir('rental/templates/base/pdf/');
+ foreach($files as $file)
{
- if(isset($contract_id) && $contract_id > 0)
+ $ending = substr($file, -3, 3);
+ if($ending == 'php')
{
- $contract =
rental_socontract::get_instance()->get_single($contract_id);
-
if(!$contract->has_permission(PHPGW_ACL_EDIT))
- {
- unset($contract);
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit_contract')));
- }
+ include 'rental/templates/base/pdf/' .
$file;
+ $template_files =
array($template_name, $file);
+ $this->pdf_templates[] =
$template_files;
}
- else
- {
- if(isset($location_id) &&
($this->isExecutiveOfficer() || $this->isAdministrator())){
- $contract = new
rental_contract();
- $fields =
rental_socontract::get_instance()->get_fields_of_responsibility();
-
$contract->set_location_id($location_id);
-
$contract->set_contract_type_title($fields[$location_id]);
- $add_default_price_items = true;
- }
- }
-
- $date_start =
strtotime(phpgw::get_var('date_start_hidden'));
- $date_end =
strtotime(phpgw::get_var('date_end_hidden'));
-
- if(isset($contract)){
- $contract->set_contract_date(new
rental_contract_date($date_start, $date_end));
-
$contract->set_security_type(phpgw::get_var('security_type'));
-
$contract->set_security_amount(phpgw::get_var('security_amount'));
-
$contract->set_executive_officer_id(phpgw::get_var('executive_officer'));
-
$contract->set_comment(phpgw::get_var('comment'));
-
- if(isset($location_id) && $location_id
> 0)
- {
-
$contract->set_location_id($location_id); // only present when new contract
- }
-
$contract->set_term_id(phpgw::get_var('billing_term'));
-
$contract->set_billing_start_date(strtotime(phpgw::get_var('billing_start_date_hidden')));
-
$contract->set_service_id(phpgw::get_var('service_id'));
-
$contract->set_responsibility_id(phpgw::get_var('responsibility_id'));
-
$contract->set_reference(phpgw::get_var('reference'));
-
$contract->set_invoice_header(phpgw::get_var('invoice_header'));
-
$contract->set_account_in(phpgw::get_var('account_in'));
-
- /*
- if($contract->get_contract_type_id() !=
phpgw::get_var('contract_type'))
- {
- // New contract type id set,
retrieve correct account out
- $type_id =
phpgw::get_var('contract_type');
- if(isset($type_id) && $type_is
!= ''){
- $account =
rental_socontract::get_instance()->get_contract_type_account($type_id);
-
$contract->set_account_out($account);
- }
- else
- {
-
$contract->set_account_out(phpgw::get_var('account_out'));
- }
- }
- else
- {*/
-
$contract->set_account_out(phpgw::get_var('account_out'));
- //}
-
-
$contract->set_project_id(phpgw::get_var('project_id'));
-
$contract->set_due_date(strtotime(phpgw::get_var('due_date_hidden')));
-
$contract->set_contract_type_id(phpgw::get_var('contract_type'));
- $old_rented_area =
$contract->get_rented_area();
- $new_rented_area =
phpgw::get_var('rented_area');
- $new_rented_area =
str_replace(',','.',$new_rented_area);
- $validated_numeric=false;
- if(!isset($new_rented_area) ||
$new_rented_area == ''){
- $new_rented_area = 0;
- }
- if($old_rented_area !=
$new_rented_area){
- $update_price_items = true;
- }
-
$contract->set_rented_area($new_rented_area);
-
$contract->set_adjustment_interval(phpgw::get_var('adjustment_interval'));
-
$contract->set_adjustment_share(phpgw::get_var('adjustment_share'));
-
$contract->set_adjustable(phpgw::get_var('adjustable') == 'on' ? true : false);
-
$contract->set_publish_comment(phpgw::get_var('publish_comment') == 'on' ? true
: false);
- $validated_numeric =
$contract->validate_numeric();
-
- if($validated_numeric){
- $so_contract =
rental_socontract::get_instance();
- $db_contract =
$so_contract->get_db();
-
$db_contract->transaction_begin();
-
if($so_contract->store($contract))
- {
- if($update_price_items){
- $success =
$so_contract->update_price_items($contract->get_id(), $new_rented_area);
- if($success){
-
$db_contract->transaction_commit();
-
$message = lang('messages_saved_form');
-
$contract_id = $contract->get_id();
- }
- else{
-
$db_contract->transaction_abort();
- $error
= lang('messages_form_error');
- }
- }
- else
if($add_default_price_items)
- {
- $so_price_item
= rental_soprice_item::get_instance();
- //get default
price items for location_id
-
$default_price_items =
$so_contract->get_default_price_items($contract->get_location_id());
-
- //add
price_items to contract
-
foreach($default_price_items as $price_item_id)
- {
-
$so_price_item->add_price_item($contract->get_id(), $price_item_id);
- }
-
$db_contract->transaction_commit();
- $message =
lang('messages_saved_form');
- $contract_id =
$contract->get_id();
- }
- else{
-
$db_contract->transaction_commit();
- $message =
lang('messages_saved_form');
- $contract_id =
$contract->get_id();
- }
- }
- else
- {
-
$db_contract->transaction_abort();
- $error =
lang('messages_form_error');
- }
- }
- else{
- $error =
$contract->get_validation_errors();
- return $this->viewedit(true,
$contract_id, $contract, $location_id,$notification, $message, $error);
- }
- }
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'rental.uicontract.edit', 'id' => $contract->get_id(),
'message' => $message, 'error' => $error));
}
- else if(isset($_POST['add_notification']))
- {
- $contract =
rental_socontract::get_instance()->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- $account_id =
phpgw::get_var('notification_target');
- $location_id =
phpgw::get_var('notification_location');
- $date =
phpgw::get_var('date_notification_hidden');
- if($date)
- {
- $date = strtotime($date);
- }
- $notification = new
rental_notification(-1, $account_id, $location_id, $contract_id, $date,
phpgw::get_var('notification_message'),
phpgw::get_var('notification_recurrence'));
- if
(rental_sonotification::get_instance()->store($notification))
- {
- $message =
lang('messages_saved_form');
- $notification = null; // We
don't want to display the date/message when it was sucessfully stored.
- }
- else
- {
-
- $error =
lang('messages_form_error');
- }
- }
- else
- {
- $error =
lang('permission_denied_edit_contract');
- }
- }
- return $this->viewedit(true, $contract_id, null,
$location_id,$notification, $message, $error);
}
-
- /**
- * Create a new empty contract
- */
- public function add()
- {
- $location_id = phpgw::get_var('location_id');
- if(isset($location_id) && $location_id > 0)
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'rental.uicontract.edit', 'location_id' => $location_id));
- }
- }
-
- /**
- * Create a new contract tied to the composite provided in the
composite_id parameter
- */
- public function add_from_composite()
- {
- $contract = new rental_contract();
-
$contract->set_location_id(phpgw::get_var('responsibility_id'));
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- $so_contract =
rental_socontract::get_instance();
- $db_contract = $so_contract->get_db();
- $db_contract->transaction_begin();
- if($so_contract->store($contract))
- {
- // Add that composite to the new
contract
- $success =
$so_contract->add_composite($contract->get_id(), phpgw::get_var('id'));
- if($success){
-
$db_contract->transaction_commit();
- $comp_name =
rental_socomposite::get_instance()->get_single(phpgw::get_var('id'))->get_name();
- $message =
lang('messages_new_contract_from_composite').' '.$comp_name;
-
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' => $message));
- }
- else{
-
$db_contract->transaction_abort();
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error')));
- }
- }
- else
- {
- $db_contract->transaction_abort();
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error')));
- }
- }
-
- // If no executive officer
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_contract')));
- }
-
- /**
- * Create a new contract based on an existing contract
- */
- public function copy_contract()
- {
- $adjustment_id = (int)phpgw::get_var('adjustment_id');
-
- $so_contract = rental_socontract::get_instance();
- $contract =
$so_contract->get_single(phpgw::get_var('id'));
- $old_contract_old_id = $contract->get_old_contract_id();
- $db_contract = $so_contract->get_db();
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- $db_contract->transaction_begin();
- //reset id's and contract dates
- $contract->set_id(null);
- $contract->set_old_contract_id(null);
- $contract->set_contract_date(null);
- $contract->set_due_date(null);
- $contract->set_billing_start_date(null);
- if($so_contract->store($contract))
- {
- // copy the contract
- $success =
$so_contract->copy_contract($contract->get_id(), phpgw::get_var('id'));
- if($success){
-
$db_contract->transaction_commit();
- $message =
lang(messages_new_contract_copied).' '.$old_contract_old_id;
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' => $message,
'adjustment_id' => $adjustment_id));
- }
- else{
-
$db_contract->transaction_abort();
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error'),'adjustment_id' => $adjustment_id));
- }
- }
- else
- {
- $db_contract->transaction_abort();
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error'),'adjustment_id' => $adjustment_id));
- }
- }
-
- // If no executive officer
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_new_contract')));
- }
-
- /**
- * Public function. Add a party to a contract
- * @param HTTP::contract_id the contract id
- * @param HTTP::party_id the party id
- * @return true if successful, false otherwise
- */
- public function add_party(){
- $contract_id = (int)phpgw::get_var('contract_id');
- $party_id = (int)phpgw::get_var('party_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
$so_contract->add_party($contract_id,$party_id);
- }
- return false;
- }
-
- /**
- * Public function. Remove a party from a contract
- * @param HTTP::contract_id the contract id
- * @param HTTP::party_id the party id
- * @return true if successful, false otherwise
- */
- public function remove_party(){
- $contract_id = (int)phpgw::get_var('contract_id');
- $party_id = (int)phpgw::get_var('party_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return $so_contract->remove_party($contract_id,
$party_id);
- }
- return false;
- }
-
- /**
- * Public function. Set the payer on a contract
- * @param HTTP::contract_id the contract id
- * @param HTTP::party_id the party id
- * @return true if successful, false otherwise
- */
- public function set_payer(){
- $contract_id = (int)phpgw::get_var('contract_id');
- $party_id = (int)phpgw::get_var('party_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
$so_contract->set_payer($contract_id,$party_id);
- }
- return false;
- }
-
- /**
- * Public function. Add a composite to a contract.
- * @param HTTP::contract_id the contract id
- * @param HTTP::composite_id the composite id
- * @return boolean true if successful, false otherwise
- */
- public function add_composite(){
- $contract_id = (int)phpgw::get_var('contract_id');
- $composite_id = (int)phpgw::get_var('composite_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
$so_contract->add_composite($contract_id, $composite_id);
- }
- return false;
- }
-
- /**
- * Public function. Remove a composite from a contract.
- * @param HTTP::contract_id the contract id
- * @param HTTP::composite_id the composite id
- * @return boolean true if successful, false otherwise
- */
- public function remove_composite(){
- $contract_id = (int)phpgw::get_var('contract_id');
- $composite_id = (int)phpgw::get_var('composite_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if(isset($contract) &&
$contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
$so_contract->remove_composite($contract_id, $composite_id);
- }
- return false;
- }
-
- /**
- * Public function. Add a price item to a contract
- * @param HTTP::contract_id the contract id
- * @param HTTP::price_item_id the price item id
- * @return boolean true if successful, false otherwise
- */
- public function add_price_item()
- {
- $contract_id = (int)phpgw::get_var('contract_id');
- $price_item_id = (int)phpgw::get_var('price_item_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
rental_soprice_item::get_instance()->add_price_item($contract_id,
$price_item_id);
- }
- return false;
- }
-
- /**
- * Public function. Remove a price item from a contract
- * @param HTTP::contract_id the contract id
- * @param HTTP::price_item_id the price item id
- * @return boolean true if successful, false otherwise
- */
- public function remove_price_item()
- {
- $contract_id = (int)phpgw::get_var('contract_id');
- $price_item_id = (int)phpgw::get_var('price_item_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
rental_soprice_item::get_instance()->remove_price_item($contract_id,
$price_item_id);
- }
- return false;
- }
-
- /**
- * Public function. Reset a price item on a contract
- * @param HTTP::contract_id the contract id
- * @param HTTP::price_item_id the price item id
- * @return boolean true if successful, false otherwise
- */
- public function reset_price_item()
- {
- $contract_id = (int)phpgw::get_var('contract_id');
- $price_item_id = (int)phpgw::get_var('price_item_id');
- $so_contract = rental_socontract::get_instance();
- $contract = $so_contract->get_single($contract_id);
- if($contract->has_permission(PHPGW_ACL_EDIT))
- {
- return
rental_soprice_item::get_instance()->reset_contract_price_item($price_item_id);
- }
- return false;
- }
-
- public function get_total_price(){
- $so_contract = rental_socontract::get_instance();
- $so_contract_price_item =
rental_socontract_price_item::get_instance();
-
- $contract_id = (int)phpgw::get_var('contract_id');
- $total_price =
$so_contract_price_item->get_total_price($contract_id);
- $contract = $so_contract->get_single($contract_id);
- $area = $contract->get_rented_area();
-
- if(isset($area) && $area > 0)
- {
- $price_per_unit = $total_price / $area;
- }
-
- $result_array = array('total_price' => $total_price,
'area' => $area, 'price_per_unit' => $price_per_unit);
- $result_data = array('results' => $result_array,
'total_records' => 1);
- return $this->yui_results($result_data,
'total_records', 'results');
- }
-
- public function get_max_area(){
- $contract_id = (int)phpgw::get_var('contract_id');
- $total_price =
rental_socontract_price_item::get_instance()->get_max_area($contract_id);
- $result_array = array('max_area' => $max_area);
- $result_data = array('results' => $result_array,
'total_records' => 1);
- return $this->yui_results($result_data,
'total_records', 'results');
- }
-
- /**
- *
- * Public function scans the contract template directory for
pdf contract templates
- */
- public function get_pdf_templates(){
- $get_template_config= true;
- $files = scandir('rental/templates/base/pdf/');
- foreach ($files as $file){
- $ending = substr($file, -3, 3);
- if($ending=='php'){
- include
'rental/templates/base/pdf/'.$file;
- $template_files =
array($template_name,$file);
- $this->pdf_templates[] =
$template_files;
- }
- }
- }
}
-?>
Modified: branches/dev-syncromind/rental/inc/class.uinotification.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uinotification.inc.php
2015-09-30 10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uinotification.inc.php
2015-09-30 12:49:21 UTC (rev 14073)
@@ -87,12 +87,6 @@
return $this->jquery_results($result_data);
- /*$editable = phpgw::get_var('editable') == 'true' ? true :
false;
-
- array_walk($rows, array($this, 'add_actions'),
array($query_type, $editable));
-
- $result_data = array('results' => $rows, 'total_records' =>
$result_count);
- return $this->yui_results($result_data, 'total_records',
'results');*/
}
/**
Modified: branches/dev-syncromind/rental/inc/class.uiparty.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiparty.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uiparty.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -561,7 +561,7 @@
}
else
{
- $this->render('permission_denied.php',array('error' =>
lang('invalid_request')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('invalid_request'));
}
if(isset($party) && $party->has_permission(PHPGW_ACL_READ))
@@ -570,7 +570,7 @@
}
else
{
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_view_party')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_view_party'));
}
}
@@ -589,7 +589,7 @@
// Retrieve the party object or create a new one if
correct permissions
if(!($this->isExecutiveOfficer() ||
$this->isAdministrator()))
{
-
$this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit'));
}
}
@@ -866,7 +866,7 @@
{
if(!($this->isExecutiveOfficer() || $this->isAdministrator()))
{
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit'));
}
$party_id = (int)phpgw::get_var('id');
@@ -1378,8 +1378,7 @@
}
else
{
- $this->render('permission_denied.php',array('error' =>
lang('permission_denied_edit')));
+
phpgw::no_access($GLOBALS['phpgw_info']['flags']['currentapp'],
lang('permission_denied_edit'));
}
}
-}
-?>
+}
\ No newline at end of file
Modified: branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
2015-09-30 10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
2015-09-30 12:49:21 UTC (rev 14073)
@@ -38,8 +38,7 @@
{
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
if (phpgw::get_var('phpgw_return_as') == 'json')
@@ -224,8 +223,7 @@
if(!self::isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$this->edit(array(), 'view');
@@ -239,8 +237,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('edit');
if(!self::isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$responsibility_id = phpgw::get_var('responsibility_id');
@@ -331,8 +328,7 @@
{
if(!self::isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$this->edit();
@@ -554,11 +550,9 @@
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('manual_adjustment');
if(!$this->isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
self::set_active_menu('rental::contracts::price_item_list::manual_adjustment');
- //$this->render('admin_price_item_manual_adjustment.php');
$types_options = array();
$types_options[] = array('id'=>'', 'name'=>'Velg priselement');
@@ -717,8 +711,7 @@
{
if(!self::isExecutiveOfficer())
{
- $this->render('permission_denied.php');
- return;
+ phpgw::no_access();
}
$id = (int)phpgw::get_var('price_item_id');
Modified: branches/dev-syncromind/rental/inc/class.uiunit.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiunit.inc.php 2015-09-30
10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/inc/class.uiunit.inc.php 2015-09-30
12:49:21 UTC (rev 14073)
@@ -62,9 +62,7 @@
$result_data['draw'] = $draw;
return $this->jquery_results($result_data);
-
- /*$result_data = array('results' => $rows,
'total_records' => count($rows));
- return $this->yui_results($result_data,
'total_records', 'results');*/
+
}
/**
Deleted: branches/dev-syncromind/rental/templates/base/orphan_unit_list.php
===================================================================
--- branches/dev-syncromind/rental/templates/base/orphan_unit_list.php
2015-09-30 10:46:08 UTC (rev 14072)
+++ branches/dev-syncromind/rental/templates/base/orphan_unit_list.php
2015-09-30 12:49:21 UTC (rev 14073)
@@ -1,93 +0,0 @@
-<?php
- include("common.php");
-?>
-
-<h1><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/32x32/actions/edit-clear.png" /> <?php echo lang('orphan_units')
?></h1>
-
-<form id="list_form" method="GET">
-
- <fieldset>
- <!-- Search -->
- <legend><?php echo lang('search_options') ?></legend>
- <label for="ctrl_search_query"><?php echo lang('search_for')
?></label>
- <input id="ctrl_search_query" type="text" name="query"
autocomplete="off" />
- <label for="ctrl_search_option"><?php echo lang('search_where')
?></label>
- <select name="search_option" id="ctrl_search_option">
- <option value="all"><?php echo lang('all') ?></option>
- <option value="id"><?php echo lang('serial') ?></option>
- <option value="property_id"><?php echo
lang('property_id') ?></option>
- <option value="property"><?php echo lang('name')
?></option>
- <option value="building"><?php echo lang('address')
?></option>
- <option value="floor"><?php echo lang('gab') ?></option>
- <option value="section"><?php echo lang('gab')
?></option>
- <option value="room"><?php echo lang('room') ?></option>
- </select>
- <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>
-
-<div id="paginator" class="paginator"></div>
-<div id="datatable-container" class="datatable_container"></div>
-
-<script type="text/javascript">
-
- // Defining columns for datatable
- var columnDefs = [{
- key: "location_code",
- label: "<?php echo lang('id') ?>",
- sortable: true
- },
- {
- key: "loc1_name",
- label: "<?php echo lang('property') ?>",
- sortable: true
- },
- {
- key: "loc2_name",
- label: "<?php echo lang('building') ?>",
- sortable: false
- },
- {
- key: "loc3_name",
- label: "<?php echo lang('section') ?>",
- sortable: false
- },
- {
- key: "address",
- label: "<?php echo lang('address') ?>",
- sortable: false
- },
- {
- key: "area_gros",
- label: "<?php echo lang('area_gros') ?>",
- sortable: false
- },
- {
- key: "area_net",
- label: "<?php echo lang('area_net') ?>",
- sortable: false
- },
- {
- key: "occupied",
- label: "<?php echo lang('availability') ?>",
- sortable: false
- },
- {
- key: "actions",
- hidden: true
- }
- ];
-
- // Initiating the data source
- setDataSource(
-
'index.php?menuaction=rental.uicomposite.query&type=orphan_units&phpgw_return_as=json',
- columnDefs,
- 'list_form',
- [],
- 'datatable-container',
- 1,
- [],
- []
- );
-</script>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14073] rental: remove references to old template style,
Sigurd Nes <=