tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
|
2
(8) |
3
(7) |
4
|
5
|
|
6
(15) |
7
(7) |
8
(5) |
9
(7) |
10
(5) |
11
(1) |
12
(7) |
|
13
(13) |
14
(3) |
15
(9) |
16
(8) |
17
(10) |
18
(3) |
19
|
|
20
|
21
(1) |
22
|
23
(5) |
24
|
25
(15) |
26
|
|
27
|
28
|
29
|
30
|
31
|
|
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11113 Modified Files: Date.pinc address.pinc base.pinc database.pinc help.php location.pinc modules.pinc timetrack.pinc timetrack_overview.php Log Message: updates Index: Date.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- Date.pinc 14 Mar 2005 09:51:47 -0000 1.106 +++ Date.pinc 25 Mar 2005 20:38:44 -0000 1.107 @@ -1,5 +1,5 @@ <?php -/* +/** * Copyright 1999 - 2005 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it Index: address.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/address.pinc,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- address.pinc 19 Jul 2004 19:08:41 -0000 1.114 +++ address.pinc 25 Mar 2005 20:38:45 -0000 1.115 @@ -1,6 +1,10 @@ <?php /** - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ Index: base.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/base.pinc,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- base.pinc 24 Feb 2005 19:28:36 -0000 1.83 +++ base.pinc 25 Mar 2005 20:38:45 -0000 1.84 @@ -1,6 +1,10 @@ <?php /** - * Copyright 2002 - 2004 by Gero Kohnert + * Copyright 2002 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ Index: database.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/database.pinc,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- database.pinc 8 Nov 2004 20:29:05 -0000 1.53 +++ database.pinc 25 Mar 2005 20:38:45 -0000 1.54 @@ -1,6 +1,10 @@ <?php /* - * Copyright 2001 - 2004 by Gero Kohnert + * Copyright 2001 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ Index: help.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/help.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- help.php 2 Nov 2004 19:47:24 -0000 1.20 +++ help.php 25 Mar 2005 20:38:46 -0000 1.21 @@ -1,6 +1,10 @@ <?php /* - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * Help System */ Index: location.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/location.pinc,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- location.pinc 13 Mar 2005 17:27:15 -0000 1.74 +++ location.pinc 25 Mar 2005 20:38:46 -0000 1.75 @@ -1,6 +1,10 @@ <?php /** - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ Index: modules.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/modules.pinc,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- modules.pinc 18 May 2004 15:27:46 -0000 1.35 +++ modules.pinc 25 Mar 2005 20:38:46 -0000 1.36 @@ -1,6 +1,10 @@ <?php -/* - * Copyright 1999 - 2003 by Gero Kohnert +/** + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * List of base modules for TUTOS * (additional modules will be announced in config.[pinc|php] Index: timetrack.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- timetrack.pinc 18 Mar 2005 08:07:24 -0000 1.75 +++ timetrack.pinc 25 Mar 2005 20:38:46 -0000 1.76 @@ -1,6 +1,10 @@ <?php /** - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ Index: timetrack_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- timetrack_overview.php 18 Mar 2005 08:07:24 -0000 1.89 +++ timetrack_overview.php 25 Mar 2005 20:38:47 -0000 1.90 @@ -1,6 +1,10 @@ <?php /** - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ |
|
From: Gero K. <gok...@us...> - 2005-03-25 20:38:58
|
Update of /cvsroot/tutos/tutos/php/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11113/auth Modified Files: auth.pinc Log Message: updates Index: auth.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/auth/auth.pinc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- auth.pinc 25 Aug 2004 19:17:03 -0000 1.9 +++ auth.pinc 25 Mar 2005 20:38:47 -0000 1.10 @@ -1,6 +1,10 @@ <?php /* - * Copyright 1999 - 2003 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ |
|
From: Gero K. <gok...@us...> - 2005-03-25 20:38:58
|
Update of /cvsroot/tutos/tutos/php/report-engine/rep_ganttproject In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11113/report-engine/rep_ganttproject Modified Files: rep_ganttproject.pinc Log Message: updates Index: rep_ganttproject.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_ganttproject/rep_ganttproject.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rep_ganttproject.pinc 15 Mar 2005 19:23:40 -0000 1.1 +++ rep_ganttproject.pinc 25 Mar 2005 20:38:48 -0000 1.2 @@ -33,7 +33,7 @@ $r .= '<?xml version="1.0" encoding="UTF-8"?>'."\n"; $r .= '<project'; $r .= ' name="'. $this->obj->getFullName().'"'; - $r .= ' webLink="'. getBaseUrl().$tutos[base].'/php/'.$this->obj->getUrl() .'"'; + $r .= ' webLink="'. getBaseUrl().$tutos['base'].'/php/'.$this->obj->getUrl() .'"'; $r .= '>'."\n"; $r .= '<description>'."\n"; $r .= ''. $this->obj->description ."\n"; @@ -52,7 +52,7 @@ $r .= ' <task'; $r .= ' id="'. $b->id .'"'; $r .= ' name="'. utf8_encode($b->getFullName()) .'"'; - $r .= ' webLink="'. getBaseUrl().$tutos[base].'/php/'.$b->getUrl() .'"'; + $r .= ' webLink="'. getBaseUrl().$tutos['base'].'/php/'.$b->getUrl() .'"'; $r .= ' start="'. $b->s_start->day.'/'.$b->s_start->month.'/'.$b->s_start->year .'"'; $r .= ' />'."\n"; # remember the allocation for each worker |
|
From: Gero K. <gok...@us...> - 2005-03-25 20:38:58
|
Update of /cvsroot/tutos/tutos/php/reminder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11113/reminder Modified Files: reminder.pinc Log Message: updates Index: reminder.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- reminder.pinc 9 Dec 2004 07:40:18 -0000 1.14 +++ reminder.pinc 25 Mar 2005 20:38:48 -0000 1.15 @@ -1,6 +1,10 @@ <?php /** - * Copyright 2004 by Gero Kohnert + * Copyright 2004 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ |
|
From: Gero K. <gok...@us...> - 2005-03-25 20:38:58
|
Update of /cvsroot/tutos/tutos/php/installation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11113/installation Modified Files: installation.pinc installation_overview.php Log Message: updates Index: installation.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- installation.pinc 9 Oct 2004 12:40:10 -0000 1.36 +++ installation.pinc 25 Mar 2005 20:38:47 -0000 1.37 @@ -1,6 +1,10 @@ <?php /** - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ @@ -522,7 +526,9 @@ } $inst->readTimetrackSum(); $obj->tsum['Installations'] += $inst->timetracksum; - $obj->tsum['Installations'] += $inst->tsum['Bugs']; + if (isset($inst->tsum['Bugs'])) { + $obj->tsum['Installations'] += $inst->tsum['Bugs']; + } $obj->list[useinstmanagement][$inst->id] = &$inst; $a++; unset($inst); Index: installation_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/installation/installation_overview.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- installation_overview.php 19 Jul 2004 19:08:53 -0000 1.19 +++ installation_overview.php 25 Mar 2005 20:38:48 -0000 1.20 @@ -1,6 +1,10 @@ <?php /** - * Copyright 1999 - 2004 by Gero Kohnert + * Copyright 1999 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * @modulegroup installation * @module installation_overview @@ -10,6 +14,7 @@ include_once 'webelements.p3'; include_once 'permission.p3'; include_once 'product.pinc'; + include_once 'timetrack.pinc'; /* Check if user is allowed to use it */ check_user(); |
|
From: Gero K. <gok...@us...> - 2005-03-25 19:23:06
|
Update of /cvsroot/tutos/tutos/php/installation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31741/installation Modified Files: Tag: BRANCH-1-2 installation_overview.php Log Message: fix Index: installation_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/installation/installation_overview.php,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -r1.18.2.1 -r1.18.2.2 --- installation_overview.php 26 Jul 2004 19:55:03 -0000 1.18.2.1 +++ installation_overview.php 25 Mar 2005 19:22:58 -0000 1.18.2.2 @@ -10,6 +10,7 @@ include_once 'webelements.p3'; include_once 'permission.p3'; include_once 'product.pinc'; + include_once 'timetrack.pinc'; /* Check if user is allowed to use it */ check_user(); @@ -247,4 +248,4 @@ <!-- CVS Info: $Id$ $Author$ ---> \ No newline at end of file +--> |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 17:37:08
|
Update of /cvsroot/tutos/tutos/html/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10090/html/classic Modified Files: Tag: BRANCH-2-0 style.css Log Message: * DEBUG: task overview pseudo graphic table was no more always 200px large Index: style.css =================================================================== RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v retrieving revision 1.1.2.24 retrieving revision 1.1.2.25 diff -u -r1.1.2.24 -r1.1.2.25 --- style.css 25 Mar 2005 17:32:34 -0000 1.1.2.24 +++ style.css 25 Mar 2005 17:36:59 -0000 1.1.2.25 @@ -759,6 +759,10 @@ } /* Logical tasks are half height */ +td.logical { + width: 200px; +} + td.logical td.ow-before, td.logical td.ow-after, td.logical td.ow-green, td.logical td.ow-red { height: 12px; |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 17:32:44
|
Update of /cvsroot/tutos/tutos/templates/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7727/templates/classic Modified Files: Tag: BRANCH-2-0 task_overview.tpl task_show.tpl Log Message: * Logical tasks are now shorter in task_overview (half size) * DEBUG: some garbage came at the end of task_show (cvs misuse I guess) Index: task_overview.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_overview.tpl,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -u -r1.1.2.20 -r1.1.2.21 --- task_overview.tpl 25 Mar 2005 14:48:22 -0000 1.1.2.20 +++ task_overview.tpl 25 Mar 2005 17:32:34 -0000 1.1.2.21 @@ -196,7 +196,7 @@ <td class="data">{$t.s_start}</td> {* task overview diagram *} - <td {if $t.milestone}class="milestone"{/if}> + <td class="{if $t.milestone}milestone{/if} {if $t.logical}logical{/if}"> {if $withtimeline} <table width="200" cellspacing="0" cellpadding="0"> <colgroup> Index: task_show.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_show.tpl,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -r1.1.2.11 -r1.1.2.12 --- task_show.tpl 25 Mar 2005 14:48:22 -0000 1.1.2.11 +++ task_show.tpl 25 Mar 2005 17:32:34 -0000 1.1.2.12 @@ -78,10 +78,8 @@ {/if} </tr> +{if not $milestone.value} <tr> -{if $milestone.value} -<td colspan="4"> </td> -{else} <td class="desc" valign="top">{real.label}</td> <td style="white-space: nowrap;"> {$DateTimeFrom} : <tt>{$real.start}</tt> @@ -90,8 +88,8 @@ {$DateTimeTill} : <tt>{$real.end}</tt> </td> <td> </td> -{/if} </tr> +{/if} {if not $milestone.value} <tr> @@ -167,4 +165,4 @@ </tr> </table> -<!-- task_show stop --> \ No newline at end of file +<!-- task_show stop --> |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 17:32:44
|
Update of /cvsroot/tutos/tutos/html/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7727/html/classic Modified Files: Tag: BRANCH-2-0 style.css Log Message: * Logical tasks are now shorter in task_overview (half size) * DEBUG: some garbage came at the end of task_show (cvs misuse I guess) Index: style.css =================================================================== RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v retrieving revision 1.1.2.23 retrieving revision 1.1.2.24 diff -u -r1.1.2.23 -r1.1.2.24 --- style.css 25 Mar 2005 14:48:21 -0000 1.1.2.23 +++ style.css 25 Mar 2005 17:32:34 -0000 1.1.2.24 @@ -758,6 +758,12 @@ background-color: #e07777; } +/* Logical tasks are half height */ +td.logical td.ow-before, td.logical td.ow-after, +td.logical td.ow-green, td.logical td.ow-red { + height: 12px; +} + /* Milestones are to be blue */ td.milestone td.ow-green, td.milestone td.ow-red { /* background-color: #d0d0d0; */ |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 16:54:08
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21928/php Modified Files: Tag: BRANCH-2-0 gantt_png.php task.pinc task_gantt.php task_overview.php Log Message: The gantt png tool now is able to represent milestones, and accept same filtering options as the task_overiew page (on state and dates). Index: gantt_png.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -u -r1.22.2.2 -r1.22.2.3 --- gantt_png.php 10 Feb 2005 14:33:36 -0000 1.22.2.2 +++ gantt_png.php 25 Mar 2005 16:53:57 -0000 1.22.2.3 @@ -21,91 +21,136 @@ check_user(); session_write_close(); -function get_bar(&$task, $n, $depth) { - global $font; +class gantt_png { - $name = $task->name; - $start = $task->s_start->getYYYYMMDD(); - $end = $task->s_end->getYYYYMMDD(); - $vol = $task->volume_done; - $comp = $task->getcompletion(); - - for ($i = 1; $i < $depth; $i++) { - $name = " ".$name; + function gantt_png($dbconn, $id) { + $this->dbconn = $dbconn; + $this->obj = GetObject($dbconn, $id); + + $this->state = -1; + $this->start = new DateTime(0); + $this->end = new DateTime(0); + + /** + * Get the filter parameters + */ + if( isset($_GET['state']) ) + $this->state = $_GET['state']; + + if ( isset($_REQUEST['start']) ) { + $this->start->setDateTime($_REQUEST['start']); + } + else { + if( isset($_REQUEST['start_d']) ) { + $this->start->setDateTimeF('start'); + $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD(); + } + } + + if ( isset($_REQUEST['end']) ) { + $this->end->setDateTime($_REQUEST['end']); + } + else { + if( isset($_REQUEST['end_d']) ) { + $this->end->setDateTimeF('end'); + $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD(); + } + } } - $bar = new GanttBar($n, $name, $start, $end, - sprintf("[%.0f %%]", $comp), 0.5); - if ( $comp > 100.0 ) { - $comp = 100.0; - # TODO make it red or so - # http://www.aditus.nu/jpgraph/manual/ref/ - - $bar->SetColor("red"); - #$bar->SetFillColor("white"); - $bar->SetPattern(BAND_RDIAG, "red"); - #$bar->progress->SetPattern(BAND_RDIAG, "red"); - } - /* Outline first level tasks */ - $bar->title->SetFont($font, FS_NORMAL, 8); - if( $depth == 1 ) { - $bar->title->SetFont($font, FS_BOLD, 8); - } - $bar->progress->Set($comp/100.0); - return $bar; -} + function get_bar(&$task, $n, $depth) { + global $font; -/* Recursive adding of project tasks */ -function addTasks(&$parent, &$graph, &$count, $depth) { - if ( $parent->getType() == "task" ) { - $graph->Add(get_bar($parent, $count++, $depth)); + $name = $task->name; + $start = $task->s_start->getYYYYMMDD(); + $end = $task->s_end->getYYYYMMDD(); + $vol = $task->volume_done; + $comp = $task->getcompletion(); + + for ($i = 1; $i < $depth; $i++) { + $name = " ".$name; + } + + if( $task->milestone ) { + $bar = new MileStone($n, $name, $start); + } + else { + $bar = new GanttBar($n, $name, $start, $end, + sprintf("[%.0f %%]", $comp), 0.5); + + if ( $comp > 100.0 ) { + $comp = 100.0; + + $bar->SetColor("red"); + // $bar->SetFillColor("white"); + $bar->SetPattern(BAND_RDIAG, "red"); + // $bar->progress->SetPattern(BAND_RDIAG, "red"); + } + $bar->progress->Set($comp/100.0); + } + + /* Outline first level tasks */ + $bar->title->SetFont($font, FS_NORMAL, 8); + if( $depth == 1 ) { + $bar->title->SetFont($font, FS_BOLD, 8); + } + + return $bar; } - $parent->readTasks(); - @reset($parent->tasklist); - while( list($i, $f) = @each($parent->tasklist) ) { - $graph = addTasks($f, $graph, $count, $depth+1); + /* Recursive adding of project tasks */ + function addTasks(&$parent, &$graph, &$count, $depth) { + if ( $parent->getType() == "task" + && $parent->filter($this->state, $this->start, $this->end) ) { + $graph->Add($this->get_bar($parent, $count++, $depth)); + } + + $parent->readTasks(); + @reset($parent->tasklist); + while( list($i, $f) = @each($parent->tasklist) ) { + $graph = $this->addTasks($f, $graph, $count, $depth+1); + } + return $graph; } - return $graph; -} -Function draw_gantt(&$parent) { - global $lang , $font, $tutos; + Function draw() { + global $lang, $font, $tutos; - task_calc($parent); + task_calc($this->obj); - // Standard calls to create a new graph - $graph = new GanttGraph(); - //$graph->SetShadow(); - $graph->SetBox(); - // Titles for chart - $graph->title->Set($lang['TaskGantt']." ". $lang['forphrase'] ." " . - html_entity_decode($parent->getFullName()) ); + // Standard calls to create a new graph + $graph = new GanttGraph(); + //$graph->SetShadow(); + $graph->SetBox(); + // Titles for chart + $graph->title->Set($lang['TaskGantt']." ". $lang['forphrase'] ." " . + html_entity_decode($this->obj->getFullName()) ); - $graph->title->SetFont($font,FS_BOLD,12); + $graph->title->SetFont($font,FS_BOLD,12); - // For illustration we enable all headers. - $graph->ShowHeaders(GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); + // For illustration we enable all headers. + $graph->ShowHeaders(GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); - $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); - $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4); + $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4); - /* TODO: we could use locale */ - // $graph->scale->SetDateLocale("fr_FR"); + /* TODO: we could use locale */ + // $graph->scale->SetDateLocale("fr_FR"); - // Change the scale font - $graph->scale->week->SetFont(FF_FONT0); - $graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12); + // Change the scale font + $graph->scale->week->SetFont(FF_FONT0); + $graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12); - $count = 0; - $graph = addTasks($parent, $graph, $count, 0); + $count = 0; + $graph = $this->addTasks($this->obj, $graph, $count, 0); - // Add a vertical line for the current day - $vline = new GanttVLine(strftime("%Y-%m-%d", time())); - $vline->SetDayOffset(0.5); - $graph->Add($vline); + // Add a vertical line for the current day + $vline = new GanttVLine(strftime("%Y-%m-%d", time())); + $vline->SetDayOffset(0.5); + $graph->Add($vline); - $graph->Stroke(); + $graph->Stroke(); + } } // we try both places @@ -135,16 +180,14 @@ } if ( isset($_GET['id']) ) { - $obj = GetObject($dbconn,$_GET['id']); - $stop = 0; -} else { + $gantt = new gantt_png($dbconn, $_GET['id']); + $gantt->draw(); +} +else { $msg = $lang['Err0048']; $stop = 1; $obj = $id; -} -if ($stop == 0) { - draw_gantt($obj); -} else { + echo $msg; } Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.130.2.23 retrieving revision 1.130.2.24 diff -u -r1.130.2.23 -r1.130.2.24 --- task.pinc 25 Mar 2005 13:09:24 -0000 1.130.2.23 +++ task.pinc 25 Mar 2005 16:53:58 -0000 1.130.2.24 @@ -740,6 +740,35 @@ } /** + * return true when the given task respects the given constraints + * + * we limit the date range and state of printed tasks + * + * we wan't to represent tasks which are running between given + * slimit and elimit + */ + function filter($state, $slimit, $elimit) { + $started = $this->s_start->datecmp($slimit) <= 0 + && $this->s_end->datecmp($slimit) >= 0; + + $not_ended = $this->s_end->datecmp($elimit) >= 0 + && $this->s_start->datecmp($elimit) <= 0; + + $between = $this->s_start->datecmp($slimit) >= 0 + && $this->s_end->datecmp($elimit) <= 0; + + $ok = ( ($slimit == 0 || $slimit->ts == -1 ) + && ($elimit == 0 || $slimit->ts == -1 ) + || + ($slimit != 0 && $elimit != 0 + && ( $started || $between || $not_ended)) ) + && + ( $state == -1 || $state == $this->state ); + + return $ok; + } + + /** * Returns a list of rows containing each a task to display * * You can filter on task dates with slimit and elimit, and on @@ -774,27 +803,7 @@ $recursive = true; } - /** - * we limit the date range and state of printed tasks - * - * we wan't to represent tasks which are running between given - * slimit and elimit - */ - $started = $this->s_start->datecmp($slimit) <= 0 - && $this->s_end->datecmp($slimit) >= 0; - - $not_ended = $this->s_end->datecmp($elimit) >= 0 - && $this->s_start->datecmp($elimit) <= 0; - - $between = $this->s_start->datecmp($slimit) >= 0 - && $this->s_end->datecmp($elimit) <= 0; - - if( ( $slimit == 0 && $elimit == 0 - || ($slimit != 0 && $elimit != 0 - && ( $started || $between || $not_ended)) ) - && - ( $state == -1 || $state == $this->state ) ) { - + if( $this->filter($state, $slimit, $elimit) ) { $result['id'] = $this->id; $result['name'] = $this->getFullName(); $result['stateid'] = $this->state; Index: task_gantt.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_gantt.php,v retrieving revision 1.14.2.3 retrieving revision 1.14.2.4 diff -u -r1.14.2.3 -r1.14.2.4 --- task_gantt.php 7 Jul 2004 15:55:23 -0000 1.14.2.3 +++ task_gantt.php 25 Mar 2005 16:53:58 -0000 1.14.2.4 @@ -27,7 +27,8 @@ Function info() { global $lang; - $this->assign('gantt_url', "gantt_png.php?id=".$this->obj->id); + $this->assign('gantt_url', + "gantt_png.php?".$this->get_task_filter('url')); $this->template('task_gantt'); } @@ -46,16 +47,52 @@ Function prepare() { global $msg,$lang; + $this->state = -1; + $this->start = new DateTime(0); + $this->end = new DateTime(0); + $this->name = $lang['TaskGantt']; if ( isset($_GET['id']) ) { - $this->obj = GetObject($this->dbconn,$_GET['id']); + $this->parent = GetObject($this->dbconn,$_GET['id']); } else { $msg .= $lang['Err0048']; $this->stop = true; - $this->obj = $this->user; + $this->parent = $this->user; + } + + if ( isset($_REQUEST['state']) ) { + if (false == is_numeric($_REQUEST['state'])) { + $msg .= sprintf($lang['Err0012'],"state",$_REQUEST['state']); + $this->stop = true; + } + $this->state = $_REQUEST['state']; + } + else + $this->state = -1; + + // Timerange Start + if ( isset($_REQUEST['start']) ) { + $this->start->setDateTime($_REQUEST['start']); + } + else { + if( isset($_REQUEST['start_d']) ) { + $this->start->setDateTimeF('start'); + $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD(); + } + } + // Timerange End + if ( isset($_REQUEST['end']) ) { + $this->end->setDateTime($_REQUEST['end']); + } + else { + if( isset($_REQUEST['end_d']) ) { + $this->end->setDateTimeF('end'); + $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD(); + } } - $this->addMenu(array('url' => "task_overview.php?id=". $this->obj->id, + $this->addMenu(array('url' => + "task_overview.php?".$this->get_task_filter('url'), 'text' => $lang['TaskOverview'], 'image' => 'task_overview', 'info' => $lang['TaskOverview'], Index: task_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v retrieving revision 1.62.2.18 retrieving revision 1.62.2.19 diff -u -r1.62.2.18 -r1.62.2.19 --- task_overview.php 8 Mar 2005 17:12:01 -0000 1.62.2.18 +++ task_overview.php 25 Mar 2005 16:53:58 -0000 1.62.2.19 @@ -403,15 +403,7 @@ /** * Make up a filter array */ - $filter['id'] = $this->parent->id; - $filter['state'] = $this->state; - $filter['start_d'] = $this->start->day; - $filter['start_m'] = $this->start->month; - $filter['start_y'] = $this->start->year; - $filter['end_d'] = $this->end->day; - $filter['end_m'] = $this->end->month; - $filter['end_y'] = $this->end->year; - + $filter = $this->get_task_filter(); // $this->debug($filter); $this->assign('filter', $filter); @@ -526,7 +518,7 @@ // The PNG Gantt functionality, using JpGraph Tools, to be installed if( $tutos[usejpgraph] ) { - $x = array('url' => "task_gantt.php?id=". $this->parent->id, + $x = array('url' => "task_gantt.php?". $this->get_task_filter('url'), 'text' => $lang['TaskGantt'], 'image' => 'gantt', 'info' => $lang['TaskGantt'], |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 16:54:07
|
Update of /cvsroot/tutos/tutos/php/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21928/php/layout Modified Files: Tag: BRANCH-2-0 layout.pinc Log Message: The gantt png tool now is able to represent milestones, and accept same filtering options as the task_overiew page (on state and dates). Index: layout.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -u -r1.1.2.19 -r1.1.2.20 --- layout.pinc 8 Mar 2005 17:12:03 -0000 1.1.2.19 +++ layout.pinc 25 Mar 2005 16:53:58 -0000 1.1.2.20 @@ -777,4 +777,37 @@ 'value' => $done_projects, 'selected' => $selected)))); } + + /** + * Return an array or an url parameter string containing all the + * filter criteria for task overview and gantt selections + */ + function get_task_filter($mode = 'array') { + $filter['id'] = $this->parent->id; + $filter['state'] = $this->state; + $filter['start_d'] = $this->start->day; + $filter['start_m'] = $this->start->month; + $filter['start_y'] = $this->start->year; + $filter['end_d'] = $this->end->day; + $filter['end_m'] = $this->end->month; + $filter['end_y'] = $this->end->year; + + switch($mode) { + case 'array': + return $filter; + break; + + case 'url': + $url = ""; + foreach($filter as $c => $v ) { + if( $url != "" ) + $url .= "&"; + + $url .= $c."=".$v; + } + error_log('get_task_filter: '.$url); + return $url; + break; + } + } } |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 14:48:32
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21367/php Modified Files: Tag: BRANCH-2-0 task_ins.php Log Message: * Added milestone icon to task_overview * Simplified task_show for milestones Index: task_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v retrieving revision 1.40.2.6 retrieving revision 1.40.2.7 diff -u -r1.40.2.6 -r1.40.2.7 --- task_ins.php 23 Mar 2005 17:00:58 -0000 1.40.2.6 +++ task_ins.php 25 Mar 2005 14:48:22 -0000 1.40.2.7 @@ -166,8 +166,14 @@ $msg .= sprintf($lang['Err0038'],$lang['TaskS_Start']) ."<br>"; } - $s_end = new DateTime(0); - $s_end->setDateTimeF("s_end"); +if( $t->milestone ) { + $s_end = $s_start; +} +else { + $s_end = new DateTime(0); + $s_end->setDateTimeF("s_end"); +} + $gotourl= addUrlParameter($gotourl,"s_end=". $s_end->getYYYYMMDDHHMM(),true); if ( !$s_end->checkDMY() ) { $msg .= sprintf($lang['Err0038'],$lang['TaskS_End']) ."<br>"; |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 14:48:32
|
Update of /cvsroot/tutos/tutos/templates/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21367/templates/classic Modified Files: Tag: BRANCH-2-0 task_new.tpl task_overview.tpl task_show.tpl Log Message: * Added milestone icon to task_overview * Simplified task_show for milestones Index: task_new.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_new.tpl,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -r1.1.2.14 -r1.1.2.15 --- task_new.tpl 23 Mar 2005 17:01:00 -0000 1.1.2.14 +++ task_new.tpl 25 Mar 2005 14:48:22 -0000 1.1.2.15 @@ -91,6 +91,9 @@ {html_options name=$state.id options=$state.options selected=$state.selected} </td> +{if $milestone.value} +<td colspan="2"> </td> +{else} <td class="desc" style="text-align: right;"> <label for="{$s_end_d.name}">{$s_end_d.label}</label> <font color="red">(*)</font> @@ -121,6 +124,7 @@ mywindow.focus();" title="MiniCal">MiniCal</a> {/if} </td> +{/if} </tr> <tr> @@ -185,6 +189,7 @@ </td> <td colspan="2"> +{if not $milestone.value} <table align="left"> <tr> <td class="desc" align="right"> @@ -241,6 +246,9 @@ </tr> </table> +{else} + +{/if} </td> </tr> Index: task_overview.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_overview.tpl,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -u -r1.1.2.19 -r1.1.2.20 --- task_overview.tpl 23 Mar 2005 17:01:01 -0000 1.1.2.19 +++ task_overview.tpl 25 Mar 2005 14:48:22 -0000 1.1.2.20 @@ -260,8 +260,8 @@ </colgroup> <tr> {if $t.b > 0}<td class="ow-{$when}"></td>{/if} - {if $t.bg > 0}<td class="ow-green"></td>{/if} - {if $t.br > 0}<td class="ow-red"></td>{/if} + {if $t.bg > 0}<td class="ow-{$when} ow-green"></td>{/if} + {if $t.br > 0}<td class="ow-{$when} ow-red"></td>{/if} {if $t.bn > 0}<td class="ow-{$when}"></td>{/if} </tr> {/if} Index: task_show.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_show.tpl,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -r1.1.2.10 -r1.1.2.11 --- task_show.tpl 23 Mar 2005 17:01:01 -0000 1.1.2.10 +++ task_show.tpl 25 Mar 2005 14:48:22 -0000 1.1.2.11 @@ -66,15 +66,22 @@ <tr> <td class="desc" valign="top">{$sched.label}</td> <td style="white-space: nowrap;"> - {$DateTimeFrom} : <tt>{$sched.start}</tt> + {if not $milestone.value}{$DateTimeFrom} : {/if}<tt>{$sched.start}</tt> </td> +{if $milestone.value} +<td colspan="2"> </td> +{else} <td style="white-space: nowrap;"> {$DateTimeTill} : <tt>{$sched.end}</tt> </td> <td> </td> +{/if} </tr> <tr> +{if $milestone.value} +<td colspan="4"> </td> +{else} <td class="desc" valign="top">{real.label}</td> <td style="white-space: nowrap;"> {$DateTimeFrom} : <tt>{$real.start}</tt> @@ -83,8 +90,10 @@ {$DateTimeTill} : <tt>{$real.end}</tt> </td> <td> </td> +{/if} </tr> +{if not $milestone.value} <tr> <td class="desc" valign="top">{$volume.label}</td> <td>{$volume.value} {$hours}</td> @@ -135,6 +144,7 @@ </table> </td> </tr> +{/if} <tbody> </table> |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 14:48:31
|
Update of /cvsroot/tutos/tutos/html/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21367/html/classic Modified Files: Tag: BRANCH-2-0 style.css Added Files: Tag: BRANCH-2-0 milestone.png Log Message: * Added milestone icon to task_overview * Simplified task_show for milestones --- NEW FILE: milestone.png --- PNG Index: style.css =================================================================== RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23 --- style.css 23 Mar 2005 17:00:57 -0000 1.1.2.22 +++ style.css 25 Mar 2005 14:48:21 -0000 1.1.2.23 @@ -760,7 +760,10 @@ /* Milestones are to be blue */ td.milestone td.ow-green, td.milestone td.ow-red { - background-color: blue; + /* background-color: #d0d0d0; */ + background-image: url("milestone.png"); + background-repeat: no-repeat; + background-position: center; } /* EOF */ \ No newline at end of file |
|
From: Dimitri F. <ta...@us...> - 2005-03-25 13:09:41
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25108 Modified Files: Tag: BRANCH-2-0 task.pinc Log Message: * BUGFIX: the volumes of a logical tasks are not updated on task edit Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.130.2.22 retrieving revision 1.130.2.23 diff -u -r1.130.2.22 -r1.130.2.23 --- task.pinc 23 Mar 2005 17:00:57 -0000 1.130.2.22 +++ task.pinc 25 Mar 2005 13:09:24 -0000 1.130.2.23 @@ -445,8 +445,16 @@ $q->addFV("status",$this->state,"INT"); $q->addFV("logical",$this->logical,"INT"); $q->addFV("milestone",$this->milestone,"INT"); - $q->addFV("volume",$this->volume,"FLOAT"); - $q->addFV("volume_todo",$this->volume_todo,"FLOAT"); + + /** + * When a task is a logical one, do not store the volume on + * update (the volume of the task object is calculated) + */ + if( ! $this->logical ) { + $q->addFV("volume",$this->volume,"FLOAT"); + $q->addFV("volume_todo",$this->volume_todo,"FLOAT"); + } + $q->addFV("name",$this->name,"STRING",$table['task']['name'][size]); $q->addFV("description",$this->desc,"TEXT"); $q->addFV("r_start",$this->r_start,"DATETIME"); @@ -496,7 +504,8 @@ $msg .= parent::save(); - # If the volume_done has been changed, we add a timetrack entry + // If the volume_done has been changed, we add a timetrack entry + // No need to check for logical property here if ( ($this->diff != 0) ) { $tt = new timetrack($this->dbconn); if( isset($cw) ) { |
|
From: Dimitri F. <ta...@us...> - 2005-03-23 17:01:41
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/php Modified Files: Tag: BRANCH-2-0 task.pinc task_ins.php task_new.php task_show.php Log Message: Implementation of new task properties : logical and milestone. When a task is tagged logical its dates and volumes are to be calculated upon its subtasks informations, and when it's a milestone it's displayed in blue in the task_overview screen. The code contains at least one bug to hunt down, on task editing the volumes may be wrong (some more hours - 20 - are added). Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.130.2.21 retrieving revision 1.130.2.22 diff -u -r1.130.2.21 -r1.130.2.22 --- task.pinc 7 Mar 2005 15:34:50 -0000 1.130.2.21 +++ task.pinc 23 Mar 2005 17:00:57 -0000 1.130.2.22 @@ -135,6 +135,11 @@ $this->plist = array(); $this->name = ""; $this->desc = ""; + + // A logical task exists for organisationnal purpose only + $this->logical = 0; + $this->milestone = 0; + $this->volume = 0; $this->volume_done = 0; $this->volume_todo = 0; @@ -158,6 +163,8 @@ $this->p_id = $r->get($pos, "p_id"); $this->parent = getObject($this->dbconn,$this->p_id); $this->state = $r->get($pos, "status"); + $this->logical = $r->get($pos, "logical"); + $this->milestone = $r->get($pos, "milestone"); $this->volume = $r->get($pos, "volume"); $this->volume_done = $r->get($pos, "volume_done"); $this->volume_todo = $r->get($pos, "volume_todo"); @@ -204,7 +211,19 @@ $this->volume_todo = -1; } - # If timetrack is used then the volume_done is read as the sum of all connected tt entries + /** + * If the task is a milestone, explicitly set its end date equal + * to its starting date + */ + if( $this->milestone ) { + $this->s_end = $this->s_end; + $this->r_end = $this->r_end; + } + + /** + * If timetrack is used then the volume_done is read as the sum of + * all connected tt entries + */ if ( ($tutos[usetimetrack] == 1) ) { $this->readTimetrackSum(); $this->volume_done = $this->timetracksum; @@ -213,6 +232,14 @@ } } + /** + * If this task is a « logical » one, read its subtasks and compute + * volumes and completion from them. + */ + if( $this->logical != 0 ) { + $this->read_subtasks(); + } + # Tasks with used volume are not longer in prestate if ( ($this->volume_done > 0) && ($this->state == TASK_PRE) ) { $this->state = TASK_RUNNING; @@ -416,6 +443,8 @@ $q->addFV("p_id",$this->p_id,"INT"); $q->addFV("status",$this->state,"INT"); + $q->addFV("logical",$this->logical,"INT"); + $q->addFV("milestone",$this->milestone,"INT"); $q->addFV("volume",$this->volume,"FLOAT"); $q->addFV("volume_todo",$this->volume_todo,"FLOAT"); $q->addFV("name",$this->name,"STRING",$table['task']['name'][size]); @@ -831,13 +860,14 @@ $result['volume_done'] = $this->volume_done; } - $result['completed'] = $this->getcompletion(); - - $result['s_start'] = $this->s_start->getDate(); - $result['s_end'] = $this->s_end->getDate(); + $result['logical'] = $this->logical; + $result['milestone'] = $this->milestone; + $result['completed'] = $this->getcompletion(); + $result['s_start'] = $this->s_start->getDate(); + $result['s_end'] = $this->s_end->getDate(); $result['s_start_ts'] = $this->s_start->ts; - $result['s_end_ts'] = $this->s_end->ts; + $result['s_end_ts'] = $this->s_end->ts; } if ( $recursive ) { @@ -1291,6 +1321,48 @@ } $r->free(); } + + /** + * Read this task subtasks + * + * This allows for presenting subtasks volume sums for main task. + */ + function read_subtasks() { + global $current_user, $tutos; + + if( isset($this->children) || $this->id == -1 ) + return; + + $this->children = array(); + + // Get the children + $q = "SELECT * FROM ".$this->tablename." t WHERE t.p_id = ".$this->id; + $r = $this->dbconn->Exec($q); + $n = $r->numrows(); + + for( $a = 0; $a < $n; $a++) { + $t = new task($this->dbconn); + $t->read_result($r, $a); + $t->read_subtasks(); + + // Compute the volume + $this->volume += $t->volume; + $this->volume_done += $t->volume_done; + $this->volume_todo += $t->volume_todo; + + // And the schedule + if( $this->s_start->datecmp($t->s_start) > 0 ) + $this->s_start = $t->s_start; + + if( $this->s_end->datecmp($t->s_end) < 0 ) + $this->s_end = $t->s_end; + + $this->children[] = &$t; + unset($t); + } + + return $this->children; + } } ?> \ No newline at end of file Index: task_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v retrieving revision 1.40.2.5 retrieving revision 1.40.2.6 diff -u -r1.40.2.5 -r1.40.2.6 --- task_ins.php 4 Oct 2004 16:08:11 -0000 1.40.2.5 +++ task_ins.php 23 Mar 2005 17:00:58 -0000 1.40.2.6 @@ -58,6 +58,13 @@ $gotourl= addUrlParameter($gotourl,"state=". UrlEncode($state),true); } +// Logical and milestone are boolean checkboxes +$t->logical = + isset($_POST['logical']) && $_POST['logical'] == "on" ? 1 : 0; + +$t->milestone = + isset($_POST['milestone']) && $_POST['milestone'] == "on" ? 1 : 0; + if ( !checkfloat($_POST['volume'],true) ) { $msg .= sprintf($lang['Err0017'],$lang['TaskVolumeFull']) ."<br>"; } else { Index: task_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_new.php,v retrieving revision 1.57.2.12 retrieving revision 1.57.2.13 diff -u -r1.57.2.12 -r1.57.2.13 --- task_new.php 7 Mar 2005 16:21:10 -0000 1.57.2.12 +++ task_new.php 23 Mar 2005 17:00:58 -0000 1.57.2.13 @@ -41,7 +41,6 @@ $this->obj->creation->getDateTime())); $this->assign('acl_link', acl_link($this->obj)); - $this->assign('name', array('id' => 'name', 'label' => $lang['TaskName'], @@ -49,6 +48,14 @@ 'maxl' => $table['task']['name'][size], 'value' => $this->obj->name)); + $this->assign('logical', + array('label' => $lang['TaskLogical'], + 'value' => $this->obj->logical)); + + $this->assign('milestone', + array('label' => $lang['TaskMilestone'], + 'value' => $this->obj->milestone)); + $states = array(); foreach($lang['TaskStates'] as $f => $i ) { $states[$f] = $lang['TaskStates'][$f]; Index: task_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_show.php,v retrieving revision 1.66.2.12 retrieving revision 1.66.2.13 diff -u -r1.66.2.12 -r1.66.2.13 --- task_show.php 8 Feb 2005 15:21:13 -0000 1.66.2.12 +++ task_show.php 23 Mar 2005 17:00:59 -0000 1.66.2.13 @@ -39,6 +39,14 @@ array('label' => $lang['TaskName'], 'value' => $this->obj->name)); + $this->assign('logical', + array('label' => $lang['TaskLogical'], + 'value' => $this->obj->logical)); + + $this->assign('milestone', + array('label' => $lang['TaskMilestone'], + 'value' => $this->obj->milestone)); + $this->assign('state', array('label' => $lang['TaskState'], 'value' => $lang['TaskStates'][$this->obj->state])); @@ -97,9 +105,13 @@ array('label' => $lang['TaskVolumeFull'], 'value' => number_format($this->obj->volume, 2))); + $ttlink = "timetrack_overview.php?link_id=".$this->obj->id; + if( $this->obj->logical ) + $ttlink .= "&show=all"; + $this->assign('volume_done', array('label' => $lang['TaskVolumeDone'], - 'link' => "timetrack_overview.php?link_id=".$this->obj->id, + 'link' => $ttlink, 'title' => $lang['TimetrackOverview'], 'value' => number_format($this->obj->volume_done,2))); |
|
From: Dimitri F. <ta...@us...> - 2005-03-23 17:01:35
|
Update of /cvsroot/tutos/tutos/html/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/html/classic Modified Files: Tag: BRANCH-2-0 style.css Log Message: Implementation of new task properties : logical and milestone. When a task is tagged logical its dates and volumes are to be calculated upon its subtasks informations, and when it's a milestone it's displayed in blue in the task_overview screen. The code contains at least one bug to hunt down, on task editing the volumes may be wrong (some more hours - 20 - are added). Index: style.css =================================================================== RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -r1.1.2.21 -r1.1.2.22 --- style.css 2 Mar 2005 10:29:43 -0000 1.1.2.21 +++ style.css 23 Mar 2005 17:00:57 -0000 1.1.2.22 @@ -758,4 +758,9 @@ background-color: #e07777; } +/* Milestones are to be blue */ +td.milestone td.ow-green, td.milestone td.ow-red { + background-color: blue; +} + /* EOF */ \ No newline at end of file |
|
From: Dimitri F. <ta...@us...> - 2005-03-23 17:01:11
|
Update of /cvsroot/tutos/tutos/templates/classic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/templates/classic Modified Files: Tag: BRANCH-2-0 task_new.tpl task_overview.tpl task_show.tpl Log Message: Implementation of new task properties : logical and milestone. When a task is tagged logical its dates and volumes are to be calculated upon its subtasks informations, and when it's a milestone it's displayed in blue in the task_overview screen. The code contains at least one bug to hunt down, on task editing the volumes may be wrong (some more hours - 20 - are added). Index: task_new.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_new.tpl,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -r1.1.2.13 -r1.1.2.14 --- task_new.tpl 7 Mar 2005 16:21:19 -0000 1.1.2.13 +++ task_new.tpl 23 Mar 2005 17:01:00 -0000 1.1.2.14 @@ -12,21 +12,24 @@ <input type="hidden" name="pid" value="{$pid}"> {/if} -{* If task is not TASK_PRE state, you can't edit the planned volume *} -{if $state.value != 0} +{** + * If task is not TASK_PRE state, or if it's a logical task + * you can't edit the planned volume + *} +{if $state.value != 0 or $logical.value} <input type="hidden" name="volume" value="{$volume.value}"> {/if} {* If is_creator is false, we do not edit the volume_done *} -{if not $is_creator} +{if not $is_creator or $logical.value} <input type="hidden" name="volume_done" value="{$volume_done.value}"> {/if} -{if $is_creator and $state.value != 0} +{if ($is_creator and $state.value != 0) or $logical.value } <input type="hidden" name="volume_todo" value="{$volume_todo.value}"> {/if} -<table class="summary" style="margin-left: 0px;"> +<table border="0" class="summary" style="margin-left: 0px;"> <thead> <tr> <th colspan="4" width="100%">{$title}</th> @@ -35,7 +38,7 @@ <tbody> <tr> -<td colspan="4">{$creation}</td> +<td colspan="4" style="text-align: center;">{$creation}</td> </tr> <tr> @@ -49,24 +52,102 @@ </td> <td class="desc" style="text-align: right;"> + <label for="{$s_start_d.name}">{$s_start_d.label}</label> + <font color="red">(*)</font> +</td> +<td style="white-space: nowrap;"> +{if $logical.value} + <input type="hidden" name="{$s_start_d.name}" value="{$s_start_d.selected}" /> + <input type="hidden" name="{$s_start_m.name}" value="{$s_start_m.selected}" /> + <input type="hidden" name="{$s_start_y.name}" value="{$s_start_y.selected}" /> + {$s_start_d.selected} / {$s_start_m.selected} / {$s_start_y.selected} +{else} +{html_options name=$s_start_d.name + values=$s_start_d.options output=$s_start_d.options + selected=$s_start_d.selected} +<b>.</b> +{html_options name=$s_start_m.name + values=$s_start_m.options output=$s_start_m.options + selected=$s_start_m.selected} +<b>.</b> +{html_options name=$s_start_y.name + values=$s_start_y.options output=$s_start_y.options + selected=$s_start_y.selected} + +<a href="JavaScript: +var d = document.forms[0]; +mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100'); +mywindow.location.href = '{$base}/php/minical.php?f={$s_start_d.f}&n=0&d={$s_start_d.selected}&m={$s_start_m.selected}&y={$s_start_y.selected}&SID'; +mywindow.focus();" title="MiniCal">MiniCal</a> +{/if} + </td> +</tr> + +<tr> +<td class="desc"> <label for="state">{$state.label} </label> </td> <td> {html_options name=$state.id options=$state.options selected=$state.selected} </td> + +<td class="desc" style="text-align: right;"> + <label for="{$s_end_d.name}">{$s_end_d.label}</label> + <font color="red">(*)</font> +</td> +<td style="white-space: nowrap;"> +{if $logical.value} + <input type="hidden" name="{$s_end_d.name}" value="{$s_end_d.selected}" /> + <input type="hidden" name="{$s_end_m.name}" value="{$s_end_m.selected}" /> + <input type="hidden" name="{$s_end_y.name}" value="{$s_end_y.selected}" /> + {$s_end_d.selected} / {$s_end_m.selected} / {$s_end_y.selected} +{else} +{html_options name=$s_end_d.name + values=$s_end_d.options output=$s_end_d.options + selected=$s_end_d.selected} +<b>.</b> +{html_options name=$s_end_m.name + values=$s_end_m.options output=$s_end_m.options + selected=$s_end_m.selected} +<b>.</b> +{html_options name=$s_end_y.name + values=$s_end_y.options output=$s_end_y.options + selected=$s_end_y.selected} + +<a href="JavaScript: +var d = document.forms[0]; +mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100'); +mywindow.location.href = '{$base}/php/minical.php?f={$s_end_d.f}&n=0&d={$s_end_d.selected}&m={$s_end_m.selected}&y={$s_end_y.selected}&SID'; +mywindow.focus();" title="MiniCal">MiniCal</a> +{/if} + </td> </tr> -{if $subtask != ""} <tr> +{if $subtask != ""} <td class="desc"> <label for="{$subtask.id}">{$subtask.label}</label> </td> -<td colspan="3"> +<td> {include file="classic/parent_select.tpl" parent=$subtask} </td> -</tr> +{else} +<td colspan="2"> </td> {/if} +<td style="text-align: right;"> + <input type="checkbox" name="logical" + {if $logical.value}checked="checked"{/if} /> + <label class="desc" for="name">{$logical.label}</label> +</td> + +<td> + <input type="checkbox" name="milestone" + {if $milestone.value}checked="checked"{/if} /> + <label class="desc" for="name">{$milestone.label}</label> +</td> +</tr> + <tr> <td class="desc" valign="top"> <label for="{$desc.id}">{$desc.label}</label> @@ -82,11 +163,11 @@ </tr> <tr> -<td valign="top" rowspan="4" class="desc"> +<td valign="top" class="desc"> {$workers.label} <font color="red">(*)</font> </td> -<td rowspan="4" valign="top"> +<td valign="top"> <select name="{$workers.name}" id="{$workers.id}" multiple size="8"> <optgroup label="{$workers.options.roles.label}"> {html_options options=$workers.options.roles.list @@ -103,6 +184,9 @@ </select> </td> +<td colspan="2"> +<table align="left"> +<tr> <td class="desc" align="right"> <label for="{$volume.id}">{$volume.label}</label> </td> @@ -111,7 +195,6 @@ <input id="{$volume.id}" size="5" name="{$volume.id}" value="{$volume.value}">{$hours} {else} - <input type="hidden" name="{$volume.id}" value="{$volume.value}"> {$volume.value} {/if} </td> @@ -122,7 +205,7 @@ <label for="{$volume_done.id}">{$volume_done.label}</label> </td> <td> - {if $is_creator} + {if $is_creator and not $logical.value} <input id="{$volume_done.id}" size="5" name="{$volume_done.id}" value="{$volume_done.value}">{$hours} {else} @@ -138,6 +221,7 @@ <td> <input type="checkbox" name="{$calc_volume_todo.id}" {if $calc_volume_todo.value == 1}checked="checked"{/if} + {if $logical.value}disabled="disabled"{/if} > </td> </tr> @@ -147,68 +231,28 @@ <label for="{$volume_todo.id}">{$volume_todo.label}</label> </td> <td valign="top"> + {if not $logical.value} <input id="{$volume_todo.id}" size="5" name="{$volume_todo.id}" value="{$volume_todo.value}">{$hours} + {else} + {$volume_todo.value} + {/if} </td> </tr> -<tr> -<td class="desc" > - <label for="{$s_start_d.name}">{$s_start_d.label}</label> - <font color="red">(*)</font> +</table> </td> -<td colspan="3"> - -{html_options name=$s_start_d.name - values=$s_start_d.options output=$s_start_d.options - selected=$s_start_d.selected} -<b>.</b> -{html_options name=$s_start_m.name - values=$s_start_m.options output=$s_start_m.options - selected=$s_start_m.selected} -<b>.</b> -{html_options name=$s_start_y.name - values=$s_start_y.options output=$s_start_y.options - selected=$s_start_y.selected} - -<a href="JavaScript: -var d = document.forms[0]; -mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100'); -mywindow.location.href = '{$base}/php/minical.php?f={$s_start_d.f}&n=0&d={$s_start_d.selected}&m={$s_start_m.selected}&y={$s_start_y.selected}&SID'; -mywindow.focus();" title="MiniCal">MiniCal</a> - - </td> </tr> -<tr> -<td class="desc" > - <label for="{$s_end_d.name}">{$s_end_d.label}</label> - <font color="red">(*)</font> -</td> -<td colspan="3"> -{html_options name=$s_end_d.name - values=$s_end_d.options output=$s_end_d.options - selected=$s_end_d.selected} -<b>.</b> -{html_options name=$s_end_m.name - values=$s_end_m.options output=$s_end_m.options - selected=$s_end_m.selected} -<b>.</b> -{html_options name=$s_end_y.name - values=$s_end_y.options output=$s_end_y.options - selected=$s_end_y.selected} - -<a href="JavaScript: -var d = document.forms[0]; -mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100'); -mywindow.location.href = '{$base}/php/minical.php?f={$s_end_d.f}&n=0&d={$s_end_d.selected}&m={$s_end_m.selected}&y={$s_end_y.selected}&SID'; -mywindow.focus();" title="MiniCal">MiniCal</a> - - </td> -</tr> </tbody> +</table> -<tfoot> +<table class="summary"> +<thead> + <tr><th colspan="4">{$FldsRequired}</th></tr> +</thead> + +<tbody> <tr> <td class="desc"> <label for="OK">{$InputOk}</label> @@ -225,14 +269,13 @@ value="{$Reset}" title="{$Reset}"> </td> </tr> -</tfoot> +</tbody> </table> + </form> <script type="text/javascript" language="JavaScript"> document.{$focus}.focus(); </script> -{$FldsRequired} - <!-- task_new stop --> \ No newline at end of file Index: task_overview.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_overview.tpl,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -u -r1.1.2.18 -r1.1.2.19 --- task_overview.tpl 9 Mar 2005 10:12:37 -0000 1.1.2.18 +++ task_overview.tpl 23 Mar 2005 17:01:01 -0000 1.1.2.19 @@ -196,7 +196,7 @@ <td class="data">{$t.s_start}</td> {* task overview diagram *} - <td> + <td {if $t.milestone}class="milestone"{/if}> {if $withtimeline} <table width="200" cellspacing="0" cellpadding="0"> <colgroup> Index: task_show.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_show.tpl,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- task_show.tpl 10 Mar 2005 15:36:13 -0000 1.1.2.9 +++ task_show.tpl 23 Mar 2005 17:01:01 -0000 1.1.2.10 @@ -65,15 +65,23 @@ <tr> <td class="desc" valign="top">{$sched.label}</td> -<td>{$DateTimeFrom} : <tt>{$sched.start}</tt></td> -<td>{$DateTimeTill} : <tt>{$sched.end}</tt></td> +<td style="white-space: nowrap;"> + {$DateTimeFrom} : <tt>{$sched.start}</tt> +</td> +<td style="white-space: nowrap;"> + {$DateTimeTill} : <tt>{$sched.end}</tt> +</td> <td> </td> </tr> <tr> <td class="desc" valign="top">{real.label}</td> -<td>{$DateTimeFrom} : <tt>{$real.start}</tt></td> -<td>{$DateTimeTill} : <tt>{$real.end}</tt></td> +<td style="white-space: nowrap;"> + {$DateTimeFrom} : <tt>{$real.start}</tt> +</td> +<td style="white-space: nowrap;"> + {$DateTimeTill} : <tt>{$real.end}</tt> +</td> <td> </td> </tr> |
|
From: Dimitri F. <ta...@us...> - 2005-03-23 17:01:08
|
Update of /cvsroot/tutos/tutos/php/localization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/php/localization Modified Files: Tag: BRANCH-2-0 en.p3 fr.p3 Log Message: Implementation of new task properties : logical and milestone. When a task is tagged logical its dates and volumes are to be calculated upon its subtasks informations, and when it's a milestone it's displayed in blue in the task_overview screen. The code contains at least one bug to hunt down, on task editing the volumes may be wrong (some more hours - 20 - are added). Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v retrieving revision 1.47.2.7 retrieving revision 1.47.2.8 diff -u -r1.47.2.7 -r1.47.2.8 --- en.p3 31 Jan 2005 17:37:32 -0000 1.47.2.7 +++ en.p3 23 Mar 2005 17:01:00 -0000 1.47.2.8 @@ -444,6 +444,8 @@ $lang['SearchForTask'] = "Task Search"; $lang['SearchForTaskExt'] = "Extended Task Search"; $lang['TaskBetween'] = "Time between"; +$lang['TaskLogical'] = "Logical task"; +$lang['TaskMilestone'] = "Milestone"; # Gantt Diagramm $lang['GanttLink'] = "See the Gantt"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v retrieving revision 1.40.2.19 retrieving revision 1.40.2.20 diff -u -r1.40.2.19 -r1.40.2.20 --- fr.p3 2 Mar 2005 10:29:45 -0000 1.40.2.19 +++ fr.p3 23 Mar 2005 17:01:00 -0000 1.40.2.20 @@ -441,6 +441,8 @@ $lang['SearchForTask'] = "Task Search"; $lang['SearchForTaskExt'] = "Extended Task Search"; $lang['TaskBetween'] = "Time between"; +$lang['TaskLogical'] = "Tâche logique"; +$lang['TaskMilestone'] = "Jalon"; # Gantt Diagramm $lang['GanttLink'] = "See the Gantt"; |
|
From: Dimitri F. <ta...@us...> - 2005-03-23 17:01:08
|
Update of /cvsroot/tutos/tutos/php/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18144/php/db Modified Files: Tag: BRANCH-2-0 table.pinc Log Message: Implementation of new task properties : logical and milestone. When a task is tagged logical its dates and volumes are to be calculated upon its subtasks informations, and when it's a milestone it's displayed in blue in the task_overview screen. The code contains at least one bug to hunt down, on task editing the volumes may be wrong (some more hours - 20 - are added). Index: table.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -r1.20.2.3 -r1.20.2.4 --- table.pinc 31 Jan 2005 17:37:32 -0000 1.20.2.3 +++ table.pinc 23 Mar 2005 17:00:59 -0000 1.20.2.4 @@ -325,6 +325,8 @@ "p_id" => array(type => "ID_TYPE", constraints => "NN", Desc => "linked object"), "worker" => array(type => "ID_TYPE", constraints => "", Desc => "user object"), "name" => array(type => "VARCHAR", size => 40, constraints => "", Desc => "short description"), + "logical" => array(type => "ID_TYPE", constraints => "", Desc => "logical task or not (organisationnal purpose only if set)"), + "milestone" => array(type => "ID_TYPE", constraints => "", Desc => "milestone or not"), "r_start" => array(type => "TS_TYPE", constraints => "", Desc => "real start date"), "r_end" => array(type => "TS_TYPE", constraints => "", Desc => "real end date"), "s_start" => array(type => "TS_TYPE", constraints => "NN", Desc => "scheduled start date"), |
|
From: Gero K. <gok...@us...> - 2005-03-21 11:29:18
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32309 Modified Files: Tag: BRANCH-1-2 task.pinc Log Message: bugfix 1167415 Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.150.2.7 retrieving revision 1.150.2.8 diff -u -r1.150.2.7 -r1.150.2.8 --- task.pinc 20 Feb 2005 19:53:59 -0000 1.150.2.7 +++ task.pinc 21 Mar 2005 11:29:09 -0000 1.150.2.8 @@ -490,7 +490,7 @@ if ( trim($name) == "" ) return; $q = "SELECT * from ". $user->dbconn->prefix ."tasks WHERE". $user->dbconn->Like("name",$name); - $q .= " order name "; + $q .= " order by name "; check_dbacl( $q, $user->id); $r = $user->dbconn->Exec($q); $n = $r->numrows(); |
|
From: Jeroen B. <kw...@us...> - 2005-03-18 08:08:08
|
Update of /cvsroot/tutos/tutos/php/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9596/db Modified Files: table.pinc Log Message: Added: -distance entry to timetrack_new -extra distance column in timetrack_overview -extra distance total to product_show -all related classes -some new entries to all localisation files Index: table.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- table.pinc 19 Feb 2005 21:41:36 -0000 1.30 +++ table.pinc 18 Mar 2005 08:07:25 -0000 1.31 @@ -436,6 +436,7 @@ "link_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "id of worked object"), "volume" => array(type => "float", constraints => '', Desc => "work volume in hours"), "volume_todo" => array(type => "float", constraints => '', Desc => "work volume still to do in hours"), + "distance" => array(type => "float", constraints => '', Desc => "distance travelled"), "t_start" => array(type => 'TS_TYPE', constraints => '', Desc => "start of work"), "t_end" => array(type => 'TS_TYPE', constraints => '', Desc => "end of work"), "description" => array(type => 'VARCHAR', size => 120, constraints => '', Desc => "description"), @@ -504,4 +505,4 @@ Desc => "main TUTOS sequencer", ); -?> \ No newline at end of file +?> |
|
From: Jeroen B. <kw...@us...> - 2005-03-18 08:08:08
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9596 Modified Files: product_show.php timetrack.pinc timetrack_ins.php timetrack_new.php timetrack_overview.php Log Message: Added: -distance entry to timetrack_new -extra distance column in timetrack_overview -extra distance total to product_show -all related classes -some new entries to all localisation files Index: product_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/product_show.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- product_show.php 19 Feb 2005 12:00:25 -0000 1.103 +++ product_show.php 18 Mar 2005 08:07:23 -0000 1.104 @@ -238,7 +238,7 @@ echo makelink("timetrack_overview.php?link_id=". $this->obj->id ,number_format($this->obj->timetracksum,2),$lang['TimetrackOverview']); echo " </td>\n"; echo " <td align=\"left\">". $lang['hours'] ."</td>\n"; - echo " <td> </td>\n"; + echo " <td>".number_format($this->obj->distancesum,2)." ".$lang['DistanceUnit']."</td>\n"; echo "</tr>\n"; $r = 1; $timesum += $this->obj->timetracksum; Index: timetrack.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- timetrack.pinc 2 Oct 2004 08:42:34 -0000 1.74 +++ timetrack.pinc 18 Mar 2005 08:07:24 -0000 1.75 @@ -21,7 +21,7 @@ global $table; $obj->timetracksum = 0; - $q = "SELECT SUM(volume) as XX FROM ". $obj->dbconn->prefix .$table['timetrack'][name]; + $q = "SELECT SUM(volume) as XX, SUM(distance) as YY FROM ". $obj->dbconn->prefix .$table['timetrack'][name]; $pre = " WHERE "; if ( $obj->getType() == "address" ) { $q .= $pre . " adr_id =". $obj->id ; @@ -38,6 +38,7 @@ return; } $obj->timetracksum = $r->get(0,"XX"); + $obj->distancesum = $r->get(0,"YY"); $r->free(); return; } @@ -114,6 +115,7 @@ $this->ref = getObject($this->dbconn,$this->link_id); $this->desc = $r->get($pos, "description"); $this->volume = $r->get($pos, "volume"); + $this->distance = $r->get($pos, "distance"); $this->volume_todo = $r->get($pos, "volume_todo"); $this->state = (integer)$r->get($pos, "state"); $this->cph = $r->get($pos, "cph"); @@ -270,6 +272,13 @@ return; } /** + * set the distance + */ + function setDistance($value) { + $this->setFloatField("distance",$value,"Distance"); + return; + } + /** * set the volume todo */ function setVolumeTodo($value) { @@ -333,6 +342,7 @@ $q->addFV("link_id",$this->link_id,""); $q->addFV("adr_id",$this->worker->id,""); $q->addFV("volume",$this->volume,"FLOAT"); + $q->addFV("distance",$this->distance,"FLOAT"); $q->addFV("volume_todo",$volume_todo,"FLOAT"); $q->addFV("description",$this->desc,"STRING",$table['timetrack']['description'][size]); $q->addFV("vtime",$this->wday,"DATETIME"); Index: timetrack_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_ins.php,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- timetrack_ins.php 13 Mar 2005 17:05:49 -0000 1.47 +++ timetrack_ins.php 18 Mar 2005 08:07:24 -0000 1.48 @@ -135,6 +135,18 @@ $tt->setVolume($_POST['volume']); } } + # distance + if ( isset($_POST['distance']) && $_POST['distance'] != "" ) { + $gotourl= addUrlParameter($gotourl,"distance=".UrlEncode($_POST['distance']),true); + + if ( !checkfloat($_POST['distance'],false) ) { + $msg .= sprintf($lang['Err0009'],$lang['Distance']) ."<br />"; + $gotourl = addBadField($gotourl,'distance',true); + } else { + $tt->setDistance($_POST['distance']); + } + } + # volume todo if ( isset($_POST['volume_todo']) && $_POST['volume_todo'] != "" ) { @@ -183,4 +195,4 @@ Header("Status: 302 Moved Temporarily"); Header("Location: ". getBaseUrl() . $gotourl); $dbconn->Close(); -?> \ No newline at end of file +?> Index: timetrack_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- timetrack_new.php 13 Mar 2005 17:05:49 -0000 1.58 +++ timetrack_new.php 18 Mar 2005 08:07:24 -0000 1.59 @@ -105,6 +105,9 @@ echo "<tr>\n"; echo $this->showfieldc($lang['TaskVolumeDone'],1,"volume"); echo " <td colspan=\"1\"><input size=\"10\" maxlength=\"10\" name=\"volume\" value=\"". number_format($this->obj->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\">". $lang['hours'] ."</td>\n"; + # added by J. baten to facilitate travel distance + echo " <td colspan=\"1\">". $lang['Distance']; + echo " <input size=\"10\" maxlength=\"10\" name=\"distance\" value=\"". number_format($this->obj->distance,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\">". $lang['DistanceUnit'] ."</td>\n"; echo $this->showfieldc($lang['atDateTime'],1,"wd"); echo " <td>\n"; $this->obj->wday->EnterDate("wd",1); @@ -144,6 +147,7 @@ echo " <td colspan=\"1\"><input size=\"10\" maxlength=\"10\" name=\"cph\" value=\"". number_format($this->obj->cph,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\">\n"; Currency_Select("currency",$this->obj->currency); echo "</td>\n"; + echo "<td></td\n"; echo $this->showfieldc($lang['TTState'],1,"state"); echo " <td><select name=\"state\">\n"; foreach($lang['TTStates'] as $s => $x) { @@ -251,6 +255,9 @@ if ( isset($_GET['cph']) ) { $this->obj->cph = $_GET['cph']; } + if ( isset($_GET['distance']) ) { + $this->obj->distance = $_GET['distance']; + } if ( isset($_GET['currency']) ) { $this->obj->currncy = $_GET['currency']; } @@ -316,4 +323,4 @@ <!-- CVS Info: $Id$ $Author$ ---> \ No newline at end of file +--> Index: timetrack_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- timetrack_overview.php 1 Sep 2004 15:29:54 -0000 1.88 +++ timetrack_overview.php 18 Mar 2005 08:07:24 -0000 1.89 @@ -96,6 +96,7 @@ $c = 0; $worksheet1->write_number($x,$c++, $a->id); $worksheet1->write_number($x,$c++, $a->volume,$format2); + $worksheet1->write_number($x,$c++, $a->distance,$format2); $worksheet1->write_number($x,$c++, $a->cph,$format2); $worksheet1->write_string($x,$c++, $a->currency,$format2); $worksheet1->write_string($x,$c++, $a->desc,$format2); @@ -133,6 +134,7 @@ echo $this->orderHeader("",$lang['TimetrackWorker'],$this->link2); echo $this->orderHeader("volume",$lang['TaskVolumeDone'],$this->link2); echo $this->orderHeader("volume_todo",$lang['TaskVolumeTodo'],$this->link2); + echo $this->orderHeader("distance",$lang['Distance'],$this->link2); echo $this->orderHeader("vtime",$lang['TimetrackDate'],$this->link2); echo $this->orderHeader("description",$lang['Description'],$this->link2); echo $this->orderHeader("state",$lang['TTState'],$this->link2); @@ -146,6 +148,7 @@ echo "</thead>\n"; $sum['v'] = 0.0; + $sum['d'] = 0.0; $sum[''] = 0.0; @reset($tutos[currencies]); while( list ($ia,$c) = @each ($tutos[currencies])) { @@ -164,10 +167,11 @@ $end = $this->start + $tutos[maxshow]; } - # Fill the sum + # Fill the sum of time and distance $x = 0; while ( $x < $a ) { $sum['v'] += $this->result->get($x, "volume"); + $sum['d'] += $this->result->get($x, "distance"); $sum[$this->result->get($x, "currency")] += ( $this->result->get($x, "cph") * $this->result->get($x, "volume") ); $x++; } @@ -198,7 +202,9 @@ } else { echo " <td align=\"right\"> </td>\n"; } + echo " <td align=\"right\">". $tt->distance ."</td>\n"; $sum['v'] += $tt->volume; + $sum['d'] += $tt->distance; $sum[$tt->currency] += ( $tt->cph * $tt->volume ); echo " <td align=\"right\" nowrap=\"nowrap\">\n"; echo $tt->wday->getDate(); @@ -231,15 +237,18 @@ echo $this->list_navigation($this->link1,$cols ,$this->start,$a,$n); - # Fill the sum + # Fill the sum of time and distance while ( $a < $n ) { $sum['v'] += $this->result->get($a, "volume"); + $sum['d'] += $this->result->get($a, "distance"); $sum[$this->result->get($a, "currency")] += ( $this->result->get($a, "cph") * $this->result->get($a, "volume") ); $a++; } echo "<tr>\n"; echo " <td colspan=\"3\"> </td>\n"; echo " <td align=\"right\"><b>". hour_format($sum['v']) ."</b></td>\n"; + echo " <td></td>\n"; + echo " <td align=\"right\"><b>". $sum['d'] ."</b></td>\n"; echo " <td colspan=\"4\"> </td>\n"; echo " <td align=\"right\"><b>\n"; @reset($sum); @@ -666,4 +675,4 @@ $l = new timetrack_overview($current_user); $l->display(); $dbconn->Close(); -?> \ No newline at end of file +?> |
|
From: Jeroen B. <kw...@us...> - 2005-03-18 08:07:50
|
Update of /cvsroot/tutos/tutos/php/localization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9596/localization Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: Added: -distance entry to timetrack_new -extra distance column in timetrack_overview -extra distance total to product_show -all related classes -some new entries to all localisation files Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ca.p3 8 Nov 2004 20:29:07 -0000 1.51 +++ ca.p3 18 Mar 2005 08:07:25 -0000 1.52 @@ -420,6 +420,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Subtasca de"; $lang['hours'] = "hores"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "creat per %s el %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "En curs"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- cs.p3 8 Nov 2004 20:29:08 -0000 1.51 +++ cs.p3 18 Mar 2005 08:07:25 -0000 1.52 @@ -423,6 +423,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Podúloha úlohy"; $lang['hours'] = "h"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "vytvoøil %s %s"; $lang['TaskStates'][0] = "Pøed"; $lang['TaskStates'][1] = "Pokraèuje"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- de.p3 26 Feb 2005 19:03:20 -0000 1.66 +++ de.p3 18 Mar 2005 08:07:33 -0000 1.67 @@ -424,6 +424,9 @@ $lang['TaskVolumeTodo'] = 'Zu erledigen'; $lang['TaskSubTask'] = 'Teilaufgabe von'; $lang['hours'] = 'Stunden'; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = 'Angelegt durch %s am %s'; $lang['TaskStates'][0] = 'Nicht angefangen'; $lang['TaskStates'][1] = 'Läuft'; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- el.p3 8 Nov 2004 20:29:08 -0000 1.52 +++ el.p3 18 Mar 2005 08:07:33 -0000 1.53 @@ -422,6 +422,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Õðï-åñãáóßá áðü"; $lang['hours'] = "þñåò"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "äçìéïõñãÞèçêå áðü %s óå %s"; $lang['TaskStates'][0] = "Ðñüôåñç"; $lang['TaskStates'][1] = "Ðáñïýóá"; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- en.p3 26 Feb 2005 19:03:21 -0000 1.64 +++ en.p3 18 Mar 2005 08:07:33 -0000 1.65 @@ -424,6 +424,9 @@ $lang['TaskVolumeTodo'] = 'Volume to do'; $lang['TaskSubTask'] = 'Subtask of'; $lang['hours'] = 'hours'; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = 'created by %s on %s'; $lang['TaskStates'][0] = 'Pre'; $lang['TaskStates'][1] = 'Ongoing'; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- es-mx.p3 8 Nov 2004 20:29:08 -0000 1.50 +++ es-mx.p3 18 Mar 2005 08:07:33 -0000 1.51 @@ -420,6 +420,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Subtarea de"; $lang['hours'] = "horas"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "Creado por %s el %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "En curso"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- es-ni.p3 8 Nov 2004 20:29:08 -0000 1.50 +++ es-ni.p3 18 Mar 2005 08:07:33 -0000 1.51 @@ -421,6 +421,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Subtarea de"; $lang['hours'] = "horas"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "creado por %s el %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "En curso"; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ve.p3,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- es-ve.p3 11 Mar 2005 16:45:30 -0000 1.26 +++ es-ve.p3 18 Mar 2005 08:07:33 -0000 1.27 @@ -420,6 +420,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Subtarea de"; $lang['hours'] = "horas"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "Creado por %s el %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "En curso"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- es.p3 10 Nov 2004 19:38:01 -0000 1.53 +++ es.p3 18 Mar 2005 08:07:33 -0000 1.54 @@ -420,6 +420,9 @@ $lang['TaskVolumeTodo'] = "Horas restantes"; $lang['TaskSubTask'] = "Subtarea de"; $lang['hours'] = "horas"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "creado por %s el %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "En curso"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- fr.p3 26 Feb 2005 19:03:21 -0000 1.55 +++ fr.p3 18 Mar 2005 08:07:33 -0000 1.56 @@ -421,6 +421,9 @@ $lang['TaskVolumeTodo'] = 'Charge de travail restant'; $lang['TaskSubTask'] = 'Sous-tâche de'; $lang['hours'] = 'Heures'; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = 'Créer par %s sur %s'; $lang['TaskStates'][0] = 'Pre'; $lang['TaskStates'][1] = 'En cours'; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- hu.p3 8 Nov 2004 20:29:08 -0000 1.60 +++ hu.p3 18 Mar 2005 08:07:33 -0000 1.61 @@ -425,6 +425,9 @@ $lang['TaskVolumeTodo'] = "Elvégzendõ munkamennyiség"; $lang['TaskSubTask'] = "Alfeladatai:"; $lang['hours'] = "óra"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "létrehozta %s %s-n."; $lang['TaskStates'][0] = "Elõzetes"; $lang['TaskStates'][1] = "Folyamatban"; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- it.p3 26 Feb 2005 19:03:37 -0000 1.52 +++ it.p3 18 Mar 2005 08:07:33 -0000 1.53 @@ -419,6 +419,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Sottolavoro di "; $lang['hours'] = "ore"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "creato da %s il %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "In Lavorazione"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ja.p3,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ja.p3 8 Nov 2004 20:29:08 -0000 1.51 +++ ja.p3 18 Mar 2005 08:07:33 -0000 1.52 @@ -416,6 +416,9 @@ $lang['TaskVolumeTodo'] = "¤Ê¤¹¤Ù¤»Å»öÎÌ"; $lang['TaskSubTask'] = "¥µ¥Ö¥¿¥¹¥¯ "; $lang['hours'] = "»þ´Ö"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "%s ¤¬ %s ¤ËºîÀ®"; $lang['TaskStates'][0] = "Á°Ãʳ¬"; $lang['TaskStates'][1] = "ºî¶ÈÃæ"; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ko.p3 28 Jan 2005 11:26:05 -0000 1.51 +++ ko.p3 18 Mar 2005 08:07:33 -0000 1.52 @@ -420,6 +420,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "´ÙÀ½ÀÇÇÏÀ§ÀÛ¾÷ : "; $lang['hours'] = "½Ã°£"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "%s¿¡ ÀÇÇØ %s »ý¼º"; $lang['TaskStates'][0] = "ÁغñÁß"; $lang['TaskStates'][1] = "¼öÇàÁß"; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- nl.p3 26 Feb 2005 19:03:37 -0000 1.58 +++ nl.p3 18 Mar 2005 08:07:33 -0000 1.59 @@ -428,6 +428,9 @@ $lang['TaskVolumeTodo'] = "Volume te doen"; $lang['TaskSubTask'] = "Subtaak van"; $lang['hours'] = "uren"; +$lang['Distance'] = "Afstand"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km"; $lang['TaskCreation'] = "aangemaakt door %s op %s"; $lang['TaskStates'][0] = "Pre"; $lang['TaskStates'][1] = "In bewerking"; @@ -634,7 +637,7 @@ $lang['HistoryDeleted'] = "tussentijds gewist"; # Timetrack -$lang['Timetrack'] = "Tijdspinspanning"; +$lang['Timetrack'] = "Tijdsinspanning"; $lang['Timetracks'] = "Tijdstracks"; $lang['TimetrackCreate'] = "Geboekte Tijd"; $lang['TimetrackCreateI'] = "geboekte tijd op %s"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- pl.p3 8 Nov 2004 20:29:08 -0000 1.62 +++ pl.p3 18 Mar 2005 08:07:34 -0000 1.63 @@ -426,6 +426,9 @@ $lang['TaskVolumeTodo'] = "Jeszcze do zrobienia"; $lang['TaskSubTask'] = "Podzadanie"; $lang['hours'] = "godzin"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "utworzone przez %s na %s"; $lang['TaskStates'][0] = "Przed"; $lang['TaskStates'][1] = "W trakcie"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pt-br.p3,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- pt-br.p3 8 Nov 2004 20:29:09 -0000 1.51 +++ pt-br.p3 18 Mar 2005 08:07:34 -0000 1.52 @@ -419,6 +419,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Sub-tarefa de"; $lang['hours'] = "horas"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "criado por %s em %s"; $lang['TaskStates'][0] = "Prévia"; $lang['TaskStates'][1] = "Em andamento"; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pt.p3,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pt.p3 8 Nov 2004 20:29:09 -0000 1.25 +++ pt.p3 18 Mar 2005 08:07:34 -0000 1.26 @@ -425,6 +425,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Sub-tarefa de"; $lang['hours'] = "horas"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "criada por %s em %s"; $lang['TaskStates'][0] = "EM PREPARAÇÃO"; $lang['TaskStates'][1] = "EM CURSO"; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ru.p3 8 Nov 2004 20:29:09 -0000 1.55 +++ ru.p3 18 Mar 2005 08:07:35 -0000 1.56 @@ -420,6 +420,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "ðÏÄÚÁÄÁÞÁ ÉÚ"; $lang['hours'] = "ÞÁÓ"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "ÓÏÚÄÁÎ %s %s"; $lang['TaskStates'][0] = "ðÏÄÇÏÔÏ×ËÁ"; $lang['TaskStates'][1] = "÷ ÒÁÂÏÔÅ"; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sv.p3 8 Nov 2004 20:29:09 -0000 1.55 +++ sv.p3 18 Mar 2005 08:07:35 -0000 1.56 @@ -416,6 +416,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Basuppgift av"; $lang['hours'] = "timmar"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "skapad av %s den %s"; $lang['TaskStates'][0] = "Förberedelse"; $lang['TaskStates'][1] = "Pågående"; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/tw.p3,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- tw.p3 8 Nov 2004 20:29:09 -0000 1.52 +++ tw.p3 18 Mar 2005 08:07:35 -0000 1.53 @@ -422,6 +422,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "¤l¤u§@"; $lang['hours'] = "¤p®É"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "¥Ñ %s ³]¥ß©ó %s"; $lang['TaskStates'][0] = "©|¥¼¶}©l"; $lang['TaskStates'][1] = "¶i¦æ¤¤"; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/vi.p3,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- vi.p3 8 Nov 2004 20:29:09 -0000 1.27 +++ vi.p3 18 Mar 2005 08:07:35 -0000 1.28 @@ -424,6 +424,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "Hạng mục của"; $lang['hours'] = "ngà y công"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = "Äược láºp bá»i %s và o ngà y %s"; $lang['TaskStates'][0] = "Chuẩn bá»"; $lang['TaskStates'][1] = "Äang thá»±c hiá»n"; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/zh.p3,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- zh.p3 8 Nov 2004 20:29:09 -0000 1.52 +++ zh.p3 18 Mar 2005 08:07:35 -0000 1.53 @@ -423,6 +423,9 @@ $lang['TaskVolumeTodo'] = "Volume to do"; $lang['TaskSubTask'] = "·ÖÅ乤×÷Ö®"; $lang['hours'] = "Сʱ"; +$lang['Distance'] = "Distance"; +# change the next entry to relevant unit here: miles or km +$lang['DistanceUnit'] = "km/miles"; $lang['TaskCreation'] = " %s ÉèÁ¢ÔÚ %s"; $lang['TaskStates'][0] = "Ç°"; $lang['TaskStates'][1] = "ÕýÔÚ¹¤×÷ÖÐ"; |
|
From: Gero K. <gok...@us...> - 2005-03-17 19:50:56
|
Update of /cvsroot/tutos/tutos/php/resource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9256/resource Modified Files: mtable.pinc resource.pinc resource_ins.php resource_new.php resource_show.php Log Message: fixed some custom field handling (see mconfig files) / custom fields may now appear in overviews Index: mtable.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/resource/mtable.pinc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mtable.pinc 21 Feb 2004 17:25:03 -0000 1.4 +++ mtable.pinc 17 Mar 2005 19:50:47 -0000 1.5 @@ -1,6 +1,10 @@ <?php /* - * Copyright 2002 by Gero Kohnert + * Copyright 2002 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * Information about the tables and indices neccessary for this module * @@ -8,15 +12,15 @@ * $Author$ */ -$table['resource'] = array( - name => "resources", - Desc => "TUTOS resources", - "id" => array(type => "ID_TYPE", constraints => "PK", Desc => "Object ID"), - "name" => array(type => "VARCHAR", size => 30, constraints => "", Desc => "name"), - "description" => array(type => "VARCHAR", size => 60, constraints => "", Desc => "description"), - "creator" => array(type => "ID_TYPE", constraints => "NN", Desc => "creator ID"), - "creation" => array(type => "TS_TYPE", constraints => "NN", Desc => "creation date") -); + +$table['resource'][name] = "resources"; +$table['resource'][Desc] = "TUTOS resources"; +$table['resource']['id'] = array(type => "ID_TYPE", constraints => "PK", Desc => "Object ID"); +$table['resource']['name'] = array(type => "VARCHAR", size => 30, constraints => "", Desc => "name"); +$table['resource']['description'] = array(type => "VARCHAR", size => 60, constraints => "", Desc => "description"); +$table['resource']['creator'] = array(type => "ID_TYPE", constraints => "NN", Desc => "creator ID"); +$table['resource']['creation'] = array(type => "TS_TYPE", constraints => "NN", Desc => "creation date"); + $table['resource1'] = array( name => "res_use", Index: resource.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- resource.pinc 7 Feb 2005 16:45:37 -0000 1.37 +++ resource.pinc 17 Mar 2005 19:50:47 -0000 1.38 @@ -1,6 +1,10 @@ <?php /** - * Copyright 2001 - 2004 by Gero Kohnert + * Copyright 2001 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * CVS Info: $Id$ * $Author$ @@ -183,6 +187,7 @@ $q->setTable($this->tablename); $q->addFV("name",$this->name,"STRING",$table['resource']['name'][size]); $q->addFV("description",$this->desc,"STRING",$table['resource']['description'][size]); + $this->save_custom_fields($q); if ( $this->id < 0 ) { unset ($this->modified); Index: resource_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/resource/resource_ins.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- resource_ins.php 13 Mar 2005 17:27:18 -0000 1.8 +++ resource_ins.php 17 Mar 2005 19:50:47 -0000 1.9 @@ -43,9 +43,15 @@ $b->setDesc(trim(StripSlashes($_POST['desc']))); $gotourl = addUrlParameter($gotourl,"desc=". UrlEncode($b->desc),true); + # + # Parse additional custom fields + # + $msg .= parse_custom_fields($b->gettype(),$b); + + # other modules $msg .= module_parseforms($current_user,$b,$gotourl); - if ( $msg == "" ) { + if ( $msg == '' ) { $dbconn->Begin("WORK"); $msg .= $b->save(); $dbconn->Commit("WORK"); Index: resource_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/resource/resource_new.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- resource_new.php 13 Mar 2005 17:27:18 -0000 1.22 +++ resource_new.php 17 Mar 2005 19:50:47 -0000 1.23 @@ -52,6 +52,10 @@ echo " <td colspan=\"3\" valign=\"top\"><input id=\"desc\" size=\"". min($table['resource']['description'][size],40) ."\" maxlength=\"". $table['resource']['description'][size] ."\" name=\"desc\" value=\"". $this->obj->desc ."\"></td>"; echo "</tr>\n"; + # + # Edit additional custom fields + # + edit_custom_fields($this,$this->obj->gettype(),$this->obj,4); # References to modules module_addforms($this->user,$this->obj,4); Index: resource_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/resource/resource_show.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- resource_show.php 19 Jul 2004 19:08:56 -0000 1.25 +++ resource_show.php 17 Mar 2005 19:50:47 -0000 1.26 @@ -1,6 +1,10 @@ <?php /** - * Copyright 2001 - 2003 by Gero Kohnert + * Copyright 2001 - 2005 by Gero Kohnert + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; version 2 of the License. * * @modulegroup resource * @module resource_show @@ -115,6 +119,10 @@ } echo "</tr>\n"; + # + # Show additional custom fields + # + show_custom_fields($this,$this->obj->gettype(),$this->obj,4); # References to modules show_module_infolists($this->user,$this->obj,4,$this->format); echo $this->obj->getHistoryLink(4); |