[Openfirst-cvscommit] projects projects.php,1.9,1.10 tasks.php,1.9,1.10
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] projects projects.php,1.9,1.10 tasks.php,1.9,1.10
|
From: <dav...@us...> - 2003-10-10 11:19:42
|
Update of /cvsroot/openfirst/projects
In directory sc8-pr-cvs1:/tmp/cvs-serv31890
Modified Files:
projects.php tasks.php
Log Message:
Updated with new interface look and project tree.
Index: projects.php
===================================================================
RCS file: /cvsroot/openfirst/projects/projects.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** projects.php 1 Sep 2003 17:29:10 -0000 1.9
--- projects.php 10 Oct 2003 11:19:38 -0000 1.10
***************
*** 91,115 ****
?>
<h2>Project Listings</h2>
! <table width="540">
! <tr>
! <td width="0" height="0"> <div align="left"><em>Location:</em> <a href="groups.php">
! <?php echo $group->GroupName; ?> Group</a> / <a href="projects.php?GroupID=<?php echo $_GET['GroupID']; ?>"><strong>Projects</strong></a></div></td>
! </tr>
! </table>
! <br>
! <table width="100%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th>Project Listings for <?php echo $group->GroupName; ?> Group</th>
! </tr>
! </table>
! <table width="100%">
<tr>
! <td class="sub" width="3%"> </td>
! <td class="sub" width="22%">Project Name</td>
! <td class="sub" width="9%">Completion</td>
! <td class="sub" width="35%">Description</td>
! <td class="sub" width="31%">Assigned</td>
! </tr>
! <?php
// List current projects in database
--- 91,116 ----
?>
<h2>Project Listings</h2>
! <table width="100%" align="center" cellpadding="0" cellspacing="0">
<tr>
! <td width="22%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th> Navigation </th>
! <tr>
! <td><?php projecttree("projects",$_GET['GroupID']); ?></td>
! </table></td>
! <td width="78%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th>Project Listings for <?php echo $group->GroupName; ?> Group</th>
! </tr>
! </table>
! <table width="100%">
! <tr>
! <td class="sub" width="3%"> </td>
! <td class="sub" width="22%">Project Name</td>
! <td class="sub" width="15%">Completion</td>
! <td class="sub" width="41%">Description</td>
! <?php if($user->membertype == "administrator"){ ?><td class="sub" width="19%">Option</td><?php } ?>
! </tr>
! <?php
// List current projects in database
***************
*** 134,140 ****
?>
! <tr <?php if(date("F j, Y",time()) == date("F j, Y",$projects->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
! <td>
! <?php
// If project completion is 100 then display completion graphic
--- 135,141 ----
?>
! <tr <?php if(date("F j, Y",time()) == date("F j, Y",$projects->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
! <td>
! <?php
// If project completion is 100 then display completion graphic
***************
*** 156,165 ****
?>
! </td>
! <td>
! <?php echo $projects->ProjectName; ?>
! </td>
! <td>
! <?php
if(! $pend){
if($projects->Completion == "CLOSE"){ echo "CLOSED"; }else{ echo $projects->Completion."%"; }
--- 157,164 ----
?>
! </td>
! <td> <a href="tasks.php?GroupID=<?php echo $projects->GroupID; ?>&ProjectID=<?php echo $projects->ID; ?>"><?php echo $projects->ProjectName; ?></a></td>
! <td>
! <?php
if(! $pend){
if($projects->Completion == "CLOSE"){ echo "CLOSED"; }else{ echo $projects->Completion."%"; }
***************
*** 168,176 ****
}
?>
! </td>
! <td><?php echo $projects->Description; ?></td>
! <td><?php echo str_replace(",", ", ",$projects->Assigned); ?></td>
! </tr>
! <?
}
--- 167,175 ----
}
?>
! </td>
! <td><?php echo $projects->Description; ?></td>
! <?php if($user->membertype == "administrator"){ ?><td><a href="edit.php">Edit</a> | <a href="delete.php">Delete</a> </td><?php } ?>
! </tr>
! <?
}
***************
*** 181,187 ****
?>
</table>
! <br>
! <?php
// Check if the current use is apart of this particular group then allow him to add/edit the project
--- 180,187 ----
?>
+ </table> </td>
+ </tr>
</table>
! <p> <?php
// Check if the current use is apart of this particular group then allow him to add/edit the project
***************
*** 196,199 ****
--- 196,200 ----
if($show){
?>
+ </p>
<form action='projects.php?GroupID=<?php echo $_GET['GroupID']; ?>' method='POST'>
<table width="39%">
***************
*** 304,308 ****
<font size="1">(To select more then one user hold down the control key
and click the names you wish.)</font></font></p>
! </td>
</tr>
<tr>
--- 305,309 ----
<font size="1">(To select more then one user hold down the control key
and click the names you wish.)</font></font></p>
! </td>
</tr>
<tr>
***************
*** 310,342 ****
<td><input name="create" type="submit" id="create2" value="Create Project">
<input type="reset" name="Reset" value="Reset"> </td>
- </tr>
- <tr>
- <th> </th>
- <th>Remove Project</th>
- </tr>
- <tr>
- <td><div align="right">Project Name:</div></td>
- <td><select name="project" id="project">
- <?php
-
- // Display current member list from the assigned values
- $query = ofirst_dbquery("SELECT * FROM ofirst_projects_projects WHERE GroupID = '".$_GET['GroupID']."'");
- while($projects = ofirst_dbfetch_object($query)){
- echo "<option value='".$projects->ID."'>".$projects->ProjectName."</option>";
- }
-
- ?>
- </select></td>
- </tr>
- <tr>
- <td><div align="right">
- <input name="confirm" type="checkbox" id="confirm" value="checkbox">
- </div></td>
- <td>Click here to confirm the removal of this project. Without checking
- the project will not be removed.</td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="remove" type="submit" id="remove" value="Remove"></td>
</tr>
</table>
--- 311,314 ----
Index: tasks.php
===================================================================
RCS file: /cvsroot/openfirst/projects/tasks.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tasks.php 1 Sep 2003 17:29:10 -0000 1.9
--- tasks.php 10 Oct 2003 11:19:38 -0000 1.10
***************
*** 110,135 ****
?>
<h2>Tasks Listings</h2>
! <table width="540">
! <tr>
! <td width="0" height="0"> <div align="left"><em>Location:</em> <a href="groups.php"><?php echo $group->GroupName; ?>
! Group</a> / <a href="projects.php?GroupID=<?php echo $_GET['GroupID']; ?>"><?php echo $project->ProjectName; ?>
! Project</a> / <strong><a href="tasks.php?GroupID=<?php echo $_GET['GroupID']; ?>&ProjectID=<?php echo $_GET['ProjectID']; ?>">Tasks</a></strong></div></td>
! </tr>
! </table>
! <br>
! <table width="100%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th>Task Listings for <?php echo $project->ProjectName; ?> Project</th>
! </tr>
! </table>
! <table width="100%">
<tr>
! <td class="sub" width="4%"> </td>
! <td class="sub" width="20%">Task Name</td>
! <td class="sub" width="13%">Target Date</td>
! <td class="sub" width="33%">Description</td>
! <td class="sub" width="30%">Assigned</td>
! </tr>
! <?php
// Run through the current tasks in the database related to this project and group
--- 110,136 ----
?>
<h2>Tasks Listings</h2>
! <table width="100%" align="center" cellpadding="0" cellspacing="0">
<tr>
! <td width="22%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th> Navigation </th>
! <tr>
! <td><?php projecttree("tasks",$_GET['ProjectID']); ?></td>
! </table></td>
! <td width="78%" valign="top"> <table width="100%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th>Task Listings for <?php echo $project->ProjectName; ?> Project</th>
! </tr>
! </table>
! <table width="100%">
! <tr>
! <td class="sub" width="3%"> </td>
! <td class="sub" width="17%">Task Name</td>
! <td class="sub" width="10%">Completion</td>
! <td class="sub" width="16%">Target Date</td>
! <td class="sub" width="37%">Description</td>
! <?php if($user->membertype == "administrator"){ ?><td class="sub" width="17%">Option</td><?php } ?>
! </tr>
! <?php
// Run through the current tasks in the database related to this project and group
***************
*** 155,161 ****
?>
! <tr <?php if(date("F j, Y",time()) == date("F j, Y",$tasks->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
! <td>
! <?php
// If the task comletion is 100% then display the completion graphic
--- 156,162 ----
?>
! <tr <?php if(date("F j, Y",time()) == date("F j, Y",$tasks->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
! <td>
! <?php
// If the task comletion is 100% then display the completion graphic
***************
*** 177,202 ****
?>
! </td>
! <td>
! <?php
// Decide between pend, close and completion value to display
! echo $tasks->TaskName." (";
if(! $pend){
! if($tasks->Completion == "CLOSE"){ echo "CLOSED"; }else{ echo $tasks->Completion."%"; }
} else {
echo "PEND ON: ".$pendtask->TaskName;
}
- echo ")";
?>
! </td>
! <td><?php
echo date("F j, Y",$tasks->TarDate);
?></td>
! <td><?php echo $tasks->Description; ?></td>
! <td><?php echo str_replace(",", ", ",$tasks->Assigned); ?></td>
! </tr>
! <?
}
--- 178,205 ----
?>
! </td>
! <td>
! <?php
// Decide between pend, close and completion value to display
! echo "<a href='notes.php?GroupID=".$_GET['GroupID']."&TaskID=".$tasks->ID."&ProjectID=".$_GET['ProjectID']."'>".$tasks->TaskName."</a>";
if(! $pend){
! if($tasks->Completion == "CLOSE"){ echo "--<b>CLOSED</b>"; }
} else {
echo "PEND ON: ".$pendtask->TaskName;
}
?>
! </td>
! <td>dsfg</td>
! <td><?php
echo date("F j, Y",$tasks->TarDate);
?></td>
! <td><?php echo $tasks->Description; ?></td>
! <?php if($user->membertype == "administrator"){ ?>
! <td><a href="edit.php">Edit</a> | <a href="delete.php">Close</a> |
! <a href="open.php">Open</a> </td><?php } ?>
! </tr>
! <?
}
***************
*** 207,210 ****
--- 210,215 ----
?>
+ </table></td>
+ </tr>
</table>
<?php
***************
*** 331,401 ****
<td><input name="create" type="submit" id="create2" value="Create Task">
<input type="reset" name="Reset" value="Reset"> </td>
- </tr>
- <tr>
- <th> </th>
- <th>Remove Task</th>
- </tr>
- <tr>
- <td><div align="right">Task Name:</div></td>
- <td><select name="task" id="task">
- <?php
-
- // View a list of tasks
- $query = ofirst_dbquery("SELECT * FROM ofirst_projects_tasks WHERE GroupID = '".$_GET['GroupID']."' AND ProjectID = '".$_GET['ProjectID']."'");
- while($tasks = ofirst_dbfetch_object($query)){
- echo "<option value='".$tasks->ID."'>".$tasks->TaskName."</option>";
- }
-
- ?>
- </select></td>
- </tr>
- <tr>
- <td><div align="right">
- <input name="confirm" type="checkbox" id="confirm" value="checkbox">
- </div></td>
- <td>Click here to confirm the removal of this task. Without checking the
- task will not be removed.</td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="remove" type="submit" id="remove" value="Remove"></td>
- </tr>
- <tr>
- <th> </th>
- <th>Add Project Completion</th>
- </tr>
- <tr>
- <td><div align="right">Completion:</div></td>
- <td><select name="completion" id="completion">
- <option selected><?php echo $project->Completion; ?></option>
- <option>----</option>
- <option>CLOSE</option>
- <option>0</option>
- <option>5</option>
- <option>10</option>
- <option>15</option>
- <option>20</option>
- <option>25</option>
- <option>30</option>
- <option>35</option>
- <option>40</option>
- <option>45</option>
- <option>50</option>
- <option>55</option>
- <option>60</option>
- <option>65</option>
- <option>70</option>
- <option>75</option>
- <option>80</option>
- <option>85</option>
- <option>90</option>
- <option>95</option>
- <option>100</option>
- </select>
- %</td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="addcompletion" type="submit" id="create" value="Add Completion"></td>
</tr>
</table>
--- 336,339 ----
|
