tutos-commits Mailing List for TUTOS

Dear Tutos user,

We are Salvador Bueno and Dolores Gallego, Assistant Professors in Business 
Administration Department in Pablo de Olavide University at Seville, Spain.  
Our research involves an analysis about Open Source Software-Enterprise 
Resource Planning (OSS-ERP) and its impact at organization. We send you this 
mail to invite your participation in our study.

Specifically, our analysis consists on development a Technological 
Acceptance Model of an OSS-ERP.  We consider you are an OSS-ERP user and we 
appreciate the time necessary for answer our questionnaire. The name of the 
participants in this study will remain anonymous.

I would be most grateful if you participate in this survey. You only have to 
answer the questionnaire in the following URL and answer online. You will 
consider for answer the distribution of OSS-ERP you use.

http://aramis.upo.es/general/centros_depart/departamentos/invest/oss/

Please do not hesitate to contact us if you have any queries regarding this 
study.

Best regards,

Salvador Bueno, Ph D.

_________________________________________________________________
Descarga gratis la Barra de Herramientas de MSN 
http://www.msn.es/usuario/busqueda/barra?XAPID=2031&DI=1055&SU=http%3A//www.hotmail.com&HL=LINKTAG1OPENINGTEXT_MSNBH

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22635/php/layout

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
PREV of change style

Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -d -r1.1.2.35 -r1.1.2.36
--- layout.pinc	23 Mar 2007 17:52:34 -0000	1.1.2.35
+++ layout.pinc	27 Mar 2007 16:51:31 -0000	1.1.2.36
@@ -554,10 +554,11 @@
     $with_legend = is_callable(array($this, 'legend'));
     $this->assign("with_legend", $with_legend);
 
-    if( isset($lang['DateTimeSPHP']) )
-      $this->assign('date', Date($lang['DateTimeSPHP']));
-    else
-      $this->assign('date', Date("d/m H:i"));
+//    if( isset($lang['DateTimeSPHP']) )
+//      $this->assign('date', Date($lang['DateTimeSPHP']));
+//    else
+//      $this->assign('date', Date("d/m H:i"));
+    $this->assign('date', time());
 
     if( isset($tutos[logolink]) )
       if( ereg("^http", $tutos[logolink]) )

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22635/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	layout_start.tpl header.tpl layout_stop.tpl 
Log Message:
PREV of change style

Index: layout_stop.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_stop.tpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- layout_stop.tpl	23 Mar 2007 17:52:34 -0000	1.1.2.8
+++ layout_stop.tpl	27 Mar 2007 16:51:31 -0000	1.1.2.9
@@ -5,14 +5,21 @@
 </div>
 
 <div class="footer">
-	{strip}
-	{if $logo2}&nbsp;<img src="{$logo2}" />&nbsp;&nbsp;{/if}
-	<a id="tutosversion"  class="nodeco" href="{$copyright}" title="TUTOS {$version} {$memory} cacheinfo {$cache_count}/{$cache_hits}">
-   	<acronym title="The Ultimative team organization software">TUTOS</acronym> {$version}
-  </a>
-	{/strip}
-	&nbsp;
-  <!-- Add a link to TUTOS-2 bugtracking, for user to have a bugtracking direct access -->
-  <a href="{$base}/php/bugtracking/bug_new.php?pid=4833" title="{$bug}"><img src="{$base}/html/classic/bugs.png" alt="bug"></a>
+  <table width="100%">
+    <tr>
+      <td style="text-align:right;">
+        {if $logo2}<img src="{$logo2}" alt="logo2" />{/if}
+      </td>
+      <td style="text-align:right;">
+        {strip}
+        <acronym title="The Ultimative Team Organization Software">TUTOS</acronym>&nbsp;
+        <a id="tutosversion"  class="nodeco" href="{$copyright}" title="TUTOS {$version} {$memory} cacheinfo {$cache_count}/{$cache_hits}">
+          {$version}
+        </a>
+        <a href="{$base}/php/bugtracking/bug_new.php?pid=4833" title="{$bug}"><img src="{$base}/html/classic/bugs.png" alt="bug"></a>
+        {/strip}
+      </td>
+    </tr>
+  </table>
 </div>
 <!-- end of layout_stop -->
\ No newline at end of file

Index: header.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/header.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- header.tpl	6 Jul 2006 13:22:09 -0000	1.1.2.7
+++ header.tpl	27 Mar 2007 16:51:31 -0000	1.1.2.8
@@ -15,13 +15,13 @@
   <link rel="Alternate stylesheet" title="No tr:hover" href="{$base}/html/classic/nohover.css" type="text/css">
 
 	{foreach from=$themes item=theme}
-  <link rel="Alternate" href="{$uri}?th={$theme}" title="Thème: {$theme}">
+  <link rel="Alternate" href="{$uri}?th={$theme}" title="Th�me: {$theme}">
   <link rel="Alternate stylesheet" href="{$base}/html/{$theme}.css" title="TUTOS {$theme} {$usertheme}" type="text/css">
 	{/foreach}
 
   <meta name="MSSmartTagsPreventParsing" content="TRUE">
   <link rel="icon" href="{$base}/html/tutos_small.gif" type="image/gif">
-  <link rel="SHORTCUT ICON" href="{$base}/html/tutos.ico">
+  <link rel="SHORTCUT ICON" href="{$base}/html/favicon.ico">
   <link rel="Copyright" href="{$base}/html/copyright.html" title="Copyright">
 
   <link rel="Help" href="{$helplink}" title="{$help}">

Index: layout_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_start.tpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- layout_start.tpl	23 Mar 2007 17:52:34 -0000	1.1.2.8
+++ layout_start.tpl	27 Mar 2007 16:51:31 -0000	1.1.2.9
@@ -5,9 +5,9 @@
 <div class="header">
 	<table>
 		<tr>
-		    <td><img src="{$logo}" /></td>
+		    <td class="logo"><img src="{$logo}" alt="logo" /></td>
 			<td class="title">{$title}</td>
-			<td class="date">{$date}</td>
+			<td class="date">{$date|date_format:"%c"}</td>
 		</tr>
 	</table>
 </div>

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22175/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	timetrack_synthesis_csv.tpl timetrack_synthesis.tpl 
Log Message:
ADD informations in synthesis and his export

Index: timetrack_synthesis_csv.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_synthesis_csv.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- timetrack_synthesis_csv.tpl	21 Mar 2007 09:09:16 -0000	1.1.2.1
+++ timetrack_synthesis_csv.tpl	27 Mar 2007 16:50:36 -0000	1.1.2.2
@@ -10,22 +10,42 @@
 {$FE}{$date.to}{$FE}{$FS}
 {$FE}{$date.end|date_format:"%Y-%m-%d"}{$FE}
 {$LS}
+{$LS}
 {if $csvparams.with_head}
 {$FE}{$lang.ProdReference}{$FE}{$FS}
+{$FE}{$lang.ProdRole.1}{$FE}{$FS}
+{$FE}{$lang.ProdRole.6}{$FE}{$FS}
 {$FE}{$lang.Projects}{$FE}{$FS}
 {$FE}{$lang.Timetracks} {$lang.Tasks}{$FE}{$FS}
 {$FE}{$lang.Timetracks} {$lang.Projects}{$FE}{$FS}
 {$FE}{$lang.Timetracks} {$lang.Bugs}{$FE}{$FS}
+{$FE}{$lang.TTSum}{$FE}
 {$LS}
 {/if}
 {foreach from=$tts.$ttsitem item=ttsum key=pid}
   {if $ttsum.total.hour > 0}
   	{$FE}{if $ttsum.ref}{$ttsum.ref}{/if}{$FE}{$FS}
+  	{$FE}{$ttsum.manager|default:""}{$FE}{$FS}
+  	{$FE}{$ttsum.client|default:""}{$FE}{$FS}
   	{$FE}{$ttsum.name}{$FE}{$FS}
   	{$FE}{$ttsum.task.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}{$FS}
   	{$FE}{$ttsum.proj.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}{$FS}
-  	{$FE}{$ttsum.bug.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}
+  	{$FE}{$ttsum.bug.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}{$FS}
+  	{$FE}{$ttsum.total.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}
   	{$LS}
   {/if}
 {/foreach}
+{foreach from=$tts.bytyp item=typval key=typkey}
+ {if $typkey == 'user' || $typkey == 'vaca'}
+  {$FS}
+  {$FS}
+  {$FS}
+  {$FE}{if $typkey != 'vaca'}{$lang.TTSum} {$lang.Timetracks} {/if}{$typval.name}{$FE}{$FS}
+  {$FS}
+  {$FS}
+  {$FS}
+  {$FE}{$typval.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}{$FS}
+  {$LS}
+ {/if}
+{/foreach}
 {/strip}
\ No newline at end of file

Index: timetrack_synthesis.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_synthesis.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- timetrack_synthesis.tpl	21 Mar 2007 09:09:16 -0000	1.1.2.5
+++ timetrack_synthesis.tpl	27 Mar 2007 16:50:36 -0000	1.1.2.6
@@ -174,9 +174,13 @@
           <a href="address_show.php?id={$ttsum.id}" title="{$ttsum.name}"><img src="{$base}/html/classic/user.png" alt="user" /></a>
         {/if}
           <a href="task_overview.php?id={$ttsum.id}" title="{$lang.TaskOverview}: {$ttsum.name}"><img src="{$base}/html/classic/task_overview.png" alt="task_overview" /></a>
-          {if $ttsum.ref}<i>[{$ttsum.ref}]</i>{/if}
           <a href="timetrack_synthesis.php?id={$ttsum.id}&startDate={$date.start|date_format:"%Y-%m-%d"}&endDate={$date.end|date_format:"%Y-%m-%d"}&histoDiv={$date.histoDiv}" title="{$lang.TimetrackSynthesis}: {$ttsum.name}">
-          {$ttsum.name}</a>
+            {$ttsum.name}</a>
+          <br />
+          {if $ttsum.ref}<i>[{$ttsum.ref}]</i>{/if}
+          {if $ttsum.manager} - <acronym title="{$lang.ProdRole.1}">{$ttsum.manager}</acronym>{/if}
+          {if $ttsum.client} - <acronym title="{$lang.ProdRole.6}">{$ttsum.client}</acronym>{/if}
+          
         </td>
         <td>
           <!-- Item Histogram -->

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22175/php

Modified Files:
      Tag: BRANCH-2-0
	timetrack_synthesis.php 
Log Message:
ADD informations in synthesis and his export

Index: timetrack_synthesis.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/timetrack_synthesis.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- timetrack_synthesis.php	21 Mar 2007 09:09:16 -0000	1.1.2.6
+++ timetrack_synthesis.php	27 Mar 2007 16:50:36 -0000	1.1.2.7
@@ -438,9 +438,23 @@
       $ttsum['byprj'] = array();
     }
     if (!isset($ttsum['byprj'][$prj->id])) {
+      $prj->readroles();
+      $manager = $prj->creator->getFullName();
+      if ( $prj->role[PROD_ROLE_MANAGER] ) {
+        $km = array_keys($prj->role[PROD_ROLE_MANAGER]);
+        $manager = $prj->role[PROD_ROLE_MANAGER][$km[0]]->getFullName();
+      }
+      $client = "";
+      if ( $prj->role[6] ) {
+        $kc = array_keys($prj->role[6]);
+        $client = $prj->role[6][$kc[0]]->getFullName();
+      }
+      
       $ttsum['byprj'][$prj->id] = array('id'    => $prj->id,
                                         'name'  => $prj->getFullName(),
                                         'ref'   => $prj->reference,
+                                        'manager' => $manager,
+                                        'client'  => $client,
                                         'type'  => 'product',
                                         'task'  => array('name' => $lang['Tasks']),
                                         'proj'  => array('name' => $lang['Projects']),

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18112

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
UPDATE css and template

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/.cvsignore,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -u -d -r1.18.4.3 -r1.18.4.4
--- .cvsignore	23 Mar 2007 17:52:53 -0000	1.18.4.3
+++ .cvsignore	23 Mar 2007 17:54:38 -0000	1.18.4.4
@@ -69,3 +69,41 @@
 export_calendar
 .settings
 OBS
+%%00^002^002C1F38%%product_show.tpl.php
+%%0C^0C6^0C6F082C%%calendar.tpl.php
+%%1B^1B4^1B427233%%menu.tpl.php
+%%1D^1D2^1D288D01%%team_overview.tpl.php
+%%24^24F^24FD207F%%mklink.tpl.php
+%%25^258^2587EB91%%menu_stop.tpl.php
+%%34^347^347697BE%%team_new.tpl.php
+%%35^351^35138B2E%%address_show.tpl.php
+%%3B^3BB^3BB1F1BC%%menu_start.tpl.php
+%%47^474^4741894D%%buglist.tpl.php
+%%4D^4D1^4D1AE3DC%%header.tpl.php
+%%53^53C^53C72C2C%%login.tpl.php
+%%59^59F^59FC1A6C%%timetrack_synthesis_csv.tpl.php
+%%5E^5E2^5E2FDE55%%address_select.tpl.php
+%%5E^5E7^5E75947A%%error.tpl.php
+%%5E^5E8^5E8FB0A6%%layout_start.tpl.php
+%%61^611^611C3A7E%%no_menu.tpl.php
+%%66^666^6668824D%%mass_update.tpl.php
+%%69^694^694CAC26%%disable_arg.tpl.php
+%%84^849^8492D431%%cal_week.tpl.php
+%%88^882^88243D25%%tasklist.tpl.php
+%%90^900^900C68BF%%minical2.tpl.php
+%%90^90F^90F95736%%legend_start.tpl.php
+%%93^93D^93D78D89%%navbar.tpl.php
+%%93^93F^93F044C3%%timetrack_synthesis.tpl.php
+%%A1^A19^A19C9F4A%%projectreport_new.tpl.php
+%%A3^A3C^A3CA58D3%%team_show.tpl.php
+%%AB^AB1^AB1F37C9%%layout_stop.tpl.php
+%%B4^B4A^B4A9D70D%%footer.tpl.php
+%%B5^B52^B522F750%%menu_elements.tpl.php
+%%BA^BA3^BA395551%%bug_overview.tpl.php
+%%BC^BC1^BC1C38BE%%legend_stop.tpl.php
+%%CD^CD6^CD6B785A%%projectreport_overview.tpl.php
+CVS
+%%DD^DD3^DD3FA4EE%%task_overview.tpl.php
+%%E0^E0E^E0E75412%%team_select.tpl.php
+%%F4^F43^F435D879%%task_overview_legend.tpl.php
+%%F8^F80^F8012A4F%%mytutos.tpl.php

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17287/html/classic

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
UPDATE css and template

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/.cvsignore,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- .cvsignore	23 Mar 2007 13:37:10 -0000	1.1.2.2
+++ .cvsignore	23 Mar 2007 17:52:53 -0000	1.1.2.3
@@ -1,3 +1,4 @@
 style_old.css
 style_cvf.css
 style_orange.css
+style.css

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17287

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
UPDATE css and template

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/.cvsignore,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -u -d -r1.18.4.2 -r1.18.4.3
--- .cvsignore	12 Mar 2007 14:12:03 -0000	1.18.4.2
+++ .cvsignore	23 Mar 2007 17:52:53 -0000	1.18.4.3
@@ -68,3 +68,4 @@
 tutos-v2.webprj
 export_calendar
 .settings
+OBS

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17237/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	layout_start.tpl minical2.tpl layout_stop.tpl 
Log Message:
UPDATE css and template

Index: layout_stop.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_stop.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- layout_stop.tpl	6 Jul 2006 13:22:09 -0000	1.1.2.7
+++ layout_stop.tpl	23 Mar 2007 17:52:34 -0000	1.1.2.8
@@ -6,6 +6,7 @@
 
 <div class="footer">
 	{strip}
+	{if $logo2}&nbsp;<img src="{$logo2}" />&nbsp;&nbsp;{/if}
 	<a id="tutosversion"  class="nodeco" href="{$copyright}" title="TUTOS {$version} {$memory} cacheinfo {$cache_count}/{$cache_hits}">
    	<acronym title="The Ultimative team organization software">TUTOS</acronym> {$version}
   </a>

Index: minical2.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/minical2.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- minical2.tpl	9 Mar 2006 14:59:05 -0000	1.1.2.1
+++ minical2.tpl	23 Mar 2007 17:52:34 -0000	1.1.2.2
@@ -42,7 +42,7 @@
 }
 
 .jours { 
-  background-color:#f4f4f4;
+  background-color:#ffffff;
   text-align: center;
   font-weight: bold;
 }
@@ -123,7 +123,7 @@
   <tr>
   {/if}
   {if $day.type eq "JF"}
-    <td class="joursFeries"><a href="javascript:setDate('{$day.link}');" title="Férié">{$day.val}</a></td>
+    <td class="joursFeries"><a href="javascript:setDate('{$day.link}');" title="F�ri�">{$day.val}</a></td>
   {elseif $day.type eq "TODAY"}
     <td class="now"><a         href="javascript:setDate('{$day.link}');" title="Aujourd'hui">{$day.val}</a></td>
   {elseif $day.type eq "DAY"}

Index: layout_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_start.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- layout_start.tpl	6 Jul 2006 13:22:09 -0000	1.1.2.7
+++ layout_start.tpl	23 Mar 2007 17:52:34 -0000	1.1.2.8
@@ -2,11 +2,12 @@
 {* $Id$ *}
 
 <!-- layout_start -->
-<div class="header" style="background-image : url({$logo});">
+<div class="header">
 	<table>
 		<tr>
-			<td class="date">{$date}</td>
+		    <td><img src="{$logo}" /></td>
 			<td class="title">{$title}</td>
+			<td class="date">{$date}</td>
 		</tr>
 	</table>
 </div>

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17237/php

Modified Files:
      Tag: BRANCH-2-0
	db.p3 
Log Message:
UPDATE css and template

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.138.2.8
retrieving revision 1.138.2.9
diff -u -d -r1.138.2.8 -r1.138.2.9
--- db.p3	10 Oct 2006 09:10:30 -0000	1.138.2.8
+++ db.p3	23 Mar 2007 17:52:34 -0000	1.138.2.9
@@ -71,6 +71,7 @@
 define ('ldapserver',67);
 define ('ldapport',68);
 define ('logo',69);
+define ('logo2',140);
 define ('logolink',70);
 # Calendar Handling
 define ('cal',71);

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17237/php/layout

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
UPDATE css and template

Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -d -r1.1.2.34 -r1.1.2.35
--- layout.pinc	6 Jul 2006 13:32:32 -0000	1.1.2.34
+++ layout.pinc	23 Mar 2007 17:52:34 -0000	1.1.2.35
@@ -572,6 +572,11 @@
      else
        $this->assign('logo', $tutos['base']."/".$tutos[logo]);
 
+     if( ereg("^http", $tutos[logo2]) )
+       $this->assign('logo2', $tutos[logo2]);
+     else
+       $this->assign('logo2', $tutos['base']."/".$tutos[logo2]);
+
     $this->template("layout_start");
 
     // Just before menus, we provide the legend

Update of /cvsroot/tutos/tutos/html
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17237/html

Modified Files:
      Tag: BRANCH-2-0
	motd.html 
Log Message:
UPDATE css and template

Index: motd.html
===================================================================
RCS file: /cvsroot/tutos/tutos/html/Attic/motd.html,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -u -d -r1.5.4.3 -r1.5.4.4
--- motd.html	16 Nov 2006 15:59:14 -0000	1.5.4.3
+++ motd.html	23 Mar 2007 17:52:34 -0000	1.5.4.4
@@ -4,8 +4,8 @@
 <!--p style="color:#6666cc;font-family : serif; font-size : 2em; font-style : italic; font-weight : bold; letter-spacing : 0.8em; text-align : center;">
   Bonjour
 </p-->
-<dl style="color:#0A63BD;">
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+<dl style="color:#666666;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     20/10/2006 - PASSAGE EN UTF-8</dt>
   <dd>
     <p>Comme vous avez pu le constater depuis quelques jours, Tutos a été passé entièrement en codage UTF-8.</p>
@@ -13,7 +13,7 @@
     <p>C'est pourquoi, n'hésitez pas à nous remonter des défauts d'accents que nous corrigerons au plus vite en fonction de l'impact sur la disponibilité du service.</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     16/08/2006 - Informations sur un projet</dt>
   <dd>
     <p>Il est maintenant possible de renseigner un numéro de référence externe dans un projet (ex: numéro intrafact).</p>
@@ -21,7 +21,7 @@
     <p>Ces informations seront utiles pour de futurs modules.</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     06/07/2006 - LE CALENDRIER des ABSENCES</dt>
   <dd>
     <p>EH oui, il est enfin arrivé.</p>
@@ -29,21 +29,21 @@
     <p>Le report se fait également dans la synthèse d'activités. C'est pourquoi il est fortement recommandé de saisir vos congés depuis l'agenda CVF.</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     27/03/2006 - Synthèse d'activités projet</dt>
   <dd>
     <p>Il est maintenant possible d'avoir une synthèse d'activité sur un Projet.</p>
     <p>A vos clavier.....</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     09/03/2006 - Nouvelle page de synthèse d'activités</dt>
   <dd>
     <p>Vous trouverez un nouveau lien "Synthèse d'activités" dans le menu de gauche de "Mon TUTOS".</p>
     <p>Bonnes activités à tous.</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     22/02/2006 - <img src="/html/classic/sync.png" alt="sync" />Synchronisation Planner et MS-Project</dt>
   <dd>
     <p>Dans le nouveau module d'import des taches depuis un fichier Planner ou Microsoft Project, il a été ajouté une fonctionnalité de synchronisation.<br />
@@ -52,7 +52,7 @@
     <p>Une aide<img src="/html/classic/help.png" alt="projectio" /> est également disponible depuis la page de synchronisation.</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     10/02/2006 - Import Planner et MS-Project</dt>
   <dd>
     <p>Un nouveau module vous permet d'importer des taches depuis un fichier Planner ou Microsoft Project.<br />
@@ -61,7 +61,7 @@
     <p>Une aide<img src="/html/classic/help.png" alt="projectio" /> est également disponible depuis la page d'import.</p>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     25/01/2006 - Modif de performance</dt>
   <dd>Traitement du bug <a href="http://tutos.int75.cvf/php/bugtracking/bug_show.php?id=50382"><img src="/html/classic/bugs.png" alt="bug" /><u>2005-12-2369</u></a>:<br />
     - L'affichage d'un projet a été accéléré dans le cas d'une liste importante de bugs<br/>
@@ -71,13 +71,13 @@
     <strong>Soyez donc patient pour les gros projets (reload inutile).</strong>
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     19/01/2006 - Modifs du jour</dt>
   <dd>* Aperçu bug: Un rollover sur l'icone <img src="/html/classic/paper.png" alt="paper" />permet de voir dans la liste de bug, en un clin d'oeil, l'historique de chaque bug.</dd>
   <dd>* Augmention du la zone de description d'un projet ainsi que la taille du nom.</dd>
   <dd>* <strong>En préparation</strong>: La possibilité de créer les taches d'un projet à partir d'un import Planner ou MS-Project.</dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     18/01/2006 - Du nouveau dans Tutos</dt>
   <dd>
     le module de liaison avec <strong><u>Mantis</u></strong><img src="/html/classic/mantis.png" alt="Mantis" title="Mantis" /> est en place
@@ -92,13 +92,13 @@
     Suppression des résumés des bugs par projet dans la page de recherche d'un bug.
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     18/01/2006 - Petit rappel</dt>
   <dd>
     L'icone <img src="/html/classic/task_overview.png" alt="task_overview" title="Aperçu taches" /> se trouvant près d'un lien <em>"Projet"</em> vous permet d'accéder directement à son aperçu taches.
   </dd>
   
-  <dt style="background-color:#6666cc; color:#ffffff; margin-top:1.2em; padding:0.2em;">
+  <dt style="background-color:#666666; color:#ffffff; margin-top:1.2em; padding:0.2em;">
     10/12/2005 - TIPS pour les utilisateurs de Firefox</dt>
   <dd>Pour faire une <em><strong>recherche rapide</strong></em> d'un projet:<br />
   - cliquer sur <em>"Produits &amp; Projets"</em> en haut<br />

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28756/html/classic

Added Files:
      Tag: BRANCH-2-0
	no.png stop.png info.png 
Log Message:
ADD control and help analysis

--- NEW FILE: info.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: no.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: stop.png ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/tutos/tutos/templates/classic/projectreport
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3438/templates/classic/projectreport

Modified Files:
      Tag: BRANCH-2-0
	projectreport_new.tpl projectreport_csv.tpl 
Log Message:
ADD control and help analysis

Index: projectreport_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/projectreport/Attic/projectreport_new.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- projectreport_new.tpl	10 Oct 2006 09:10:32 -0000	1.1.2.1
+++ projectreport_new.tpl	23 Mar 2007 13:37:10 -0000	1.1.2.2
@@ -4,6 +4,24 @@
 <!-- projectreport_new start -->
 {include file="classic/js/mass_update.tpl"}
 
+{literal}
+<script type="text/javascript" language="JavaScript">
+<!--
+function FlipTRByName(name) {
+  var list=document.getElementsByName(name);
+  for (var i=0; i < list.length; i++) {
+  	var elt=list[i];
+  	if (elt.style.display == 'none') {
+  	  elt.style.display='table-row';
+    } else {
+      elt.style.display='none';
+    }
+  }
+}
+//-->
+</script>
+{/literal}
+
 <form name="actionform1" method="POST" action="{$form_action}">
 <input type="hidden" name="id" value="{$report.id}" />
 <input type="hidden" name="mark[]" value="{$report.id}" />
@@ -54,7 +72,23 @@
     {if $director || $nochange}
       <td>{$statelist[$report.state]}</td>
     {else}
-      <td>{html_options name=state options=$statelist selected=$report.state}</td>
+      <td>
+ 		<select name="state">
+ 		{foreach from=$statelist key=value item=option}
+ 		  {strip}
+  		  <option value="{$value}" label="{$option}"
+  		    {if $value > 20  && $report.blocked}disabled="disabled"{/if}
+  		    {if $value == $report.state}selected="selected"{/if} >
+		    {$option}
+  		  </option>
+  		  {/strip}
+  		{/foreach}
+		</select>
+		{if $report.blocked}
+		<p id="warns" style="position:absolute; overflow:auto; display:none; padding:5px; border:solid 1px black; margin-left:50px;" class="taskmuch">{$lang.ProjectReportBlocked}</p>
+        <img src="{$base}/html/classic/no.png" alt="no"   />
+		{/if}     
+      </td>
     {/if}
     </tr>
     <tr>
@@ -77,26 +111,31 @@
   <thead>
     <tr>
       {if !$director && !$nochange}<th rowspan="3"><input type="checkbox" name="checkit" ></th>{/if}
-      <th>{$lang.ProjectReportPName}</th>
-      
-      <th>{$lang.ProjectReportPRef}</th>
-      <th>{$lang.ProjectReportPState}</th>
-      <th>{$lang.ProjectReportPBegin} {$lang.ProjectReportPPrevi}</th>
-      <th>{$lang.ProjectReportPEnd} {$lang.ProjectReportPPrevi}</th>
-      <th>{$lang.ProjectReportPBegin} {$lang.ProjectReportPReal}</th>
-      <th>{$lang.ProjectReportPEnd} {$lang.ProjectReportPReal}</th>
-    </tr><tr>
-      <th>{$lang.ProjectReportPCustumer}</th>
+      <th colspan="3">{$lang.ProjectReportPName}</th>
       
+      <th>{$lang.ProjectReportPBegin} - {$lang.ProjectReportPEnd} {$lang.ProjectReportPPrevi}</th>
       <th>{$lang.ProjectReportPVEstimate}</th>
-      <th>{$lang.ProjectReportPVTsk}</th>
+
       <th>{$lang.ProjectReportPVPlanned} {$lang.ProjectReportPVDone}</th>
       <th>{$lang.ProjectReportPVNotPlanned} {$lang.ProjectReportPVDone}</th>
       <th>{$lang.ProjectReportPVBug} {$lang.ProjectReportPVDone}</th>
+      
+    </tr><tr>
+      <th>{$lang.ProjectReportPRef}</th>
+      <th>{$lang.ProjectReportPCustumer}</th>
+      <th>{$lang.ProjectReportPState}</th>
+
+      <th>{$lang.ProjectReportPBegin} - {$lang.ProjectReportPEnd} {$lang.ProjectReportPReal}</th>
+      <th>{$lang.ProjectReportPVTsk}</th>
+      
       <th>{$lang.ProjectReportPVTodo}</th>
+      <th colspan="2">{$lang.ProjectReportPVDonePeriod}</th>
     </tr><tr>
-      <th>&nbsp;</th>
-      <th colspan="6">{$lang.ProjectReportPComment}</th>
+      <th colspan="3">
+      	<input type="checkbox" checked="true" >voir les projets inactifs
+      	<input type="checkbox" checked="true" >voir les projets actifs
+      </th>
+      <th colspan="5">{$lang.ProjectReportPComment}</th>
     </tr>
   </thead>
 
@@ -107,7 +146,7 @@
         <i>{$action.label}</i>
         <select id="{$action.name}" name="{$action.name}">
           {foreach from=$action.options key=value item=option}
-            <option value="{$value}">{$option}</option>
+            <option value="{$value}" {if $report.blocked && $value == 'savecomplete'}disabled="disabled"{/if}>{$option}</option>
           {/foreach}
         </select>
         <input type="submit" value="{$lang.InputOk}">
@@ -116,55 +155,104 @@
   </tfoot>
 {/if}
 
-  <tbody>
+  <tbody name="tabreport">
     {foreach from=$rpprolist item=rpp}
-    {cycle values="alt1,alt2" assign=datastyle}
+    {cycle values="0,0,0,0,0,0,0,0,0,0,1" assign=repeatHeader name=rh}
+    {cycle values="alt1,alt2" assign=datastyle name=ds}
     {strip}
-    <tr style="{if $rpp.state < 0}font-style:italic;{/if} {if $rpp.nodata}font-weight:bold;{/if}" class="{$datastyle}">
+    
+    {if $repeatHeader == 1}
+    <tr>
+      {if !$director && !$nochange}<th rowspan="3"></th>{/if}
+      <th colspan="3">{$lang.ProjectReportPName}</th>
+      
+      <th>{$lang.ProjectReportPBegin} - {$lang.ProjectReportPEnd} {$lang.ProjectReportPPrevi}</th>
+      <th>{$lang.ProjectReportPVEstimate}</th>
+
+      <th>{$lang.ProjectReportPVPlanned} {$lang.ProjectReportPVDone}</th>
+      <th>{$lang.ProjectReportPVNotPlanned} {$lang.ProjectReportPVDone}</th>
+      <th>{$lang.ProjectReportPVBug} {$lang.ProjectReportPVDone}</th>
+      
+    </tr><tr>
+      <th>{$lang.ProjectReportPRef}</th>
+      <th>{$lang.ProjectReportPCustumer}</th>
+      <th>{$lang.ProjectReportPState}</th>
+
+      <th>{$lang.ProjectReportPBegin} - {$lang.ProjectReportPEnd} {$lang.ProjectReportPReal}</th>
+      <th>{$lang.ProjectReportPVTsk}</th>
+      
+      <th>{$lang.ProjectReportPVTodo}</th>
+      <th colspan="2">{$lang.ProjectReportPVDonePeriod}</th>
+    </tr><tr>
+      <th colspan="3">&nbsp;</th>
+      <th colspan="5">{$lang.ProjectReportPComment}</th>
+    </tr>
+    {/if}
+    
+    <tr style="display:table-row; {if $rpp.state < 0}font-style:italic;{/if} {if $rpp.nodata}font-weight:bold;{/if}" class="{$datastyle}" {if $rpp.no_period_activity} name="noActivity"{else}name="hasActivity"{/if}>
       {if !$director && !$nochange}<td class="check"><input id="chk{$rpp.id}" name="mark[]" type="checkbox" value="{$rpp.id}"></td>{/if}
-      <td class="data" style="white-space : nowrap;">
+      <td class="data" style="white-space : nowrap;" colspan="3">
         <a href="{$base}/php/task_overview.php?id={$rpp.prod_id}" title="{$lang.TaskOverview}">
           <img src="{$base}/html/classic/task_overview.png" alt="task" /></a>
         <a href="{$base}/php/timetrack_synthesis.php?id={$rpp.prod_id}&startDate={$report.r_start|date_format:"%Y-%m-%d"}&endDate={$report.r_end|date_format:"%Y-%m-%d"}" title="{$lang.TimetrackSynthesis}">
-          <img src="{$base}/html/classic/timetrack.png" alt="timetrack" /></a> {""|indent:$rpp.depth:"&mdash;"}
+          <img src="{$base}/html/classic/timetrack.png" alt="timetrack" /></a>
+        
+ 		{""|indent:$rpp.depth:"&mdash;"}
         <a href="{$base}/php/product_show.php?id={$rpp.prod_id}" title="{$lang.ProductsDetail}">{$rpp.prod_name}</a>
+
+        {if $rpp.warning}
+        &nbsp;
+        <p id="warn{$rpp.id}" style="position:absolute; overflow:auto; display:none; padding:5px; border:solid 1px black; margin-left:100px;" class="taskmuch"><u>Contr&ocirc;le de coh&eacute;rence</u>:<br />{$rpp.coherence}</p>
+        <img src="{$base}/html/classic/no.png" alt="no"   />
+        {/if}
+
+        {if $rpp.analyze}
+        &nbsp;
+        <p id="anlz{$rpp.id}" style="position:absolute; overflow:auto; display:none; padding:5px; border:solid 1px black; margin-left:100px;" class="note"><u>Aide &agrave; l'analyse</u>:<br />{$rpp.analyze}</p>
+        <img src="{$base}/html/classic/warning.png" alt="warning"   />
+        {/if}
       </td>
-      <td class="data" title="{$lang.ProjectReportPRef}">{$rpp.prod_ref|default:"&nbsp;"}</td>
-      <td class="data" title="{$lang.ProjectReportPState}" style="white-space : nowrap;">{if $rpp.state>=0}{$lang.ProdStates[$rpp.state]}{else}{$lang.ProjectReportPStateID[$rpp.state]}{/if}</td>
     
-      <td class="data" title="{$lang.ProjectReportPBegin} {$lang.ProjectReportPPrevi}">{$rpp.p_start|date_format:"%d/%m/%Y"|default:"--/--/----"}</td>
-      <td class="data" title="{$lang.ProjectReportPEnd} {$lang.ProjectReportPPrevi}">{$rpp.p_end|date_format:"%d/%m/%Y"|default:"--/--/----"}</td>
-      <td class="data" title="{$lang.ProjectReportPBegin} {$lang.ProjectReportPReal}">{$rpp.r_start|date_format:"%d/%m/%Y"|default:"--/--/----"}</td>
-      <td class="data" title="{$lang.ProjectReportPEnd} {$lang.ProjectReportPReal}">{if $rpp.state>=0}{$rpp.r_end|date_format:"%d/%m/%Y"|default:"--/--/----"}{/if}&nbsp;</td>
+      <td class="data" style="white-space:nowrap;" title="{$lang.ProjectReportPBegin} - {$lang.ProjectReportPEnd} {$lang.ProjectReportPPrevi}">
+        {$rpp.p_start|date_format:"%d/%m/%Y"|default:"--/--/----"} - {$rpp.p_end|date_format:"%d/%m/%Y"|default:"--/--/----"}
+      </td>
 
-    {if !$rpp.nodata}
-    </tr><tr {if $rpp.state < 0}style="font-style:italic;"{/if} class="{$datastyle}">
-      {if !$director && !$nochange}<td class="data"></td>{/if}
-      <td class="data" style="text-align:right;">{$rpp.custumer|default:"&nbsp;"}</td>
-          
       <td class="data" style="text-align:right;{if !$rpp.vol_estimate}color:#888;{/if}" title="{$lang.ProjectReportPVEstimate}">
         {$rpp.vol_estimate|string_format:"%.2f"}{$lang.hours}</td>
         
-      <td class="data" style="text-align:right;{if !$rpp.vol_tasks}color:#888;{/if}" title="{$lang.ProjectReportPVTsk}">
-        {$rpp.vol_tasks|string_format:"%.2f"}{$lang.hours}</td>
-        
       <td class="data" style="text-align:right;{if !$rpp.vol_tasks_done}color:#888;{/if}" title="{$lang.ProjectReportPVPlanned} {$lang.ProjectReportPVDone}">
         {$rpp.vol_tasks_done|string_format:"%.2f"}{$lang.hours}</td>
-        
       <td class="data" style="text-align:right;{if !$rpp.vol_prod_done}color:#888;{/if}" title="{$lang.ProjectReportPVNotPlanned} {$lang.ProjectReportPVDone}">
         {$rpp.vol_prod_done|string_format:"%.2f"}{$lang.hours}</td>
-        
       <td class="data" style="text-align:right;{if !$rpp.vol_bugs_done}color:#888;{/if}" title="{$lang.ProjectReportPVBug} {$lang.ProjectReportPVDone}">
         {$rpp.vol_bugs_done|string_format:"%.2f"}{$lang.hours}</td>
         
+
+    {if !$rpp.nodata}
+    </tr><tr style="display:table-row; {if $rpp.state < 0}font-style:italic;{/if}" class="{$datastyle}" {if $rpp.no_period_activity}name="noActivity"{else}name="hasActivity"{/if}>
+      {if !$director && !$nochange}<td class="data"></td>{/if}
+      <td class="data" style="text-align:right;" title="{$lang.ProjectReportPRef}">{$rpp.prod_ref|default:"&nbsp;"}</td>
+      <td class="data" style="text-align:right;">{$rpp.custumer|default:"&nbsp;"}</td>
+      <td class="data" style="text-align:right; white-space:nowrap;" title="{$lang.ProjectReportPState}">{if $rpp.state>=0}{$lang.ProdStates[$rpp.state]}{else}{$lang.ProjectReportPStateID[$rpp.state]}{/if}</td>
+
+      <td class="data" style="white-space:nowrap;" title="{$lang.ProjectReportPBegin} - {$lang.ProjectReportPEnd} {$lang.ProjectReportPReal}">
+        {$rpp.r_start|date_format:"%d/%m/%Y"|default:"--/--/----"} - {$rpp.p_end|date_format:"%d/%m/%Y"|default:"--/--/----"}
+      </td>
+          
+      <td class="data" style="text-align:right;{if !$rpp.vol_tasks}color:#888;{/if}" title="{$lang.ProjectReportPVTsk}">
+        {$rpp.vol_tasks|string_format:"%.2f"}{$lang.hours}</td>
+        
       <td class="data" style="text-align:right;{if !$rpp.vol_tasks_todo}color:#888;{/if}" title="{$lang.ProjectReportPVTodo}">
         {$rpp.vol_tasks_todo|string_format:"%.2f"}{$lang.hours}</td>
+      <td class="data" style="text-align:center;font-weight:bolder;{if !$rpp.vol_period_done}color:#888;{else}color:#007000{/if}"
+        title="{$lang.ProjectReportPVPlanned}={$rpp.vol_tasks_period|string_format:"%.2f"}{$lang.hours} {$lang.ProjectReportPVNotPlanned}={$rpp.vol_prod_period|string_format:"%.2f"}{$lang.hours} {$lang.ProjectReportPVBug}={$rpp.vol_bugs_period|string_format:"%.2f"}{$lang.hours}" colspan="2">
+        {$rpp.vol_period_done|string_format:"%.2f"}{$lang.hours}</td>
         
 
-    </tr><tr {if $rpp.state < 0}style="font-style:italic;"{/if} class="{$datastyle}">
+    </tr><tr style="display:table-row; {if $rpp.state < 0}font-style:italic;{/if}" class="{$datastyle}" {if $rpp.no_period_activity}name="noActivity"{else}name="hasActivity"{/if}>
       {if !$director && !$nochange}<td class="data"></td>{/if}
-      <td class="data">&nbsp;</td>
-      <td class="data" colspan="6">
+      <td class="data" colspan="3">&nbsp;</td>
+      <td class="data" colspan="5">
       {if $director || $nochange}
         {$rpp.comment|nl2br|default:"&nbsp"}
       {else}
@@ -178,4 +266,5 @@
     {/foreach}
   </tbody>
 </table>
+
 </form>
\ No newline at end of file

Index: projectreport_csv.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/projectreport/Attic/projectreport_csv.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- projectreport_csv.tpl	12 Oct 2006 15:01:12 -0000	1.1.2.1
+++ projectreport_csv.tpl	23 Mar 2007 13:37:10 -0000	1.1.2.2
@@ -30,6 +30,10 @@
 {$FE}{$lang.ProjectReportPVNotPlanned} {$lang.ProjectReportPVDone}{$FE}{$FS}
 {$FE}{$lang.ProjectReportPVBug} {$lang.ProjectReportPVDone}{$FE}{$FS}
 {$FE}{$lang.ProjectReportPVTodo}{$FE}{$FS}
+{$FE}{$lang.ProjectReportPVPlanned} {$lang.ProjectReportPVDone} {$lang.ProjectReportOnPeriod}{$FE}{$FS}
+{$FE}{$lang.ProjectReportPVNotPlanned} {$lang.ProjectReportPVDone} {$lang.ProjectReportOnPeriod}{$FE}{$FS}
+{$FE}{$lang.ProjectReportPVBug} {$lang.ProjectReportPVDone} {$lang.ProjectReportOnPeriod}{$FE}{$FS}
+{$FE}{$lang.ProjectReportPVDonePeriod}{$FE}{$FS}
 {$FE}{$lang.ProjectReportPComment}{$FE}
 {$LS}
 {/if}
@@ -48,6 +52,10 @@
   {$FE}{$rpp.vol_prod_done|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
   {$FE}{$rpp.vol_bugs_done|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
   {$FE}{$rpp.vol_tasks_todo|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
+  {$FE}{$rpp.vol_tasks_period|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
+  {$FE}{$rpp.vol_prod_period|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
+  {$FE}{$rpp.vol_bugs_period|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
+  {$FE}{$rpp.vol_period_done|string_format:"%.2f"|regex_replace:"/\./":","}{$FE}{$FS}
   {$FE}{$rpp.comment}{$FE}{$FS}
   {$LS}
 {/foreach}

Update of /cvsroot/tutos/tutos/php/projectreport
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3438/php/projectreport

Modified Files:
      Tag: BRANCH-2-0
	projectreport_new.php fr.p3 projectreport.pinc mtable.pinc 
Log Message:
ADD control and help analysis

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/fr.p3,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- fr.p3	12 Oct 2006 15:01:12 -0000	1.1.2.2
+++ fr.p3	23 Mar 2007 13:37:10 -0000	1.1.2.3
@@ -35,13 +35,15 @@
 $lang['ProjectReportPPrevi']      = "Prevu";
 $lang['ProjectReportPReal']       = "Réel";
 $lang['ProjectReportPState']      = "Etat";
-$lang['ProjectReportPVEstimate']  = "Estimé";
-$lang['ProjectReportPVTsk']       = "Planifié";
+$lang['ProjectReportPVEstimate']  = "Estimation";
+$lang['ProjectReportPVTsk']       = "Planification";
 $lang['ProjectReportPVDone']      = "Réalisé";
 $lang['ProjectReportPVPlanned']   = "Taches";
 $lang['ProjectReportPVNotPlanned']= "Projet";
 $lang['ProjectReportPVBug']       = "Incident";
 $lang['ProjectReportPVTodo']      = "Restant";
+$lang['ProjectReportPVDonePeriod']= "Réalisé sur la période";
+$lang['ProjectReportOnPeriod']    = "sur la période";
 $lang['ProjectReportPComment']    = "Commentaire";
 $lang['ProjectReportReloadP']     = "Recharger le projet";
 $lang['ProjectReportSaveComment'] = "Enregistrer les commentaires";
@@ -50,6 +52,7 @@
 $lang['ProjectReportValidate']    = "Valider";
 $lang['ProjectReportReturn']      = "Retourner";
 $lang['ProjectReportReason']      = "Commentaire";
+$lang['ProjectReportBlocked']     = "Vous devez corriger les différents projets présentants des défauts<br />avant d'envoyer votre rapport";
 
 $lang['ProjectReportPStateID'][-2]= "prod";
 $lang['ProjectReportPStateShort'][0]  = "L";
@@ -71,6 +74,20 @@
 $lang['ProjectReportMsg0002']     = "Rapport %s de %s retourné";
 $lang['ProjectReportMsg0003']     = "Rapport %s complété et notification envoyée par mail";
 
+$lang['ProjectReportCoherence0001'] = "- Le projet n'a pas de client défini";
+$lang['ProjectReportCoherence0002'] = "- Le projet n'a pas d'estimation de temps défini";
+$lang['ProjectReportCoherence0003'] = "- Une référence doit être définie pour ce projet non CVF";
+$lang['ProjectReportCoherence0004'] = "- Des activités ont été saisies sur ce projet alors qu'il est 'à venir'";
+
+$lang['ProjectReportAnalyze0001'] = "- La charge globale est supérieure à l'estimation de +%s%%";
+$lang['ProjectReportAnalyze0002'] = "- La planification est supérieure à l'estimation de +%s%%";
+$lang['ProjectReportAnalyze0003'] = "- Le projet n'est pas terminé alors qu'il n'y a plus de charge restante";
+$lang['ProjectReportAnalyze0004'] = "- Le projet n'a pas eu d'activités durant la période de référence";
+$lang['ProjectReportAnalyze0005'] = "- Le projet n'a plus d'activités depuis plus de 2 mois";
+
+$lang['ProjectReportAnalyze0010'] = "- La charge des incidents en prod a dépassé le seuil des 8h";
+$lang['ProjectReportAnalyze0011'] = "- La charge projet en prod a dépassé le seuil des 8h";
+$lang['ProjectReportAnalyze0012'] = "- Il ne devrait  pas y avoir de temps sur les taches";
 
 
 $lang['perm'][useprojectreport]  = "Utiliser Rapport projet";

Index: projectreport_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/projectreport_new.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- projectreport_new.php	16 Nov 2006 15:54:11 -0000	1.1.2.5
+++ projectreport_new.php	23 Mar 2007 13:37:10 -0000	1.1.2.6
@@ -46,16 +46,16 @@
 
     /* report data */
     $rp = &$this->obj;
-    $this->assign("report", array('id'        => $rp->id,
-                                  'refname'   => $rp->getFullName(),
-                                  'r_start'   => $rp->r_start->getTimestamp(),
-                                  'r_end'     => $rp->r_end->getTimestamp(),
-                                  'date'      => $rp->date->getTimestamp(),
-                                  'state'     => $rp->state,
-                                  'manager'   => $rp->creator->getLink(),
-                                  'manager_name' => $rp->creator->getFullName(),
-                                 ));
-
+    $rpData = array('id'        => $rp->id,
+                    'refname'   => $rp->getFullName(),
+                    'r_start'   => $rp->r_start->getTimestamp(),
+                    'r_end'     => $rp->r_end->getTimestamp(),
+                    'date'      => $rp->date->getTimestamp(),
+                    'state'     => $rp->state,
+                    'manager'   => $rp->creator->getLink(),
+                    'manager_name' => $rp->creator->getFullName(),
+                   );
+    
     /* state label list of report */
     $statelist = array();
     foreach ($lang['ProjectReportStateID'] as $stid => $stlabel) {
@@ -88,29 +88,38 @@
         $prod_id   = $rp_pro->prod_ref->id;
       }
       error_log ("projet num ".$rp_pro->prod_ref->id." rppro = ".$rp_pro->id);
-      $rpProList[] = array('id'             => $rp_pro->id,
-                           'prod_name'      => $prod_name,
-                           'prod_ref'       => $prod_ref,
-                           'prod_id'        => $prod_id,
-                           'depth'          => $dl['depth'],
-                           'custumer'       => $custumer,
-                           'state'          => $rp_pro->state,
-                           'p_start'        => $rp_pro->p_start->notime ? 0 : $rp_pro->p_start->ts,
-                           'p_end'          => $rp_pro->p_end->notime ? 0 : $rp_pro->p_end->ts,
-                           'r_start'        => $rp_pro->r_start->notime ? 0 : $rp_pro->r_start->ts,
-                           'r_end'          => $rp_pro->r_end->notime ? 0 : $rp_pro->r_end->ts,
-                           'vol_estimate'   => $rp_pro->vol_estimate,
-                           'vol_tasks'      => $rp_pro->vol_tasks,
-                           'vol_tasks_done' => $rp_pro->vol_tasks_done,
-                           'vol_tasks_todo' => $rp_pro->vol_tasks_todo,
-                           'vol_prod_done'  => $rp_pro->vol_prod_done,
-                           'vol_bugs_done'  => $rp_pro->vol_bugs_done,
-                           'comment'        => $rp_pro->comment,
-                           'nodata'         => $nodata,
-                          );
+      $rpProData = array('id'             => $rp_pro->id,
+                     'prod_name'      => $prod_name,
+                     'prod_ref'       => $prod_ref,
+                     'prod_id'        => $prod_id,
+                     'depth'          => $dl['depth'],
+                     'custumer'       => $custumer,
+                     'state'          => $rp_pro->state,
+                     'p_start'        => $rp_pro->p_start->notime ? 0 : $rp_pro->p_start->ts,
+                     'p_end'          => $rp_pro->p_end->notime ? 0 : $rp_pro->p_end->ts,
+                     'r_start'        => $rp_pro->r_start->notime ? 0 : $rp_pro->r_start->ts,
+                     'r_end'          => $rp_pro->r_end->notime ? 0 : $rp_pro->r_end->ts,
+                     'vol_estimate'   => $rp_pro->vol_estimate,
+                     'vol_tasks'      => $rp_pro->vol_tasks,
+                     'vol_tasks_done' => $rp_pro->vol_tasks_done,
+                     'vol_tasks_todo' => $rp_pro->vol_tasks_todo,
+                     'vol_prod_done'  => $rp_pro->vol_prod_done,
+                     'vol_bugs_done'  => $rp_pro->vol_bugs_done,
+                     'vol_tasks_period' => $rp_pro->vol_tasks_period,
+                     'vol_prod_period'  => $rp_pro->vol_prod_period,
+                     'vol_bugs_period'  => $rp_pro->vol_bugs_period,
+                     'vol_period_done'=> $rp_pro->vol_period_done,
+                     'comment'        => $rp_pro->comment,
+                     'nodata'         => $nodata,
+                    );
+      $this->report_control($rpProData, $rpData);
+      $this->report_analyze($rpProData, $rpData);
+      $rpProList[] = $rpProData;
     }
     $this->assign("rpprolist", &$rpProList);
 
+    $this->assign("report", $rpData);
+
     // Mass updating And Legend
     $options = array();
 //    $options[-1]            = $lang['ActionNil'];
@@ -141,6 +150,87 @@
   }
 
   /**
+   * Analyze of report project
+   */
+  function report_analyze(&$rpProData,&$rpData) {
+    global $lang;
+    
+    $rpProData['analyze'] = '';
+    $done_todo = $rpProData['vol_tasks_done'] + $rpProData['vol_tasks_todo'] + $rpProData['vol_prod_done'] + $rpProData['vol_bugs_done'];
+    if ($rpProData['state'] >= 0 && !$rpProData['nodata']) {
+      if ($done_todo > $rpProData['vol_estimate']){
+        $pcent = '-';
+        if ($rpProData['vol_estimate'] > 0){
+          $pcent = round(($done_todo - $rpProData['vol_estimate']) / $rpProData['vol_estimate'] * 100, 1);
+        }        
+        $rpProData['analyze'] .= sprintf($lang['ProjectReportAnalyze0001'], $pcent)."<br />";
+      }
+      if ($rpProData['vol_tasks'] > $rpProData['vol_estimate']){
+        $pcent = '-';
+        if ($rpProData['vol_estimate'] > 0){
+          $pcent = round(($rpProData['vol_tasks'] - $rpProData['vol_estimate']) / $rpProData['vol_estimate'] * 100, 1);
+        }        
+        $rpProData['analyze'] .= sprintf($lang['ProjectReportAnalyze0002'], $pcent)."<br />";
+      }
+      if ($rpProData['vol_tasks_todo'] == 0 && $rpProData['state'] != PROD_STATE_FINISH){
+        $rpProData['analyze'] .= $lang['ProjectReportAnalyze0003']."<br />";
+      }
+      if ($rpProData['r_end'] && $rpProData['r_end'] < $rpData['r_start']){
+        $rpProData['analyze'] .= $lang['ProjectReportAnalyze0004']."<br />";
+        $rpProData['no_period_activity'] = 1;
+      }
+      $diffEndReport = $rpData['r_end'] - $rpProData['r_end'];
+      if ($rpProData['r_end'] && $diffEndReport > 5270400){ // 2 months
+        $rpProData['analyze'] .= $lang['ProjectReportAnalyze0005']."<br />";
+      }
+    } else {
+      if ($rpProData['vol_bugs_done'] > 8){
+        $rpProData['analyze'] .= $lang['ProjectReportAnalyze0010']."<br />";
+      }
+      if ($rpProData['vol_prod_done'] > 8){
+        $rpProData['analyze'] .= $lang['ProjectReportAnalyze0011']."<br />";
+      }
+//      if ($rpProData['vol_tasks_done'] != 0){
+//        $rpProData['analyze'] .= $lang['ProjectReportAnalyze0012']."<br />";
+//      }
+      
+    }
+  }
+
+  /**
+   * Controle coherence project in report
+   */
+  function report_control(&$rpProData, &$rpData) {
+    global $lang;
+    $count = 0;
+    
+    $rpProData['coherence'] = '';
+    
+    if ($rpProData['custumer'] == '' && !$rpProData['nodata']) {
+      $rpProData['coherence'] .= $lang['ProjectReportCoherence0001']."<br />";
+      $count++;
+    }
+    if (!$rpProData['vol_estimate'] && !$rpProData['nodata'] && $rpProData['state'] >= 0) {
+      $rpProData['coherence'] .= $lang['ProjectReportCoherence0002']."<br />";
+      $count++;      
+    }
+    if (!$rpProData['prod_ref'] && $rpProData['custumer'] != 'CVF' && !$rpProData['nodata']){
+      $rpProData['coherence'] .= $lang['ProjectReportCoherence0003']."<br />";
+      $count++;
+    }
+    $vol_done = $rpProData['vol_tasks_done'] + $rpProData['vol_prod_done'] + $rpProData['vol_bugs_done'];
+    if ($rpProData['state'] == 0 && $vol_done > 0){
+      $rpProData['coherence'] .= $lang['ProjectReportCoherence0004']."<br />";
+      $count++;
+    }
+    
+    if ($count > 0) {
+      $rpProData['warning'] = 1;
+      $rpData['blocked'] = 1;
+    }
+  }
+
+  /**
    * navigate
    */
   function navigate() {

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/mtable.pinc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mtable.pinc	10 Oct 2006 09:10:31 -0000	1.1.2.1
+++ mtable.pinc	23 Mar 2007 13:37:10 -0000	1.1.2.2
@@ -36,6 +36,9 @@
   "vol_tasks_todo" => array(type => "float",            constraints => "",    Desc => "planned hours todo"),
   "vol_prod_done"  => array(type => "float",            constraints => "",    Desc => "not planned hours done"),
   "vol_bugs_done"  => array(type => "float",            constraints => "",    Desc => "bugs hours done"),
+  "vol_tasks_period" => array(type => "float",            constraints => "",    Desc => "planned hours done in period"),
+  "vol_prod_period"  => array(type => "float",            constraints => "",    Desc => "not planned hours done in period"),
+  "vol_bugs_period"  => array(type => "float",            constraints => "",    Desc => "bugs hours done in period"),
   "comment"        => array(type => "TX_TYPE",          constraints => "",    Desc => "comment"),
 );
 

Index: projectreport.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/projectreport.pinc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- projectreport.pinc	12 Mar 2007 13:11:15 -0000	1.1.2.3
+++ projectreport.pinc	23 Mar 2007 13:37:10 -0000	1.1.2.4
@@ -54,6 +54,10 @@
     $this->vol_tasks_todo = 0.0;            // planned hours todo
     $this->vol_prod_done  = 0.0;            // not planned hours done
     $this->vol_bugs_done  = 0.0;            // bugs hours done
+    $this->vol_tasks_period = 0.0;            // planned hours done in period
+    $this->vol_prod_period  = 0.0;            // not planned hours done in period
+    $this->vol_bugs_period  = 0.0;            // bugs hours done in period
+    $this->vol_period_done  = 0.0;            // done in period
     $this->comment        = '';             // comment
     $this->tablename = $this->dbconn->prefix .$table['report1'][name];
     $this->acl[$current_user->id] = $tutos[delok];
@@ -80,6 +84,7 @@
 
     $obj->ottlist = array();
     $obj->ottsum = 0;
+    $obj->ottsum_period = 0;
     if ($obj->getType() == 'task') {
       $obj->otttodo = $obj->volume_todo;
 //       error_log("TODO TASK = ".$obj->otttodo);
@@ -102,6 +107,11 @@
         $obj->ottsum += $tt->volume;
 //       } else {
 //         error_log ("OVERDUE TT ".$tt->wday->getYYYYMMDD());
+
+        // cumul timetrack in report period
+        if ($tt->wday->ts >= $report->r_start->ts) {
+          $obj->ottsum_period += $tt->volume;
+        }
       }
 
       // calculate the todo for task
@@ -155,8 +165,12 @@
     $this->vol_tasks      = 0.0;
     $this->vol_tasks_done = 0.0;
     $this->vol_tasks_todo = 0.0;
+    $this->vol_tasks_period= 0.0;
     $this->vol_bugs_done  = 0.0;
+    $this->vol_bugs_period = 0.0;
     $this->vol_prod_done  = 0.0;
+    $this->vol_prod_period  = 0.0;
+    $this->vol_period_done = 0.0;
     $this->r_start->setNoTime();
     $this->r_end->setNoTime();
 
@@ -173,7 +187,9 @@
 
 
   function computeProdVol (&$pro, $cumul) {
-
+    $report_start = $this->report_ref->r_start; // beginning of report period
+    $report_end   = $this->report_ref->r_end;   // end of report period
+    
     // read task for this product
     task::obj_read($pro);
     $tasks = &$pro->fulltasklist;
@@ -197,6 +213,7 @@
 //       error_log("prod=".$pro->id." task.volume=".$task->volume." task.ottsum=".$task->ottsum." task.otttodo=".$task->otttodo);
       error_log("THERE IS ".count($task->ottlist)." task ottlist");
       $this->vol_tasks_done += $task->ottsum;
+      $this->vol_tasks_period += $task->ottsum_period;
       if ($task->logical || $task->milestone)
         continue;
       $this->vol_tasks      += $task->volume;
@@ -218,12 +235,14 @@
 //       error_log("prod=".$pro->id." pbug.ottsum=".$task->ottsum);
       error_log("THERE IS ".count($bug->ottlist)." pbug ottlist");
       $this->vol_bugs_done += $bug->ottsum;
+      $this->vol_bugs_period += $bug->ottsum_period;
     }
     foreach ($tbugs as $bug) {
       $this->objectTTList($bug, $report, $cumul);
 //       error_log("prod=".$pro->id." tbug.ottsum=".$task->ottsum);
       error_log("THERE IS ".count($bug->ottlist)." tbug ottlist");
       $this->vol_bugs_done += $bug->ottsum;
+      $this->vol_bugs_period += $bug->ottsum_period;
     }
 
     /* product hours */
@@ -231,6 +250,7 @@
 //     error_log("prod=".$pro->id." pro.ottsum=".$task->ottsum);
     error_log("THERE IS ".count($pro->ottlist)." pro ottlist");
     $this->vol_prod_done += $pro->ottsum;
+    $this->vol_prod_period += $pro->ottsum_period;
 
     /* search for real start and real end product */
 //    reset($pro->ottlist);
@@ -239,6 +259,7 @@
     $this->realStartEnd($pro);
 
 
+    $this->vol_period_done  = $this->vol_tasks_period + $this->vol_prod_period + $this->vol_bugs_period;
     
     
     
@@ -283,6 +304,10 @@
     $this->vol_tasks_todo = $r->get($pos, "vol_tasks_todo");
     $this->vol_prod_done  = $r->get($pos, "vol_prod_done");
     $this->vol_bugs_done  = $r->get($pos, "vol_bugs_done");
+    $this->vol_tasks_period = $r->get($pos, "vol_tasks_period");
+    $this->vol_prod_period  = $r->get($pos, "vol_prod_period");
+    $this->vol_bugs_period  = $r->get($pos, "vol_bugs_period");
+    $this->vol_period_done  = $this->vol_tasks_period + $this->vol_prod_period + $this->vol_bugs_period;
     $this->comment        = $r->get($pos, "comment");
 
     parent::read_result($r,$pos);
@@ -315,6 +340,9 @@
     $q->addFV("vol_tasks_todo", $this->vol_tasks_todo,   "FLOAT");
     $q->addFV("vol_prod_done",  $this->vol_prod_done,    "FLOAT");
     $q->addFV("vol_bugs_done",  $this->vol_bugs_done,    "FLOAT");
+    $q->addFV("vol_tasks_period", $this->vol_tasks_period,   "FLOAT");
+    $q->addFV("vol_prod_period",  $this->vol_prod_period,    "FLOAT");
+    $q->addFV("vol_bugs_period",  $this->vol_bugs_period,    "FLOAT");
     $q->addFV("comment",        $this->comment,          "TEXT");
 
     $query;

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3438/html/classic

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
ADD control and help analysis

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/.cvsignore,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- .cvsignore	12 Mar 2007 14:12:04 -0000	1.1.2.1
+++ .cvsignore	23 Mar 2007 13:37:10 -0000	1.1.2.2
@@ -1 +1,3 @@
 style_old.css
+style_cvf.css
+style_orange.css

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26817/php/bugtracking

Modified Files:
	bug.pinc 
Log Message:
fix

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- bug.pinc	18 Jan 2007 11:51:31 -0000	1.46
+++ bug.pinc	23 Mar 2007 09:22:14 -0000	1.47
@@ -876,7 +876,7 @@
     foreach($ml as $i => $f) {
       if (!is_object($f)) continue;
 
-      $mail->resetBody();
+      $mail->resetBodies();
       $mail->resetTo();
       $mail->addTo($ml[$i]);
       $body = "";
@@ -1053,7 +1053,6 @@
    */
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
-
     if (! is_object($obj) ) return "";
     if ( $obj->id == -1 ) return "";
     if (! $user->feature_ok(usebugtracking,PERM_NEW) ) return "";

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26412/php/db

Modified Files:
	db_mysql.pinc 
Log Message:
fix

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- db_mysql.pinc	10 Mar 2007 17:33:25 -0000	1.33
+++ db_mysql.pinc	23 Mar 2007 09:21:43 -0000	1.34
@@ -98,7 +98,7 @@
  
     $this->conn = &$c;
 
-    $r = $this->exec('SET CHARACTER SET latin1',1);
+#    $r = $this->exec('SET CHARACTER SET latin1',1);
   }
   /* ---------------------------------------------------------------------------
    */
@@ -601,4 +601,4 @@
   }
 
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6115/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	timetrack_synthesis.tpl 
Added Files:
      Tag: BRANCH-2-0
	timetrack_synthesis_csv.tpl 
Log Message:
ADD export view by project in CSV

--- NEW FILE: timetrack_synthesis_csv.tpl ---
{strip}
{assign var=FE value=$csvparams.field_encaps}
{assign var=FS value=$csvparams.field_sep}
{assign var=LS value=$csvparams.line_sep}
{$FE}{$lang.TimetrackSynthesis}: {$ref.name}{$FE}{$FS}
{$LS}
{$FE}{$date.from}{$FE}{$FS}
{$FE}{$date.start|date_format:"%Y-%m-%d"}{$FE}
{$LS}
{$FE}{$date.to}{$FE}{$FS}
{$FE}{$date.end|date_format:"%Y-%m-%d"}{$FE}
{$LS}
{if $csvparams.with_head}
{$FE}{$lang.ProdReference}{$FE}{$FS}
{$FE}{$lang.Projects}{$FE}{$FS}
{$FE}{$lang.Timetracks} {$lang.Tasks}{$FE}{$FS}
{$FE}{$lang.Timetracks} {$lang.Projects}{$FE}{$FS}
{$FE}{$lang.Timetracks} {$lang.Bugs}{$FE}{$FS}
{$LS}
{/if}
{foreach from=$tts.$ttsitem item=ttsum key=pid}
  {if $ttsum.total.hour > 0}
  	{$FE}{if $ttsum.ref}{$ttsum.ref}{/if}{$FE}{$FS}
  	{$FE}{$ttsum.name}{$FE}{$FS}
  	{$FE}{$ttsum.task.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}{$FS}
  	{$FE}{$ttsum.proj.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}{$FS}
  	{$FE}{$ttsum.bug.hour|default:"0"|string_format:"%.2f"|replace:".":","}{$FE}
  	{$LS}
  {/if}
{/foreach}
{/strip}
Index: timetrack_synthesis.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_synthesis.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- timetrack_synthesis.tpl	6 Jul 2006 13:32:32 -0000	1.1.2.4
+++ timetrack_synthesis.tpl	21 Mar 2007 09:09:16 -0000	1.1.2.5
@@ -174,7 +174,9 @@
           <a href="address_show.php?id={$ttsum.id}" title="{$ttsum.name}"><img src="{$base}/html/classic/user.png" alt="user" /></a>
         {/if}
           <a href="task_overview.php?id={$ttsum.id}" title="{$lang.TaskOverview}: {$ttsum.name}"><img src="{$base}/html/classic/task_overview.png" alt="task_overview" /></a>
-          <a href="timetrack_synthesis.php?id={$ttsum.id}&startDate={$date.start|date_format:"%Y-%m-%d"}&endDate={$date.end|date_format:"%Y-%m-%d"}&histoDiv={$date.histoDiv}" title="{$lang.TimetrackSynthesis}: {$ttsum.name}">{$ttsum.name}</a>
+          {if $ttsum.ref}<i>[{$ttsum.ref}]</i>{/if}
+          <a href="timetrack_synthesis.php?id={$ttsum.id}&startDate={$date.start|date_format:"%Y-%m-%d"}&endDate={$date.end|date_format:"%Y-%m-%d"}&histoDiv={$date.histoDiv}" title="{$lang.TimetrackSynthesis}: {$ttsum.name}">
+          {$ttsum.name}</a>
         </td>
         <td>
           <!-- Item Histogram -->

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6115/php

Modified Files:
      Tag: BRANCH-2-0
	timetrack_synthesis.php 
Log Message:
ADD export view by project in CSV

Index: timetrack_synthesis.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/timetrack_synthesis.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- timetrack_synthesis.php	6 Jul 2006 13:32:32 -0000	1.1.2.5
+++ timetrack_synthesis.php	21 Mar 2007 09:09:16 -0000	1.1.2.6
@@ -195,7 +195,21 @@
     $this->assign('ttsitem', $this->ttsitem);
     $this->assign('tts',     $this->tts);
 
-    $this->template('timetrack_synthesis');
+    if ($this->export == 'csv') {
+      error_log("Export in CSV");
+      $this->assign('csvparams', array('with_head'    => true,
+                                       'field_sep'    => ",",
+                                       'field_encaps' => "\"",
+                                       'line_sep'     => "\n",
+                                      ));
+      header('Content-Type: test/x-csv');
+      header('Content-Disposition: attachment; filename="ttsynth.csv"');
+      header('Content-Encoding: '.$lang['content_encoding']);
+      header('Cache-Control: no-cache');
+      $this->template('timetrack_synthesis_csv');
+    } else {
+      $this->template('timetrack_synthesis');
+    }
 
    // $this->debug($this->tts);
   }
@@ -282,15 +296,35 @@
               );
     $this->addMenu($x);
 
+    $ctb = ""; 
+    if ( $this->cutby ) {
+      $ctb = "&cutby=".$this->cutby;
+    }
+    
     $x = array('url'   => "timetrack_synthesis.php?format=paper&id=".$this->ref->id.
                           "&startDate=".strftime("%Y-%m-%d",$this->startDate).
                           "&endDate=".strftime("%Y-%m-%d",$this->endDate).
-                          "&histoDiv=".$this->formHistoDiv,
+                          "&histoDiv=".$this->formHistoDiv.
+                          $ctb,
                'text'  => $lang['Printable'],
                'image' => 'format',
                'info'  => $lang['PrintableInfo'],
                'category' => array("obj", "Timetrack_synthesis"));
     $this->addMenu($x);
+  
+  
+    if ( $this->ttsitem == 'byprj' ) {
+      $x = array('url'   => "timetrack_synthesis.php?format=csv&id=".$this->ref->id.
+                            "&startDate=".strftime("%Y-%m-%d",$this->startDate).
+                            "&endDate=".strftime("%Y-%m-%d",$this->endDate).
+                            "&histoDiv=".$this->formHistoDiv.
+                            $ctb,
+                 'text'  => $lang['Export'],
+                 'image' => 'spreadsheet',
+                 'info'  => $lang['ExportInfo'],
+                'category' => array("obj", "Timetrack_synthesis"));
+      $this->addMenu($x);
+    }
   }
 
   /**
@@ -406,6 +440,7 @@
     if (!isset($ttsum['byprj'][$prj->id])) {
       $ttsum['byprj'][$prj->id] = array('id'    => $prj->id,
                                         'name'  => $prj->getFullName(),
+                                        'ref'   => $prj->reference,
                                         'type'  => 'product',
                                         'task'  => array('name' => $lang['Tasks']),
                                         'proj'  => array('name' => $lang['Projects']),
@@ -804,13 +839,13 @@
     }
 
     if (!$this->startDate || !$this->endDate) {
-      $msg .= "pb de sélection de date";
+      $msg .= "pb de s�lection de date";
       return false;
     }
     $this->endDate += (24 * 3600) - 1; /* 23h59mn59s */
 
     if ($this->endDate < $this->startDate) {
-      $msg .= "PB de cohérence de dates";
+      $msg .= "PB de coh�rence de dates";
       return false;
     }
 
@@ -821,7 +856,7 @@
       if ($div == 'D' || $div == 'W' || $div == 'M' || $div == 'A') {
         $this->formHistoDiv = $_REQUEST['histoDiv'];
       } else {
-        $msg .= "Périodicité d'histogramme incorrect";
+        $msg .= "P�riodicit� d'histogramme incorrect";
         return false;
       }
     }
@@ -1073,6 +1108,14 @@
       }
       $this->tts = $this->getProductTT($tasks, $pbugs, $tbugs);
     }
+      
+      
+    $this->export = false;
+    if (isset($_REQUEST['format']) && $_REQUEST['format'] == 'csv') {
+      $this->export = 'csv';
+    }
+      
+      
 
     $this->prepareTeamList();
   }

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22143

Modified Files:
	ChangeLog 
Log Message:
update

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- ChangeLog	19 Nov 2006 17:44:42 -0000	1.116
+++ ChangeLog	17 Mar 2007 08:15:19 -0000	1.117
@@ -1,4 +1,8 @@
 #$Header$
+March 2007
+	* Release 1.3.20070317
+December 2006
+	* support of PHP 5.2 
 November 2006
 	* tasks with predecessor tasks
         * report-engine: added milestone trend analysis rep_mta

Update of /cvsroot/tutos/tutos/html
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20174/html

Modified Files:
	nuke.css 
Log Message:
bugfix

Index: nuke.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/nuke.css,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- nuke.css	23 May 2005 12:58:18 -0000	1.26
+++ nuke.css	13 Mar 2007 18:12:18 -0000	1.27
@@ -9,6 +9,10 @@
  *
  */
 
+.datafield {
+        background: #EFEFEF;
+}
+
 .center {
         margin-left: auto;
         margin-right: auto;
@@ -59,7 +63,7 @@
 
 /* preformatted text */
 .pre {
-        background: #F0F0F0;
+        background: #F5F5F5;
         color: black;
 }
 
@@ -259,6 +263,9 @@
         vertical-align: top;
         color: black;
         font-size: 12px;
+        border-width: 1px;
+        border-color: gray;
+        border-style: solid;
 }
 
 .freeday {
@@ -266,6 +273,9 @@
         vertical-align: top;
         color: black;
         font-size: 12px;
+        border-width: 1px;
+        border-color: gray;
+        border-style: solid;
 }
 
 .appday {
@@ -273,6 +283,9 @@
         vertical-align: top;
         color: black;
         font-size: 12px;
+        border-width: 1px;
+        border-color: gray;
+        border-style: solid;
 }
 
 .today {
@@ -280,6 +293,9 @@
         vertical-align: top;
         color: black;
         font-size: 12px;
+        border-width: 1px;
+        border-color: red;
+        border-style: solid;
 }
 
 .week {

Update of /cvsroot/tutos/tutos/homepage
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20174/homepage

Modified Files:
	links.html status.html 
Log Message:
bugfix

Index: status.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/status.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- status.html	3 Mar 2003 19:53:38 -0000	1.17
+++ status.html	13 Mar 2007 18:12:18 -0000	1.18
@@ -25,7 +25,7 @@
 
 <b>Online Demo:</b>
 <p>
-An online demo (PHP with MySQL) of version 1.1 could be found <a href="HERE." rel="nofollow">http://tutos.sourceforge.net/devel/php/mytutos.php"><b><blink>HERE</blink></b></a>.
+An online demo (PHP with MySQL) of version 1.3 could be found <a href="HERE." rel="nofollow">http://demo.tutos.de/devel/php/mytutos.php"><b><blink>HERE</blink></b></a>.
 <p>
 <table bgcolor="black" border="0" cellpadding="1" cellspacing="2"><tr><td>
 <table bgcolor="#DDDDDD" border="0" cellpadding="2" cellspacing="0">
@@ -41,10 +41,6 @@
 </table>
 </td></tr></table>
 
-<p>The previous version 1.0 vould be found <a
-href="HERE" rel="nofollow">http://tutos.sourceforge.net/php/mytutos.php">HERE</a> (same user/password
-as above)</p>
-
 <p>
 You like TUTOS and want to say Thank You ? Look behind these links<br>
 &nbsp;&nbsp;<a

Index: links.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/links.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- links.html	30 Oct 2005 11:54:58 -0000	1.16
+++ links.html	13 Mar 2007 18:12:18 -0000	1.17
@@ -31,7 +31,7 @@
     border="0" height="20"
     src="http://www.tutos-france.com/images/logo_defisud.gif"
     alt="defisud"></a> (in french)
-    <li>TUTOS hosting and Outlook sync: <a href="" rel="nofollow">http://www.ecosoft.net/index.php?id=452&L=0"> ecosoft.net</a>
+<!--    <li>TUTOS hosting and Outlook sync: <a href="" rel="nofollow">http://www.ecosoft.net/index.php?id=452&L=0"> ecosoft.net</a> -->
  </ul>
   <li><b>really good books for (not only) software projectmanagers</b><br>(Note: Links zu den deutschen B&uuml;chern sind <a href="hier)" rel="nofollow">http://www.tutos.de/?id=42">hier</a>)</li>
     <ul>

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20174/php

Modified Files:
	mail.pinc task.pinc 
Log Message:
bugfix

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- mail.pinc	10 Mar 2007 17:33:25 -0000	1.86
+++ mail.pinc	13 Mar 2007 18:12:18 -0000	1.87
@@ -20,7 +20,6 @@
   function mail_body() {
     global $lang;
 
-    $this->resetBody();
     $this->contenttype = "text/plain";
     $this->contentdesc = "";
     $this->contentdispotype = "";
@@ -585,6 +584,7 @@
    */
   function mail(&$user) {
     parent::mail_body();
+    $this->resetBodies();
     $this->dbconn = $user->dbconn;
     $this->user = $user;
     $this->subject = "";
@@ -1250,7 +1250,7 @@
    * set the address where to send the mail
    * if obj is a team , than a mail will be send to every team member
    */
-  function resetBody() {
+  function resetBodies() {
     $this->bodies = array();
     $this->body = '';
   }

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- task.pinc	2 Jan 2007 19:59:56 -0000	1.176
+++ task.pinc	13 Mar 2007 18:12:18 -0000	1.177
@@ -817,7 +817,7 @@
         $m->addBody($body,"text/plain",$f->lg['TaskDetail'],"",$f->lg['content_encoding']);
                 
         $msg .= $m->send();
-        $m->resetBody();
+        $m->resetBodies();
         $m->resetTo();
       }
     }

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20174

Modified Files:
	Makefile 
Log Message:
bugfix

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- Makefile	19 Nov 2006 17:44:42 -0000	1.83
+++ Makefile	13 Mar 2007 18:12:18 -0000	1.84
@@ -2,7 +2,7 @@
 #   the ultimate team organization software
 #   ---------------------------------------
 #
-# Copyright 1999-2001 by Gero Kohnert
+# Copyright 1999-2007 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   
@@ -15,6 +15,9 @@
 #
 #
 # $Log$
+# Revision 1.84  2007/03/13 18:12:18  gokohnert
+# bugfix
+#
 # Revision 1.83  2006/11/19 17:44:42  gokohnert
 # removed webstack stuff
 #