[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.sott...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.sott... |
Date: |
Fri, 24 Aug 2007 12:44:54 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/08/24 12:44:53
Modified files:
inc : class.botts.inc.php class.sotts.inc.php
class.uitts.inc.php
setup : phpgw_no.lang phpgw_no.lang_latin
phpgw_no_bh.lang
Log message:
Added "In progress" to status for tickets
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang_latin?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no_bh.lang?cvsroot=phpgroupware&r1=1.1&r2=1.2
Patches:
Index: inc/class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- inc/class.botts.inc.php 22 May 2007 08:17:57 -0000 1.35
+++ inc/class.botts.inc.php 24 Aug 2007 12:44:53 -0000 1.36
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.botts.inc.php,v 1.35 2007/05/22 08:17:57 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.36 2007/08/24 12:44:53 sigurdne
Exp $
*/
/**
@@ -197,10 +197,12 @@
break;
}
- $filters[0]['id']='closed';
- $filters[0]['name']=lang('Closed');
- $filters[1]['id']='all';
- $filters[1]['name']=lang('All');
+ $filters[0]['id']='progress';
+ $filters[0]['name']=lang('In progress');
+ $filters[1]['id']='closed';
+ $filters[1]['name']=lang('Closed');
+ $filters[2]['id']='all';
+ $filters[2]['name']=lang('All');
return $this->bocommon->select_list($selected,$filters);
}
@@ -212,6 +214,8 @@
$filters[0]['name']=lang('Closed');
$filters[1]['id']='O';
$filters[1]['name']=lang('Open');
+ $filters[2]['id']='P';
+ $filters[2]['name']=lang('In progress');
return $this->bocommon->select_list($selected,$filters);
}
Index: inc/class.sotts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- inc/class.sotts.inc.php 24 Apr 2007 08:04:10 -0000 1.24
+++ inc/class.sotts.inc.php 24 Aug 2007 12:44:53 -0000 1.25
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.sotts.inc.php,v 1.24 2007/04/24 08:04:10 sigurdne
Exp $
+ * @version $Id: class.sotts.inc.php,v 1.25 2007/08/24 12:44:53 sigurdne
Exp $
*/
/**
@@ -123,6 +123,11 @@
$filtermethod .= " $where
fm_tts_tickets.status='O'";
$where = 'AND';
}
+ elseif($filter == 'progress'):
+ {
+ $filtermethod .= " $where
fm_tts_tickets.status='P'";
+ $where = 'AND';
+ }
endif;
if ($cat_id > 0)
Index: inc/class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- inc/class.uitts.inc.php 23 Aug 2007 13:29:35 -0000 1.61
+++ inc/class.uitts.inc.php 24 Aug 2007 12:44:53 -0000 1.62
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.61 2007/08/23 13:29:35 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.62 2007/08/24 12:44:53 sigurdne
Exp $
*/
/**
@@ -280,18 +280,25 @@
$first= $ticket['category'];
}
- if ($ticket['status']=='O')
+ if ($ticket['status']=='O'):
{
$status = lang('Open');
$text_edit_status = lang('Close');
$new_status = 'X';
}
- else
+ elseif($ticket['status']=='P'):
+ {
+ $status = lang('In progress');
+ $text_edit_status = lang('Close');
+ $new_status = 'X';
+ }
+ else:
{
$status = lang('Closed');
$text_edit_status = lang('Open');
$new_status = 'O';
}
+ endif;
$link_status_data = array
@@ -314,7 +321,7 @@
$content[] = array
(
'id'
=> $ticket['id'],
- 'bgcolor'
=> $ticket['status']=='X' ? '#5EFB6E':$bgcolor[$ticket['priority']],
+ 'bgcolor'
=> $ticket['status']=='X' ? '#5EFB6E': $ticket['status']=='P' ? '#FF9933' :
$bgcolor[$ticket['priority']],
'new_ticket' =>
(isset($ticket['new_ticket'])?$ticket['new_ticket']:''),
'priostr'
=> $ticket['priority'],
'first'
=> $first,
Index: setup/phpgw_no.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- setup/phpgw_no.lang 11 May 2007 12:50:57 -0000 1.24
+++ setup/phpgw_no.lang 24 Aug 2007 12:44:53 -0000 1.25
@@ -744,6 +744,7 @@
Initials property no Initialer
Initial Status property no Initiell status
Initial value property no Initiell verdi
+In progress property no PÃ¥begynt
inputdata for the method property no inputdata for metoden
Input data for the nethod property no Input data til metoden
input text property no ledetekst
Index: setup/phpgw_no.lang_latin
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang_latin,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- setup/phpgw_no.lang_latin 5 Jan 2007 12:54:25 -0000 1.7
+++ setup/phpgw_no.lang_latin 24 Aug 2007 12:44:53 -0000 1.8
@@ -741,6 +741,7 @@
Initials property no Initialer
Initial Status property no Initiell status
Initial value property no Initiell verdi
+In progress property no Påbegynt
inputdata for the method property no inputdata for metoden
Input data for the nethod property no Input data til metoden
input text property no ledetekst
Index: setup/phpgw_no_bh.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no_bh.lang,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- setup/phpgw_no_bh.lang 24 Aug 2007 06:57:19 -0000 1.1
+++ setup/phpgw_no_bh.lang 24 Aug 2007 12:44:53 -0000 1.2
@@ -744,6 +744,7 @@
Initials property no Initialer
Initial Status property no Initiell status
Initial value property no Initiell verdi
+In progress property no PÃ¥begynt
inputdata for the method property no inputdata for metoden
Input data for the nethod property no Input data til metoden
input text property no ledetekst
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.sott...,
Sigurd Nes <=