[Openfirst-cvscommit] meetings index.php,1.1.1.1,1.2 viewmeeting.php,1.1.1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/openfirst/meetings
In directory sc8-pr-cvs1:/tmp/cvs-serv26444

Modified Files:
	index.php viewmeeting.php 
Log Message:
Minor updates to features.

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.php	1 Nov 2003 18:33:28 -0000	1.1.1.1
--- index.php	2 Nov 2003 21:06:13 -0000	1.2
***************
*** 56,60 ****
     $fordate = strtotime($_POST['month']." ".$_POST['day'].",".$_POST['year']." ".$_POST['hour'].":".$_POST['minute']." ".$_POST['ampm']);
  
!     // Put value into database
      ofirst_dbquery("INSERT INTO ofirst_meetings SET
                    ForDate = '".$fordate."',
--- 56,62 ----
     $fordate = strtotime($_POST['month']." ".$_POST['day'].",".$_POST['year']." ".$_POST['hour'].":".$_POST['minute']." ".$_POST['ampm']);
  
!     if(isset($_POST['sendreminder'])){ $sendreminder = "1"; }else{ $sendreminder = "0"; }
! 
!     // Put value into database	
      ofirst_dbquery("INSERT INTO ofirst_meetings SET
                    ForDate = '".$fordate."',
***************
*** 63,68 ****
                    AbsentList = 'none',
                    Status = 'wait',
                    Dates = '".time()."'") or die(ofirst_dberror());
!     echo "<br><br>Meeting created! [ <a href='meetings.php'>Meetings</a> ]<br><br>";
      die(include_once($footer));
    }
--- 65,74 ----
                    AbsentList = 'none',
                    Status = 'wait',
+ 				  SendReminder = '$sendreminder',
+ 				  CalledBy = '".$user->user."',
+ 				  EndHour = '".$_POST['endhour']."',
+ 				  EndMinute = '".$_POST['endminute']."',
                    Dates = '".time()."'") or die(ofirst_dberror());
!     echo "<br><br>Meeting created! [ <a href='index.php'>Meetings</a> ]<br><br>";
      die(include_once($footer));
    }
***************
*** 79,144 ****
      // Remove meeting information
      ofirst_dbquery("DELETE FROM ofirst_meetings WHERE ID = '".$_POST['project']."'") or die(ofirst_dberror());
!     echo "<br><br>Meetings removed! [ <a href='meetings.php'>Meetings</a> ]<br><br>";
      die(include_once($footer));
  
    }
  
! ?>
! <h2><font face="Verdana, Arial, Helvetica, sans-serif"> Meeting Organizer</font></h2>
! <p><font face="Verdana, Arial, Helvetica, sans-serif">Click on the image to view
!     more infomation about the meeting.</font></p>
  <table width="57%">
!   <tr>
      <th>Upcoming Meetings</th>
    </tr>
  </table>
  <table width="57%">
!   <tr>
      <td class="sub" width="7%">&nbsp;</td>
      <td class="sub" width="28%"><div align="left">Date</div></td>
!     <td class="sub" width="65%"><div align="left">Arranged For</div></td>
    </tr>
    <?php
- 
-   // Check for meetings that have not passed yet
    $meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
    while($meeting = ofirst_dbfetch_object($meetquery)){
- 
    ?>
!   <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->ArrangedFor;
!     ?>
!     </td>
    </tr>
    <?php
    }
- 
-   // If there are no values then output a no value message
    if(ofirst_dbnum_rows($meetquery) == 0){
      echo "<tr><td>&nbsp;</td><td>&nbsp;</td><td>There are no planned meetings!</td></tr>";
    }
- 
    ?>
  </table>
  <br>
  <table width="57%">
!   <tr>
      <th>Past Meetings</th>
    </tr>
  </table>
  <table width="57%">
!   <tr>
      <td class="sub" width="7%">&nbsp;</td>
!     <td class="sub" width="28%"><div align="left">Date
!         </th>
!     </div>
!     <td class="sub" width="65%"><div align="left">Arranged For
!         </th>
!         </div>
!     </tr>
    <?php
    // Check for passed meetings and preview them
--- 85,134 ----
      // Remove meeting information
      ofirst_dbquery("DELETE FROM ofirst_meetings WHERE ID = '".$_POST['project']."'") or die(ofirst_dberror());
!     echo "<br><br>Meetings removed! [ <a href='index.php'>Meetings</a> ]<br><br>";
      die(include_once($footer));
  
    }
  
! ?> 
! <h2> Meeting Organizer</h2>
! <p>Click on the image to view more infomation about the meeting.</p>
  <table width="57%">
!   <tr> 
      <th>Upcoming Meetings</th>
    </tr>
  </table>
  <table width="57%">
!   <tr> 
      <td class="sub" width="7%">&nbsp;</td>
      <td class="sub" width="28%"><div align="left">Date</div></td>
!     <td class="sub" width="65%"><div align="left">Arranged For Divisions</div></td>
    </tr>
    <?php
    $meetquery = ofirst_dbquery("SELECT * FROM ofirst_meetings WHERE Status='wait'");
    while($meeting = ofirst_dbfetch_object($meetquery)){
    ?>
!   <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 str_replace(",",", ",$meeting->ArrangedFor); ?></td>
    </tr>
    <?php
    }
    if(ofirst_dbnum_rows($meetquery) == 0){
      echo "<tr><td>&nbsp;</td><td>&nbsp;</td><td>There are no planned meetings!</td></tr>";
    }
    ?>
  </table>
  <br>
  <table width="57%">
!   <tr> 
      <th>Past Meetings</th>
    </tr>
  </table>
  <table width="57%">
!   <tr> 
      <td class="sub" width="7%">&nbsp;</td>
!     <td class="sub" width="28%"><div align="left">Date </th> </div>
!     <td class="sub" width="65%"><div align="left">Arranged For Divisions</div></tr>
    <?php
    // Check for passed meetings and preview them
***************
*** 146,183 ****
    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->ArrangedFor;
!     ?>
! </td>
    </tr>
    <?php
    }
- 
-   // If there are no values then output a message
    if(ofirst_dbnum_rows($query) == 0){
      echo "<tr><td>&nbsp;</td><td>&nbsp;</td><td>There are no past meetings!</td></tr>";
    }
- 
    ?>
  </table>
  <br>
! <?php if($user->membertype == "administrator"){ ?>
! <form onsubmit="return dhtmlEditorPrepareSubmit();" action='meetings.php' method='POST'>
  <table width="64%">
!   <tr>
      <th width="19%">&nbsp;</th>
      <th width="31%">Plan New Meeting</th>
    </tr>
!   <tr>
!     <td valign="top">
! <div align="right">Description:</div></td>
!     <td>
!   <?php
! 
    // If the WYSIWYG function is set then use the WYSIWYG module
    if (function_exists("make_wysiwyg")) {
--- 136,163 ----
    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 str_replace(",",", ",$meeting->ArrangedFor); ?></td>
    </tr>
    <?php
    }
    if(ofirst_dbnum_rows($query) == 0){
      echo "<tr><td>&nbsp;</td><td>&nbsp;</td><td>There are no past meetings!</td></tr>";
    }
    ?>
  </table>
  <br>
! <?php if($user->membertype == "administrator"){ ?><form onsubmit="return dhtmlEditorPrepareSubmit();" action='index.php' method='POST'> 
  <table width="64%">
!   <tr> 
      <th width="19%">&nbsp;</th>
      <th width="31%">Plan New Meeting</th>
    </tr>
!   <tr> 
!     <td valign="top"> <div align="right">Description:</div></td>
!     <td> 
!       <?php
    // If the WYSIWYG function is set then use the WYSIWYG module
    if (function_exists("make_wysiwyg")) {
***************
*** 190,194 ****
      </td>
    </tr>
!   <tr>
      <td><div align="right">Meeting Date:</div></td>
      <td><select name="month" id="month">
--- 170,174 ----
      </td>
    </tr>
!   <tr> 
      <td><div align="right">Meeting Date:</div></td>
      <td><select name="month" id="month">
***************
*** 207,212 ****
          <option>November</option>
          <option>December</option>
!       </select>
!       <select name="day" id="day">
          <option selected><?php echo date("j",time()); ?></option>
          <option>----</option>
--- 187,191 ----
          <option>November</option>
          <option>December</option>
!       </select> <select name="day" id="day">
          <option selected><?php echo date("j",time()); ?></option>
          <option>----</option>
***************
*** 243,247 ****
          <option>31</option>
        </select>
!       ,
        <select name="year" id="year">
          <option selected><?php echo date("Y",time()); ?></option>
--- 222,226 ----
          <option>31</option>
        </select>
!       , 
        <select name="year" id="year">
          <option selected><?php echo date("Y",time()); ?></option>
***************
*** 255,272 ****
          <option>2009</option>
          <option>2010</option>
        </select>
!       <input name="hour" type="text" id="hour" size="2">
!       :  <input name="minute" type="text" id="minute" size="2">
!       <select name="ampm" id="ampm">
!         <option selected>AM</option>
!         <option>PM</option>
!       </select> </td>
    </tr>
!   <tr>
      <td><div align="right">Arranged For:</div></td>
!     <td><p>
          <select name="assign[]" size="6" multiple="multiple" style="width: 250px;" id="assign">
!       <?php
! 
        // Output a list of current groups
        $divisionquery = ofirst_dbquery("SELECT * FROM ofirst_divisions;");
--- 234,258 ----
          <option>2009</option>
          <option>2010</option>
+       </select> <input name="hour" type="text" id="hour" value="3" size="2">
+       : 
+       <input name="minute" type="text" id="minute" value="00" size="2"> <select name="ampm" id="ampm">
+         <option>AM</option>
+         <option selected>PM</option>
        </select>
!       to 
!       <input name="endhour" type="text" id="hour22" value="4" size="2">
!       : 
!       <input name="endminute" type="text" id="minute22" value="00" size="2">
!     </td>
    </tr>
!   <tr> 
!     <td><div align="right">Meeting Called By:</div></td>
!     <td><?php echo $user->user." (".$user->firstname." ".$user->lastname.")"; ?></td>
!   </tr>
!   <tr> 
      <td><div align="right">Arranged For:</div></td>
!     <td><p> 
          <select name="assign[]" size="6" multiple="multiple" style="width: 250px;" id="assign">
!           <?php
        // Output a list of current groups
        $divisionquery = ofirst_dbquery("SELECT * FROM ofirst_divisions;");
***************
*** 277,296 ****
        ?>
          </select>
!         <font size="2"></font></p></td>
    </tr>
!   <tr>
      <td>&nbsp;</td>
!     <td><input name="create" type="submit" id="create2" value="Create Meeting">
        <input type="reset" name="Reset" value="Reset"> </td>
    </tr>
!   <tr>
      <th>&nbsp;</th>
      <th>Remove Meeting</th>
    </tr>
!   <tr>
      <td><div align="right">Meeting Date:</div></td>
      <td><select name="project" id="project">
!      <?php
! 
       // Output a list of meetings by date
       $query = ofirst_dbquery("SELECT * FROM ofirst_meetings ORDER BY ForDate");
--- 263,287 ----
        ?>
          </select>
!         <br>
!       </p></td>
    </tr>
!   <tr> 
!     <td><div align="right">Send reminder messages to users by cell phone:</div></td>
!     <td><input name="sendreminder" type="checkbox" id="sendreminder" value="checkbox"> 
!       <font size="1">(Featue must be enabled by administrator)</font></td>
!   </tr>
!   <tr> 
      <td>&nbsp;</td>
!     <td><input name="create" type="submit" id="create2" value="Create Meeting"> 
        <input type="reset" name="Reset" value="Reset"> </td>
    </tr>
!   <tr> 
      <th>&nbsp;</th>
      <th>Remove Meeting</th>
    </tr>
!   <tr> 
      <td><div align="right">Meeting Date:</div></td>
      <td><select name="project" id="project">
!         <?php
       // Output a list of meetings by date
       $query = ofirst_dbquery("SELECT * FROM ofirst_meetings ORDER BY ForDate");
***************
*** 302,313 ****
        </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 meeting. Without checking the
        meeting will not be removed.</td>
    </tr>
!   <tr>
      <td>&nbsp;</td>
      <td><input name="remove" type="submit" id="remove" value="Remove"></td>
--- 293,304 ----
        </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 meeting. Without checking the 
        meeting will not be removed.</td>
    </tr>
!   <tr> 
      <td>&nbsp;</td>
      <td><input name="remove" type="submit" id="remove" value="Remove"></td>

Index: viewmeeting.php
===================================================================
RCS file: /cvsroot/openfirst/meetings/viewmeeting.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** viewmeeting.php	1 Nov 2003 18:33:31 -0000	1.1.1.1
--- viewmeeting.php	2 Nov 2003 21:06:13 -0000	1.2
***************
*** 57,62 ****
                Notes = '".$_POST['notes']."',
                AbsentList = '$absentlist',
                Status = 'done' WHERE ID = '".$_GET['ID']."'") or die(ofirst_dberror());
!       echo "<br><br>Meeting updated! [ <a href='meetings.php'>Meetings</a> ]<br><br>";
        die(include_once($footer));
      }
--- 57,63 ----
                Notes = '".$_POST['notes']."',
                AbsentList = '$absentlist',
+ 			  NoteTaker = '".$user->user."',
                Status = 'done' WHERE ID = '".$_GET['ID']."'") or die(ofirst_dberror());
!       echo "<br><br>Meeting updated! [ <a href='index.php'>Meetings</a> ]<br><br>";
        die(include_once($footer));
      }
***************
*** 69,90 ****
  <h2>Meeting Viewer</h2>
  <table width="64%">
!   <tr>
      <th width="24%">&nbsp;</th>
      <th width="76%">Meeting for <?php echo date("F j, Y",$meeting->ForDate); ?></th>
    </tr>
!   <tr>
      <td valign="top"> <div align="right"><strong>Description:</strong></div></td>
      <td><?php echo $meeting->Description; ?></td>
    </tr>
!   <tr>
      <td><div align="right"><strong>Arranged For:</strong></div></td>
!     <td><p>
!     <?php
! 
!     // List people who meeting was arranged for
!     echo $meeting->ArrangedFor;
! 
!     ?>
!       </p></td>
    </tr>
    <?php
--- 70,96 ----
  <h2>Meeting Viewer</h2>
  <table width="64%">
!   <tr> 
      <th width="24%">&nbsp;</th>
      <th width="76%">Meeting for <?php echo date("F j, Y",$meeting->ForDate); ?></th>
    </tr>
!   <tr> 
!     <td valign="top"><div align="right"><strong>Called By:</strong></div></td>
!     <td>David Di Biase</td>
!   </tr>
!   <tr> 
      <td valign="top"> <div align="right"><strong>Description:</strong></div></td>
      <td><?php echo $meeting->Description; ?></td>
    </tr>
!   <tr> 
!     <td><div align="right"><strong>Called By:</strong></div></td>
!     <td><?php echo $meeting->CalledBy; ?></td>
!   </tr>
!   <tr> 
!     <td><div align="right"><strong>Finishes at:</strong></div></td>
!     <td><?php echo $meeting->EndHour.":".$meeting->EndMinute; ?></td>
!   </tr>
!   <tr> 
      <td><div align="right"><strong>Arranged For:</strong></div></td>
!     <td><?php echo str_replace(",",", ",$meeting->ArrangedFor); ?></td>
    </tr>
    <?php
***************
*** 92,102 ****
      if($meeting->Status == "done"){
    ?>
!   <tr>
      <td><div align="right"><strong>Notes:</strong></div></td>
      <td><?php echo $meeting->Notes; ?></td>
    </tr>
!   <tr>
      <td><div align="right"><strong>Absent List:</strong></div></td>
!     <td><?php echo $meeting->AbsentList; ?></td>
    </tr>
    <?php } ?>
--- 98,116 ----
      if($meeting->Status == "done"){
    ?>
!   <tr> 
!     <th>&nbsp;</th>
!     <th>Meeting Notes</th>
!   </tr>
!   <tr> 
      <td><div align="right"><strong>Notes:</strong></div></td>
      <td><?php echo $meeting->Notes; ?></td>
    </tr>
!   <tr> 
!     <td><div align="right"><strong>Note Taker:</strong></div></td>
!     <td><?php echo $meeting->NoteTaker; ?></td>
!   </tr>
!   <tr> 
      <td><div align="right"><strong>Absent List:</strong></div></td>
!     <td><?php echo str_replace(",",", ",$meeting->AbsentList); ?></td>
    </tr>
    <?php } ?>
***************
*** 107,120 ****
  ?>
  <form onsubmit="return dhtmlEditorPrepareSubmit();" action='viewmeeting.php?ID=<?php echo $_GET['ID']; ?>' method='POST'>
! <table width="48%">
!   <tr>
!     <th width="19%">&nbsp;</th>
!     <th width="31%">Plan New Meeting</th>
!   </tr>
!   <tr>
!     <td valign="top">
! <div align="right">Notes:</div></td>
!     <td>
!   <?php
  
          // If WYSIWYG function is set then view the WYSIWYG function module
--- 121,133 ----
  ?>
  <form onsubmit="return dhtmlEditorPrepareSubmit();" action='viewmeeting.php?ID=<?php echo $_GET['ID']; ?>' method='POST'>
!   <table width="48%">
!     <tr> 
!       <th width="19%">&nbsp;</th>
!       <th width="31%">Meeting Completed Notes</th>
!     </tr>
!     <tr> 
!       <td valign="top"> <div align="right">Notes:</div></td>
!       <td> 
!         <?php
  
          // If WYSIWYG function is set then view the WYSIWYG function module
***************
*** 126,168 ****
  
    ?>
!     </td>
!   </tr>
!   <tr>
!     <td><div align="right">Please list the people who were <strong>NOT</strong>
!         present:</div></td>
!     <td><p>
!           <select name="absent[]" size="6" multiple width='60'>
!             <option>none</option>
!   <?php
! 
          // Make a list of people who were present at the meeting
!         $assign = explode(",",$meeting->ArrangedFor);
!         foreach($assign as $assign){
! 
!           // Run through the groups and find values
!           $query = ofirst_dbquery("SELECT * FROM ofirst_projects_groups WHERE ID = '".$assign."'");
!           $group = ofirst_dbfetch_object($query);
! 
!           $people = explode(",",$group->Members);
! 
!           // Remove any duplicated names in the array
!           $people = array_unique($people);
! 
!         }
!         // List the people currently in the array
!         foreach($people as $people){
!           echo "\n            <option>$people</option>";
          }
- 
      ?>
            </select>
!         <font size="2"></font></p></td>
!   </tr>
!   <tr>
!     <td>&nbsp;</td>
!     <td><input name="update" type="submit" id="update" value="Update Meeting">
!       <input type="reset" name="Reset" value="Reset"> </td>
!   </tr>
! </table></form>
  <br>
  <?php
--- 139,176 ----
  
    ?>
!       </td>
!     </tr>
!     <tr> 
!       <td><div align="right">Note Taker:</div></td>
!       <td> <?php echo $user->user." (".$user->firstname." ".$user->lastname.")"; ?> 
!       </td>
!     </tr>
!     <tr> 
!       <td><div align="right">Please list the people who were <strong>NOT</strong> 
!           present:</div></td>
!       <td><p> 
!           <select name="absent[]" size="6" style="width: 250px;" multiple width='60'>
!             <option value="none">No one absent!</option>
!             <?php
          // Make a list of people who were present at the meeting
!         $listdivisions = explode(",",$meeting->ArrangedFor);
!         foreach($listdivisions as $division){
!           // Loop through selected divisions and display the proper persons
!           $memberquery = ofirst_dbquery("SELECT * FROM ofirst_members WHERE Division = '".$division."';");
! 		  while($members = ofirst_dbfetch_object($memberquery)){
! 		     echo "<option>".$members->user."</option>\n";
! 		  }
          }
      ?>
            </select>
!           <font size="2"></font></p></td>
!     </tr>
!     <tr> 
!       <td>&nbsp;</td>
!       <td><input name="update" type="submit" id="update" value="Update Meeting"> 
!         <input type="reset" name="Reset" value="Reset"> </td>
!     </tr>
!   </table>
! </form>
  <br>
  <?php