tutos-commits Mailing List for TUTOS (Page 463)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv8604/php

Modified Files:
	task.pinc task_ins.php task_new.php task_show.php 
Log Message:
New: Resource Allocation for tasks

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** task.pinc	2001/08/09 10:53:08	1.26
--- task.pinc	2001/08/09 14:48:13	1.27
***************
*** 403,408 ****
      @DB_Begin($this->conn,"WORK");
      $r = @DB_Exec($this->conn,$q);
!     acl_save($this);
!     $msg = $msg . history_save($this);
      @DB_Commit($this->conn,"WORK");
      # DB_FreeResult ($r);
--- 403,411 ----
      @DB_Begin($this->conn,"WORK");
      $r = @DB_Exec($this->conn,$q);
!     $msg .= acl_save($this);
!     $msg .= history_save($this);
! 	$msg .= resource_save($this);
! 
! 
      @DB_Commit($this->conn,"WORK");
      # DB_FreeResult ($r);
***************
*** 428,432 ****
        @reset ($this->buglist);
        while ( list ($i,$f) = @each ($this->buglist) ) {
! 	$msg = $msg . $f->delete();
        }
      }
--- 431,435 ----
        @reset ($this->buglist);
        while ( list ($i,$f) = @each ($this->buglist) ) {
!         $msg = $msg . $f->delete();
        }
      }
***************
*** 436,440 ****
        @reset ($this->buglist);
        while ( list ($i,$f) = @each ($this->filelist) ) {
! 	$msg = $msg . $f->delete();
        }
      }
--- 439,443 ----
        @reset ($this->buglist);
        while ( list ($i,$f) = @each ($this->filelist) ) {
!         $msg = $msg . $f->delete();
        }
      }
***************
*** 580,583 ****
--- 583,593 ----
    }
    /* ---------------------------------------------------------------------------
+    * Return Info about resources used by this task
+    */
+   function readRes() {
+     readRes($this);
+     return;
+   }
+   /* ---------------------------------------------------------------------------
     * Return Info about connected tasks of this task
     */
***************
*** 608,611 ****
--- 618,627 ----
    function getType () {
      return "task";
+   }
+   /* ---------------------------------------------------------------------------
+    * get the timespan
+    */
+   function getTimespan () {
+     return $this->s_start->getDate() ." - " . $this->s_end->getDate() ;
    }
    /* ---------------------------------------------------------------------------

Index: task_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** task_ins.php	2001/08/09 10:32:03	1.7
--- task_ins.php	2001/08/09 14:48:13	1.8
***************
*** 12,15 ****
--- 12,16 ----
   include("mail.pinc");
   include("timetrack.pinc");
+  include("resource.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 61,64 ****
--- 62,76 ----
   }
  
+  #
+  # Resources
+  #
+  if ( isset($res) && (count($res) > 0)) {
+    @reset($res);
+    while ( list ($i,$f) = @each ($res) ) {
+      $gotourl= addUrlParameter($gotourl,"res[]=".$f );
+    }
+  } else {
+    $res = array();
+  }
  
   $s_start = new DateTime(0);
***************
*** 101,104 ****
--- 113,117 ----
     $t->name = $name;
     $t->desc = $desc;
+    $t->res = $res;
  
     # First time work done

Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** task_new.php	2001/08/09 10:32:03	1.10
--- task_new.php	2001/08/09 14:48:13	1.11
***************
*** 8,11 ****
--- 8,12 ----
   include("url.pinc");
   include("task.pinc");
+  include("resource.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 16,20 ****
    */
   Function info(&$t) {
!    global $lang, $current_user;
  
     echo "<TABLE BORDER=0 CELLSPACING=0>\n";
--- 17,21 ----
    */
   Function info(&$t) {
!    global $tutos, $lang, $current_user;
  
     echo "<TABLE BORDER=0 CELLSPACING=0>\n";
***************
*** 66,70 ****
  
     echo " <TR>\n";
!    echo "  <TD VALIGN=top ROWSPAN=2><B>". $lang['TaskWorker'] ."</B><FONT COLOR=red>(*)</FONT></TD>\n";
     echo "  <TD ROWSPAN=2>". $current_user->askPeople("worker",$t->worker->id,0) ."</TD>\n";
     showfieldc($lang['TaskVolumeFull']);
--- 67,71 ----
  
     echo " <TR>\n";
!    echo "  <TD VALIGN=top ROWSPAN=2><B>". $lang['TaskWorker'] ."<FONT COLOR=red>(*)</FONT></B></TD>\n";
     echo "  <TD ROWSPAN=2>". $current_user->askPeople("worker",$t->worker->id,0) ."</TD>\n";
     showfieldc($lang['TaskVolumeFull']);
***************
*** 72,75 ****
--- 73,77 ----
     echo " </TR>\n";
  
+ 
     echo " <TR>\n";
     showfieldc($lang['TaskVolumeDone']);
***************
*** 77,80 ****
--- 79,95 ----
     echo " </TR>\n";
  
+    #
+    # Resources
+    #
+    if ( ($current_user->p[useresource] == 1) && ($tutos[useresource] == 1) ) {
+      echo " <TR>\n";
+      showfield($lang['Resources']);
+      echo " <TD COLSPAN=3>\n";
+      echo ResAskUse($t,0,0);
+      echo " </TD>\n";
+      echo " </TR>\n";
+    }
+ 
+ 
     echo " <TR>\n";
     showfieldc($lang['TaskS_Start']);
***************
*** 108,112 ****
    */
   Function navigate($t) {
!    global $lang;
  
     echo "<TABLE>";
--- 123,127 ----
    */
   Function navigate($t) {
!    global $lang,$tutos,$current_user;
  
     echo "<TABLE>";
***************
*** 119,122 ****
--- 134,140 ----
       echo makelink("watchlist_overview.php?id=".$t->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$t->getFullname())) ."<BR>\n";
     }
+    if ( ($current_user->p[useresource] == 1) && ($tutos[useresource] == 1) ) {
+      echo makelink("resource_overview.php",$lang['Resources'],$lang['Resources']) ."<BR>";
+    }
     echo "</TD></TR>";
  
***************
*** 137,140 ****
--- 155,160 ----
     HTML_Header($lang['TaskCreate']);
   }
+  $t->readRes();
+ 
   if ( isset($name) ) {
     $t->name = $name;

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** task_show.php	2001/08/09 10:32:03	1.7
--- task_show.php	2001/08/09 14:48:13	1.8
***************
*** 12,15 ****
--- 12,16 ----
   include("history.pinc");
   include("timetrack.pinc");
+  include("resource.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 89,92 ****
--- 90,108 ----
     echo " </TR>\n";
  
+    #
+    # Resources
+    #
+    if ( ($current_user->p[useresource] == 1) && ($tutos[useresource] == 1) ) {
+      $t->readRes();
+      if ( count($t->resuselist) > 0 ) {
+        @reset($t->reslist);
+        echo "<TR>\n";
+        showfield ($lang['Resources']);
+        echo " <TD VALIGN=top COLSPAN=3>\n";
+        showResources($t,0);
+        echo " </TD>";
+        echo "</TR>\n";
+      }
+    }
     /* Notes */
     if ( ($current_user->p[usenotes] == 1) && ($tutos[usenotes] == 1) ) {

2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

tutos-commits Mailing List for TUTOS (Page 463)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

tutos-commits — SVN commits