tutos-commits Mailing List for TUTOS (Page 455)

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-serv6247/php

Modified Files:
	calendar_week.php calendar.php mytutos.php 
Log Message:
week calendar view

Index: calendar_week.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_week.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** calendar_week.php	2001/08/21 21:57:11	1.1
--- calendar_week.php	2001/09/02 18:34:37	1.2
***************
*** 10,18 ****
--- 10,161 ----
   include("product.pinc");
   include("resource.pinc");
+  include("task.pinc");
+  include("bug.pinc");
+  include("timetrack.pinc");
  
   /* Check if user is allowed to use it */
   check_user();
  
+  /* ---------------------------------------------------------------------------
+   * A one week calendar sheet
+   */
+  Function info($t) {
+    global $lang,$current_user,$tutos;
+ 
+    $adr = $current_user;
+    $ts = mktime(12,0,0,substr($t,4,2),substr($t,6,2),substr($t,0,4));
+ 
+    /* Back to last Monday or Sunday before ts */
+    while ( Date("w",$ts) != $current_user->weekstart ) {
+      $ts -= 86400;
+    }
+ 
+    $w0 =  (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3;
+    $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
+    $yy = Date("y",$ts);
+ 
+ 
+    echo "<TABLE CLASS=single BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=\"100%\">\n";
+    echo " <TR>\n";
+    echo "  <TH COLSPAN=2 WIDTH=\"100%\">". $lang['week'] ."&nbsp;" . $wn . "/". $yy ."</TH>\n";
+    echo " </TR>\n";
+ 
+    $day = 0;
+    $col = 1;
+    $dd = new DateTime();
+    while ( $day < 7 ) {
+ 	 $dd->setDateTimeTS($ts);
+      $d = $dd->getDate();
+      $tref = Date("Ymd",$ts);
+      $dinfo = GetDaysInfo($ts);
+      /* Select appointments for this day */
+      $next = NextDay($ts);
+      $from =  new DateTime();
+      $from->setDateTimeTS($ts - 12 * 3600);
+ 
+      $current_user->callist = array();
+      readAppsCal($current_user,$from);
+      readTaskCal($current_user,$from);
+ 
+ 	 if ( $col == 1 ) {
+        echo " <TR>\n";
+ 	 }
+      echo "  <TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"50%\">\n";
+ 
+      # TABLE STARTS
+      echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH=\"100%\">\n";
+      echo " <TR>\n";
+      echo "  <TH>". Date("l",$ts) ."</TH>\n";
+      echo " </TR>\n";
+      echo " <TR>\n";
+      echo "  <TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"50%\">\n";
+      if ( isset($dinfo[Desc]) ) {
+        echo " " . makelink("app_new.php?t=". $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
+        echo "<BR><FONT SIZE=-1>". $dinfo[Desc] ."</FONT>\n";
+      } else {
+        echo " " . makelink("app_new.php?t=". $tref,$d,$lang['NewAppointInfo']) ."\n";
+      }
+ 
+      $hastable = 0;
+      if ( count($current_user->callist) > 0 ) {
+        $xxx = $current_user->callist;
+        @reset($xxx);
+        while( list ($a,$apo) = @each ($xxx)) {
+ 	     # Check if appointment is displayed
+ 	     if ( $apo->gettype() == "appointment" ) {
+ 		   $found = 0;
+ 		   @reset($apo->participant);
+ 		   while ( ($found == 0) && (list ($i,$f) = @each ($apo->participant)) ) {
+ 			 if ( $f->id == $adr->id ) {
+ 			   $found = 1;
+ 			 } else {
+ 			   $xx = $adr->teamids;
+ 			   @reset($xx);
+ 			   while ( list ($i2,$f2) = @each ($xx) ) {
+ 			     if ( $f->id == $i2 ) {
+ 				   $found = 1;
+ 				 }
+ 			   }
+ 			 }
+ 		   }
+ 		   if ( $found == 0 ) {
+ 			 continue;
+ 		   }
+ 		 }
+ 		 // Do not show finished tasks
+ 		 if ( ($apo->gettype() == "task") && ($apo->state == 2) ) {
+ 		   continue;
+ 		 }
+ 		 if ( $hastable == 0 ) {
+ 		   echo " <TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=\"100%\">\n";
+ 		   $hastable = 1;
+ 		 } else {
+            echo "  <TR><TD CLASS=". $dinfo[color] ." COLSPAN=3><IMG SRC=\"../html/black.png\" WIDTH=\"100%\" HEIGHT=1></TD></TR>\n";
+ 		 }
+ 		 // Show appointments or task
+ 		 $apo->formatted();
+        }
+      }
+ 
+      if ( $hastable == 1 ) {
+        echo " </TABLE>\n";
+      }
+ 
+      # TABLE ENDS
+      echo "</TABLE>\n";
+ 
+      echo "  </TD>\n";
+ 	 if ( $col == 2 ) {
+        echo " </TR>\n";
+        $col = 0;
+ 	 }
+ 
+      $day++;
+      $col++;
+      $ts = $next;
+    }
+ 
+    echo "</TABLE>\n";
+  }
+  /* ---------------------------------------------------------------------------
+   *
+   */
+  Function navigate() {
+    global $tutos, $lang , $current_user;
+    echo "<TABLE>";
+    echo "<TR><TD>";
+    echo "</TD></TR>";
+ 
+    HTML_Select();
+  }
+ 
   HTML_Header($lang['Appointments']);
+ 
+  HTML_Base1();
+  navigate();
+  HTML_Base2($msg);
+  info($t);
+  HTML_Base3();
+ 
  
   DB_Close($conn);

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** calendar.php	2001/08/30 16:01:58	1.28
--- calendar.php	2001/09/02 18:34:37	1.29
***************
*** 133,137 ****
     $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
     $yy = Date("y",$ts);
!    echo " <TD WIDTH=\"5%\" CLASS=week>". $wn ."/". $yy ."</TD>\n";
  
     $dd = new DateTime();
--- 133,137 ----
     $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
     $yy = Date("y",$ts);
!    echo " <TD CLASS=week WIDTH=\"5%\">". menulink("calendar_week.php?t=".Date("Ymd",$ts), $wn ."/". $yy, $wn ."/". $yy ) ."</TD>\n";
  
     $dd = new DateTime();

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** mytutos.php	2001/08/30 16:01:58	1.32
--- mytutos.php	2001/09/02 18:34:37	1.33
***************
*** 39,43 ****
  
     /* Back to last Monday or Sunday before ts */
!    while ( Date("w",$ts) != $current_user->weekstart ) {
       $ts -= 86400;
     }
--- 39,43 ----
  
     /* Back to last Monday or Sunday before ts */
!    while ( Date("w",$ts) != $adr->weekstart ) {
       $ts -= 86400;
     }
***************
*** 50,54 ****
     echo " <TR>\n";
     echo "  <TH>". $lang['week'] ."</TH>\n";
!    if ( $current_user->weekstart == 0 ) {
       echo "  <TH>". $lang['Day0'] ."</TH>\n";
     }
--- 50,54 ----
     echo " <TR>\n";
     echo "  <TH>". $lang['week'] ."</TH>\n";
!    if ( $adr->weekstart == 0 ) {
       echo "  <TH>". $lang['Day0'] ."</TH>\n";
     }
***************
*** 59,63 ****
     echo "  <TH>". $lang['Day5'] ."</TH>\n";
     echo "  <TH>". $lang['Day6'] ."</TH>\n";
!    if ( $current_user->weekstart != 0 ) {
       echo "  <TH>". $lang['Day0'] ."</TH>\n";
     }
--- 59,63 ----
     echo "  <TH>". $lang['Day5'] ."</TH>\n";
     echo "  <TH>". $lang['Day6'] ."</TH>\n";
!    if ( $adr->weekstart != 0 ) {
       echo "  <TH>". $lang['Day0'] ."</TH>\n";
     }
***************
*** 65,69 ****
  
     echo " <TR>\n";
!    echo " <TD CLASS=week WIDTH=\"5%\">". $wn ."/". $yy ."</TD>\n";
     $day = 0;
     $dd = new DateTime();
--- 65,69 ----
  
     echo " <TR>\n";
!    echo " <TD CLASS=week WIDTH=\"5%\">". menulink("calendar_week.php?t=".Date("Ymd",$ts), $wn ."/". $yy, $wn ."/". $yy ) ."</TD>\n";
     $day = 0;
     $dd = new DateTime();
***************
*** 79,85 ****
       $from->setDateTimeTS($ts - 12 * 3600);
  
!      $current_user->callist = array();
!      readAppsCal($current_user,$from);
!      readTaskCal($current_user,$from);
  
       echo "<TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
--- 79,85 ----
       $from->setDateTimeTS($ts - 12 * 3600);
  
!      $adr->callist = array();
!      readAppsCal($adr,$from);
!      readTaskCal($adr,$from);
  
       echo "<TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
***************
*** 93,98 ****
  
       $hastable = 0;
!      if ( count($current_user->callist) > 0 ) {
!        $xxx = $current_user->callist;
         @reset($xxx);
         while( list ($a,$apo) = @each ($xxx)) {
--- 93,98 ----
  
       $hastable = 0;
!      if ( count($adr->callist) > 0 ) {
!        $xxx = $adr->callist;
         @reset($xxx);
         while( list ($a,$apo) = @each ($xxx)) {
***************
*** 195,199 ****
     global $lang,$conn, $tutos;
  
!    $q = "SELECT * from bugs where creator = ". $adr->id ." order by creation DESC";
     $r = @DB_Exec($conn,$q);
     $n = DB_NumRows($r);
--- 195,199 ----
     global $lang,$conn, $tutos;
  
!    $q = "SELECT * from bugs where creator = ". $adr->id ." where state <> 4 order by creation DESC";
     $r = @DB_Exec($conn,$q);
     $n = DB_NumRows($r);

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 455)

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

tutos-commits — SVN commits