[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.43,1.44 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.43,1.44 class.socommon.inc.php,1.18,1.19class.sostandard_2.inc.php,1.14,1.15 class.sostandard_entity.inc.php,1.7,1.8 class.sotts.inc.php,1.13,1.14 class.uitts.inc.php,1.23,1.24 hook_admin.inc.php,1.30,1.31 |
|
Date: |
Mon, 12 May 2003 17:45:34 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv9770/inc
Modified Files:
class.bocommon.inc.php class.socommon.inc.php
class.sostandard_2.inc.php class.sostandard_entity.inc.php
class.sotts.inc.php class.uitts.inc.php hook_admin.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.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** class.bocommon.inc.php 10 May 2003 17:53:44 -0000 1.43
--- class.bocommon.inc.php 12 May 2003 21:45:32 -0000 1.44
***************
*** 592,596 ****
'lang_pricebook' =>
lang('Pricebook'),
'link_documentation'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index'),
! 'lang_documentation'=> lang('Documentation')
);
--- 592,598 ----
'lang_pricebook' =>
lang('Pricebook'),
'link_documentation'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index'),
! 'lang_documentation'=> lang('Documentation'),
! 'link_report'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uireport.index'),
! 'lang_report'=> lang('Report')
);
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.socommon.inc.php 28 Apr 2003 10:26:44 -0000 1.18
--- class.socommon.inc.php 12 May 2003 21:45:32 -0000 1.19
***************
*** 144,147 ****
--- 144,151 ----
$attrib_table='fm_location_attrib';
break;
+ case 'report':
+ $type_table='fm_report_type_attrib';
+ $attrib_table='fm_report_attrib';
+ break;
}
***************
*** 183,186 ****
--- 187,193 ----
case 'location':
$table='fm_location_attrib';
+ break;
+ case 'report':
+ $table='fm_report_attrib';
break;
}
Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.sostandard_2.inc.php 8 May 2003 09:53:16 -0000 1.14
--- class.sostandard_2.inc.php 12 May 2003 21:45:32 -0000 1.15
***************
*** 122,125 ****
--- 122,128 ----
$table='fm_document_status';
break;
+ case 'report_status':
+ $table='fm_report_status';
+ break;
case 'unit':
$table='fm_standard_unit';
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sostandard_entity.inc.php 15 Feb 2003 19:51:39 -0000 1.7
--- class.sostandard_entity.inc.php 12 May 2003 21:45:32 -0000 1.8
***************
*** 101,104 ****
--- 101,107 ----
$table='fm_location_type';
break;
+ case 'report':
+ $table='fm_report_type';
+ break;
}
***************
*** 116,119 ****
--- 119,125 ----
case 'location':
$table='fm_location_type_attrib';
+ break;
+ case 'report':
+ $table='fm_report_type_attrib';
break;
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.sotts.inc.php 8 May 2003 09:53:16 -0000 1.13
--- class.sotts.inc.php 12 May 2003 21:45:32 -0000 1.14
***************
*** 186,189 ****
--- 186,200 ----
}
+
+ $sql = "SELECT * FROM fm_report_origin WHERE
origin_id='$id' and origin ='ticket'";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $ticket['report_id'][]['id'] =
$this->db->f('report_id');
+ }
+
+
//_debug_array($ticket);
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uitts.inc.php 8 May 2003 09:53:16 -0000 1.23
--- class.uitts.inc.php 12 May 2003 21:45:32 -0000 1.24
***************
*** 428,432 ****
'location_code' =>
$ticket['location_code'],
'equipment_id' =>
$ticket['equipment_id'],
! 'tenant_id' =>
$ticket['tenant_id']
);
--- 428,433 ----
'location_code' =>
$ticket['location_code'],
'equipment_id' =>
$ticket['equipment_id'],
! 'tenant_id' =>
$ticket['tenant_id'],
! 'ticket_id' => $id
);
***************
*** 437,441 ****
'location_code' =>
$ticket['location_code'],
'equipment_id' =>
$ticket['equipment_id'],
! 'tenant_id' =>
$ticket['tenant_id']
);
--- 438,453 ----
'location_code' =>
$ticket['location_code'],
'equipment_id' =>
$ticket['equipment_id'],
! 'tenant_id' =>
$ticket['tenant_id'],
! 'ticket_id' => $id
! );
!
! $report_link_data = array
! (
! 'menuaction' =>
$this->currentapp.'.uireport.edit',
! 'bypass' => true,
! 'location_code' =>
$ticket['location_code'],
! 'equipment_id' =>
$ticket['equipment_id'],
! 'tenant_id' =>
$ticket['tenant_id'],
! 'ticket_id' => $id
);
***************
*** 480,486 ****
--- 492,514 ----
'apartment_id' =>
$ticket['apartment_id']));
+
+ if($ticket['report_id'])
+ {
+ $report_lookup_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uireport.view'
+ );
+ }
+
+ //_debug_array($ticket);
+
$data = array
(
+ 'lang_report'
=> lang('Report'),
+ 'lang_report_statustext' =>
lang('Link to the report originatet from this ticket'),
+ 'link_report'
=> $GLOBALS['phpgw']->link('/index.php',$report_lookup_data),
+ 'value_report_id'
=> $ticket['report_id'],
+
'location_data'
=> $location_data,
'error'
=> $receipt['error'],
***************
*** 550,558 ****
'request_link'
=> $GLOBALS['phpgw']->link('/index.php',$request_link_data),
'order_link'
=> $GLOBALS['phpgw']->link('/index.php',$order_link_data),
'lang_generate_request' =>
lang('Generate Request'),
'lang_generate_request_statustext'
=> lang('Klick this to generate a request with this information'),
! 'lang_generate_order' =>
lang('Generate order'),
'lang_generate_order_statustext'
=> lang('Klick this to generate an order with this information'),
'lang_save'
=> lang('save'),
--- 578,589 ----
'request_link'
=> $GLOBALS['phpgw']->link('/index.php',$request_link_data),
'order_link'
=> $GLOBALS['phpgw']->link('/index.php',$order_link_data),
+ 'report_link'
=> $GLOBALS['phpgw']->link('/index.php',$report_link_data),
'lang_generate_request' =>
lang('Generate Request'),
'lang_generate_request_statustext'
=> lang('Klick this to generate a request with this information'),
! 'lang_generate_order' =>
lang('Generate order'),
'lang_generate_order_statustext'
=> lang('Klick this to generate an order with this information'),
+ 'lang_start_report' =>
lang('Start Report'),
+ 'lang_start_report_statustext' =>
lang('Klick this to start a report'),
'lang_save'
=> lang('save'),
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** hook_admin.inc.php 8 May 2003 13:56:29 -0000 1.30
--- hook_admin.inc.php 12 May 2003 21:45:32 -0000 1.31
***************
*** 16,19 ****
--- 16,20 ----
'Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname),
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
+ 'Report type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=report'),
'Location type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=location'),
'Update the not active category for
locations'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiproperty.update_cat'),
***************
*** 32,35 ****
--- 33,37 ----
'ID Controle'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.edit_id'),
'Permissions'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl2'),
+ 'Report status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=report_status'),
'Request status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
'Workorders status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=workorder_status'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.43,1.44 class.socommon.inc.php,1.18,1.19class.sostandard_2.inc.php,1.14,1.15 class.sostandard_entity.inc.php,1.7,1.8 class.sotts.inc.php,1.13,1.14 class.uitts.inc.php,1.23,1.24 hook_admin.inc.php,1.30,1.31,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default attributes_view.xsl,1.2,1.3 menu.xsl,1.8,1.9 tts.xsl,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.47,1.48 tables_current.inc.php,1.74,1.75
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default attributes_view.xsl,1.2,1.3 menu.xsl,1.8,1.9 tts.xsl,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup setup.inc.php,1.47,1.48 tables_current.inc.php,1.74,1.75
- Index(es):