[evolvis-commits] r6450: Feature requests: ↵ ↵ - [#682] Abschalten des Redirects nach Eintragen/ Ändern eines Tracker-Items /Tasks

papel at evolvis.org papel at evolvis.org
Wed Mar 3 15:34:31 CET 2010


Author: papel
Date: 2010-03-03 14:34:31 +0000 (Wed, 03 Mar 2010)
New Revision: 6450

Modified:
   trunk/gforge_base/gforge-4.8.1+evolvis/common/frs/FRSRelease.class.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.class.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/index.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/add_task.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/mod_task.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/task.php
   trunk/gforge_base/gforge-4.8.1+evolvis/www/reporting/timeadd.php
Log:
Feature requests:

- [#682] Abschalten des Redirects nach Eintragen/Ändern eines Tracker-Items/Tasks

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/common/frs/FRSRelease.class.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/common/frs/FRSRelease.class.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/common/frs/FRSRelease.class.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -33,6 +33,7 @@
  *	  @param array	The result array, if it's passed in
  *	  @return object  FRSRelease object
  */
+
 function &frsrelease_get_object($release_id, $data=false) {
 	global $FRSRELEASE_OBJ;
 	if (!isset($FRSRELEASE_OBJ['_'.$release_id.'_'])) {
@@ -106,7 +107,38 @@
 		}
 		return true;
 	}
+	
+/**
+ *  Function that selects the latest release. 
+ *  The latest release is the release with the highest ID, because of the
+ *  auto increment in the table frs_release (not null default nextval(('frs_release_pk_seq'::text)::regclass))
+ *
+ *  You can also determine the latest release on the release_date
+ * 
+ *  @author Patrick Apel, tarent GmbH
+ * 
+ *  @param int intPackageId
+ *  @return int intReleaseId 
+ *
+ */
+ 
+function getLatestReleaseId($intPackage_id) {
 
+	$strSqlString= "SELECT MAX(release_id) AS release_id FROM frs_release WHERE package_id='$intPackage_id'";
+	$result = pg_query($strSqlString) OR $this->setError('FRSRelease:: No valid max release id');
+	
+	if(pg_num_rows($result)===1){
+		while($row = pg_fetch_object($result)) {
+			$release_id = $row->release_id;
+		}
+	} else {
+		$this->setError('FRSRelease:: No valid max release id');
+		
+	} 
+	
+	return $release_id;
+}
+
 	/**
 	 *	create - create a new release in the database.
 	 *
@@ -146,7 +178,7 @@
 			$this->setError('FRSRelease::create() Error Adding Release: Name Already Exists');
 			return false;
 		}
-
+		
 		db_begin();
 		$result=db_query_params ('INSERT INTO frs_release(package_id,notes,changes,preformatted,name,release_date,released_by,status_id) VALUES ($1,$2,$3,$4,$5,$6,$7,$8)',
 					 array ($this->FRSPackage->getId(),
@@ -279,7 +311,7 @@
 	 *
 	 *  @return	boolean	success.
 	 */
-	function sendNotice() {
+	function sendNotice() { //send E-Mail
 		$arr =& $this->FRSPackage->getMonitorIDs();
 
 		$date = date('Y-m-d H:i',time());
@@ -288,18 +320,37 @@
 				    $this->FRSPackage->Group->getUnixName(),
 				    $this->FRSPackage->getName());
 		$text = stripcslashes(sprintf(_('Project %1$s (%2$s) has released a new version of package "%3$s".
-You can download it by following this link:
 
+Release note: 
+		
 %4$s
+								
+Change note:
 
+%5$s
+
+
+You can download it by following this link:
+
+%6$s
+
 You receive this email because you requested to be notified when new
 versions of this package were released. If you don\'t wish to be
-notified in the future, please login to %5$s and click this link:
+notified in the future, please login to %7$s and click this link:
 
-%6$s'),
+%8$s
+		
+
+		
+	
+
+'
+),
 					      $this->FRSPackage->Group->getPublicName(),
 					      $this->FRSPackage->Group->getUnixName(),
-					      $this->FRSPackage->getName(),
+					      $this->FRSPackage->getName(), 
+					      $this->getNotes(),
+					      $this->getChanges(),
 					      util_make_url ("/frs/?group_id=". $this->FRSPackage->Group->getID() ."&release_id=". $this->getID()),
 					      $GLOBALS['sys_name'],
 					      util_make_url ("/frs/monitor.php?filemodule_id=".$this->FRSPackage->getID()."&group_id=".$this->FRSPackage->Group->getID()."&stop=1")));
@@ -462,5 +513,5 @@
 // mode: php
 // c-file-style: "bsd"
 // End:
+?>
 
-?>

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.class.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.class.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.class.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -18,7 +18,9 @@
     var $release_;
     var $uploaddir_;
     var $file_;
+    var $nameFileRelease;
     var $latestReleasePath_;
+    
 
 	public function download($group=null, $package=null, $release=null, $uploaddir=null, $file=null){
 		global $group_;
@@ -37,15 +39,29 @@
 		global $package_;
 		global $release_;
 		global $uploaddir_;
+		global $nameFileRelease;
 		global $latestReleasePath_;
     
-    $latestReleasePath= $uploaddir_.$group_->getUnixName().'/'.$package_->getFileName().'/'.$release_->getFileName();
+    $nameFileRelease = $group_->getUnixName().'/'.$package_->getFileName().'/'.$release_->getFileName();
+    $latestReleasePath= $uploaddir_.$nameFileRelease;
+    
     $latestReleasePath_ = $latestReleasePath;
 		
 	return $latestReleasePath;
 	}	
 	
-	public function downloadLatestReleaseFilesAsZip(){
+	function getLatestReleaseFileName() {
+		global $release_;
+		global $uploaddir_;
+		global $nameFileRelease;
+		
+		$fileName = $release_->getFileName().'.zip';
+		
+	 return $fileName;
+	} 
+	
+	
+	public function createLatestReleaseFilesAsZip(){
 		global $group_;
 		global $package_;
 		global $release_;
@@ -56,24 +72,21 @@
 	$zip = new ZipArchive();
 
 	$filename = $release_->getFileName().'.zip';
-	$filePath = $latestReleasePath_.'/'.$filename;
+	$zipFilePlusPath = $latestReleasePath_.'/'.$filename;
+	
 
-	if ($zip->open($filePath, ZIPARCHIVE::OVERWRITE)!==TRUE) {
-    	exit("cannot open <$filePath>\n");
+	if ($zip->open($zipFilePlusPath, ZIPARCHIVE::OVERWRITE)!==TRUE) {
+    	exit("cannot open <$zipFilePlusPath>\n");
 	}
 
 	$files_ =& $release_->getFiles(); $intErgCount = count($files_);
 	
 	for ($i = 0; $i<$intErgCount; $i++) {
-		$zip->addFile($latestReleasePath_ ,$files_[$i]->getName());
+		$filePath = $latestReleasePath_.'/'.$files_[$i]->getName();
+		$zip->addFile($filePath,$files_[$i]->getName());
 	} 
 
 	$zip->close();
-	
-	if(!file_exists($filePath)) { return "#"; } /* Nothing will happen
-	if the file does not exist and someone clicks on the link because of the return value "#" */
-	
-	return  $filePath;
 }
 }
 ?>
\ No newline at end of file

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/download.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -27,14 +27,29 @@
 
 require_once('../env.inc.php');
 require_once $gfwww.'include/pre.php';
+
+require_once $gfcommon.'include/Error.class.php'; 
 require_once $gfcommon.'frs/FRSPackage.class.php';
 require_once $gfcommon.'frs/FRSRelease.class.php';
 require_once $gfcommon.'frs/FRSFile.class.php';
 
-$arr=explode('/',getStringFromServer('REQUEST_URI'));
+$uri = getStringFromServer('REQUEST_URI');
+$arr=explode('/',$uri);
 $file_id=$arr[3];
 
-$res=db_query("SELECT frs_file.filename,frs_package.is_public,frs_package.package_id,
+$file_id_ = explode(';',$file_id);
+
+if($file_id_[0]==0){
+	
+$arrIDs = explode(';', $uri);
+		
+$group_id = $arrIDs[1];
+$package_id = $arrIDs[2];
+$release_id = $arrIDs[3];
+
+} else {
+	
+	$res=db_query("SELECT frs_file.filename,frs_package.is_public,frs_package.package_id,
 	frs_file.file_id,groups.unix_group_name,groups.group_id,frs_release.release_id
 	FROM frs_package,frs_release,frs_file,groups
 	WHERE frs_release.release_id=frs_file.release_id
@@ -50,6 +65,7 @@
 $group_id = db_result($res,0,'group_id');
 $package_id = db_result($res,0,'package_id');
 $release_id=db_result($res,0,'release_id');
+}
 
 $Group =& group_get_object($group_id);
 if (!$Group || !is_object($Group) || $Group->isError()) {
@@ -67,13 +83,17 @@
 	exit_error('Error','Error Getting Release');
 }
 
+if($file_id_[0]==0) {
+$filename = $arr[4];
+
+} else {
 $File = new FRSFile($Release,$file_id);
 if (!$File || !is_object($File) || $File->isError()) {
 	exit_error('Error','Error Getting File');
 }
-$filename = $File->getName();
+	$filename = $File->getName();
+}
 
-
 //  Members of projects can see all packages
 //  Non-members can only see public packages
 if(!$is_public) {
@@ -82,7 +102,9 @@
 	}
 }
 
-$filepath=$sys_upload_dir.'/'.$Group->getUnixName().'/'.$Package->getFileName().'/'.$Release->getFileName().'/'.$File->getName();
+$filepath=$sys_upload_dir.'/'.$Group->getUnixName().'/'.$Package->getFileName().'/'.$Release->getFileName().'/'.$filename;
+
+
 if (file_exists($filepath)) {
 	Header('Content-disposition: attachment; filename="'.str_replace('"', '', $filename).'"');
 	Header("Content-type: application/binary");
@@ -102,7 +124,7 @@
 	$res=db_query("INSERT INTO frs_dlstats_file (ip_address,file_id,month,day,user_id) 
 		VALUES ('$ip','$file_id','".date('Ym')."','".date('d')."','$us')");
 } else {
-	Header("Status: 404");
-}
+	Header("Status: 404"); 
+} 
 
 ?>

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/index.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/index.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/frs/index.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -28,6 +28,7 @@
 require_once $gfwww.'include/pre.php';
 require_once $gfwww.'frs/include/frs_utils.php';
 require_once $gfcommon.'frs/FRSPackage.class.php';
+require_once $gfwww.'frs/download.class.php';
 
 $group_id = getIntFromRequest('group_id');
 $release_id = getIntFromRequest('release_id');
@@ -113,9 +114,24 @@
 			print ' <a href="'.util_make_url ('/frs/monitor.php?filemodule_id='. db_result($res_package,$p,'package_id') .'&group_id='.db_result($res_package,$p,'group_id').'&start=1').'">'.
 				html_image('ic/mail16w.png','20','20',array('alt'=>_('Monitor this package')));
 		}
+
+		print '</a></h3></td><td colspan="4">';
 		
-		print '</a></h3></td><td colspan="4">&nbsp;</td></tr>';
+		//my edit begin
+		$frsRelease = new FRSRelease($frsPackage);
+		$latestReleaseId = $frsRelease->getLatestReleaseId($frsPackage->getID());
+		$frsRelease_ = new FRSRelease($frsPackage, $latestReleaseId);
+		$frsDownload = new download($cur_group, $frsPackage, $frsRelease_, $sys_upload_dir); //Group, Package, Release, Upload dir
+		$strLatestReleasePath = $frsDownload->getLatestReleasePathAsString();
+		
+		$frsDownload->createLatestReleaseFilesAsZip(); #Creates a zip-archiv
+		$fileName = $frsDownload->getLatestReleaseFileName();
 
+		print 'Download latest release: '. util_make_link ('/frs/download.php/'.'0'.';'.$cur_group->getID().';'.$frsPackage->getID().';'.$frsRelease_->getID().';0/'.$fileName,$fileName); #$latestReleaseId,$latestReleaseId);#.$file_release['filename'],$file_release['filename']) .'test';
+		#print ' ('.$strLatestReleasePath.')';
+		print '</td></tr>';
+		//my edit end
+
 		// get the releases of the package
 		$sql = "SELECT * FROM frs_release
 		WHERE package_id='". db_result($res_package,$p,'package_id') . "'
@@ -220,6 +236,7 @@
 
 	print "</table>\n\n";
 }
+
 frs_footer();
 
 ?>

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/add_task.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/add_task.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/add_task.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -22,6 +22,7 @@
 
 pm_header(array('title'=>_('Add a new Task'),'group_project_id'=>$group_project_id));
 echo notepad_func();
+
 ?>
 
 <form action="<?php echo getStringFromServer('PHP_SELF')."?group_id=$group_id&amp;group_project_id=$group_project_id"; ?>" method="post">

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/mod_task.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/mod_task.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/mod_task.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -15,6 +15,7 @@
 	Total rewrite in OO and GForge coding guidelines 12/2002 by Tim Perdue
 */
 
+#require_once('../env.inc.php');
 require_once $gfwww.'include/note.php';
 require_once $gfcommon.'reporting/report_utils.php';
 require_once $gfcommon.'reporting/Report.class.php';
@@ -23,8 +24,50 @@
 
 pm_header(array('title'=>_('Modify Task'),'pagename'=>'pm_modtask','group_project_id'=>$group_project_id));
 
+
+if (!session_loggedin()) {
+	exit_not_logged_in();
+}
+
+$report=new Report();
+if ($report->isError()) {
+	exit_error('Error',$report->getErrorMessage());
+}
+
+$week = getStringFromRequest('week');
+$project_task_id = getStringFromRequest('project_task_id');
+
+if (getStringFromRequest('submit')) {
+	$report_date = getStringFromRequest('report_date');
+	$time_code = getStringFromRequest('time_code');
+	$old_time_code = getStringFromRequest('old_time_code');
+	$hours = getStringFromRequest('hours');
+
+
+if (getStringFromRequest('add')) {
+		$days_adjust = getIntFromRequest('days_adjust');
+
+		if ($project_task_id && $week && $days_adjust && $time_code && $hours) {
+
+			$report_date=($week + ($days_adjust*REPORT_DAY_SPAN))+(12*60*60);
+			$res=db_query("INSERT INTO rep_time_tracking (user_id,week,report_date,project_task_id,time_code,hours)
+				VALUES ('".user_getid()."','$week','$report_date','$project_task_id','$time_code','$hours')");
+			if (!$res || db_affected_rows($res) < 1) {
+				exit_error('Error',db_error());
+			} else {
+				$feedback.=_('Successfully Added');
+			echo '<b><span style="color:2FBD75">'._('Successfully Added').'</b></span>';
+				
+			}
+		} else {
+			#echo "INTERNAL ERROR: add: $project_task_id && $week && $days_adjust && $time_code && $hours";
+			#exit_error('Error',_('All Fields Are Required.'));
+				$feedback = _('All Fields Are Required.');
+			echo '<b><span style="color:FF0000">'._('All Fields Are Required.').'</b></span>';
+		}
+}
+}
 ?>
-
 <form action="<?php echo getStringFromServer('PHP_SELF')."?group_id=$group_id&amp;group_project_id=$group_project_id"; ?>" method="post">
 <input type="hidden" name="func" value="postmodtask" />
 <input type="hidden" name="project_task_id" value="<?php echo $project_task_id; ?>" />
@@ -34,7 +77,12 @@
 	<tr>
 		<td><strong><?php echo _('Submitted by') ?>:</strong><br />
 			<?php echo $pt->getSubmittedRealName(); ?> (<?php echo $pt->getSubmittedUnixName(); ?>)</td>
-		<td><input type="submit" value="<?php echo _('Submit') ?>" name="submit" /></td>
+		<td>
+		<!-- FIRST SUBMIT BEGIN: There is a second submit button in the same form below, 
+		so it is just for usability reasons. Both submit the same data -->
+		<input type="submit" value="<?php echo _('Submit') ?>" name="submit" />
+		<!-- FIRST SUBMIT END -->
+		</td>
 	</tr>
 
 	<tr>
@@ -192,7 +240,9 @@
 
 	<tr>
 		<td colspan="2" style="text-align:center">
+		<!-- SECOND SUBMIT BEGIN -->
 		<input type="submit" value="<?php echo _('Submit') ?>" name="submit" />
+		<!-- SECOND SUBMIT END -->
 		</td>
 	</tr>
 
@@ -200,36 +250,42 @@
 </form>
 <p>
 <h3><?php echo _('Time tracking'); ?></h3>
-<p>
+</p>
 <?php
 $title_arr = array();
 $title_arr[]=_('Week');
 $title_arr[]=_('Day');
 $title_arr[]=_('Estimated Hours');
 $title_arr[]=_('Category');
-$title_arr[]=_('User');
+$title_arr[]=_('User'); 
 $title_arr[]=' ';
 
 $report=new Report();
 if ($report->isError()) {
 	exit_error('Error',$report->getErrorMessage());
 }
-
+/*
+ * https://evolvis-pa.bonn.tarent.de/pm/task.php?func=detailtask&project_task_id=108&group_id=8&group_project_id=6
+*/
 echo $HTML->listTableTop ($title_arr);
-	echo '<form action="/reporting/timeadd.php" method="post" />
+	echo '<form action='.'"'
+	.getStringFromServer('PHP_SELF')."?func=detailtask&project_task_id=$project_task_id&group_id=$group_id&group_project_id=$group_project_id".'"'.
+	' method="post" />
 	<input type="hidden" name="project_task_id" value="'.$project_task_id.'">
 	<input type="hidden" name="submit" value="1" />
 	<tr '.$HTML->boxGetAltRowStyle(@$xi++).'>
-		<td style="text-align:center">'. report_weeks_box($report, 'week') .'</td>
+		<td style="text-align:center">'. report_weeks_box($report, 'week') .'</td> 
 		<td style="text-align:center">'. report_day_adjust_box($report, 'days_adjust') .'</td>
-		<td style="text-align:center"><input type="text" name="hours" value="" size="3" maxlength="3" /></td>
+		<td style="text-align:center">
+		<input type="text" name="hours" value="" size="3" maxlength="3" />
+		</td>
 		<td style="text-align:center">'.report_time_category_box('time_code',false).'</td>
 		<td>&nbsp;</td>
 		<td style="text-align:center"><input type="submit" name="add" value="'._('Add').'" /><input type="submit" name="cancel" value="'._('Cancel').'" /></td>
 	</tr></form>';
+
+//setenv("TZ=" . $user_timezone); //restore the users timezone
 	
-//setenv("TZ=" . $user_timezone); //restore the user�s timezone
-	
 //
 //	Display Time Recorded for this task
 //
@@ -257,15 +313,46 @@
 }
 
 echo '
+
 <tr '.$HTML->boxGetAltRowStyle($xi++).'>
 <td><strong>'._('Total').':</strong></td>
 <td>&nbsp;</td>
 <td>'.$total_hours.'</td>
 <td>&nbsp;</td>
 <td>&nbsp;</td>
-<td>&nbsp;</td></tr>';
+<td>&nbsp;</td>
+</tr>
+<tr>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>';
 $total_hours += db_result($res,$i,'hours');
 
+echo'<tr><td><h3>'._('Time tracking list').'</h3></td>
+		 <td>&nbsp;</td>
+		 <td>&nbsp;</td>
+		 <td>&nbsp;</td>
+		 <td>&nbsp;</td>
+		 <td>&nbsp;</td>
+  
+<form action="/reporting/timeadd.php" method="post" />
+	<input type="hidden" name="project_task_id" value="'.$project_task_id.'">
+	<input type="hidden" name="submit" value="1" />
+	<tr '.$HTML->boxGetAltRowStyle(@$xi++).'>
+		<td style="text-align:center">'. report_weeks_box($report, 'week') .'</td> 
+		<td style="text-align:center;"><input type="submit" name="showTasks" value="'._('Edit').'" /></td>
+		<td style="text-align:center;visibility:hidden">'
+		. report_day_adjust_box($report, 'days_adjust').'
+		<input type="text" name="hours" value="" size="3" maxlength="3" />
+		</td>
+		<td style="text-align:center;visibility:hidden">'.report_time_category_box('time_code',false).'</td>
+		<td>&nbsp;</td>
+		<td style="text-align:center">&nbsp;</td>
+</tr></form>';
+
 echo $HTML->listTableBottom();
 
 pm_footer(array());

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/task.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/task.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/pm/task.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -72,6 +72,9 @@
 /*
 	Figure out which function we're dealing with here
 */
+
+#echo '<b>'.getStringFromRequest('func').'</b>';
+
 switch (getStringFromRequest('func')) {
 
 	//
@@ -165,7 +168,23 @@
 					}
 				}
 				$feedback=_('Task Updated Successfully');
-				include $gfwww.'pm/browse_task.php';
+				
+				#Detailtask begin
+				#include $gfwww.'pm/browse_task.php'; OLD	
+				$pt=new ProjectTaskHTML($pg,$project_task_id);
+				if (!$pt || !is_object($pt)) {
+					exit_error('Error','Could Not Get ProjectTask');
+				} elseif ($pt->isError()) {
+					exit_error('Error',$pt->getErrorMessage());
+				}
+
+				if (session_loggedin() && $pg->userIsAdmin()) {
+					include $gfwww.'pm/mod_task.php';
+				} else {
+					include $gfwww.'pm/detail_task.php';
+				}	
+				#detailtask end
+				
 			}
 		} else {
 			exit_permission_denied();
@@ -371,7 +390,7 @@
 			include $gfwww.'pm/mod_task.php';
 		} else {
 			include $gfwww.'pm/detail_task.php';
-		}
+		} 
 		break;
 	}
 

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/www/reporting/timeadd.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/www/reporting/timeadd.php	2010-03-03 14:16:38 UTC (rev 6449)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/www/reporting/timeadd.php	2010-03-03 14:34:31 UTC (rev 6450)
@@ -82,7 +82,7 @@
 			echo "$project_task_id && $report_date && $old_time_code";
 		}
 
-	} elseif (getStringFromRequest('add')) {
+	    } elseif (getStringFromRequest('add')) {
 		$days_adjust = getIntFromRequest('days_adjust');
 
 		if ($project_task_id && $week && $days_adjust && $time_code && $hours) {
@@ -98,12 +98,29 @@
 			} else {
 				$feedback.=_('Successfully Added');
 			}
-		} else {
+			} else {
 			echo "INTERNAL ERROR: add: $project_task_id && $week && $days_adjust && $time_code && $hours";
 			exit_error('Error',_('All Fields Are Required.'));
-		}
+			}
+		
+		} elseif (getStringFromRequest('showTasks')) {
+		$days_adjust = getIntFromRequest('days_adjust');
 
-	}
+		//if ($project_task_id && $week && $days_adjust && $time_code && $hours) {
+
+			$report_date=($week + ($days_adjust*REPORT_DAY_SPAN))+(12*60*60);
+			// $res=db_query("INSERT INTO rep_time_tracking (user_id,week,report_date,project_task_id,time_code,hours)
+			//	VALUES ('".user_getid()."','$week','$report_date','$project_task_id','$time_code','$hours')");
+			//if (!$res || db_affected_rows($res) < 1) {
+			//	exit_error('Error',db_error());
+			//} else {
+			//	$feedback.=_('Successfully Added');
+		//	}
+		//	} else {
+			//echo "INTERNAL ERROR: add: $project_task_id && $week && $days_adjust && $time_code && $hours";
+			//exit_error('Error',_('All Fields Are Required.'));
+		} 
+		//} 
 }
 
 if ($week) {




More information about the evolvis-commits mailing list