[Netoffice-cvs-2x] netoffice-2.x/reports hours.php,1.7,1.8 overdue.php,1.7,1.8 phasestatus.php,1.5,1.6 snapshot.php,1.6,1.7

[Juha-Mikko A. <jua...@us...>]

Update of /cvsroot/netoffice/netoffice-2.x/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15827/reports

Modified Files:
	hours.php overdue.php phasestatus.php snapshot.php 
Log Message:
Most problems with recursive report lists have been fixed.


Index: hours.php
===================================================================
RCS file: /cvsroot/netoffice/netoffice-2.x/reports/hours.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hours.php	23 May 2005 06:31:21 -0000	1.7
--- hours.php	8 Jun 2005 06:49:52 -0000	1.8
***************
*** 170,174 ****
      $block1->cellRow("");
      $block1->cellRow("");
!     $block1->cellRow("Total:");
      $block1->cellRow($totalMemHours);
      $block1->closeRow();
--- 170,175 ----
      $block1->cellRow("");
      $block1->cellRow("");
! 	$block1->cellRow("");
!     $block1->cellRow("$strings[total]:");
      $block1->cellRow($totalMemHours);
      $block1->closeRow();

Index: overdue.php
===================================================================
RCS file: /cvsroot/netoffice/netoffice-2.x/reports/overdue.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** overdue.php	23 May 2005 06:31:21 -0000	1.7
--- overdue.php	8 Jun 2005 06:49:52 -0000	1.8
***************
*** 116,119 ****
--- 116,120 ----
  // close block1
  $block1->closeFormResults();
+ $block1->block_close();
  
  

Index: snapshot.php
===================================================================
RCS file: /cvsroot/netoffice/netoffice-2.x/reports/snapshot.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** snapshot.php	15 Dec 2004 12:25:20 -0000	1.6
--- snapshot.php	8 Jun 2005 06:49:52 -0000	1.7
***************
*** 56,59 ****
--- 56,60 ----
  
  $block0->closeContent();
+ $block0->block_close();
  
  if ($comptListProjects != "0") {
***************
*** 81,89 ****
          $queryTask = " WHERE tas.project = '$projectId'";
          $tmpqueryTask = "$queryTask ORDER BY tas.due_date";
          $listTasks = new request();
          $listTasks->openTasks($tmpqueryTask);
          $comptListTasks = count($listTasks->tas_id);
! 
!         $blockProject->openResults($checkbox = "false");
  
          $blockProject->labels($labels = array(0 => $strings["task"], 1 => $strings["priority"], 2 => $strings["status"], 3 => $strings["due_date"], 4 => $strings["completed"], 5 => $strings["assigned_to"], 6 => $strings["published"]), "true");
--- 82,94 ----
          $queryTask = " WHERE tas.project = '$projectId'";
          $tmpqueryTask = "$queryTask ORDER BY tas.due_date";
+ 
+ 		$blockProject->closeContent();
+ 		$blockProject->heading_close();
+ 
          $listTasks = new request();
          $listTasks->openTasks($tmpqueryTask);
          $comptListTasks = count($listTasks->tas_id);
! 		
!         $blockProject->openResults("false");
  
          $blockProject->labels($labels = array(0 => $strings["task"], 1 => $strings["priority"], 2 => $strings["status"], 3 => $strings["due_date"], 4 => $strings["completed"], 5 => $strings["assigned_to"], 6 => $strings["published"]), "true");
***************
*** 129,135 ****
  
          $blockProject->closeResults();
      } 
!     $blockProject->closeContent();
! 	$blockProject->headingForm_close();
  } else {
      // $block1->noresults();
--- 134,141 ----
  
          $blockProject->closeResults();
+ 		$blockProject->block_close();
+ 		$blockProject->block_close();
      } 
!     // $blockProject->closeContent();
  } else {
      // $block1->noresults();

Index: phasestatus.php
===================================================================
RCS file: /cvsroot/netoffice/netoffice-2.x/reports/phasestatus.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** phasestatus.php	15 Dec 2004 12:25:20 -0000	1.5
--- phasestatus.php	8 Jun 2005 06:49:52 -0000	1.6
***************
*** 65,70 ****
  
          $blockProject = new block();
-         $blockProject->openContent();
          $blockProject->headingForm(buildLink("../projects/viewproject.php?id=" . $projectId, $projectTitle, LINK_INSIDE));
  
          $queryPhase = "WHERE pha.project_id = '$projectId' ";
--- 65,70 ----
  
          $blockProject = new block();
          $blockProject->headingForm(buildLink("../projects/viewproject.php?id=" . $projectId, $projectTitle, LINK_INSIDE));
+ //         $blockProject->openContent();
  
          $queryPhase = "WHERE pha.project_id = '$projectId' ";
***************
*** 168,175 ****
  
          $blockProject->closeResults();
          print "<p><br></p>";
      } 
!     $blockProject->closeContent();
! 	$blockProject->headingForm_close();
  } else {
      // $block1->noresults();
--- 168,176 ----
  
          $blockProject->closeResults();
+ 	$blockProject->heading_close();
          print "<p><br></p>";
      } 
! //    $blockProject->closeContent();
! 	$blockProject->block_close();
  } else {
      // $block1->noresults();