[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.27,1.28 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.27,1.28 class.boworkorder.inc.php,1.5,1.6 class.soproject.inc.php,1.1,1.2 class.soworkorder.inc.php,1.6,1.7 class.uiworkorder.inc.php,1.5,1.6 |
|
Date: |
Sun, 16 Mar 2003 12:49:36 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv23854/inc
Modified Files:
class.bocommon.inc.php class.boworkorder.inc.php
class.soproject.inc.php class.soworkorder.inc.php
class.uiworkorder.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.bocommon.inc.php 16 Mar 2003 11:41:16 -0000 1.27
--- class.bocommon.inc.php 16 Mar 2003 17:49:33 -0000 1.28
***************
*** 590,594 ****
if ($sub == workorder)
{
!
$menu['sub_workorder_list']=$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder');
$menu['sub_workorder_request']=$GLOBALS['phpgw']->link('/property/list_request.php','sub=workorder');
$menu['sub_workorder_archive']=$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder&status=Avsluttet');
--- 590,594 ----
if ($sub == workorder)
{
!
$menu['sub_workorder_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
$menu['sub_workorder_request']=$GLOBALS['phpgw']->link('/property/list_request.php','sub=workorder');
$menu['sub_workorder_archive']=$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder&status=Avsluttet');
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.boworkorder.inc.php 16 Mar 2003 11:41:17 -0000 1.5
--- class.boworkorder.inc.php 16 Mar 2003 17:49:33 -0000 1.6
***************
*** 31,35 ****
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->historylog =
CreateObject($this->currentapp.'.historylog','project');
$start = get_var('start',array('POST','GET'));
--- 31,35 ----
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
$start = get_var('start',array('POST','GET'));
***************
*** 215,219 ****
}
! function select_category_project_list($format='',$selected='')
{
switch($format)
--- 215,219 ----
}
! function select_category_workorder_list($format='',$selected='')
{
switch($format)
***************
*** 259,263 ****
function read()
{
! $project = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id));
$this->total_records = $this->so->total_records;
--- 259,263 ----
function read()
{
! $workorder = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id));
$this->total_records = $this->so->total_records;
***************
*** 265,275 ****
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
! for ($i=0; $i<count($project); $i++)
{
! $project[$i]['coordinator'] =
$GLOBALS['phpgw']->accounts->id2name($project[$i]['coordinator']);
! $project[$i]['start_date'] =
$GLOBALS['phpgw']->common->show_date($project[$i]['start_date'],$dateformat);
}
! return $project;
}
--- 265,275 ----
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
! for ($i=0; $i<count($workorder); $i++)
{
! $workorder[$i]['owner'] =
$GLOBALS['phpgw']->accounts->id2name($workorder[$i]['owner']);
! $workorder[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($workorder[$i]['entry_date'],$dateformat);
}
! return $workorder;
}
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.soproject.inc.php 16 Mar 2003 11:41:17 -0000 1.1
--- class.soproject.inc.php 16 Mar 2003 17:49:33 -0000 1.2
***************
*** 161,165 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_wo_project.title LIKE
'%$query%' or fm_wo_project.descr LIKE '%$query%'";
}
--- 161,165 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_wo_project.name LIKE
'%$query%' or fm_wo_project.descr LIKE '%$query%' or fm_wo_project.street_name
LIKE '%$query%'";
}
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.soworkorder.inc.php 16 Mar 2003 11:41:17 -0000 1.6
--- class.soworkorder.inc.php 16 Mar 2003 17:49:33 -0000 1.7
***************
*** 19,23 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! $this->historylog =
CreateObject($this->currentapp.'.historylog','project');
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
--- 19,23 ----
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon',True);
! $this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
***************
*** 122,129 ****
else
{
! $ordermethod = ' order by fm_wo_project.id ASC';
}
! $filtermethod = ' ( fm_wo_project.owner=' .
$this->account;
if (is_array($this->grants))
{
--- 122,129 ----
else
{
! $ordermethod = ' order by fm_wo_wrkorders.id
ASC';
}
! $filtermethod = ' ( fm_wo_wrkorders.owner=' .
$this->account;
if (is_array($this->grants))
{
***************
*** 134,138 ****
}
reset($public_user_list);
! $filtermethod .= " OR
(fm_wo_project.access='public' OR fm_wo_project.owner IN(" .
implode(',',$public_user_list) . ")))";
}
else
--- 134,138 ----
}
reset($public_user_list);
! $filtermethod .= " OR
(fm_wo_wrkorders.access='public' OR fm_wo_wrkorders.owner IN(" .
implode(',',$public_user_list) . ")))";
}
else
***************
*** 143,157 ****
if ($cat_id > 0)
{
! $filtermethod .= " AND
fm_wo_project.category='$cat_id' ";
}
if ($status_id)
{
! $filtermethod .= " AND
fm_wo_project.status='$status_id' ";
}
if ($filter)
{
! $filtermethod .= " AND
fm_wo_project.coordinator='$filter' ";
}
--- 143,157 ----
if ($cat_id > 0)
{
! $filtermethod .= " AND
fm_wo_wrkorders.category='$cat_id' ";
}
if ($status_id)
{
! $filtermethod .= " AND
fm_wo_wrkorders.status='$status_id' ";
}
if ($filter)
{
! $filtermethod .= " AND
fm_wo_wrkorders.owner='$filter' ";
}
***************
*** 161,168 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_wo_project.title LIKE
'%$query%' or fm_wo_project.descr LIKE '%$query%'";
}
! $sql = "SELECT * FROM fm_wo_project $this->join
phpgw_accounts ON fm_wo_project.owner = phpgw_accounts.account_id WHERE
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 161,171 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_wo_wrkorders.title LIKE
'%$query%' or fm_wo_wrkorders.descr LIKE '%$query%' or
fm_wo_project.street_name LIKE '%$query%'";
}
! $sql = "SELECT fm_wo_project.id as
project_id,fm_wo_wrkorders.id,fm_wo_wrkorders.entry_date,fm_wo_wrkorders.status,fm_wo_project.property_id,"
! . "
fm_wo_project.building_id,fm_wo_project.entrance_id,fm_wo_project.floor,fm_wo_project.apartment_id,"
! . "
fm_wo_project.street_name,fm_wo_project.street_number,fm_wo_wrkorders.title,fm_wo_wrkorders.owner
"
! . " FROM fm_wo_wrkorders $this->join
fm_wo_project ON fm_wo_project.id = fm_wo_wrkorders.project_id WHERE
$filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 175,182 ****
$project_list[] = array
(
! 'project_id' =>
$this->db->f('id'),
! 'name' =>
stripslashes($this->db->f('name')),
! 'start_date' =>
$this->db->f('start_date'),
! 'coordinator' =>
$this->db->f('coordinator'),
'equipment_id' =>
$this->db->f('equipment_id'),
'location_code' =>
$this->db->f('location_code'),
--- 178,187 ----
$project_list[] = array
(
! 'workorder_id' => $this->db->f('id'),
! 'project_id' =>
$this->db->f('project_id'),
! 'title' =>
stripslashes($this->db->f('title')),
! 'entry_date' =>
$this->db->f('entry_date'),
! 'status' =>
$this->db->f('status'),
! 'owner' =>
$this->db->f('owner'),
'equipment_id' =>
$this->db->f('equipment_id'),
'location_code' =>
$this->db->f('location_code'),
***************
*** 190,194 ****
'street_number' =>
$this->db->f('street_number'),
'category' =>
$this->db->f('category'),
- 'title' =>
$this->db->f('title'),
'grants' => $ngrants
);
--- 195,198 ----
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiworkorder.inc.php 16 Mar 2003 11:41:17 -0000 1.5
--- class.uiworkorder.inc.php 16 Mar 2003 17:49:33 -0000 1.6
***************
*** 79,107 ****
$links = $this->bocommon->menu($sub);
! $project_list = $this->bo->read();
! //_debug_array($project_list);
! while (is_array($project_list) && list(,$project) =
each($project_list))
{
$content[] = array
(
! 'name'
=> $project['name'],
! 'project_id'
=> $project['project_id'],
! 'descr'
=> $project['descr'],
! 'property_id'
=> $project['property_id'],
! 'building_id'
=> $project['building_id'],
! 'entrance_id'
=> $project['entrance_id'],
! 'floor'
=> $project['floor'],
! 'apartment_id'
=> $project['apartment_id'],
! 'street'
=> $project['street'],
! 'start_date'
=> $project['start_date'],
! 'coordinator'
=> $project['coordinator'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $project['project_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $project['project_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&project_id='
. $project['project_id']),
! 'lang_view_statustext' =>
lang('view the project'),
! 'lang_edit_statustext' =>
lang('edit the project'),
! 'lang_delete_statustext' =>
lang('delete this project'),
'text_view'
=> lang('view'),
'text_edit'
=> lang('edit'),
--- 79,110 ----
$links = $this->bocommon->menu($sub);
! $workorder_list = $this->bo->read();
! //_debug_array($workorder_list);
! while (is_array($workorder_list) && list(,$workorder) =
each($workorder_list))
{
$content[] = array
(
!
! 'title'
=> $workorder['title'],
! 'workorder_id'
=> $workorder['workorder_id'],
! 'project_id'
=> $workorder['project_id'],
! 'descr'
=> $workorder['descr'],
! 'property_id'
=> $workorder['property_id'],
! 'building_id'
=> $workorder['building_id'],
! 'entrance_id'
=> $workorder['entrance_id'],
! 'floor'
=> $workorder['floor'],
! 'apartment_id'
=> $workorder['apartment_id'],
! 'street'
=> $workorder['street'],
! 'entry_date'
=> $workorder['entry_date'],
! 'status'
=> $workorder['status'],
! 'owner'
=> $workorder['owner'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $workorder['workorder_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $workorder['workorder_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $workorder['workorder_id']),
! 'lang_view_statustext' =>
lang('view the workorder'),
! 'lang_edit_statustext' =>
lang('edit the workorder'),
! 'lang_delete_statustext' =>
lang('delete this workorder'),
'text_view'
=> lang('view'),
'text_edit'
=> lang('edit'),
***************
*** 113,117 ****
$table_header[] = array
(
! 'sort_project' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
--- 116,131 ----
$table_header[] = array
(
! 'sort_project' =>
$this->nextmatchs->show_sort_order(array
!
(
!
'sort' => $this->sort,
!
'var' => 'project_id',
!
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiworkorder.index',
!
'cat_id'
=>$this->cat_id,
!
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'sort_workorder' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
***************
*** 124,130 ****
'query'
=>$this->query)
)),
! 'lang_project' => lang('project'),
! 'lang_name' => lang('Name'),
! 'sort_property' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
--- 138,145 ----
'query'
=>$this->query)
)),
! 'lang_project' => lang('project'),
! 'lang_workorder' => lang('workorder'),
! 'lang_title' => lang('Title'),
! 'sort_property' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
***************
*** 155,160 ****
'lang_street_name' => lang('Street Name'),
'lang_street_num' => lang('Num'),
! 'lang_start_date' => lang('Start date'),
! 'lang_coordinator' => lang('Coordinator'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
--- 170,176 ----
'lang_street_name' => lang('Street Name'),
'lang_street_num' => lang('Num'),
! 'lang_entry_date' => lang('Entry date'),
! 'lang_user' => lang('User'),
! 'lang_status' => lang('Status'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
***************
*** 165,169 ****
(
'lang_add' =>
lang('add'),
! 'lang_add_statustext' => lang('add a
project'),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit')
);
--- 181,185 ----
(
'lang_add' =>
lang('add'),
! 'lang_add_statustext' => lang('add a
workorder'),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit')
);
***************
*** 176,179 ****
--- 192,196 ----
'cat_id'
=>$this->cat_id,
'district_id'
=>$this->district_id,
+ 'status_id'
=>$this->status_id,
'filter'
=>$this->filter,
'query'
=>$this->query
***************
*** 186,203 ****
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
! 'num_records'
=> count($project_list),
'all_records'
=> $this->bo->total_records,
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
! 'function_msg'
=> lang('list project'),
'lang_no_cat'
=> lang('no category'),
! 'lang_cat_statustext' =>
lang('Select the category the project belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=> $this->bo->select_category_project_list('filter',$this->cat_id),
! 'district_list'
=> $this->bocommon->select_district_list('filter',$this->district_id),
! 'lang_no_district'
=> lang('no district'),
! 'lang_district_statustext' =>
lang('Select the district the selection belongs to. To do not use a district
select NO DISTRICT'),
! 'select_district_name' =>
'district_id',
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
--- 203,216 ----
'start_record'
=> $this->start,
'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
! 'num_records'
=> count($workorder_list),
'all_records'
=> $this->bo->total_records,
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
! 'function_msg'
=> lang('list workorder'),
'lang_no_cat'
=> lang('no category'),
! 'lang_cat_statustext' =>
lang('Select the category the workorder belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=> $this->bo->select_category_workorder_list('filter',$this->cat_id),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
***************
*** 207,211 ****
'status_list'
=> $this->bo->select_status_list('filter',$this->status_id),
! 'lang_user_statustext' =>
lang('Select the user the project belongs to. To do not use a category select
NO USER'),
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
--- 220,224 ----
'status_list'
=> $this->bo->select_status_list('filter',$this->status_id),
! 'lang_user_statustext' =>
lang('Select the user the workorder belongs to. To do not use a category select
NO USER'),
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
***************
*** 216,225 ****
'query'
=> $this->query,
'lang_submit'
=> lang('submit'),
! 'table_header_project' =>
$table_header,
! 'values_project'
=> $content,
'table_add'
=> $table_add
);
!
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_project' => $data));
$this->save_sessiondata();
}
--- 229,238 ----
'query'
=> $this->query,
'lang_submit'
=> lang('submit'),
! 'table_header_workorder' =>
$table_header,
! 'values_workorder'
=> $content,
'table_add'
=> $table_add
);
!
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_workorder' => $data));
$this->save_sessiondata();
}
***************
*** 500,504 ****
'select_name'
=> 'values[cat_id]',
'value_cat_id'
=> $values['cat_id'],
! 'cat_list'
=> $this->bo->select_category_project_list('select',$values['cat_id']),
'lang_workorder_id'
=> lang('Workorder ID'),
--- 513,517 ----
'select_name'
=> 'values[cat_id]',
'value_cat_id'
=> $values['cat_id'],
! 'cat_list'
=>
$this->bo->select_category_workorder_list('select',$values['cat_id']),
'lang_workorder_id'
=> lang('Workorder ID'),
***************
*** 686,690 ****
'lang_save_statustext' =>
lang('Save the equipment'),
'select_name'
=> 'values[cat_id]',
! 'cat_list'
=> $this->bo->select_category_project_list('select',$values['cat_id']),
'lang_workorder_id'
=> lang('Workorder ID'),
--- 699,703 ----
'lang_save_statustext' =>
lang('Save the equipment'),
'select_name'
=> 'values[cat_id]',
! 'cat_list'
=>
$this->bo->select_category_workorder_list('select',$values['cat_id']),
'lang_workorder_id'
=> lang('Workorder ID'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.27,1.28 class.boworkorder.inc.php,1.5,1.6 class.soproject.inc.php,1.1,1.2 class.soworkorder.inc.php,1.6,1.7 class.uiworkorder.inc.php,1.5,1.6,
Sigurd Nes <address@hidden> <=