[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/www/pm add_task.php, 1.16, 1.17 detail_task.php,
From: |
tperdue |
Subject: |
[Gforge-commits] gforge/www/pm add_task.php, 1.16, 1.17 detail_task.php, 1.7, 1.8 mod_task.php, 1.16, 1.17 task.php, 1.13, 1.14 |
Date: |
Mon, 08 Nov 2004 11:01:23 -0600 |
Update of /cvsroot/gforge/gforge/www/pm
In directory db.perdue.net:/home/tperdue/share/dev.gforge.org/www/pm
Modified Files:
add_task.php detail_task.php mod_task.php task.php
Log Message:
beginning major enhancements of task mgr
Index: add_task.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/pm/add_task.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- add_task.php 12 Sep 2004 17:36:48 -0000 1.16
+++ add_task.php 8 Nov 2004 17:01:20 -0000 1.17
@@ -118,7 +118,21 @@
<input type="submit" value="<?php echo
$Language->getText('general','submit') ?>" name="submit" />
</td>
</tr>
+ <input type="hidden" name="duration" value="0">
+ <input type="hidden" name="parent_id" value="0">
+<!--
+will add duration and parent_id choices at some point
+ <tr>
+ <td>
+ <strong><?php echo $Language->getText('pm','hours')
?>:</strong><?php echo utils_requiredField(); ?><br />
+ <input type="text" name="hours" size="5" />
+ </td>
+ <td>
+ <input type="submit" value="<?php echo
$Language->getText('general','submit') ?>" name="submit" />
+ </td>
+ </tr>
+-->
</table>
</form>
<?php
Index: detail_task.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/pm/detail_task.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- detail_task.php 29 Jul 2004 13:43:19 -0000 1.7
+++ detail_task.php 8 Nov 2004 17:01:20 -0000 1.8
@@ -78,8 +78,8 @@
to pass into multiple select box
*/
- $result2=db_query("SELECT users.user_name AS User_Name FROM
users,project_assigned_to ".
- "WHERE users.user_id=project_assigned_to.assigned_to_id
AND project_task_id='$project_task_id'");
+ $result2=db_query("SELECT users.user_name AS User_Name FROM
users,project_assigned_to
+ WHERE users.user_id=project_assigned_to.assigned_to_id
AND project_task_id='$project_task_id'");
ShowResultSet($result2,$Language->getText('pm_detailtask','assigned_to'),
false, false);
?>
</td>
@@ -89,8 +89,9 @@
Get the list of ids this is dependent on and convert to
array
to pass into multiple select box
*/
- $result2=db_query("SELECT project_task.summary FROM
project_dependencies,project_task ".
- "WHERE
is_dependent_on_task_id=project_task.project_task_id AND
project_dependencies.project_task_id='$project_task_id'");
+ $result2=db_query("SELECT project_task.summary FROM
project_dependencies,project_task
+ WHERE
is_dependent_on_task_id=project_task.project_task_id
+ AND
project_dependencies.project_task_id='$project_task_id'");
ShowResultSet($result2,$Language->getText('pm_detailtask','dependend_on_task'),
false, false);
?>
</td>
Index: mod_task.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/pm/mod_task.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mod_task.php 12 Sep 2004 17:36:48 -0000 1.16
+++ mod_task.php 8 Nov 2004 17:01:20 -0000 1.17
@@ -150,7 +150,24 @@
?>
</td>
</tr>
+ <input type="hidden" name="duration" value="<?php echo
$pt->getDuration(); ?>">
+ <input type="hidden" name="parent_id" value="<?php echo
$pt->getParentID(); ?>">
+<!--
+//will add duration and parent selection boxes
+ <tr>
+ <td>
+ <strong><?php echo $Language->getText('pm','hours')
?>:</strong><br />
+ <input type="text" name="hours" size="5" value="<?php echo
$pt->getHours(); ?>" />
+ </td>
+ <td>
+ <strong><?php echo $Language->getText('pm','status')
?>:</strong><br />
+ <?php
+// echo $pg->statusBox('status_id', $pt->getStatusID(), false );
+ ?>
+ </td>
+ </tr>
+-->
<tr>
<td colspan="2">
<?php echo $pt->showDependentTasks(); ?>
Index: task.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/pm/task.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- task.php 2 Apr 2004 16:24:59 -0000 1.13
+++ task.php 8 Nov 2004 17:01:20 -0000 1.14
@@ -81,7 +81,7 @@
$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
- if
(!$pt->create($summary,$details,$priority,$hours,$start_date,$end_date,$category_id,$percent_complete,$assigned_to,$dependent_on))
{
+ if
(!$pt->create($summary,$details,$priority,$hours,$start_date,$end_date,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$duration,$parent_id))
{
exit_error('ERROR',$pt->getErrorMessage());
} else {
if (count($add_artifact_id) > 0) {
@@ -113,7 +113,7 @@
$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
if
(!$pt->update($summary,$details,$priority,$hours,$start_date,$end_date,
-
$status_id,$category_id,$percent_complete,$assigned_to,$dependent_on,$new_group_project_id))
{
+
$status_id,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$new_group_project_id,$duration,$parent_id))
{
exit_error('ERROR','update()::
'.$pt->getErrorMessage());
} else {
if (count($rem_artifact_id) > 0) {
@@ -155,11 +155,13 @@
//yikes, we want the ability to
mass-update to "un-assigned", which is the ID=100, which
//conflicts with the "no change" ID!
Sorry for messy use of 100.1
$_assigned_to=(($assigned_to !=
'100.1') ? $pt->getAssignedTo() : array('100'));
- $_dependent_on=$pt->getDependentOn();
+
$_dependent_on=array_keys($pt->getDependentOn());
$_new_group_project_id=(($new_group_project_id != 100) ? $new_group_project_id
: $pt->ProjectGroup->getID() );
+ $_duration=$pt->getDuration();
+ $_parent_id=$pt->getParentID();
if
(!$pt->update($_summary,$_details,$_priority,$_hours,$_start_date,$_end_date,
-
$_status_id,$_category_id,$_percent_complete,$_assigned_to,$_dependent_on,$_new_group_project_id))
{
+
$_status_id,$_category_id,$_percent_complete,$_assigned_to,$_dependent_on,$_new_group_project_id,$_duration,$parent_id))
{
$was_error=true;
$feedback .= ' ID:
'.$project_task_id_list[$i].'::'.$pt->getErrorMessage();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/www/pm add_task.php, 1.16, 1.17 detail_task.php, 1.7, 1.8 mod_task.php, 1.16, 1.17 task.php, 1.13, 1.14,
tperdue <=