extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

additional statusfilters: open and upcoming, own open and upcoming, delegated open and upcoming, responsible open and upcoming

Browse Source
This commit is contained in:
Klaus Leithoff 2010-07-15 10:09:35 +00:00
parent b5f35a4b75
commit 544c522904
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_bo.inc.php
View File

@ -117,17 +117,21 @@ class infolog_bo
'responsible-open-today' => 'responsible open',
'responsible-open-overdue' => 'responsible overdue',
'responsible-upcoming' => 'responsible upcoming',
'responsible-open-upcoming'=> 'responsible open and upcoming',
'delegated' => 'delegated',
'delegated-open-today' => 'delegated open',
'delegated-open-overdue' => 'delegated overdue',
'delegated-upcoming' => 'delegated upcomming',
'delegated-open-upcoming' => 'delegated open and upcoming',
'own' => 'own',
'own-open-today' => 'own open',
'own-open-overdue' => 'own overdue',
'own-upcoming' => 'own upcoming',
'own-open-upcoming' => 'own open and upcoming',
'open-today' => 'open',
'open-overdue' => 'overdue',
'upcoming' => 'upcoming',
'open-upcoming' => 'open and upcoming',
'bydate' => 'startdate',
);

4
infolog/inc/class.infolog_so.inc.php
View File

@ -295,7 +295,7 @@ class infolog_so
*/
function dateFilter($filter = '')
{
preg_match('/(upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$filter,$vars);
preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$filter,$vars);
$filter = $vars[1];
if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
@ -310,6 +310,8 @@ class infolog_so
}
switch ($filter)
{
case 'open-upcoming':
return "AND (info_startdate >= $tomorrow OR NOT (info_status IN ('done','billed','cancelled','deleted','template','nonactive','archive')))";
case 'upcoming':
return " AND info_startdate >= $tomorrow";
case 'today':

4
infolog/lang/egw_de.lang
View File

@ -104,6 +104,7 @@ default filter for infolog infolog de Standard-Filter für InfoLog
default status for a new log entry infolog de Vorgabe für den Status eines neuen Eintrags
delegated infolog de delegiert
delegated open infolog de delegiert offen
delegated open and upcoming infolog de delegiert offene und zukünftige
delegated overdue infolog de delegiert überfällig
delegated upcomming infolog de delegiert zukünftig
delegation infolog de Delegation
@ -238,12 +239,14 @@ only if i get assigned or removed infolog de Nur wenn ich zugewiesen oder entfer
only the attachments infolog de nur die Anhänge
only the links infolog de nur die Verknüpfungen
open infolog de offen
open and upcoming infolog de zukünftige und offene
optional note to the link infolog de zusätzliche Notiz zur Verknüfung
order infolog de Reihenfolge
organization infolog de Organisation
overdue infolog de überfällig
own infolog de eigene
own open infolog de eigene offen
own open and upcoming infolog de eigene offene und zukünftige
own overdue infolog de eigene überfällig
own upcoming infolog de eigene zukünftig
parent infolog de Elterneintrag
@ -285,6 +288,7 @@ remark infolog de Bemerkung
remove this link (not the entry itself) infolog de Diese Verknüpfung lösen (nicht den Eintrag selbst)
responsible infolog de verantwortlich
responsible open infolog de verantwortlich offen
responsible open and upcoming infolog de verantwortlich offene und zukünftige
responsible overdue infolog de verantwortlich überfällig
responsible upcoming infolog de verantwortlich zukünftig
responsible user, priority infolog de Verantwortlicher, Priorität

4
infolog/lang/egw_en.lang
View File

@ -104,6 +104,7 @@ default filter for infolog infolog en Default Filter for InfoLog
default status for a new log entry infolog en default status for a new log entry
delegated infolog en delegated
delegated open infolog en delegated open
delegated open and upcoming infolog en delegated open and upcoming
delegated overdue infolog en delegated overdue
delegated upcomming infolog en delegated upcomming
delegation infolog en Delegation
@ -238,12 +239,14 @@ only if i get assigned or removed infolog en Only if I get assigned or removed
only the attachments infolog en only the attachments
only the links infolog en only the links
open infolog en open
open and upcoming infolog en open and upcoming
optional note to the link infolog en optional note to the Link
order infolog en Order
organization infolog en Organization
overdue infolog en overdue
own infolog en own
own open infolog en own open
own open and upcoming infolog en own open and upcoming
own overdue infolog en own overdue
own upcoming infolog en own upcoming
parent infolog en Parent
@ -285,6 +288,7 @@ remark infolog en Remark
remove this link (not the entry itself) infolog en Remove this link (not the entry itself)
responsible infolog en responsible
responsible open infolog en responsible open
responsible open and upcoming infolog en responsible open and upcoming
responsible overdue infolog en responsible overdue
responsible upcoming infolog en responsible upcoming
responsible user, priority infolog en responsible user, priority