[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12063] property: typo
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12063] property: typo |
|
Date: |
Thu, 21 Aug 2014 12:43:28 +0000 |
Revision: 12063
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12063
Author: sigurdne
Date: 2014-08-21 12:43:27 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
property: typo
Modified Paths:
--------------
trunk/phpsysinfo/inc/class.menu.inc.php
trunk/property/inc/class.bodocument.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.menu.inc.php
trunk/property/inc/class.sodocument.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uicondition_survey.inc.php
trunk/property/inc/class.uidocument2.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/setup/phpgw_no.lang
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
trunk/property/templates/base/location.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/phpsysinfo/inc/class.menu.inc.php
===================================================================
--- trunk/phpsysinfo/inc/class.menu.inc.php 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/phpsysinfo/inc/class.menu.inc.php 2014-08-21 12:43:27 UTC (rev
12063)
@@ -53,7 +53,7 @@
'url' =>
$GLOBALS['phpgw']->link('/phpsysinfo/index.php')
. '"
onclick="window.open(\''
.
$GLOBALS['phpgw']->link('/phpsysinfo/index.php')
- . '\'); return
false;"',
+ . '\'); return
false;',
'image' => array('admin', 'php')
);
Modified: trunk/property/inc/class.bodocument.inc.php
===================================================================
--- trunk/property/inc/class.bodocument.inc.php 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/inc/class.bodocument.inc.php 2014-08-21 12:43:27 UTC (rev
12063)
@@ -180,6 +180,41 @@
return $documents;
}
+ function read2($data)
+ {
+ $documents = $this->so->read2($data);
+ $this->total_records = $this->so->total_records;
+
+ $this->uicols = $this->so->uicols;
+ $cols_extra = $this->so->cols_extra;
+
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ foreach ($documents as &$document)
+ {
+ $location_data =
$this->solocation->read_single($document['location_code']);
+
+ if(isset($location_data['street_name']) &&
$location_data['street_name'])
+ {
+ $document['address'] =
"{$location_data['street_name']} {$location_data['street_number']}";
+ }
+ elseif($location_data['loc2_name'])
+ {
+ $document['address'] =
$location_data['loc2_name'];
+ }
+ elseif($location_data['loc1_name'])
+ {
+ $document['address'] =
$location_data['loc1_name'];
+ }
+
+ for ($j=0;$j<count($cols_extra);$j++)
+ {
+ $document[$cols_extra[$j]] =
$location_data[$cols_extra[$j]];
+ }
+ }
+
+ return $documents;
+ }
+
function get_files_at_location($data)
{
return $this->so->get_files_at_location($data);
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2014-08-21 12:42:27 UTC
(rev 12062)
+++ trunk/property/inc/class.boworkorder.inc.php 2014-08-21 12:43:27 UTC
(rev 12063)
@@ -229,6 +229,37 @@
'name'=> lang('end date'),
'sortable' => true
);
+ $columns['tender_deadline'] = array
+ (
+ 'id' => 'tender_deadline',
+ 'name'=> lang('tender deadline'),
+ 'sortable' => true
+ );
+ $columns['tender_received'] = array
+ (
+ 'id' => 'tender_received',
+ 'name'=> lang('tender received'),
+ 'sortable' => true
+ );
+
+ $columns['tender_delay'] = array
+ (
+ 'id' => 'tender_delay',
+ 'name'=> lang('tender delay'),
+ 'sortable' => false
+ );
+ $columns['inspection_on_completion'] = array
+ (
+ 'id' => 'inspection_on_completion',
+ 'name'=> lang('inspection on
completion'),
+ 'sortable' => true
+ );
+ $columns['end_date_delay'] = array
+ (
+ 'id' => 'end_date_delay',
+ 'name'=> lang('end date delay'),
+ 'sortable' => false
+ );
$columns['billable_hours'] = array
(
'id' => 'billable_hours',
@@ -512,9 +543,16 @@
foreach ($workorder as &$entry)
{
- $entry['entry_date'] =
$GLOBALS['phpgw']->common->show_date($entry['entry_date'],$dateformat);
- $entry['start_date'] =
$GLOBALS['phpgw']->common->show_date($entry['start_date'],$dateformat);
- $entry['end_date'] =
$GLOBALS['phpgw']->common->show_date($entry['end_date'],$dateformat);
+ $entry['tender_delay']
= phpgwapi_datetime::get_working_days($entry['tender_deadline'],
$entry['tender_received']);
+ $entry['end_date_delay']
= phpgwapi_datetime::get_working_days($entry['end_date'],
$entry['inspection_on_completion']);
+
+ //Formatting
+ $entry['entry_date']
= $GLOBALS['phpgw']->common->show_date($entry['entry_date'],$dateformat);
+ $entry['start_date']
= $GLOBALS['phpgw']->common->show_date($entry['start_date'],$dateformat);
+ $entry['end_date']
= $GLOBALS['phpgw']->common->show_date($entry['end_date'],$dateformat);
+ $entry['tender_deadline']
= $GLOBALS['phpgw']->common->show_date($entry['tender_deadline'],$dateformat);
+ $entry['tender_received']
= $GLOBALS['phpgw']->common->show_date($entry['tender_received'],$dateformat);
+ $entry['inspection_on_completion'] =
$GLOBALS['phpgw']->common->show_date($entry['inspection_on_completion'],$dateformat);
}
return $workorder;
@@ -529,10 +567,17 @@
$contacts = CreateObject('property.sogeneric');
$contacts->get_location_info('vendor',false);
- $workorder
= $this->so->read_single($workorder_id);
- $dateformat
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $workorder['start_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['start_date'],$dateformat);
- $workorder['end_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['end_date'],$dateformat);
+ $workorder
= $this->so->read_single($workorder_id);
+ $dateformat
=
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ //Delay;
+ $workorder['tender_delay']
= phpgwapi_datetime::get_working_days($workorder['tender_deadline'],
$workorder['tender_received']);
+ $workorder['end_date_delay'] =
phpgwapi_datetime::get_working_days($workorder['end_date'],
$workorder['inspection_on_completion']);
+ //formtatting
+ $workorder['start_date']
= $GLOBALS['phpgw']->common->show_date($workorder['start_date'],$dateformat);
+ $workorder['end_date']
= $GLOBALS['phpgw']->common->show_date($workorder['end_date'],$dateformat);
+ $workorder['tender_deadline'] =
$GLOBALS['phpgw']->common->show_date($workorder['tender_deadline'],$dateformat);
+ $workorder['tender_received'] =
$GLOBALS['phpgw']->common->show_date($workorder['tender_received'],$dateformat);
+ $workorder['inspection_on_completion'] =
$GLOBALS['phpgw']->common->show_date($workorder['inspection_on_completion'],$dateformat);
if(isset($workorder['vendor_id']) &&
$workorder['vendor_id'])
{
@@ -752,9 +797,12 @@
function save($workorder,$action='')
{
- $workorder['start_date'] =
$this->bocommon->date_to_timestamp($workorder['start_date']);
- $workorder['end_date'] =
$this->bocommon->date_to_timestamp($workorder['end_date']);
- $workorder['location_code'] =
isset($workorder['location']) && $workorder['location'] ?
implode('-',$workorder['location']) : '';
+ $workorder['start_date']
= $this->bocommon->date_to_timestamp($workorder['start_date']);
+ $workorder['end_date']
= $this->bocommon->date_to_timestamp($workorder['end_date']);
+ $workorder['tender_deadline'] =
$this->bocommon->date_to_timestamp($workorder['tender_deadline']);
+ $workorder['tender_received'] =
$this->bocommon->date_to_timestamp($workorder['tender_received']);
+ $workorder['inspection_on_completion'] =
$this->bocommon->date_to_timestamp($workorder['inspection_on_completion']);
+ $workorder['location_code']
= isset($workorder['location']) && $workorder['location'] ?
implode('-',$workorder['location']) : '';
if ($action=='edit')
{
Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/inc/class.menu.inc.php 2014-08-21 12:43:27 UTC (rev
12063)
@@ -398,7 +398,7 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index', 'appname' => 'property') ),
'children' => array
(
- 'custom config'
=> array
+ 'custom_config'
=> array
(
'text'
=> lang('custom config'),
'url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig2.index', 'location_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.admin')) )
Modified: trunk/property/inc/class.sodocument.inc.php
===================================================================
--- trunk/property/inc/class.sodocument.inc.php 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/inc/class.sodocument.inc.php 2014-08-21 12:43:27 UTC (rev
12063)
@@ -84,18 +84,55 @@
return $branch;
}
+ function read2($data)
+ {
+ $columns = $data['columns'];
+ $params = $data['params'];
+ $ordermethod_arr = array();
+
+ if(isset($params['order']) &&
is_array($params['order']))
+ {
+ foreach ($params['order'] as &$order)
+ {
+ // $ordermethod_arr[] =
"{$columns[$order['column']]['key']} {$order['dir']}";
+ }
+ }
+
+ $ordermethod = ' ';
+ if($ordermethod_arr)
+ {
+ $ordermethod = 'ORDER BY ' . implode(',',
$ordermethod_arr);
+ }
+
+ $values = $this->read(array (
+ 'start' =>
isset($params['start']) && $params['start'] ? $params['start'] : 0,
+ 'filter' =>
isset($params['filter'])?$params['filter']:'',
+ 'query' =>
isset($params['query'])?$params['query']:'',
+ 'sort' =>
isset($params['sort']) && $params['sort'] ? $params['sort'] : 'DESC',
+ 'order' =>
isset($params['order'])?$params['order']:'',
+ 'ordermethod' => $ordermethod,
+ 'cat_id' =>
isset($params['cat_id']) && $params['cat_id'] ? $params['cat_id']:0,
+ 'entity_id' =>
isset($params['entity_id'])?$params['entity_id']:'',
+ 'doc_type' =>
isset($params['doc_type']) && $params['doc_type'] ? $params['doc_type']: 0,
+ 'allrows' =>
isset($params['allrows'])?$params['allrows']:'',
+ ));
+ return $values;
+
+ }
function read($data)
{
if(is_array($data))
{
- $start = isset($data['start']) &&
$data['start'] ? $data['start'] : 0;
- $filter =
isset($data['filter'])?$data['filter']:'';
- $query =
isset($data['query'])?$data['query']:'';
- $sort = isset($data['sort']) &&
$data['sort'] ? $data['sort'] : 'DESC';
- $order =
isset($data['order'])?$data['order']:'';
- $cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id']:0;
- $entity_id =
isset($data['entity_id'])?$data['entity_id']:'';
- $doc_type = isset($data['doc_type']) &&
$data['doc_type'] ? $data['doc_type']: 0;
+ $start = isset($data['start'])
&& $data['start'] ? $data['start'] : 0;
+ $filter =
isset($data['filter'])?$data['filter']:'';
+ $query =
isset($data['query'])?$data['query']:'';
+ $sort = isset($data['sort'])
&& $data['sort'] ? $data['sort'] : 'DESC';
+ $order =
isset($data['order'])?$data['order']:'';
+ $ordermethod =
isset($data['ordermethod'])?$data['ordermethod']:'';
+ $cat_id =
isset($data['cat_id']) && $data['cat_id'] ? $data['cat_id']:0;
+ $entity_id =
isset($data['entity_id'])?$data['entity_id']:'';
+ $doc_type =
isset($data['doc_type']) && $data['doc_type'] ? $data['doc_type']: 0;
+ $allrows =
isset($data['allrows'])?$data['allrows']:'';
}
$doc_types = $this->get_sub_doc_types($doc_type);
@@ -185,11 +222,11 @@
//FIXME
$groupmethod = '';
- if ($order)
+ if (!$ordermethod && $order)
{
$ordermethod = " order by fm_document.$order
$sort";
}
- else
+ else if (!$ordermethod)
{
$ordermethod = ' order by
fm_document.location_code ASC';
}
@@ -242,8 +279,17 @@
$this->db->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db->num_rows();
- $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
+ if(!$allrows)
+ {
+ $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
+ }
+ else
+ {
+ $this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
+ }
+
+
$document_list = array();
$j=0;
while ($this->db->next_record())
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2014-08-21 12:42:27 UTC
(rev 12062)
+++ trunk/property/inc/class.soworkorder.inc.php 2014-08-21 12:43:27 UTC
(rev 12063)
@@ -231,6 +231,13 @@
$cols_return[] = 'start_date';
$cols .= ",fm_workorder.end_date as end_date";
$cols_return[] = 'end_date';
+ $cols .= ",fm_workorder.tender_deadline as
tender_deadline";
+ $cols_return[] = 'tender_deadline';
+ $cols .= ",fm_workorder.tender_received as
tender_received";
+ $cols_return[] = 'tender_received';
+ $cols .=
",fm_workorder.inspection_on_completion as inspection_on_completion";
+ $cols_return[] = 'inspection_on_completion';
+
$cols.= ",fm_project.ecodimb";
$cols_return[] = 'ecodimb';
$cols.= ",fm_workorder.contract_sum";
@@ -493,6 +500,18 @@
$order_field = ",
fm_workorder.end_date";
$ordermethod = " ORDER BY
fm_workorder.end_date {$sort}, fm_workorder.id";
break;
+ case 'tender_deadline':
+ $order_field = ",
fm_workorder.tender_deadline";
+ $ordermethod = " ORDER BY
fm_workorder.tender_deadline {$sort}, fm_workorder.id";
+ break;
+ case 'tender_received':
+ $order_field = ",
fm_workorder.tender_received";
+ $ordermethod = " ORDER BY
fm_workorder.tender_received {$sort}, fm_workorder.id";
+ break;
+ case 'inspection_on_completion':
+ $order_field = ",
fm_workorder.inspection_on_completion";
+ $ordermethod = " ORDER BY
fm_workorder.inspection_on_completion {$sort}, fm_workorder.id";
+ break;
case 'ecodimb':
$order_field = ",
fm_project.ecodimb";
$ordermethod = " ORDER BY
fm_workorder.ecodimb {$sort}, fm_workorder.id";
@@ -893,14 +912,17 @@
'b_account_id' =>
(int) $this->db->f('account_id'),
'addition_percentage' => (int)
$this->db->f('addition'),
'addition_rs' =>
(int) $this->db->f('rig_addition'),
- // 'act_mtrl_cost'
=> $this->db->f('act_mtrl_cost'),
- // 'act_vendor_cost'
=> $this->db->f('act_vendor_cost'),
+ // 'act_mtrl_cost' =>
$this->db->f('act_mtrl_cost'),
+ // 'act_vendor_cost' =>
$this->db->f('act_vendor_cost'),
'user_id'
=> $this->db->f('user_id'),
'vendor_id'
=> $this->db->f('vendor_id'),
- // 'coordinator'
=> $this->db->f('coordinator'),
+ // 'coordinator' =>
$this->db->f('coordinator'),
'access'
=> $this->db->f('access'),
'start_date' =>
$this->db->f('start_date'),
'end_date'
=> $this->db->f('end_date'),
+ 'tender_deadline' =>
$this->db->f('tender_deadline'),
+ 'tender_received' =>
$this->db->f('tender_received'),
+ 'inspection_on_completion' =>
$this->db->f('inspection_on_completion'),
'cat_id'
=> $this->db->f('category'),
'chapter_id' =>
$this->db->f('chapter_id'),
'chapter'
=> $this->db->f('chapter'),
@@ -1189,6 +1211,9 @@
time(),
$workorder['start_date'],
$workorder['end_date'],
+ $workorder['tender_deadline'],
+ $workorder['tender_received'],
+ $workorder['inspection_on_completion'],
$workorder['status'],
$workorder['descr'],
(int) $workorder['budget'],
@@ -1213,7 +1238,8 @@
$values = $this->db->validate_insert($values);
- $this->db->query("INSERT INTO fm_workorder
(id,num,project_id,title,access,entry_date,start_date,end_date,status,"
+ $this->db->query("INSERT INTO fm_workorder
(id,num,project_id,title,access,entry_date,start_date,end_date,tender_deadline,"
+ . "tender_received,inspection_on_completion,status,"
.
"descr,budget,combined_cost,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,"
.
"user_id,ecodimb,category,billable_hours,contract_sum,approved,continuous,fictive_periodization,mail_recipients
$cols) "
. "VALUES ( {$values} {$vals})", __LINE__, __FILE__);
@@ -1330,29 +1356,30 @@
$value_set = array
(
- 'title' =>
$workorder['title'],
- 'status' =>
$workorder['status'],
- 'start_date' =>
$workorder['start_date'],
- 'end_date' =>
$workorder['end_date'],
- 'descr' =>
$workorder['descr'],
- 'budget' =>
(int) $workorder['budget'],
-// 'combined_cost' =>
$combined_cost,
- 'key_deliver' =>
$workorder['key_deliver'],
- 'key_fetch' =>
$workorder['key_fetch'],
- 'account_id' =>
$workorder['b_account_id'],
- 'rig_addition' =>
$workorder['addition_rs'],
- 'addition' =>
$workorder['addition_percentage'],
- 'charge_tenant' =>
$workorder['charge_tenant'],
- 'vendor_id' =>
$workorder['vendor_id'],
- 'user_id' =>
$workorder['user_id'],
- 'ecodimb' =>
$workorder['ecodimb'],
- 'category' =>
$workorder['cat_id'],
- 'billable_hours' =>
$workorder['billable_hours'],
-// 'contract_sum' =>
$workorder['contract_sum'],
- 'approved' =>
$workorder['approved'],
- 'continuous' =>
$workorder['continuous'],
- 'fictive_periodization' =>
$workorder['fictive_periodization'],
- 'mail_recipients' =>
isset($workorder['vendor_email']) && is_array($workorder['vendor_email']) ?
implode(',', $workorder['vendor_email']) : '',
+ 'title'
=> $workorder['title'],
+ 'status'
=> $workorder['status'],
+ 'start_date' =>
$workorder['start_date'],
+ 'end_date'
=> $workorder['end_date'],
+ 'tender_deadline' =>
$workorder['tender_deadline'],
+ 'tender_received' =>
$workorder['tender_received'],
+ 'inspection_on_completion' =>
$workorder['inspection_on_completion'],
+ 'descr'
=> $workorder['descr'],
+ 'budget'
=> (int) $workorder['budget'],
+ 'key_deliver' =>
$workorder['key_deliver'],
+ 'key_fetch'
=> $workorder['key_fetch'],
+ 'account_id' =>
$workorder['b_account_id'],
+ 'rig_addition' =>
$workorder['addition_rs'],
+ 'addition'
=> $workorder['addition_percentage'],
+ 'charge_tenant' =>
$workorder['charge_tenant'],
+ 'vendor_id'
=> $workorder['vendor_id'],
+ 'user_id'
=> $workorder['user_id'],
+ 'ecodimb'
=> $workorder['ecodimb'],
+ 'category'
=> $workorder['cat_id'],
+ 'billable_hours' =>
$workorder['billable_hours'],
+ 'approved'
=> $workorder['approved'],
+ 'continuous' =>
$workorder['continuous'],
+ 'fictive_periodization' =>
$workorder['fictive_periodization'],
+ 'mail_recipients' =>
isset($workorder['vendor_email']) && is_array($workorder['vendor_email']) ?
implode(',', $workorder['vendor_email']) : '',
);
@@ -1417,10 +1444,8 @@
$this->activate_period_from_budget($workorder['id'],
$_active_period);
- unset($_close_period);
unset($_active_period);
-
if($workorder['delete_b_period'])
{
$this->db->query("SELECT sum(budget) AS budget
FROM fm_workorder_budget WHERE order_id = '{$workorder['id']}'", __LINE__,
__FILE__);
Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2014-08-21 12:42:27 UTC
(rev 12062)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2014-08-21 12:43:27 UTC
(rev 12063)
@@ -1217,7 +1217,7 @@
if ($quotient >= 1)
{
//If yes, get top level column + the current
column code
- return getexcelcolumnname($quotient-1).
chr(($index % 26)+65);
+ return $this->getexcelcolumnname($quotient-1).
chr(($index % 26)+65);
}
else
{
Modified: trunk/property/inc/class.uidocument2.inc.php
===================================================================
--- trunk/property/inc/class.uidocument2.inc.php 2014-08-21 12:42:27 UTC
(rev 12062)
+++ trunk/property/inc/class.uidocument2.inc.php 2014-08-21 12:43:27 UTC
(rev 12063)
@@ -59,7 +59,7 @@
public function __construct()
{
- parent::__construct('', 'yui3');
+ parent::__construct(); //'', 'yui3');
$this->bo =
CreateObject('property.bodocument');
$this->bocommon = &
$this->bo->bocommon;
@@ -110,11 +110,6 @@
$columns = array();
$columns[] = array(
- 'key' => 'id',
- 'label' => 'id',
- 'hidden' => true
- );
- $columns[] = array(
'key' => 'loc1',
'label' =>
lang('property'),
'sortable' => true,
@@ -141,7 +136,9 @@
);
$columns[] = array(
'key' => 'link',
- 'hidden' => true
+ 'label' => 'dummy',
+ 'hidden' => true,
+ 'sortable' => false,
);
@@ -157,15 +154,32 @@
return;
}
+ //FIXME:Responsive(js/css) - shows 'hidden' columns...
phpgwapi_jquery::load_widget('core');
self::add_javascript('phpgwapi', 'DataTables',
'media/js/jquery.dataTables.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'extensions/Responsive/js/dataTables.responsive.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'extensions/ColVis/js/dataTables.colVis.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'extensions/TableTools/js/dataTables.tableTools.js');
+// self::add_javascript('phpgwapi', 'jquery-mobile',
'jquery.mobile-1.4.3.min.js');
+
+ //FIXME: working?
+// self::add_javascript('phpgwapi', 'DataTables',
'media/js/jquery.dataTables.columnFilter.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/media/css/jquery.dataTables.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colVis.min.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colvis.jqueryui.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.css');
+//
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/jquery-mobile/jquery.mobile-1.4.3.min.css');
+
+
if (phpgw::get_var('phpgw_return_as') == 'json')
{
return $this->query();
}
- self::add_javascript('phpgwapi', 'yui3',
'datatable.js');
+// self::add_javascript('phpgwapi', 'yui3',
'datatable.js');
// phpgwapi_yui::load_widget('datatable');
// phpgwapi_yui::load_widget('paginator');
@@ -183,40 +197,29 @@
'text' =>
lang('category') . ':',
'list' =>
$categories,
),
- array('type' => 'text',
- 'text' =>
lang('search'),
- 'name' =>
'query'
- ),
array(
- 'type' =>
'submit',
- 'name' =>
'search',
- 'value' =>
lang('Search')
- ),
- array(
'type' =>
'link',
'value' =>
lang('new'),
- 'href' =>
self::link(array('menuaction' => 'property.uidocument2.add')),
+ 'href' =>
self::link(array('menuaction' => 'property.uidocument.edit')),
'class' =>
'new_item'
),
- array(
+/* array(
'type' =>
'link',
'value' =>
lang('download'),
'href' =>
'javascript:window.open("'. self::link(array('menuaction' =>
'property.uidocument2.download', 'export' => true, 'allrows' => true)) .
'","window")',
'class' =>
'new_item'
- ),
- array(
- 'type' =>
'link',
- 'value' =>
$_SESSION['allrows'] ? lang('Show only active') : lang('Show all'),
- 'href' =>
self::link(array('menuaction' => 'property.uidocument2.index', 'allrows' =>
true))
- ),
-
+ )*/
),
),
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'property.uidocument2.index',
'phpgw_return_as' => 'json')),
'editor_action' =>
'property.uidocument2.edit_survey_title',
- 'field' => $columns
+ 'field' => $columns,
+ 'allrows' => true,
+ // 'left_click_action' =>
'console.log',
+ // 'dbl_click_action' => 'alert', //
Only one of them (or none..)
+ 'download' =>
self::link(array('menuaction' => 'property.uidocument2.download', 'export' =>
true, 'allrows' => true)),
),
);
@@ -229,6 +232,11 @@
'name' => 'id',
'source' => 'id'
),
+ array
+ (
+ 'name' =>
'loc1',
+ 'source' =>
'loc1'
+ ),
)
);
@@ -302,35 +310,37 @@
public function query()
{
- $params = array(
- 'start' => phpgw::get_var('startIndex', 'int',
'REQUEST', 0),
- 'results' => phpgw::get_var('results', 'int',
'REQUEST', 0),
- 'query' => phpgw::get_var('query'),
- 'sort' => phpgw::get_var('sort'),
- 'dir' => phpgw::get_var('dir'),
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+
+ $columns = $this->_get_columns();
+
+
+ $params = array
+ (
+ 'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
+ 'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' => $order,
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('allrows', 'bool')
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1
);
- $result_objects = array();
- $result_count = 0;
+ $values = $this->bo->read2(array('columns' => $columns,
'params' => $params));
- $values = $this->bo->read($params);
if ( phpgw::get_var('export', 'bool'))
{
return $values;
}
$result_data = array('results' => $values);
-
$result_data['total_records'] =
$this->bo->total_records;
- $result_data['start'] = $params['start'];
- $result_data['sort'] = $params['sort'];
- $result_data['dir'] = $params['dir'];
+ $result_data['draw'] = $draw;
array_walk( $result_data['results'], array($this,
'_add_links'), "property.uidocument2.view" );
- return $this->yui_results($result_data);
+ return $this->jquery_results($result_data);
}
@@ -1351,10 +1361,22 @@
{
if ( $e )
{
- return $e->getMessage();
+ $result = array
+ (
+ 'status' => 'deleted',
+ 'receipt' =>
$e->getMessage()
+ );
+ return $result;
}
}
- return 'Deleted';
+
+ $result = array
+ (
+ 'status' => 'deleted',
+ 'receipt' => lang('deleted') . " {$id}"
+ );
+
+ return $result;
}
/**
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2014-08-21 12:42:27 UTC
(rev 12062)
+++ trunk/property/inc/class.uiworkorder.inc.php 2014-08-21 12:43:27 UTC
(rev 12063)
@@ -1708,6 +1708,10 @@
$GLOBALS['phpgw']->jqcal->add_listener('values_start_date');
$GLOBALS['phpgw']->jqcal->add_listener('values_end_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('values_tender_deadline');
+
$GLOBALS['phpgw']->jqcal->add_listener('values_tender_received');
+
$GLOBALS['phpgw']->jqcal->add_listener('values_inspection_on_completion');
+
if( isset($receipt) && is_array($receipt))
{
$msgbox_data =
$this->bocommon->msgbox_data($receipt);
@@ -2094,13 +2098,13 @@
'b_group_data'
=> $b_group_data,
'b_account_data'
=> $b_account_data,
- 'lang_start_date_statustext'
=> lang('Select the estimated end date for the Project'),
- 'lang_start_date'
=> lang('Workorder start date'),
'value_start_date'
=> $values['start_date'],
-
- 'lang_end_date_statustext'
=> lang('Select the estimated end date for the Project'),
- 'lang_end_date'
=> lang('Workorder end date'),
'value_end_date'
=> $values['end_date'],
+ 'value_tender_deadline'
=> $values['tender_deadline'],
+ 'value_tender_received'
=> $values['tender_received'],
+ 'value_tender_delay'
=> $values['tender_delay'],
+ 'value_inspection_on_completion'
=> $values['inspection_on_completion'],
+ 'value_end_date_delay'
=> $values['end_date_delay'],
'lang_copy_workorder'
=> lang('Copy workorder ?'),
'lang_copy_workorder_statustext'
=> lang('Choose Copy Workorder to copy this workorder to a new workorder'),
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2014-08-21 12:42:27 UTC (rev 12062)
+++ trunk/property/setup/phpgw_no.lang 2014-08-21 12:43:27 UTC (rev 12063)
@@ -1962,7 +1962,7 @@
workorder %1 has been saved property no Bestilling %1 er lagret
workorder %1 needs approval property no Bestilling %1 venter på
godkjenning
workorder detail categories property no Detaljering av
bestilling
-workorder end date property no Frist for bestilling
+workorder end date property no Sluttdato
workorder entry date property no Registreringsdato
workorder id property no Bestilling
workorder is sent by email! property no Bestilling er sendt pr
e-post!
@@ -2032,3 +2032,8 @@
grant category property no Tilskuddskategori
what property no Hva
fictive periodization property no Periodiser løpende ut året
+tender deadline property no Tilbudsfrist
+tender received property no Mottatt tilbud
+inspection on completion property no Ferdigbefaring
+end date delay property no Forsinket utførelse
+tender delay property no Forsinket tilbud
\ No newline at end of file
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2014-08-21 12:42:27 UTC (rev 12062)
+++ trunk/property/setup/setup.inc.php 2014-08-21 12:43:27 UTC (rev 12063)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.683';
+ $setup_info['property']['version'] = '0.9.17.684';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/setup/tables_current.inc.php 2014-08-21 12:43:27 UTC (rev
12063)
@@ -496,6 +496,9 @@
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => False),
'start_date' => array('type' =>
'int','precision' => '8','nullable' => False),
'end_date' => array('type' => 'int','precision'
=> '8','nullable' => true),
+ 'tender_deadline' => array('type' =>
'int','precision' => '8','nullable' => true),
+ 'tender_received' => array('type' =>
'int','precision' => '8','nullable' => true),
+ 'inspection_on_completion' => array('type' =>
'int','precision' => '8','nullable' => true),
'coordinator' => array('type' =>
'int','precision' => '4','nullable' => True),
'vendor_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'status' => array('type' =>
'varchar','precision' => '20','nullable' => False,'default' => 'active'),
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/setup/tables_update.inc.php 2014-08-21 12:43:27 UTC (rev
12063)
@@ -8065,6 +8065,10 @@
}
}
+ /**
+ * Update property version from 0.9.17.682 to 0.9.17.683
+ * Add actual cost year to tickets
+ */
$test[] = '0.9.17.682';
function property_upgrade0_9_17_682()
{
@@ -8077,3 +8081,25 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.681 to 0.9.17.682
+ * Add tender related dates to workorder
+ */
+ $test[] = '0.9.17.683';
+ function property_upgrade0_9_17_683()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','tender_deadline',array('type'
=> 'int','precision' => 8,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','tender_received',array('type'
=> 'int','precision' => 8,'nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','inspection_on_completion',array('type'
=> 'int','precision' => 8,'nullable' => True));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.684';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: trunk/property/templates/base/location.xsl
===================================================================
--- trunk/property/templates/base/location.xsl 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/templates/base/location.xsl 2014-08-21 12:43:27 UTC (rev
12063)
@@ -654,7 +654,7 @@
</table>
<xsl:choose>
<xsl:when test="values != ''">
- <table width="100%" cellpadding="2"
cellspacing="2" align="center">
+ <table class="pure-table
pure-table-bordered">
<xsl:call-template
name="table_header_history"/>
<xsl:call-template
name="values_history"/>
</table>
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2014-08-21 12:42:27 UTC (rev
12062)
+++ trunk/property/templates/base/workorder.xsl 2014-08-21 12:43:27 UTC (rev
12063)
@@ -26,7 +26,7 @@
<xsl:value-of
select="lang_add"/>
</xsl:variable>
<form method="post"
action="{$add_action}">
- <input type="submit"
class="forms" name="add" value="{$lang_add}"
onMouseout="window.status='';return true;">
+ <input type="submit"
class="forms" name="add" value="{$lang_add}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_add_statustext"/>
</xsl:attribute>
@@ -39,7 +39,7 @@
<xsl:value-of
select="lang_search"/>
</xsl:variable>
<form method="post"
action="{$search_action}">
- <input type="submit"
class="forms" name="search" value="{$lang_search}"
onMouseout="window.status='';return true;">
+ <input type="submit"
class="forms" name="search" value="{$lang_search}">
<xsl:attribute
name="title">
<xsl:value-of
select="lang_search_statustext"/>
</xsl:attribute>
@@ -52,7 +52,7 @@
<xsl:value-of
select="lang_done"/>
</xsl:variable>
<form method="post"
action="{$done_action}">
- <input type="submit"
class="forms" name="done" value="{$lang_done}"
onMouseout="window.status='';return true;">
+ <input type="submit"
class="forms" name="done" value="{$lang_done}">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
<xsl:value-of
select="lang_done_statustext"/>
@@ -381,7 +381,7 @@
<xsl:value-of select="lang_descr"/>
</td>
<td>
-
<textarea cols="60" rows="6" name="values[descr]"
onMouseout="window.status='';return true;">
+
<textarea cols="60" rows="6" name="values[descr]">
<xsl:attribute name="title">
<xsl:value-of select="lang_descr_statustext"/>
</xsl:attribute>
@@ -463,7 +463,7 @@
<xsl:value-of select="lang_remark"/>
</td>
<td>
-
<textarea cols="60" rows="6" name="values[remark]"
onMouseout="window.status='';return true;">
+
<textarea cols="60" rows="6" name="values[remark]">
<xsl:attribute name="title">
<xsl:value-of select="lang_remark_statustext"/>
</xsl:attribute>
@@ -477,29 +477,90 @@
<table cellpadding="2"
cellspacing="2" width="80%" align="center">
<tr>
<td
valign="top">
-
<xsl:value-of select="lang_start_date"/>
+
<xsl:value-of select="php:function('lang', 'Workorder start date')"/>
<div
id="ctx"><!--Align lightbox to me--></div>
</td>
<td>
- <input
type="text" id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;">
+ <input
type="text" id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly">
<xsl:attribute name="title">
-
<xsl:value-of select="lang_start_date_statustext"/>
+
<xsl:value-of select="php:function('lang', 'Select the estimated start date for
the Project')"/>
</xsl:attribute>
</input>
</td>
</tr>
<tr>
+ <xsl:variable
name="lang_end_date">
+
<xsl:value-of select="php:function('lang', 'Workorder end date')"/>
+ </xsl:variable>
<td
valign="top">
-
<xsl:value-of select="lang_end_date"/>
+
<xsl:value-of select="$lang_end_date"/>
</td>
<td>
- <input
type="text" id="values_end_date" name="values[end_date]" size="10"
value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;">
+ <input
type="text" id="values_end_date" name="values[end_date]" size="10"
value="{value_end_date}" readonly="readonly">
<xsl:attribute name="title">
-
<xsl:value-of select="lang_end_date_statustext"/>
+
<xsl:value-of select="$lang_end_date"/>
</xsl:attribute>
</input>
</td>
</tr>
+ <tr>
+ <xsl:variable
name="lang_tender_deadline">
+
<xsl:value-of select="php:function('lang', 'tender deadline')"/>
+ </xsl:variable>
+ <td
valign="top">
+
<xsl:value-of select="$lang_tender_deadline"/>
+ </td>
+ <td>
+ <input
type="text" id="values_tender_deadline" name="values[tender_deadline]"
size="10" value="{value_tender_deadline}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_tender_deadline"/>
+
</xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <xsl:variable
name="lang_tender_received">
+
<xsl:value-of select="php:function('lang', 'tender received')"/>
+ </xsl:variable>
+ <td
valign="top">
+
<xsl:value-of select="$lang_tender_received"/>
+ </td>
+ <td>
+ <input
type="text" id="values_tender_received" name="values[tender_received]"
size="10" value="{value_tender_received}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_tender_received"/>
+
</xsl:attribute>
+ </input>
+ <xsl:if
test="value_tender_delay > 0">
+
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="php:function('lang', 'delay')"/>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="value_tender_delay"/>
+
</xsl:if>
+ </td>
+ </tr>
+ <tr>
+ <xsl:variable
name="lang_inspection_on_completion">
+
<xsl:value-of select="php:function('lang', 'inspection on completion')"/>
+ </xsl:variable>
+ <td
valign="top">
+
<xsl:value-of select="$lang_inspection_on_completion"/>
+ </td>
+ <td>
+ <input
type="text" id="values_inspection_on_completion"
name="values[inspection_on_completion]" size="10"
value="{value_inspection_on_completion}" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="$lang_inspection_on_completion"/>
+
</xsl:attribute>
+ </input>
+ <xsl:if
test="value_end_date_delay > 0">
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="php:function('lang', 'delay')"/>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="value_end_date_delay"/>
+
</xsl:if>
+ </td>
+ </tr>
<xsl:choose>
<xsl:when
test="mode='edit'">
<xsl:call-template name="event_form"/>
@@ -645,7 +706,7 @@
<xsl:value-of select="lang_budget"/>
</td>
<td>
- <input
type="text" name="values[budget]" value="{value_budget}"
onMouseout="window.status='';return true;"><xsl:attribute
name="title"><xsl:value-of
select="lang_budget_statustext"/></xsl:attribute></input><xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
+ <input
type="text" name="values[budget]" value="{value_budget}"><xsl:attribute
name="title"><xsl:value-of
select="lang_budget_statustext"/></xsl:attribute></input><xsl:text> </xsl:text>
[ <xsl:value-of select="currency"/> ]
</td>
</tr>
<tr>
@@ -653,7 +714,7 @@
<xsl:value-of select="lang_addition_rs"/>
</td>
<td>
- <input
type="text" name="values[addition_rs]" value="{value_addition_rs}"
onMouseout="window.status='';return true;"><xsl:attribute
name="title"><xsl:value-of
select="lang_addition_rs_statustext"/></xsl:attribute></input><xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
+ <input
type="text" name="values[addition_rs]"
value="{value_addition_rs}"><xsl:attribute name="title"><xsl:value-of
select="lang_addition_rs_statustext"/></xsl:attribute></input><xsl:text>
</xsl:text> [ <xsl:value-of select="currency"/> ]
</td>
</tr>
<td
valign="top">
@@ -826,7 +887,7 @@
<xsl:variable name="lang_key_fetch_statustext">
<xsl:value-of select="lang_key_fetch_statustext"/>
</xsl:variable>
-
<select name="values[key_fetch]" class="forms"
onMouseover="window.status='{$lang_key_fetch_statustext}'; return true;"
onMouseout="window.status='';return true;">
+
<select name="values[key_fetch]" class="forms"
onMouseover="window.status='{$lang_key_fetch_statustext}'; return true;">
<option value="">
<xsl:value-of select="lang_no_key_fetch"/>
</option>
@@ -842,7 +903,7 @@
<xsl:variable name="lang_key_deliver_statustext">
<xsl:value-of select="lang_key_deliver_statustext"/>
</xsl:variable>
-
<select name="values[key_deliver]" class="forms"
onMouseover="window.status='{$lang_key_deliver_statustext}'; return true;"
onMouseout="window.status='';return true;">
+
<select name="values[key_deliver]" class="forms"
onMouseover="window.status='{$lang_key_deliver_statustext}'; return true;">
<option value="">
<xsl:value-of select="lang_no_key_deliver"/>
</option>
@@ -962,7 +1023,7 @@
<xsl:value-of
select="lang_edit"/>
</xsl:variable>
<form method="post"
action="{$edit_action}">
- <input
type="submit" class="forms" name="edit" value="{$lang_edit}"
onMouseout="window.status='';return true;">
+ <input
type="submit" class="forms" name="edit" value="{$lang_edit}">
<xsl:attribute name="title">
<xsl:value-of select="lang_edit_statustext"/>
</xsl:attribute>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12063] property: typo,
Sigurd Nes <=