tutos-commits Mailing List for TUTOS

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

Modified Files:
      Tag: BRANCH-2-0
	menu_elements.tpl 
Log Message:
*ADD confirm dialog box on delete

Index: menu_elements.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu_elements.tpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- menu_elements.tpl	6 Jul 2006 13:22:09 -0000	1.1.2.3
+++ menu_elements.tpl	23 Aug 2006 15:22:54 -0000	1.1.2.4
@@ -1,6 +1,5 @@
 {* Display menu elements *}
 {* $Id$ *}
-
 {*
 Array
 (
@@ -15,14 +14,13 @@
             [2] => default
         )
 *}
-
-    {foreach from=$menu item=m}
+{foreach from=$menu item=m}
       <li>
 	  {if $img == True and $m.image != ""}
         <img src="{$base}/html/classic/{$m.image}.png"  alt="{$m.image}" />
 	  {else}
         <img src="{$base}/html/classic/blank.png" alt="blank" />
 	  {/if}
-        <a href="{$base}/php/{$m.url}" title="{$m.info}">{$m.text}</a>
-   	  </li>
-	{/foreach}
+        <a href="{$base}/php/{$m.url}" title="{$m.info}" {if $m.confirm} {/if}>{$m.text}</a>
+      </li>
+{/foreach}

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

Modified Files:
      Tag: BRANCH-2-0
	product_ins.php product.pinc 
Log Message:
* BUGFIX: error when cloning project

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.6
retrieving revision 1.53.2.7
diff -u -r1.53.2.6 -r1.53.2.7
--- product_ins.php	16 Aug 2006 14:17:02 -0000	1.53.2.6
+++ product_ins.php	23 Aug 2006 13:33:52 -0000	1.53.2.7
@@ -277,11 +277,14 @@
      $diff = (int) ( (mktime( 0, 0, 0, $pstart->month, $pstart->day, $pstart->year ) - $tplstart) / 86400);
       
      files_clone( $dbconn, $oldid, $p->id, $current_user );
+
      tasks_clone_recursive( $p->tasklist, $p->id, $current_user, $diff );
+
    }
 
    $dbconn->Commit("WORK");
 
+
    # we want to see what we create
    $gotourl = $p->getUrl();
  }

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.16
retrieving revision 1.133.2.17
diff -u -r1.133.2.16 -r1.133.2.17
--- product.pinc	16 Aug 2006 14:17:02 -0000	1.133.2.16
+++ product.pinc	23 Aug 2006 13:33:52 -0000	1.133.2.17
@@ -154,6 +154,8 @@
     $this->p_start     = $r->getDateTime($pos, "p_start");
     $this->p_end       = $r->getDateTime($pos, "p_end");
     $this->reference       = $r->get($pos, "reference");
+    if (!isset($this->reference))
+      $this->reference = "";
     $this->volume_estimate = $r->get($pos, "volume_estimate");;
     $this->state_date      = $r->getDateTime($pos,"state_date");
     if ($this->state_date->notime) {

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

Modified Files:
      Tag: BRANCH-2-0
	fr.p3 
Log Message:
clean code

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mantis/Attic/fr.p3,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- fr.p3	18 Jan 2006 13:52:53 -0000	1.1.2.1
+++ fr.p3	23 Aug 2006 13:31:49 -0000	1.1.2.2
@@ -8,7 +8,6 @@
 # using the same format like here
 # =======================================================
 
-error_log("Lecture mantis/fr.p3");
 # Filehandling
 $lang['Mantis']            = "Mantis";
 $lang['MantisProject']     = "Projet Mantis";

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

Modified Files:
	product_new.php 
Log Message:
fix

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- product_new.php	22 Aug 2006 09:54:59 -0000	1.97
+++ product_new.php	22 Aug 2006 10:13:23 -0000	1.98
@@ -312,7 +312,7 @@
        if ( is_numeric($this->obj) && $this->obj == -1 ) {
          $msg .= sprintf($lang['Err0040'],$lang['Product']);
          $this->stop = true;
-	 return;
+         return;
        }
        $this->name = sprintf($lang['ProdModifyT'], $this->obj->getFullName());
        $this->obj->readroles();

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

Modified Files:
	group_new.php 
Log Message:
fix

Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- group_new.php	25 May 2005 06:05:07 -0000	1.31
+++ group_new.php	22 Aug 2006 10:13:23 -0000	1.32
@@ -98,6 +98,11 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Group']);
+         $this->stop = true;
+         return;
+       }
        $this->name = $lang['GroupModify'] .": ". $this->obj->getFullName();
      } else {
        $this->name = $lang['GroupCreate'];

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

Modified Files:
	reminder_new.php reminder_show.php 
Log Message:
fix

Index: reminder_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_new.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- reminder_new.php	29 Jan 2006 13:44:09 -0000	1.15
+++ reminder_new.php	22 Aug 2006 10:10:24 -0000	1.16
@@ -209,6 +209,11 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Reminder']);
+         $this->stop = true;
+	 return;
+       }
        $this->name = $lang['ReminderModify'] .": ". $this->obj->getFullName();
      } else {
        $this->name = $lang['ReminderCreate'];

Index: reminder_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- reminder_show.php	23 May 2005 15:44:13 -0000	1.12
+++ reminder_show.php	22 Aug 2006 10:10:24 -0000	1.13
@@ -107,6 +107,13 @@
      } else {
        $msg .= $lang['Err0048'] ."<br />";
        $this->stop = true;
+       return;
+     }
+     if ( !is_object($this->obj) ) {
+       $msg .= sprintf($lang['Err0040'],$lang['Reminder']);
+       $this->stop = true;
+       $this->format = "html";
+       return;
      }
      if ( ! $this->obj->see_ok() ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);

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

Modified Files:
	base.pinc team_new.php team_show.php 
Log Message:
fix

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- base.pinc	16 Jul 2006 11:10:42 -0000	1.91
+++ base.pinc	22 Aug 2006 10:10:24 -0000	1.92
@@ -123,6 +123,7 @@
     if ( empty($id) ) return -1;
     if ( -1 == $id ) return -1;
     if ( ! is_numeric($id) ) return -1;
+    if ( ! is_object($obj) ) return -1;
     if ( $obj->tablename == 'UNKNOWN' ) return -1;
 
     if ( !isset($tutos['nohash']) && isset($g_hash[$id]) ) {

Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- team_new.php	1 May 2005 13:37:53 -0000	1.51
+++ team_new.php	22 Aug 2006 10:10:24 -0000	1.52
@@ -204,6 +204,11 @@
      $this->obj = new team($this->dbconn);
      if ( isset($_GET['id'])  ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Team']);
+         $this->stop = true;
+         return;
+       }
        $this->obj->read_member();
        $this->obj->read_permissions();
        $this->name = $lang['TeamModify'] .": ". $this->obj->getFullName();

Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- team_show.php	28 Jan 2006 19:35:02 -0000	1.64
+++ team_show.php	22 Aug 2006 10:10:24 -0000	1.65
@@ -253,6 +253,12 @@
      } else {
        $msg .= $lang['Err0048'] ."<br />";
        $this->stop = true;
+       return;
+     }
+     if ( is_numeric($this->obj) && $this->obj == -1 ) {
+       $msg .= sprintf($lang['Err0040'],$lang['Team']);
+       $this->stop = true;
+       return;
      }
      if ( ! $this->obj->see_ok() ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);

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

Modified Files:
	note_new.php 
Log Message:
fix

Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- note_new.php	22 Jan 2006 20:19:21 -0000	1.34
+++ note_new.php	22 Aug 2006 10:00:01 -0000	1.35
@@ -124,9 +124,10 @@
      if ( isset($_GET['id']) ){
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
        $this->name = $lang['NoteMod'];
-       if ( $this->obj->id < 0 ) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Note']);
          $this->stop = true ;
+	 return;
        }
      } else {
        $this->name = $lang['NoteCreation'];
@@ -187,4 +188,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	bug_new.php 
Log Message:
fix

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bug_new.php	5 Apr 2006 11:58:32 -0000	1.21
+++ bug_new.php	22 Aug 2006 10:00:01 -0000	1.22
@@ -234,11 +234,12 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-       $this->obj->read_bughistory();
-       if ($this->obj->id < 0) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Bug']);
          $this->stop = true;
+	 return;
        }
+       $this->obj->read_bughistory();
        $this->name = sprintf($lang['BugModifyI'],$this->obj->getFullName());
      } else {
        $this->name = $lang['BugCreate'];

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

Modified Files:
	product_new.php address_new.php 
Log Message:
fix

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- product_new.php	22 Jan 2006 20:19:20 -0000	1.96
+++ product_new.php	22 Aug 2006 09:54:59 -0000	1.97
@@ -309,9 +309,10 @@
      
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-       if ( $this->obj->id < 0 ) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Product']);
          $this->stop = true;
+	 return;
        }
        $this->name = sprintf($lang['ProdModifyT'], $this->obj->getFullName());
        $this->obj->readroles();

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- address_new.php	28 Jan 2006 17:34:08 -0000	1.77
+++ address_new.php	22 Aug 2006 09:54:59 -0000	1.78
@@ -347,11 +347,12 @@
        $id = $_GET['id'];
        # Modify Base Address
        $this->obj = $this->obj->read($id,$this->obj);
-       $this->obj->read_locs_data();
-       if ($this->obj->id < 0) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Address']);
          $this->stop = true;
+	 return;
        }
+       $this->obj->read_locs_data();
      }
 
      if ( isset($_GET['loc_id']) && ($_GET['loc_id'] != "-1" )) {

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

Modified Files:
	app_new.php 
Log Message:
fix

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- app_new.php	25 Jul 2006 11:19:55 -0000	1.68
+++ app_new.php	22 Aug 2006 09:50:49 -0000	1.69
@@ -230,9 +230,11 @@
      if ( isset($_GET['id']) ) {
        $this->name =  $lang['AppointModify'];
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
-       if ($this->obj->id < 0) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       if ( is_numeric($this->obj) && $this->obj == -1 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['Appointment']);
          $this->stop = true;
+         $this->format = "html";
+         return;
        }
        $this->obj->read_participants();
        /* only the owner may change */
@@ -313,6 +315,7 @@
      } else if (  ! $this->obj->mod_ok() ) {
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
        $this->stop = true;
+       return;
      }
      # menu
      $m = appointment::getSelectLink($this->user);

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

Modified Files:
      Tag: BRANCH-2-0
	motd.html 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: motd.html
===================================================================
RCS file: /cvsroot/tutos/tutos/html/Attic/motd.html,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- motd.html	1 Jan 2003 18:54:36 -0000	1.5
+++ motd.html	16 Aug 2006 14:17:03 -0000	1.5.4.1
@@ -1,19 +1,105 @@
+</pre>
 <!-- $Id$ -->
 <!-- This will be read inside of <PRE> </PRE> -->
-This is the <u>default</u> message of today.
-
-Congratulations you have managed to install <a href="http://www.tutos.org">TUTOS</a>.
-
-To change the message of today:
-
- change the file [tutoshome]/html/motd.html
- or remove/rename it and nothing will be displayed
- move it away and make a link to an executable.
-    The output of the excutable will be shown.
-    Try for example:
-    <i>ln -fs /usr/bin/fortune [tutoshome]/html/motd.html</i>
-
-
-
-Have fun.
+<!--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;">
+    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>
+    <p>Il est également possible de renseigner le temps total estimé de la propal.</p>
+    <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;">
+    06/07/2006 - LE CALENDRIER des ABSENCES</dt>
+  <dd>
+    <p>EH oui, il est enfin arrivé.</p>
+    <p>Vous pouvez maintenant consulter votre agenda CVF depuis Tutos.</p>
+    <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;">
+    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;">
+    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;">
+    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 />
+    Ce module est accessible depuis le menu de l'aperçu projet derrière l'icone <img src="/html/classic/projectio.png" alt="projectio" />.
+    </p>
+    <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;">
+    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 />
+    Ce module est accessible depuis le menu de l'aperçu projet derrière l'icone <img src="/html/classic/projectio.png" alt="projectio" />.
+    </p>
+    <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;">
+    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/>
+  </dd>
+  <dd style="color:#cc6666;">
+    - TOUTEFOIS: le premier affichage de la page projet risque d'être plus long afin de rassembler les informations manquantes.<br />
+    <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;">
+    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;">
+    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
+  </dd><p>
+  <dd>
+    Vous trouverez quelques nouveautés dans l'aperçu tache:<br />
+    - un lien direct pour saisir une activité sur une des taches listées<br />
+    - un rollover permet de voir le descriptif de la tâche<br />
+    - la page de recherche de bug a été simplifiée
+  </dd><p>
+  <dd>
+    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;">
+    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;">
+    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 />
+  - dans le champ de recherche, cliquez droit puis <em>"ajouter un mot-clé pour cette recherche"</em><br />
+  - mettre <em>"Recherche Projet Mantis"</em> dans <em>"Nom"</em>, <em>"tutosp"</em> dans <em>"Mot clef"</em> puis ajouter<br />
+  - tapez <em>"tutosp &lt;quelque chose&gt;"</em> dans la barre d'adresse pour chercher un projet.
+  </dd>
+  <dd>Ceci peut être fait pour les projets, les bugs, les utilisateurs....</dd>
+</dl>
+</p>
 <!-- EOF -->
+<pre>

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

Modified Files:
      Tag: BRANCH-2-0
	product_new.tpl product_show.tpl 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: product_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_new.tpl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- product_new.tpl	1 Aug 2006 08:27:06 -0000	1.1.2.15
+++ product_new.tpl	16 Aug 2006 14:17:03 -0000	1.1.2.16
@@ -99,7 +99,7 @@
 <td class="desc" >
   <label for="{$p_end_d.name}">{$p_end_d.label}</label>
 </td>
-<td colspan="4" style="white-space: nowrap;">
+<td style="white-space: nowrap;">
 {html_options name=$p_end_d.name
       values=$p_end_d.options output=$p_end_d.options
       selected=$p_end_d.selected}
@@ -121,21 +121,37 @@
 mywindow.focus();" title="MiniCal">MiniCal</a>
 
  </td>
+<td class="desc" align="right">{$reference.label}</td>
+<td colspan="2">
+<input id="{$reference.name}" size="{$reference.size}" maxlength="{$reference.maxl}"
+     name="{$reference.name}" value="{$reference.value}">
+</td>
+</tr>
+
+<tr>
+<td colspan="2"></td>
+<td class="desc" align="right">
+  <label for="{$volume_estimate.name}">{$volume_estimate.label}</label>
+</td>
+<td colspan="2">
+<input id="{$volume_estimate.name}" size="4" maxlength="6"
+     name="{$volume_estimate.name}" value="{$volume_estimate.value}"> {$volume_estimate.hours}
+</td>
 </tr>
 
 <tr class="em">
  <td class="desc" >{$role.label}</td>
- <th>{$ProdFunc}</th>
- <th>{$AdrName}</th>
- <th>{$ProdRoleDesc}</th>
+ <th style="text-align:left;">{$AdrName}</th>
+ <th style="text-align:left;">{$ProdFunc}</th>
+ <th style="text-align:left;">{$ProdRoleDesc}</th>
  <th>&nbsp;</th>
 </tr>
 
 {section name=role loop=$roles}
 <tr>
  <td>&nbsp;</td>
- <td>{$roles[role].name}</td>
  <td>{$roles[role].link}</td>
+ <td>{$roles[role].name}</td>
  <td>{$roles[role].desc}</td>
  <td align="right">
    <input id="del[]" type="checkbox" name="del[]"
@@ -146,11 +162,6 @@
 
 <tr>
 <td class="desc" >{$ProdRolesNew}</td>
-<td align="right">
- {html_options name=$role1.name
-               options=$role1.options selected=$role1.selected}
-</td>
-
 <td>
 {if $r1fn.select}
   {html_options name=$r1l.name options=$r1l.options}
@@ -159,6 +170,11 @@
          value="{$r1fn.value}">
 {/if}
 </td>
+<td>
+ {html_options name=$role1.name
+               options=$role1.options selected=$role1.selected}
+</td>
+
 <td colspan="2">
   <input id="{$r1desc.name}" name="{$r1desc.name}" value="{$r1desc.value}"
          size="{r1desc.size}" maxlength="{$r1desc.maxl}">
@@ -167,11 +183,6 @@
 
 <tr>
 <td class="desc" >{$ProdRolesNew}</td>
-<td align="right">
- {html_options name=$role1a.name
-               options=$role1a.options selected=$role1a.selected}
-</td>
-
 <td>
 {if $r1afn.select}
   {html_options name=$r1al.name options=$r1al.options}
@@ -180,6 +191,11 @@
          value="{$r1afn.value}">
 {/if}
 </td>
+<td>
+ {html_options name=$role1a.name
+               options=$role1a.options selected=$role1a.selected}
+</td>
+
 <td colspan="2">
   <input id="{$r1adesc.name}" name="{$r1adesc.name}" value="{$r1adesc.value}"
          size="{r1adesc.size}" maxlength="{$r1adesc.maxl}">
@@ -188,15 +204,17 @@
 
 <tr class="em">
 <td class="desc" >{$ProdProd}</td>
- <th>{$ProdFunc}</th><th>{$AdrName}</th><th>{$ProdRoleDesc}</th>
+ <th style="text-align:left;">{$AdrName}</th>
+ <th style="text-align:left;">{$ProdFunc}</th>
+ <th style="text-align:left;">{$ProdRoleDesc}</th>
  <th>&nbsp;</th>
 </tr>
 
 {section name=prodrole loop=$prodroles}
 <tr>
  <td>&nbsp;</td>
- <td>{$prodroles[prodrole].name}</td>
  <td>{$prodroles[prodrole].link}</td>
+ <td>{$prodroles[prodrole].name}</td>
  <td>{$prodroles[prodrole].desc}</td>
  <td align="right">
    <input id="del[]" type="checkbox" name="del[]"
@@ -209,14 +227,6 @@
 <tr>
 <td class="desc" >{$ProdProdNew}</td>
 <td>
-  <select name="{$role2.name}">
-  {foreach from=$role2.options key=value item=option}
-   <option value="{$value}">{$option}</option>
-  {/foreach}
-  </select>
-</td>
-
-<td>
 {if $r2fn.select}
   {html_options name=$r2l.name options=$r2l.options}
 {else}
@@ -224,6 +234,14 @@
          value="{$r2fn.value}">
 {/if}
 </td>
+<td>
+  <select name="{$role2.name}">
+  {foreach from=$role2.options key=value item=option}
+   <option value="{$value}">{$option}</option>
+  {/foreach}
+  </select>
+</td>
+
 <td colspan="2">
   <input id="{$r2desc.name}" name="{$r2desc.name}" value="{$r2desc.value}"
          size="{$r2desc.size}" maxlength="{$r2desc.maxl}">

Index: product_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_show.tpl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- product_show.tpl	19 Jan 2006 14:30:10 -0000	1.1.2.18
+++ product_show.tpl	16 Aug 2006 14:17:03 -0000	1.1.2.19
@@ -64,6 +64,13 @@
 {/if}
 </tr>
 
+{if $ProdReference.value != ""}
+<tr>
+<td class="desc" valign="top">{$ProdReference.label}</td>
+<td colspan="3" class="data">{$ProdReference.value|nl2br}</td>
+</tr>
+{/if}
+
 <tr>
 <td class="desc" valign="top">{$ProdVersion.label}</td>
 <td class="data" valign="top">
@@ -194,6 +201,13 @@
 </tr>
 {/if}
 
+{if $ProdVolEstimate.value != ""}
+<tr>
+<td class="desc" valign="top">{$ProdVolEstimate.label}</td>
+<td colspan="3" class="data">{$ProdVolEstimate.value} {$ProdVolEstimate.hours}</td>
+</tr>
+{/if}
+
 <tr>
 <td class="desc" valign="top">{$TimeTrack.label}</td>
 <td colspan="3" class="data">

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

Modified Files:
      Tag: BRANCH-2-0
	en.p3 fr.p3 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.16
retrieving revision 1.47.2.17
diff -u -r1.47.2.16 -r1.47.2.17
--- en.p3	1 Aug 2006 15:52:17 -0000	1.47.2.16
+++ en.p3	16 Aug 2006 14:17:03 -0000	1.47.2.17
@@ -280,6 +280,7 @@
 $lang['ProductsDetail']  = "Product/Project Detail";
 $lang['ProdApps']        = "Related Appointments";
 $lang['ProdName']        = "Product/Project";
+$lang['ProdReference']   = "Reference";
 $lang['ProdVersion']     = "Version";
 $lang['ProdProd']        = "related Projects";
 $lang['ProdProdNew']     = "new relation";
@@ -349,6 +350,7 @@
 $lang['SubProject']      = "Sub-project";
 $lang['SubProjects']     = "Sub-projects";
 $lang['ProdSubNew']      = "New subproject";
+$lang['ProdVolEstimate'] = "Volume estimated";
 
 # Mail
 $lang['MailboxEmail']    = "Email";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.35
retrieving revision 1.40.2.36
diff -u -r1.40.2.35 -r1.40.2.36
--- fr.p3	1 Aug 2006 15:52:18 -0000	1.40.2.35
+++ fr.p3	16 Aug 2006 14:17:03 -0000	1.40.2.36
@@ -277,6 +277,7 @@
 $lang['ProductsDetail']  = "Détails Produit/Projet";
 $lang['ProdApps']        = "Enregistrement associé";
 $lang['ProdName']        = "Produit/Projet";
+$lang['ProdReference']   = "Référence";
 $lang['ProdVersion']     = "Version";
 $lang['ProdProd']        = "Projets liés";
 $lang['ProdProdNew']     = "Nouvelle relation";
@@ -346,6 +347,7 @@
 $lang['SubProject']      = "Sous-projet";
 $lang['SubProjects']     = "Sous-projets";
 $lang['ProdSubNew']      = "Nouveau sous-projet";
+$lang['ProdVolEstimate'] = "Estimation de charge";
 
 # Mailboxes
 $lang['MailboxEmail']    = "Email";

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

Modified Files:
      Tag: BRANCH-2-0
	table.pinc 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: table.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- table.pinc	19 Jan 2006 14:31:09 -0000	1.20.2.5
+++ table.pinc	16 Aug 2006 14:17:03 -0000	1.20.2.6
@@ -267,7 +267,10 @@
   "p_start"     => array(type => "TS_TYPE",     constraints => "",    Desc => "start date"),
   "p_end"       => array(type => "TS_TYPE",     constraints => "",    Desc => "end date"),
   "creator"     => array(type => "ID_TYPE",     constraints => "",    Desc => "creator ID"),
-  "creation"    => array(type => "TS_TYPE",     constraints => "",    Desc => "creation date")
+  "creation"    => array(type => "TS_TYPE",     constraints => "",    Desc => "creation date"),
+  "reference"   => array(type => "VARCHAR", size => 20,  constraints => "",    Desc => "external reference number"),
+  "volume_estimate"=> array(type => "float",             constraints => "",    Desc => "estimated hours"),
+  "state_date"  => array(type => "TS_TYPE",              constraints => "",    Desc => "date of state change")
 );
 
 $table['product2'] = array(

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

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- .cvsignore	2 Apr 2003 05:48:18 -0000	1.18
+++ .cvsignore	16 Aug 2006 14:17:03 -0000	1.18.4.1
@@ -55,3 +55,4 @@
 gklc
 #
 # EOF
+.project

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

Modified Files:
      Tag: BRANCH-2-0
	mconfig.pinc 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/extcal/Attic/mconfig.pinc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- mconfig.pinc	6 Jul 2006 13:32:32 -0000	1.1.2.1
+++ mconfig.pinc	16 Aug 2006 14:17:03 -0000	1.1.2.2
@@ -46,7 +46,7 @@
                                                      'color' => 'yellow',
                                                      'url'   => 'http://intracvf.dev75.cvf/export_calendar/export_ical.php?user=%U',
 #                                                     'url'   => 'http://tutos.edeweerdt.dev33.cvf/export_calendar/export_ical.php?user=%U',
-                                                     'cache' => 30,
+                                                     'cache' => 0,
                                                      'hour_by_day' => 7.5,
                                                      'vacation_category' => null
                                                     )

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

Modified Files:
      Tag: BRANCH-2-0
	product_ins.php product_new.php product.pinc product_show.php 
Log Message:
-ADD new informations for product (external ref and volume estimated)

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.5
retrieving revision 1.53.2.6
diff -u -r1.53.2.5 -r1.53.2.6
--- product_ins.php	1 Aug 2006 08:27:05 -0000	1.53.2.5
+++ product_ins.php	16 Aug 2006 14:17:02 -0000	1.53.2.6
@@ -163,6 +163,10 @@
  if ( !checkfloat($_POST['prob']) ) {
    $msg .= sprintf($lang['Err0017'],$lang['ProdProb']) ."<br>";
  }
+ 
+ if ( !checkfloat($_POST['volume_estimate']) ) {
+   $msg .= sprintf($lang['Err0017'],$lang['ProdVolEstimate']) ."<br>";
+ }
 
  $gotourl= addUrlParameter($gotourl,"price=". $_POST['price'],true);
  $gotourl= addUrlParameter($gotourl,"cost=". $_POST['cost'],true);
@@ -172,6 +176,8 @@
  $gotourl= addUrlParameter($gotourl,"description=". UrlEncode(StripSlashes($_POST['description'])),true);
  $gotourl= addUrlParameter($gotourl,"path=". UrlEncode(StripSlashes($_POST['path'])),true);
  $gotourl= addUrlParameter($gotourl,"currency=". UrlEncode(StripSlashes($_POST['currency'])),true);
+ $gotourl= addUrlParameter($gotourl,"reference=". UrlEncode(StripSlashes($_POST['reference'])),true);
+ $gotourl= addUrlParameter($gotourl,"volume_estimate=". $_POST['volume_estimate'],true);
 
 
  $pstart = new DateTime(0);
@@ -244,7 +250,11 @@
 
    $p->setPStart($pstart);
    $p->setPEnd($pend);
+
+   $p->setReference($_POST['reference']);
+   $p->setVolumeEstimate($_POST['volume_estimate']);
    
+
    $dbconn->Begin("WORK");
    
    if ($template) {

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.76.2.17
retrieving revision 1.76.2.18
diff -u -r1.76.2.17 -r1.76.2.18
--- product_new.php	1 Aug 2006 14:19:00 -0000	1.76.2.17
+++ product_new.php	16 Aug 2006 14:17:02 -0000	1.76.2.18
@@ -65,7 +65,20 @@
 			 'value' => myentities($this->obj->version)
 			 ));
 
-
+     $this->assign("reference",
+		   array('label' => $lang['ProdReference'],
+			 'name'  => 'reference',
+			 'size'  => min($table['product']['reference'][size],20),
+			 'maxl'  => $table['product']['reference'][size],
+			 'value' => myentities($this->obj->reference)
+			 ));
+
+     $this->assign("volume_estimate",
+		   array('label' => $lang['ProdVolEstimate'],
+			 'name'  => 'volume_estimate',
+			 'value' => myentities($this->obj->volume_estimate),
+			 'hours' => $lang['hours']
+			 ));
 
      $states = array();
      foreach ($lang['ProdStates'] as $f => $i) {
@@ -525,6 +538,9 @@
      if ( isset($_GET['version']) ) {
        $this->obj->version = StripSlashes($_GET['version']);
      }
+     if ( isset($_GET['reference']) ) {
+       $this->obj->reference = StripSlashes($_GET['reference']);
+     }
      if ( isset($_GET['desc1']) ) {
        $this->obj->desc1 = StripSlashes($_GET['desc1']);
      }
@@ -546,6 +562,9 @@
      if ( isset($_GET['cost']) ) {
        $this->obj->cost = $_GET['cost'];
      }
+     if ( isset($_GET['volume_estimate']) ) {
+       $this->obj->volume_estimate = $_GET['volume_estimate'];
+     }
      if ( isset($_GET['currency']) ) {
        $this->obj->currency = $_GET['currency'];
      }

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.15
retrieving revision 1.133.2.16
diff -u -r1.133.2.15 -r1.133.2.16
--- product.pinc	4 Nov 2005 13:39:07 -0000	1.133.2.15
+++ product.pinc	16 Aug 2006 14:17:02 -0000	1.133.2.16
@@ -100,6 +100,7 @@
     $this->cost = "";
     $this->currency = $tutos[currencies][0];
     $this->state = PROD_STATE_AQ;
+    $this->state_orig = -1;
     $this->path = "";
     $this->probability = 100;
     $this->role = array();
@@ -123,6 +124,10 @@
     $this->tablename = $this->dbconn->prefix ."products";
     $this->tablename2 = $this->dbconn->prefix ."projectroles";
     $this->acl[$current_user->id] = $tutos[delok];
+
+    $this->reference = "";
+    $this->volume_estimate = 0;
+    $this->state_date = new DateTime(0);
   }
 
   /**
@@ -144,9 +149,16 @@
     $this->currency    = $r->get($pos, "currency");
     $this->probability = $r->get($pos, "probability");
     $this->state       = $r->get($pos, "state");
+    $this->state_orig  = $this->state;
     $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
     $this->p_start     = $r->getDateTime($pos, "p_start");
     $this->p_end       = $r->getDateTime($pos, "p_end");
+    $this->reference       = $r->get($pos, "reference");
+    $this->volume_estimate = $r->get($pos, "volume_estimate");;
+    $this->state_date      = $r->getDateTime($pos,"state_date");
+    if ($this->state_date->notime) {
+      $this->state_date = new DateTime();
+    }
 
     parent::read_result($r,$pos);
     #
@@ -574,6 +586,18 @@
     return $this->setFloatField("probability",$value,"ProdProb");
   }
   /**
+   * set the Volume Estimate
+   */
+  function setVolumeEstimate($value) {
+    return $this->setFloatField("volume_estimate",$value,"ProdVolEstimate");
+  }
+  /**
+   * set the External Reference
+   */
+  function setReference($value) {
+    return $this->setStrField("reference",$value,"ProdReference");
+  }
+  /**
    * set the Path
    */
   function setPath($value) {
@@ -671,6 +695,9 @@
     $q->addFV("p_start",$this->p_start,"DATETIME");
     $q->addFV("p_end",$this->p_end,"DATETIME");
     $q->addFV("state",$this->state,"");
+    if ($this->state != $this->state_orig) {
+      $this->state_date = new DateTime("-1");
+    }
     if ( ! empty ($this->probability) ) {
       $q->addFV("probability",$this->probability,"FLOAT");
     } else {
@@ -686,6 +713,13 @@
     } else {
       $q->addFV("cost","null","");
     }
+    $q->addFV("reference",$this->reference,"STRING",$table['product']['reference'][size]);
+    if ( ! empty ($this->volume_estimate) ) {
+      $q->addFV("volume_estimate",$this->volume_estimate,"FLOAT");
+    } else {
+      $q->addFV("volume_estimate","null","");
+    }
+    $q->addFV("state_date",$this->state_date,"DATETIME");
 
     error_log('product.pinc: parent id '.$this->parent->id);
 

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.90.2.27
retrieving revision 1.90.2.28
diff -u -r1.90.2.27 -r1.90.2.28
--- product_show.php	27 Mar 2006 15:23:36 -0000	1.90.2.27
+++ product_show.php	16 Aug 2006 14:17:02 -0000	1.90.2.28
@@ -84,6 +84,10 @@
 		   array('label' => $lang['ProdName'],
 			 'value' => myentities($this->obj->name)));
 
+     $this->assign('ProdReference',
+		   array('label' => $lang['ProdReference'],
+			 'value' => myentities($this->obj->reference)));
+
      $this->assign('ProdVersion',
 		   array('label' => $lang['ProdVersion'],
 			 'value' => myentities($this->obj->version)));
@@ -244,6 +248,11 @@
      // $this->debug($infos);
      $this->assign('modules', $infos);
 
+     $this->assign('ProdVolEstimate',
+		   array('label' => $lang['ProdVolEstimate'],
+			 'value' => number_format($this->obj->volume_estimate, 2),
+			 'hours' => $lang['hours']));
+     
      // Show product timetrack entries
      if( $this->user->feature_ok(usetimetrack, PERM_SEE) ) {
        $timesum = 0.0;

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

Modified Files:
	timetrack_new.php 
Log Message:
layout fix


Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- timetrack_new.php	17 Mar 2006 09:29:35 -0000	1.67
+++ timetrack_new.php	14 Aug 2006 16:30:39 -0000	1.68
@@ -71,12 +71,16 @@
      $this->addHidden("mode",$this->mode);
      echo $this->DataTableStart();
      echo '<tr><th colspan="6">';
-     echo '&nbsp;';
+     if ( $this->obj->id > 0 ) {
+       echo $lang['TimetrackModify'];
+     } else {
+       echo $lang['TimetrackNew'];
+	 }
      echo "</th></tr>\n";
 
 
      if ( $this->obj->id > 0 ) {
-       echo '<tr><th colspan="6">';
+       echo '<tr>';
        echo ' <td colspan="6" align="right">'. acl_link($this->obj) .'</td>';
        echo "\n</tr>\n";
        $this->addHidden("id",$this->obj->id);

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

Modified Files:
      Tag: BRANCH-2-0
	res_cal.tpl 
Log Message:
- ADD extcal view in res_cal

Index: res_cal.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/res_cal.tpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- res_cal.tpl	22 Apr 2005 14:53:09 -0000	1.1.2.10
+++ res_cal.tpl	9 Aug 2006 16:11:28 -0000	1.1.2.11
@@ -55,7 +55,11 @@
     <td colspan="{$r.colspan}"
           class="{if $smarty.foreach.rows.last}sep{/if} {$r.class}">
     {strip}
+      {if $r.link}
       <a href="{$r.link}" title="{$r.title}">{$r.label}</a>
+      {else}
+      <span title="{$r.title}">{$r.label}</span>
+      {/if}
       {if $r.volume}
       {strip}
         &nbsp;

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

Modified Files:
      Tag: BRANCH-2-0
	res_cal.php 
Log Message:
- ADD extcal view in res_cal

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.30.2.16
retrieving revision 1.30.2.17
diff -u -r1.30.2.16 -r1.30.2.17
--- res_cal.php	2 Aug 2006 14:59:59 -0000	1.30.2.16
+++ res_cal.php	9 Aug 2006 16:11:28 -0000	1.30.2.17
@@ -14,6 +14,7 @@
  /* Check if user is allowed to use it */
  check_user();
  loadmodules('product','overview');
+ loadmodule('extcal');
 
  /**
   * show a overview of user-resources and appointmens
@@ -40,7 +41,7 @@
     * display the info
     */
    Function info() {
-     global $tutos, $lang;
+     global $tutos, $lang, $current_user;
 
      $month = Date("m/Y",$this->start->ts);
      $m = Date("m",$this->start->ts);
@@ -92,6 +93,9 @@
 
      $line = 0;
      foreach ($this->uids as $i => $f) {
+
+       /* Tasks for the user $f */
+       /* --------------------- */
        $line++;
        $maxr = 0;
        $q1 = "SELECT t.* from ". $this->dbconn->prefix ."tasks t,". $this->dbconn->prefix ."taskworker w";
@@ -111,11 +115,24 @@
        $result1 = $this->dbconn->Exec($q1);
        $n1 = $result1->numrows();
 
+       /* Appointments for the user $f from extcal */
+       $n3 = 0;
+       $fCalendars = null;
+         if ($current_user->feature_ok(useextcal,PERM_SEE) && $f->isUser()) {
+           $fCalendars = new extcal();
+           $fCalendars->loadUserCal($f->user);
+         }
+
+       if ($fCalendars) {
+         $f->extcallist = $fCalendars->searchEventForDay($this->start->getYYYYMMDD(), $this->end->getYYYYMMDD());
+         $n3 = count($f->extcallist);
+       }
+       
        // echo "<!-- tasks $n1 | apps $n2 | cols $cols -->\n";
        // $this->debug($this->state);
 
        // Reset Fields  / Field index is day in month
-       for ($r = 0; $r < ($n1 + $n2) ; $r++) {
+       for ($r = 0; $r < ($n1 + $n2 + $n3) ; $r++) {
          for ($d = 1; $d <= $cols; $d++) {
            $xarr[$d][$r] = -1;
          }
@@ -180,6 +197,9 @@
 
        // echo "<!-- $n1 $n2 $maxr -->\n";
 
+
+        /* Appointments for the user $f */
+        /* ---------------------------- */
        // Calendar Entries
        foreach($this->callist as $i => $app) {
          $found = 0;
@@ -221,8 +241,40 @@
          // $a++;
          unset($app);
        }
+       
+       
+        /* Appointments for the user $f from extcal */
+        /* ---------------------------------------- */
+
+        foreach($f->extcallist as $extcalapp) {
+          $n3++;
+          // Mark all fields covered by this appointment
+          $m1 = Date("m/Y",$extcalapp['tsstart']);
+          $d1 = Date("j",$extcalapp['tsstart']);
+          $m2 = Date("m/Y",$extcalapp['tsend']);
+          $d2 = Date("j",$extcalapp['tsend']);
+          if ( $m1 != $month ) {
+            $d1 = 1;
+          }
+          if ( $m2 != $month ) {
+            $d2 = $cols;
+          }
+  
+          $r = $this->find_row($xarr, $d1, $d2);
+  
+          for( $d = $d1; $d <= $d2; $d++ ) {
+            $extcalid = 'extcal-'.$extcalapp['uid'];
+            $obj[$extcalid] = &$extcalapp;
+            $xarr[$d][$r] = $extcalid;
+            $maxr = Max($maxr, $r);
+          }
+
+          unset($extcalapp);
+        }
 
-       if ( ($n1 + $n2) > 0 ) {
+#  $this->debug($xarr);
+
+       if ( ($n1 + $n2 + $n3) > 0 ) {
 	 error_log('New entry '. $f->getFullName());
 	 if( isset($entry) ) {
 	   $entries[] = $entry;
@@ -236,6 +288,8 @@
 		  'title' => $f->getFullName());
 
 	 $entry['res']  = array();
+	 
+	 
        }
        // echo "<!-- $n1 $n2 $maxr -->\n";
 
@@ -246,7 +300,7 @@
        // each line
        $fcols = 0;
 
-       for ($r = 0; $r < ($n1 + $n2); $r++) {
+       for ($r = 0; $r < ($n1 + $n2 + $n3); $r++) {
          if ( $r > $maxr ) {
            continue;
          }
@@ -319,6 +373,19 @@
 			   'title'   => myentities($obj[$old]->descr));
 		 }
 	       }
+	       else if (preg_match('/^extcal/', $old) > 0) {
+//                 $this->debug($obj[$old]);
+                 $app_class = 'appday';
+                 if ($obj[$old]['vacation']) {
+                   $app_class = 'freeday';
+                 }
+                 $entry['res'][$l][] = array('id'      => $obj[$old]['uid'],
+                                            'colspan' => $colspan,
+                                            'class'   => $app_class,
+                                            'label'   => myentities($obj[$old]['summary']),
+                                            'link'    => '',
+                                            'title'   => $obj[$old]['summary']);
+	       }
 	       else {
 		 // $obj[$old] is not an object !
 		 error_log('res_cal: '.$obj[$old]);
@@ -344,7 +411,7 @@
 				     'colspan' => $colspan);
            }
 	   else {
-             if ( $obj[$old]->getType() == "task" ) {
+             if ( is_object($obj[$old]) && $obj[$old]->getType() == "task" ) {
 
 		 $entry['res'][$l][] =
 		    array('id'      => $old,
@@ -356,7 +423,7 @@
 			  'volume'  => $obj[$old]->volume);
 
              }
-	     else {
+	     else if ( is_object($obj[$old]) && $obj[$old]->getType() == "appointment" ) {
 	       if ( $obj[$old]->mod_allow == 3 )
 		 $class = "privapp";
 	       else
@@ -370,6 +437,18 @@
 			'link'    => $obj[$old]->getUrl(),
 			'title'   => $obj[$old]->descr);
 
+             } else if (preg_match('/^extcal/', $old) > 0) {
+               $app_class = 'appday';
+               if ($obj[$old]['vacation']) {
+                 $app_class = 'freeday';
+               }
+	       $entry['res'][$l][] =
+		  array('id'      => $old,
+			'colspan' => $colspan,
+			'class'   => $app_class,
+			'label'   => myentities($obj[$old]['summary']),
+			'link'    => '',
+			'title'   => $obj[$old]['summary']);
              }
 	     $fcols += $colspan;
            }

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

Modified Files:
      Tag: BRANCH-2-0
	extcal.pinc 
Log Message:
- ADD extcal view in res_cal

Index: extcal.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/extcal/Attic/extcal.pinc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- extcal.pinc	6 Jul 2006 13:32:32 -0000	1.1.2.1
+++ extcal.pinc	9 Aug 2006 16:11:28 -0000	1.1.2.2
@@ -152,7 +152,8 @@
           } else {
             $cats = $tmpcat;
           }
-          $tmp = array('summary'     => $component->getAttributeDefault('SUMMARY'),
+          $tmp = array('uid'         => $component->getAttributeDefault('UID'),
+                       'summary'     => $component->getAttributeDefault('SUMMARY'),
                        'description' => $component->getAttributeDefault('DESCRIPTION'),
                        'categorie'   => $cats,
                        'dtstart'     => extcal::_icsDate2day($component->getAttributeDefault('DTSTART')),

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

Modified Files:
      Tag: BRANCH-2-0
	res_cal.php 
Log Message:
* BUGFIX: no appointment in ressource usage

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.30.2.15
retrieving revision 1.30.2.16
diff -u -r1.30.2.15 -r1.30.2.16
--- res_cal.php	23 May 2005 16:00:01 -0000	1.30.2.15
+++ res_cal.php	2 Aug 2006 14:59:59 -0000	1.30.2.16
@@ -213,13 +213,13 @@
 	 $r = $this->find_row($xarr, $d1, $d2);
 
 	 for( $d = $d1; $d <= $d2; $d++ ) {
-	   $obj[$app->id] = &$task;
+	   $obj[$app->id] = &$app;
 	   $xarr[$d][$r] = $app->id;
 	   $maxr = Max($maxr, $r);
 	 }
 
          // $a++;
-         unset($task);
+         unset($app);
        }
 
        if ( ($n1 + $n2) > 0 ) {

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

Modified Files:
      Tag: BRANCH-2-0
	en.p3 fr.p3 
Log Message:
- UPD loca for Timetrack Synthesis

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.15
retrieving revision 1.47.2.16
diff -u -r1.47.2.15 -r1.47.2.16
--- en.p3	4 Nov 2005 13:39:09 -0000	1.47.2.15
+++ en.p3	1 Aug 2006 15:52:17 -0000	1.47.2.16
@@ -631,6 +631,8 @@
 $lang['TimetrackBetween']  = "between";
 $lang['TimetrackBooked']   = "Booked Time";
 $lang['TimetrackBookedI']  = "booked time for %s";
+$lang['TimetrackSynthesis']  = "Time synthesis";
+$lang['TimetrackSynthesisI'] = "Time synthesis for %s";
 $lang['TTStatsTitle']      = "Timetrack Statistics";
 $lang['TTcph']             = "Cost per hour";
 $lang['TTState']           = "State";
@@ -641,6 +643,28 @@
 $lang['TTStates'][4]       = "unbillable";
 $lang['TTRecord']          = "Time recording";
 $lang['TTfinish']          = "Finish";
+$lang['TTSum']             = "Sum";
+$lang['TTtotal']           = "Total";
+$lang['MiniCal2']          = "Clic for select date";
+$lang['TTHistogramPrj']    = "Histo by Project";
+$lang['TTHistoPrecision']  = "Histo precision";
+$lang['TTHistoBy']['D']    = "by day";
+$lang['TTHistoBy']['W']    = "by week";
+$lang['TTHistoBy']['M']    = "by month";
+$lang['TTHistoBy']['A']    = "automatic";
+$lang['TTPeriodPreset']    = "Preselect";
+$lang['TTPeriodThisWeek']  = "Current week";
+$lang['TTPeriodLastWeek']  = "Next week";
+$lang['TTPeriod7Days']     = "7 last days";
+$lang['TTPeriodThis15']    = "Current 15 days";
+$lang['TTPeriodLast15']    = "Next 15 days";
+$lang['TTPeriodThisMonth'] = "Current month";
+$lang['TTPeriodLastMonth'] = "Next month";
+$lang['Order']             = "Asc sort";
+$lang['RevOrder']          = "Desc sort";
+$lang['TTSynthBy']         = "Cut by";
+$lang['TTTypeVacation']    = "Vacations";
+
 
 # Fax
 $lang['FaxCreate']         = "FAX New";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.34
retrieving revision 1.40.2.35
diff -u -r1.40.2.34 -r1.40.2.35
--- fr.p3	6 Jul 2006 13:32:32 -0000	1.40.2.34
+++ fr.p3	1 Aug 2006 15:52:18 -0000	1.40.2.35
@@ -107,6 +107,7 @@
 $lang['lang']['nl']      = "Hollandais";
 $lang['lang']['sv']      = "Suédois";
 $lang['lang']['el']      = "Grec";
+$lang['lang']['hu']      = "Hongrois";
 
 # Common
 $lang['ChangesOk']       = "Changements OK ?";

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

Modified Files:
      Tag: BRANCH-2-0
	product_new.php 
Log Message:
-MOD : dont ask for parent if it was not changed

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.76.2.16
retrieving revision 1.76.2.17
diff -u -r1.76.2.16 -r1.76.2.17
--- product_new.php	1 Aug 2006 08:27:05 -0000	1.76.2.16
+++ product_new.php	1 Aug 2006 14:19:00 -0000	1.76.2.17
@@ -111,7 +111,9 @@
        $parent = "";
 
        if( isset($this->obj->parent) && is_object($this->obj->parent) ) {
-	 $parent = $this->obj->parent->getShortName();	 
+	 $parent = $this->obj->parent->getShortName();
+       } elseif (isset($_GET['parent'])) {
+         $parent = $_GET['parent'];
        }
        $this->assign("parent",
 		     array('id'     => 'parent',
@@ -121,8 +123,10 @@
 
 			   'label'  => $lang['ProdRole'][10],
 			   'value'  => $parent));
-	$this->assign("cur_parent", array('id'    => $this->obj->parent->id,
-			                  'value' => $parent));
+        if (isset($this->obj->parent->id)) {
+	   $this->assign("cur_parent", array('id'    => $this->obj->parent->id,
+	 		                     'value' => $parent));
+	}
      }