[Openfirst-cvscommit] projects viewmeeting.php,1.4,1.5 preferences.php,1.7,1.8 meetings.php,1.6,1.7
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] projects viewmeeting.php,1.4,1.5 preferences.php,1.7,1.8 meetings.php,1.6,1.7 index.php,1.9,1.10
|
From: <dav...@us...> - 2003-09-13 15:38:29
|
Update of /cvsroot/openfirst/projects
In directory sc8-pr-cvs1:/tmp/cvs-serv20924/projects
Modified Files:
viewmeeting.php preferences.php meetings.php index.php
Log Message:
Minor bug and design changes.
Index: viewmeeting.php
===================================================================
RCS file: /cvsroot/openfirst/projects/viewmeeting.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** viewmeeting.php 30 Aug 2003 14:42:57 -0000 1.4
--- viewmeeting.php 13 Sep 2003 15:38:24 -0000 1.5
***************
*** 123,129 ****
// If WYSIWYG function is set then view the WYSIWYG function module
if (function_exists("make_wysiwyg")) {
! make_wysiwyg("description",500,255,"");
} else {
! echo "<textarea name='description'></textarea>";
}
--- 123,129 ----
// If WYSIWYG function is set then view the WYSIWYG function module
if (function_exists("make_wysiwyg")) {
! make_wysiwyg("notes",500,255,"");
} else {
! echo "<textarea name='notes'></textarea>";
}
***************
*** 135,140 ****
present:</div></td>
<td><p>
! <select name="absent[]" width='60' size="6">
! <option>none</option>
<?php
--- 135,140 ----
present:</div></td>
<td><p>
! <select name="absent[]" size="6" multiple width='60'>
! <option>none</option>
<?php
***************
*** 171,174 ****
--- 171,175 ----
<?php
+ }
}
include($footer);
Index: preferences.php
===================================================================
RCS file: /cvsroot/openfirst/projects/preferences.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** preferences.php 30 Aug 2003 14:42:57 -0000 1.7
--- preferences.php 13 Sep 2003 15:38:24 -0000 1.8
***************
*** 48,53 ****
?>
! <h2><font face="Verdana, Arial, Helvetica, sans-serif">Preferences</font><br>
</h2>
<form action='preferences.php' method='POST'>
<table width="527" align="center">
--- 48,59 ----
?>
! <h2><font face="Verdana, Arial, Helvetica, sans-serif">Projects Preferences</font><br>
</h2>
+ <p>This preference menu allows you to edit your daily update options<br>
+ If the administrator activates daily updates then every single day you will
+ receive an automatic<br>
+ update e-mail with all the changes made for the particular day.</p>
+ <p>The options below allow you to specify what kind<br>
+ of information you would like sent and if you want to receive the updates.</p>
<form action='preferences.php' method='POST'>
<table width="527" align="center">
***************
*** 59,69 ****
<p align="center"><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Your
E-Mail Address: <strong><?php if(! isset($user->email)){ echo "You must configure your user account in order for this to automatically set."; }else{ echo $user->email; } ?></strong></font></p>
! <p align="center"><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Would
! you like to be sent daily updates?
<select name="updates" id="updates">
! <option selected><?php echo $user->ProjectsUpdates; ?></option>
<option>-----</option>
! <option value="On">Yes</option>
! <option value="Off">No</option>
</select>
</font></p>
--- 65,75 ----
<p align="center"><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Your
E-Mail Address: <strong><?php if(! isset($user->email)){ echo "You must configure your user account in order for this to automatically set."; }else{ echo $user->email; } ?></strong></font></p>
! <p align="center"><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Send
! daily updates?
<select name="updates" id="updates">
! <option><?php echo $user->ProjectsUpdates; ?></option>
<option>-----</option>
! <option>On</option>
! <option>Off</option>
</select>
</font></p>
Index: meetings.php
===================================================================
RCS file: /cvsroot/openfirst/projects/meetings.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** meetings.php 1 Sep 2003 17:29:10 -0000 1.6
--- meetings.php 13 Sep 2003 15:38:24 -0000 1.7
***************
*** 144,155 ****
</tr>
<?php
-
// Check for passed meetings and preview them
$query = ofirst_dbquery("SELECT * FROM ofirst_projects_meetings WHERE Status='done'");
while($meeting = ofirst_dbfetch_object($query)){
-
?>
! <tr>
! <td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>"><img src="../members/icons/apps/date.png" width="32" height="32" border="0"></a></div></td>
<td><?php echo date("F j, Y",$meeting->ForDate); ?></td>
<td><?php echo $meeting->Description; ?></td>
--- 144,154 ----
</tr>
<?php
// Check for passed meetings and preview them
$query = ofirst_dbquery("SELECT * FROM ofirst_projects_meetings WHERE Status='done'");
while($meeting = ofirst_dbfetch_object($query)){
?>
! <tr>
! <td><div align="center"><a href="viewmeeting.php?ID=<?php echo $meeting->ID; ?>">
! <img src="../members/icons/apps/date.png" width="32" height="32" border="0"></a></div></td>
<td><?php echo date("F j, Y",$meeting->ForDate); ?></td>
<td><?php echo $meeting->Description; ?></td>
***************
*** 158,168 ****
$assign = explode(",",$meeting->ArrangedFor);
foreach($assign as $assign){
! $query = ofirst_dbquery("SELECT * FROM ofirst_projects_groups WHERE ID = '".$assign."'");
! $group = ofirst_dbfetch_object($query);
echo $group->GroupName;
}
-
?>
! </td>
</tr>
<?php
--- 157,166 ----
$assign = explode(",",$meeting->ArrangedFor);
foreach($assign as $assign){
! $groupquery = ofirst_dbquery("SELECT * FROM ofirst_projects_groups WHERE ID = '".$assign."'");
! $group = ofirst_dbfetch_object($groupquery);
echo $group->GroupName;
}
?>
! </td>
</tr>
<?php
Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/projects/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php 30 Aug 2003 14:42:57 -0000 1.9
--- index.php 13 Sep 2003 15:38:24 -0000 1.10
***************
*** 41,47 ****
showlogin();
} else {
! echo "<p> </p><p>Welcome ".$user->user.", thank you for logging in!<br><br>";
}
include($footer);
! ?>
\ No newline at end of file
--- 41,144 ----
showlogin();
} else {
! echo "<h2>Projects System</h2>Welcome <font color='green'>".$user->user."</font>, thank you for logging in!<br><br>";
! ?>
!
!
! <table width="52%" border="0" cellspacing="0" cellpadding="6">
! <tr>
! <th>Your Assigned Groups</th>
! </tr>
! </table>
! <table width="52%">
! <tr>
! <td class="sub" width="4%"> </th>
! <td class="sub" width="20%">Task Name</th>
! <td class="sub" width="13%">Target Date</th>
! <td class="sub" width="30%">Assigned</th> </tr>
! <?php
!
! // Run through the current tasks
! $query = ofirst_dbquery("SELECT * FROM ofirst_projects_tasks");
! while($tasks = ofirst_dbfetch_object($query)){
!
! $showtask = false;
!
! $assigned = explode(",",$tasks->Assigned);
! foreach($assigned As $member){
! if($member == $user->user){
! $showtask = true;
! }
! }
!
! if($showtask){
!
! // If value is pending then select the proper information
! if($tasks->Pend == "none"){
! $pend = false;
! } else {
!
! $taskquery = ofirst_dbquery("SELECT * FROM ofirst_projects_tasks WHERE ID = '".$tasks->Pend."'");
! $pendtask = ofirst_dbfetch_object($taskquery);
!
! if($pendtask->Completion == 100){
! $pend = false;
! } else {
! $pend = true;
! }
! }
! }
! ?>
! <tr <?php if(date("F j, Y",time()) == date("F j, Y",$tasks->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
! <td><a href="notes.php?GroupID=<?php echo $_GET['GroupID']; ?>&TaskID=<?php echo $tasks->ID; ?>&ProjectID=<?php echo $_GET['ProjectID']; ?>">
! <?php
!
! // If value is pending then show pend graphics
! if($pend){
! echo "<img src='../members/icons/actions/encrypted.png' border='0'>";
! } else {
! echo "<a href='notes.php?GroupID=".$tasks->GroupID."&TaskID=".$tasks->ID."&ProjectID=".$tasks->ProjectID."'><img src='../members/icons/filesystems/desktop.png' border='0'></a>";
! }
!
! ?>
! </a></td>
! <td>
! <?php
! echo $tasks->TaskName." (";
! if(! $pend){
! 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->Assigned; ?></td>
! </tr>
! <?
! }
!
! if(ofirst_dbnum_rows($query) == 0){
! echo "\n <tr>\n <td> </td>\n <td> </td>\n <td> </td>\n <td>There are no tasks for this project!</td>\n <td> </td>";
! }
!
! ?>
! <tr>
! <td width="4%"> </th>
! <td width="20%">
! <td width="13%">
! <td width="30%">[ <a href="mytask.php">Detailed Related Tasks</a> ]</tr>
! </table>
!
!
! <br>
! <?php
!
}
include($footer);
! ?>
|
