From 4864f9b2fba34b9c5130b9af518a2430afedeb75 Mon Sep 17 00:00:00 2001
From: sunsetsystems <sunsetsystems>
Date: Wed, 28 Jun 2006 17:49:00 +0000
Subject: [PATCH] calendar updates: support for preferred category in IN event,
 visual improvements, some bug fixes

---
 interface/main/calendar/add_edit_event.php         |  99 ++-
 interface/main/calendar/find_appt_popup.php        |  71 +-
 .../pntemplates/default/views/day/default.html     | 101 ++-
 .../pntemplates/default/views/week/default.html    | 100 ++-
 .../calendar/modules/PostCalendar/pnuserapi.php    | 720 +++++++++++----------
 sql/2_8_1-to-2_8_2_upgrade.sql                     |   4 +-
 sql/database.sql                                   |   1 +
 7 files changed, 678 insertions(+), 418 deletions(-)

diff --git a/interface/main/calendar/add_edit_event.php b/interface/main/calendar/add_edit_event.php
index f4ef4567c..8745b71ec 100644
--- a/interface/main/calendar/add_edit_event.php
+++ b/interface/main/calendar/add_edit_event.php
@@ -1,5 +1,5 @@
 <?
- // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com>
+ // Copyright (C) 2005-2006 Rod Roark <rod@sunsetsystems.com>
  //
  // This program is free software; you can redistribute it and/or
  // modify it under the terms of the GNU General Public License
@@ -10,10 +10,11 @@
 
  //------------------------------------------------------------//
  // Category __________________V   O All day event             //
- // Date     _____________ [?]     O Date     ___:___ __V      //
- // Title    ___________________     Duration ____ minutes     //
- // Provider __________________V   X Repeats  _____________V   //
- // Patient  ___________________     Until    ___________ [?]  //
+ // Date     _____________ [?]     O Time     ___:___ __V      //
+ // Title    ___________________     duration ____ minutes     //
+ // Patient  _(Click_to_select)_                               //
+ // Provider __________________V   X Repeats  ______V ______V  //
+ // Status   __________________V     until    __________ [?]   //
  // Comments ________________________________________________  //
  //                                                            //
  //       [Save]  [Find Available]  [Delete]  [Cancel]         //
@@ -24,9 +25,10 @@
 
  // Things that might be passed by our opener.
  //
- $eid        = $_GET['eid'];         // only for existing events
- $date       = $_GET['date'];        // this and below only for new events
- $userid     = $_GET['userid'];
+ $eid           = $_GET['eid'];         // only for existing events
+ $date          = $_GET['date'];        // this and below only for new events
+ $userid        = $_GET['userid'];
+ $default_catid = $_GET['catid'] ? $_GET['catid'] : '5';
  //
  if ($date)
   $date = substr($date, 0, 4) . '-' . substr($date, 4, 2) . '-' . substr($date, 6);
@@ -113,14 +115,15 @@
     "pc_startTime = '$starttime', "                                    .
     "pc_endTime = '$endtime', "                                        .
     "pc_alldayevent = '" . $_POST['form_allday']               . "', " .
-    "pc_apptstatus = '"  . $_POST['form_apptstatus']           . "' "  .
+    "pc_apptstatus = '"  . $_POST['form_apptstatus']           . "', "  .
+    "pc_prefcatid = '"   . $_POST['form_prefcat']              . "' "  .
     "WHERE pc_eid = '$eid'");
   } else {
    sqlInsert("INSERT INTO openemr_postcalendar_events ( " .
     "pc_catid, pc_aid, pc_pid, pc_title, pc_time, pc_hometext, " .
     "pc_informant, pc_eventDate, pc_endDate, pc_duration, pc_recurrtype, " .
     "pc_recurrspec, pc_startTime, pc_endTime, pc_alldayevent, " .
-    "pc_apptstatus, pc_location, pc_eventstatus, pc_sharing " .
+    "pc_apptstatus, pc_prefcatid, pc_location, pc_eventstatus, pc_sharing " .
     ") VALUES ( " .
     "'" . $_POST['form_category']             . "', " .
     "'" . $_POST['form_provider']             . "', " .
@@ -138,6 +141,7 @@
     "'$endtime', "                                    .
     "'" . $_POST['form_allday']               . "', " .
     "'" . $_POST['form_apptstatus']           . "', " .
+    "'" . $_POST['form_prefcat']              . "', " .
     "'$locationspec', "                               .
     "1, " .
     "1 )");
@@ -260,6 +264,7 @@ td { font-size:10pt; }
  // Read the event categories, generate their options list, and get
  // the default event duration from them if this is a new event.
  $catoptions = "";
+ $prefcat_options = "    <option value='0'>-- None --</option>\n";
  $thisduration = 0;
  if ($eid) {
   $thisduration = $row['pc_alldayevent'] ? 1440 : round($row['pc_duration'] / 60);
@@ -273,12 +278,22 @@ td { font-size:10pt; }
   if ($eid) {
    if ($crow['pc_catid'] == $row['pc_catid']) $catoptions .= " selected";
   } else {
-   if ($crow['pc_catid'] == '5') { // office visit
+   if ($crow['pc_catid'] == $default_catid) {
     $catoptions .= " selected";
     $thisduration = $duration;
    }
   }
   $catoptions .= ">" . $crow['pc_catname'] . "</option>\n";
+
+  // This section is to build the list of preferred categories:
+  if ($duration) {
+   $prefcat_options .= "    <option value='" . $crow['pc_catid'] . "'";
+   if ($eid) {
+    if ($crow['pc_catid'] == $row['pc_prefcatid']) $prefcat_options .= " selected";
+   }
+   $prefcat_options .= ">" . $crow['pc_catname'] . "</option>\n";
+  }
+
  }
 ?>
 
@@ -298,12 +313,37 @@ td { font-size:10pt; }
 
  // Do whatever is needed when a new event category is selected.
  // For now this means changing the event title and duration.
+ function set_display() {
+  var f = document.forms[0];
+  var s = f.form_category;
+  if (s.selectedIndex >= 0) {
+   var catid = s.options[s.selectedIndex].value;
+   var style_apptstatus = document.getElementById('title_apptstatus').style;
+   var style_prefcat = document.getElementById('title_prefcat').style;
+   if (catid == '2') { // In Office
+    style_apptstatus.display = 'none';
+    style_prefcat.display = '';
+    f.form_apptstatus.style.display = 'none';
+    f.form_prefcat.style.display = '';
+   } else {
+    style_prefcat.display = 'none';
+    style_apptstatus.display = '';
+    f.form_prefcat.style.display = 'none';
+    f.form_apptstatus.style.display = '';
+   }
+  }
+ }
+
+ // Do whatever is needed when a new event category is selected.
+ // For now this means changing the event title and duration.
  function set_category() {
   var f = document.forms[0];
   var s = f.form_category;
   if (s.selectedIndex >= 0) {
+   var catid = s.options[s.selectedIndex].value;
    f.form_title.value = s.options[s.selectedIndex].text;
-   f.form_duration.value = durations[s.options[s.selectedIndex].value];
+   f.form_duration.value = durations[catid];
+   set_display();
   }
  }
 
@@ -365,8 +405,20 @@ td { font-size:10pt; }
  // Invoke the find-available popup.
  function find_available() {
   var s = document.forms[0].form_provider;
-  dlgopen('find_appt_popup.php?providerid=' + s.options[s.selectedIndex].value,
-   '_blank', 500, 400);
+  var c = document.forms[0].form_category;
+  dlgopen('find_appt_popup.php?providerid=' + s.options[s.selectedIndex].value +
+   '&catid=' + c.options[c.selectedIndex].value, '_blank', 500, 400);
+ }
+
+ // Check for errors when the form is submitted.
+ function validate() {
+  var f = document.forms[0];
+  if (f.form_repeat.checked &&
+      (! f.form_enddate.value || f.form_enddate.value < f.form_date.value)) {
+   alert('An end date later than the start date is required for repeated events!');
+   return false;
+  }
+  return true;
  }
 
 </script>
@@ -378,7 +430,8 @@ td { font-size:10pt; }
 <!-- Required for the popup date selectors -->
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
 
-<form method='post' name='theform' action='add_edit_event.php?eid=<? echo $eid ?>'>
+<form method='post' name='theform' action='add_edit_event.php?eid=<? echo $eid ?>'
+ onsubmit='return validate()'>
 <center>
 
 <table border='0' width='100%'>
@@ -533,9 +586,11 @@ td { font-size:10pt; }
 
  <tr>
   <td nowrap>
-   <b><? xl('Status','e'); ?>:</b>
+   <span id='title_apptstatus'><b><? xl('Status','e'); ?>:</b></span>
+   <span id='title_prefcat' style='display:none'><b><? xl('Pref Cat','e'); ?>:</b></span>
   </td>
   <td nowrap>
+
    <select name='form_apptstatus' style='width:100%' title='Appointment status'>
 <?
  foreach ($statuses as $key => $value) {
@@ -545,6 +600,14 @@ td { font-size:10pt; }
  }
 ?>
    </select>
+   <!--
+    The following list will be invisible unless this is an In Office
+    event, in which case form_apptstatus (above) is to be invisible.
+   -->
+   <select name='form_prefcat' style='width:100%;display:none' title='Preferred Event Category'>
+<? echo $prefcat_options ?>
+   </select>
+
   </td>
   <td nowrap>
    &nbsp;
@@ -609,7 +672,9 @@ td { font-size:10pt; }
 </center>
 </form>
 <script language='JavaScript'>
-<? if (! $eid) { ?>
+<? if ($eid) { ?>
+ set_display();
+<? } else { ?>
  set_category();
 <? } ?>
  set_allday();
diff --git a/interface/main/calendar/find_appt_popup.php b/interface/main/calendar/find_appt_popup.php
index b481b4c8c..99e3f9a31 100644
--- a/interface/main/calendar/find_appt_popup.php
+++ b/interface/main/calendar/find_appt_popup.php
@@ -9,9 +9,11 @@
  include_once("../../globals.php");
  include_once("$srcdir/patient.inc");
 
+ $input_catid = $_REQUEST['catid'];
+
  // Record an event into the slots array for a specified day.
- function doOneDay($catid, $udate, $starttime, $duration) {
-  global $slots, $slotsecs, $slotstime, $slotbase, $slotcount;
+ function doOneDay($catid, $udate, $starttime, $duration, $prefcatid) {
+  global $slots, $slotsecs, $slotstime, $slotbase, $slotcount, $input_catid;
   $udate = strtotime($starttime, $udate);
   if ($udate < $slotstime) return;
   $i = (int) ($udate / $slotsecs) - $slotbase;
@@ -20,11 +22,21 @@
   if ($iend <= $i) $iend = $i + 1;
   for (; $i < $iend; ++$i) {
    if ($catid == 2) {        // in office
-    $slots[$i] |= 1;
-    break;
+    // If a category ID was specified when this popup was invoked, then select
+    // only IN events with a matching preferred category or with no preferred
+    // category; other IN events are to be treated as OUT events.
+    if ($input_catid) {
+     if ($prefcatid == $input_catid || !$prefcatid)
+      $slots[$i] |= 1;
+     else
+      $slots[$i] |= 2;
+    } else {
+     $slots[$i] |= 1;
+    }
+    break; // ignore any positive duration for IN
    } else if ($catid == 3) { // out of office
     $slots[$i] |= 2;
-    break;
+    break; // ignore any positive duration for OUT
    } else { // all other events reserve time
     $slots[$i] |= 4;
    }
@@ -34,6 +46,12 @@
  // seconds per time slot
  $slotsecs = $GLOBALS['calendar_interval'] * 60;
 
+ $catslots = 1;
+ if ($input_catid) {
+  $srow = sqlQuery("SELECT pc_duration FROM openemr_postcalendar_categories WHERE pc_catid = '$input_catid'");
+  if ($srow['pc_duration']) $catslots = ceil($srow['pc_duration'] / $slotsecs);
+ }
+
  $info_msg = "";
 
  $searchdays = 7; // default to a 1-week lookahead
@@ -78,9 +96,9 @@
 
   // Note there is no need to sort the query results.
   $query = "SELECT pc_eventDate, pc_endDate, pc_startTime, pc_duration, " .
-   "pc_recurrtype, pc_recurrspec, pc_alldayevent, pc_catid " .
-   "FROM openemr_postcalendar_events WHERE " .
-   "pc_aid = '$providerid' AND " .
+   "pc_recurrtype, pc_recurrspec, pc_alldayevent, pc_catid, pc_prefcatid " .
+   "FROM openemr_postcalendar_events " .
+   "WHERE pc_aid = '$providerid' AND " .
    "((pc_endDate >= '$sdate' AND pc_eventDate < '$edate') OR " .
    "(pc_endDate = '0000-00-00' AND pc_eventDate >= '$sdate' AND pc_eventDate < '$edate'))";
   $res = sqlStatement($query);
@@ -88,12 +106,28 @@
   while ($row = sqlFetchArray($res)) {
    $thistime = strtotime($row['pc_eventDate'] . " 00:00:00");
    if ($row['pc_recurrtype']) {
+
     preg_match('/"event_repeat_freq_type";s:1:"(\d)"/', $row['pc_recurrspec'], $matches);
     $repeattype = $matches[1];
+
+    preg_match('/"event_repeat_freq";s:1:"(\d)"/', $row['pc_recurrspec'], $matches);
+    $repeatfreq = $matches[1];
+    if (! $repeatfreq) $repeatfreq = 1;
+
     $endtime = strtotime($row['pc_endDate'] . " 00:00:00") + (24 * 60 * 60);
     if ($endtime > $slotetime) $endtime = $slotetime;
+
+    $repeatix = 0;
     while ($thistime < $endtime) {
-     doOneDay($row['pc_catid'], $thistime, $row['pc_startTime'], $row['pc_duration']);
+
+     // Skip the event if a repeat frequency > 1 was specified and this is
+     // not the desired occurrence.
+     if (! $repeatix) {
+      doOneDay($row['pc_catid'], $thistime, $row['pc_startTime'],
+       $row['pc_duration'], $row['pc_prefcatid']);
+     }
+     if (++$repeatix >= $repeatfreq) $repeatix = 0;
+
      $adate = getdate($thistime);
      if ($repeattype == 0)        { // daily
       $adate['mday'] += 1;
@@ -116,7 +150,8 @@
      $thistime = mktime(0, 0, 0, $adate['mon'], $adate['mday'], $adate['year']);
     }
    } else {
-    doOneDay($row['pc_catid'], $thistime, $row['pc_startTime'], $row['pc_duration']);
+    doOneDay($row['pc_catid'], $thistime, $row['pc_startTime'],
+     $row['pc_duration'], $row['pc_prefcatid']);
    }
   }
 
@@ -158,7 +193,7 @@ td { font-size:10pt; }
 <body <?echo $top_bg_line;?>>
 <?
 ?>
-<form method='post' name='theform' action='find_appt_popup.php?providerid=<? echo $providerid ?>'>
+<form method='post' name='theform' action='find_appt_popup.php?providerid=<?php echo $providerid ?>&catid=<?php echo $input_catid ?>'>
 <center>
 
 <table border='0' cellpadding='5' cellspacing='0'>
@@ -201,10 +236,16 @@ td { font-size:10pt; }
 <?
   $lastdate = "";
   for ($i = 0; $i < $slotcount; ++$i) {
-   if ($slots[$i] >= 4) continue;
+
+   $available = true;
+   for ($j = $i; $j < $i + $catslots; ++$j) {
+    if ($slots[$j] >= 4) $available = false;
+   }
+   if (!$available) continue; // skip reserved slots
+
    $utime = ($slotbase + $i) * $slotsecs;
    $thisdate = date("Y-m-d", $utime);
-   if ($thisdate != $lastdate) {
+   if ($thisdate != $lastdate) { // if a new day, start a new row
     if ($lastdate) {
      echo "</td>\n";
      echo " </tr>\n";
@@ -223,6 +264,10 @@ td { font-size:10pt; }
     $adate['hours'] . "," .
     $adate['minutes'] . ")'>";
    echo $anchor . date("H:i", $utime) . "</a> ";
+
+   // If category duration is more than 1 slot, increment $i appropriately.
+   // This is to avoid reporting available times on undesirable boundaries.
+   $i += $catslots - 1;
   }
   if ($lastdate) {
    echo "</td>\n";
diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html
index 98fc8d0c7..d8d8fe9eb 100644
--- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html
+++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html
@@ -3,7 +3,7 @@
 [-* This is the source code for both day/default.html and week/default.html.  *-]
 [-* They should always be identical.  If you change one, copy to the other!   *-]
 [-*****************************************************************************-]
-[-* Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com> and others           *-]
+[-* Copyright (C) 2005-2006 Rod Roark <rod@sunsetsystems.com> and others      *-]
 [-*                                                                           *-]
 [-* This program is free software; you can redistribute it and/or             *-]
 [-* modify it under the terms of the GNU General Public License               *-]
@@ -42,10 +42,10 @@ a       { text-decoration:none; }
   document.forms[0].submit();
  }
 
- function newEvt(startampm, starttimeh, starttimem, eventdate, providerid) {
+ function newEvt(startampm, starttimeh, starttimem, eventdate, providerid, catid) {
   dlgopen('add_edit_event.php?startampm=' + startampm +
    '&starttimeh=' + starttimeh + '&starttimem=' + starttimem +
-   '&date=' + eventdate + '&userid=' + providerid,
+   '&date=' + eventdate + '&userid=' + providerid + '&catid=' + catid,
    '_blank', 550, 270);
  }
 
@@ -68,7 +68,6 @@ a       { text-decoration:none; }
    theForm.submit();
  }
 
-
 </script>
 
 <!-- Required for the popup date selectors -->
@@ -76,13 +75,21 @@ a       { text-decoration:none; }
 
 [-php-]
 
+ // A_CATEGORY is an ordered array of associative-array categories.
+ // Keys of interest are: id, name, color, desc, event_duration.
+ //
+ // echo "<!-- A_CATEGORY = "; print_r($this->_tpl_vars['A_CATEGORY']); echo " -->\n"; // debugging
+ // echo "<!-- A_EVENTS = "; print_r($this->_tpl_vars['A_EVENTS']); echo " -->\n"; // debugging
+
+ $A_CATEGORY  =& $this->_tpl_vars['A_CATEGORY'];
+
  // [-if $PRINT_VIEW != 1-]
  // [-*Main Navigation*-]
  // [-include file="$TPL_NAME/views/global/navigation.html"-]
  // [-/if-]
 
  $A_EVENTS  =& $this->_tpl_vars['A_EVENTS'];
- $S_EVENTS  =& $this->_tpl_vars['S_EVENTS'];
+ // $S_EVENTS  =& $this->_tpl_vars['S_EVENTS']; // Deleted by Rod
  $providers =& $this->_tpl_vars['providers'];
  $times     =& $this->_tpl_vars['times'];
  $interval  =  $this->_tpl_vars['interval'];
@@ -148,7 +155,7 @@ a       { text-decoration:none; }
 
  // Show the Add and Search buttons.
  echo "  <td align='right' valign='top' width='33%' nowrap>\n";
- echo "   <input type='button' value='Add' onclick='newEvt(1, 9, 00, $Date, 0)' />\n";
+ echo "   <input type='button' value='Add' onclick='newEvt(1, 9, 00, $Date, 0, 0)' />\n";
  echo "   <input type='button' value='Search' onclick='location=\"index.php?module=PostCalendar&func=search\"' />\n";
  echo "  </td>\n";
  echo " </tr>\n";
@@ -224,9 +231,9 @@ a       { text-decoration:none; }
    // Repeat doc names at 1PM.  This is a kludge; omit it for released code.
    // if ($starttimeh == 13 && $starttimem == 0) $need_headers = true;
 
-   // Get all events just for this time slot now, because we can pick up where
-   // we left off and because we don't want to re-scan all events for the day
-   // for each table cell.
+   // Get all events for all providers just for this time slot now, because we
+   // can pick up where we left off and because we don't want to re-scan all
+   // events for the day for each table cell.
    //
    $arr_slot = array();
    for (; isset($slotkey); list($slotkey, $slotevent) = each($arr_events)) {
@@ -242,20 +249,42 @@ a       { text-decoration:none; }
     $durminutes = ceil($slotevent['duration'] / 60);
     $durslots = ceil($durminutes / $interval);
 
-    // While we're here, collect information for setting cell colors.
+    // While we're here, collect information for cell cosmetics.
     if ($catid == 2) { // in office
      $provstat[$providerid]['in'] = true;
+
+     // Save preferred category info for this IN event.
+     $provstat[$providerid]['in_cat'] = -1;
+     $provstat[$providerid]['in_slot0'] = $slotindex;
+     $provstat[$providerid]['in_slots'] = 1;
+     if ($slotevent['prefcatid']) {
+      foreach ($A_CATEGORY as $catkey => $catval) {
+       if ($catval['id'] == $slotevent['prefcatid']) {
+        $provstat[$providerid]['in_cat'] = $catkey;
+        $provstat[$providerid]['in_slots'] =
+         ceil(ceil($catval['event_duration'] / 60) / $interval);
+        break;
+       }
+      }
+      // Debugging:
+      if ($provstat[$providerid]['in_cat'] < 0) {
+       echo "<!-- Unmatched prefcatid = " . $slotevent['prefcatid'] . " -->\n"; // debugging
+      }
+     }
+
     }
     else if ($catid == 3) { // out of office
      $provstat[$providerid]['in'] = false;
     }
     else if ($catid == 4 || $catid == 8 || $catid == 11) { // unavailable types
+     // unavailable slots are marked 'res' for appropriate coloring.
      $endindex = $slotindex + $durslots;
      for ($i = $slotindex; $i < $endindex; ++$i) {
       $provstat[$providerid][$i]['res'] = true;
      }
     }
-    // if duration > slot size then mark slots for border control.
+    // If duration > slot size then mark slots for border control.  A slot
+    // marked 'ext' is not to have a border between itself and the slot below.
     if ($durslots > 1) {
      $endindex = $slotindex + $durslots - 1;
      for ($i = $slotindex; $i < $endindex; ++$i) {
@@ -263,6 +292,7 @@ a       { text-decoration:none; }
      }
     }
    }
+   // Finished getting event information for this time slot.
 
    // Write a header row with the provider names if appropriate.
    if ($need_headers) {
@@ -284,6 +314,19 @@ a       { text-decoration:none; }
    foreach ($providers as $provider) {
     $providerid = $provider['id'];
 
+    // Mark this as a no-bottom-border slot if the preferred category
+    // duration extends beyond it.
+    //
+    // echo "<!-- slotindex=$slotindex in=" . $provstat[$providerid]['in'] .
+    //  " in_cat=" . $provstat[$providerid]['in_cat'] .
+    //  " in_slot0=" . $provstat[$providerid]['in_slot0'] .
+    //  " in_slots=" . $provstat[$providerid]['in_slots'] . " -->\n"; // debugging
+    //
+    if ($provstat[$providerid]['in']) {
+     if (($slotindex + 1 - $provstat[$providerid]['in_slot0']) % $provstat[$providerid]['in_slots'])
+      $provstat[$providerid][$slotindex]['ext'] = true;
+    }
+
     $content = ""; // this will be the event cell content
 
     $clsuffix = "acell";
@@ -295,7 +338,8 @@ a       { text-decoration:none; }
     // time slots or when the practitioner is not in-office.  Using "rowspan"
     // would be a difficult and inferior solution to this problem.
     //
-    $tdstyle="";
+    $tdstyle = "";
+    $timelabel = true;
     if ($slotindex < $lastslotindex &&
         ($provstat[$providerid][$slotindex]['ext'] || !$provstat[$providerid]['in'])) {
      $tdstyle .= " nobot";
@@ -303,18 +347,39 @@ a       { text-decoration:none; }
     if ($slotindex > 0 && ($provstat[$providerid][$slotindex-1]['ext'] ||
         !($provstat[$providerid]['in'] || $provstat[$providerid]['wasin']))) {
      $tdstyle .= " notop";
+     $timelabel = false;
     }
 
     $disptimeh = ($starttimeh > 12) ? ($starttimeh - 12) : $starttimeh;
 
-    echo "  <td class='t$clsuffix'";
+    $in_cat_id = 0;
+    if ($provstat[$providerid]['in_cat'] >= 0) {
+     $category =& $A_CATEGORY[$provstat[$providerid]['in_cat']];
+     $in_cat_id = $category['id'];
+    }
+
+    // If a slot omits the top border, then we omit the TOD cell's top border
+    // and skip writing its time-of-day text.  This way we can get some rows
+    // with no content at all, which should produce a more compact and readable
+    // calendar display.
+
+    echo "  <td class='t$clsuffix$tdstyle'";
     if ($slotindex == 0) echo " width='1%'";
     echo ">";
-    echo "<a href='javascript:newEvt($startampm,$starttimeh,$starttimem,$eventdate,$providerid)'>";
-    echo "$disptimeh:$starttimem";
-    echo "</a></td>\n";
+    if ($timelabel) {
+     echo "<a href='javascript:newEvt($startampm,$starttimeh,$starttimem,$eventdate,$providerid,$in_cat_id)'>";
+     echo "$disptimeh:$starttimem</a>";
+    } else {
+     echo "<span style='font-size:1px'>&nbsp;</span>";
+    }
+    echo "</td>\n";
 
-    echo "  <td class='e$clsuffix$tdstyle'>";
+    echo "  <td class='e$clsuffix$tdstyle'";
+    if ($clsuffix == "acell" && $in_cat_id) {
+     echo " style='background-color:" . $category['color'] . "'";
+     echo " title='" . $category['name'] . "'";
+    }
+    echo ">";
 
     // Scan all events for this time slot and generate the associated HTML for
     // this doc.  JavaScript is used in hrefs to reduce the volume of output.
@@ -369,7 +434,7 @@ a       { text-decoration:none; }
      }
     } // end while
 
-    if (! $content) $content = "&nbsp;";
+    if (! $content) $content = "<span style='font-size:1px'>&nbsp;</span>";
     echo $content . "</td>\n";
 
     // Keep track of whether the doc was in during the previous time slot.
diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html
index 184029f8d..d8d8fe9eb 100644
--- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html
+++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html
@@ -3,7 +3,7 @@
 [-* This is the source code for both day/default.html and week/default.html.  *-]
 [-* They should always be identical.  If you change one, copy to the other!   *-]
 [-*****************************************************************************-]
-[-* Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com> and others           *-]
+[-* Copyright (C) 2005-2006 Rod Roark <rod@sunsetsystems.com> and others      *-]
 [-*                                                                           *-]
 [-* This program is free software; you can redistribute it and/or             *-]
 [-* modify it under the terms of the GNU General Public License               *-]
@@ -42,10 +42,10 @@ a       { text-decoration:none; }
   document.forms[0].submit();
  }
 
- function newEvt(startampm, starttimeh, starttimem, eventdate, providerid) {
+ function newEvt(startampm, starttimeh, starttimem, eventdate, providerid, catid) {
   dlgopen('add_edit_event.php?startampm=' + startampm +
    '&starttimeh=' + starttimeh + '&starttimem=' + starttimem +
-   '&date=' + eventdate + '&userid=' + providerid,
+   '&date=' + eventdate + '&userid=' + providerid + '&catid=' + catid,
    '_blank', 550, 270);
  }
 
@@ -75,13 +75,21 @@ a       { text-decoration:none; }
 
 [-php-]
 
+ // A_CATEGORY is an ordered array of associative-array categories.
+ // Keys of interest are: id, name, color, desc, event_duration.
+ //
+ // echo "<!-- A_CATEGORY = "; print_r($this->_tpl_vars['A_CATEGORY']); echo " -->\n"; // debugging
+ // echo "<!-- A_EVENTS = "; print_r($this->_tpl_vars['A_EVENTS']); echo " -->\n"; // debugging
+
+ $A_CATEGORY  =& $this->_tpl_vars['A_CATEGORY'];
+
  // [-if $PRINT_VIEW != 1-]
  // [-*Main Navigation*-]
  // [-include file="$TPL_NAME/views/global/navigation.html"-]
  // [-/if-]
 
  $A_EVENTS  =& $this->_tpl_vars['A_EVENTS'];
- $S_EVENTS  =& $this->_tpl_vars['S_EVENTS'];
+ // $S_EVENTS  =& $this->_tpl_vars['S_EVENTS']; // Deleted by Rod
  $providers =& $this->_tpl_vars['providers'];
  $times     =& $this->_tpl_vars['times'];
  $interval  =  $this->_tpl_vars['interval'];
@@ -147,7 +155,7 @@ a       { text-decoration:none; }
 
  // Show the Add and Search buttons.
  echo "  <td align='right' valign='top' width='33%' nowrap>\n";
- echo "   <input type='button' value='Add' onclick='newEvt(1, 9, 00, $Date, 0)' />\n";
+ echo "   <input type='button' value='Add' onclick='newEvt(1, 9, 00, $Date, 0, 0)' />\n";
  echo "   <input type='button' value='Search' onclick='location=\"index.php?module=PostCalendar&func=search\"' />\n";
  echo "  </td>\n";
  echo " </tr>\n";
@@ -223,9 +231,9 @@ a       { text-decoration:none; }
    // Repeat doc names at 1PM.  This is a kludge; omit it for released code.
    // if ($starttimeh == 13 && $starttimem == 0) $need_headers = true;
 
-   // Get all events just for this time slot now, because we can pick up where
-   // we left off and because we don't want to re-scan all events for the day
-   // for each table cell.
+   // Get all events for all providers just for this time slot now, because we
+   // can pick up where we left off and because we don't want to re-scan all
+   // events for the day for each table cell.
    //
    $arr_slot = array();
    for (; isset($slotkey); list($slotkey, $slotevent) = each($arr_events)) {
@@ -241,20 +249,42 @@ a       { text-decoration:none; }
     $durminutes = ceil($slotevent['duration'] / 60);
     $durslots = ceil($durminutes / $interval);
 
-    // While we're here, collect information for setting cell colors.
+    // While we're here, collect information for cell cosmetics.
     if ($catid == 2) { // in office
      $provstat[$providerid]['in'] = true;
+
+     // Save preferred category info for this IN event.
+     $provstat[$providerid]['in_cat'] = -1;
+     $provstat[$providerid]['in_slot0'] = $slotindex;
+     $provstat[$providerid]['in_slots'] = 1;
+     if ($slotevent['prefcatid']) {
+      foreach ($A_CATEGORY as $catkey => $catval) {
+       if ($catval['id'] == $slotevent['prefcatid']) {
+        $provstat[$providerid]['in_cat'] = $catkey;
+        $provstat[$providerid]['in_slots'] =
+         ceil(ceil($catval['event_duration'] / 60) / $interval);
+        break;
+       }
+      }
+      // Debugging:
+      if ($provstat[$providerid]['in_cat'] < 0) {
+       echo "<!-- Unmatched prefcatid = " . $slotevent['prefcatid'] . " -->\n"; // debugging
+      }
+     }
+
     }
     else if ($catid == 3) { // out of office
      $provstat[$providerid]['in'] = false;
     }
     else if ($catid == 4 || $catid == 8 || $catid == 11) { // unavailable types
+     // unavailable slots are marked 'res' for appropriate coloring.
      $endindex = $slotindex + $durslots;
      for ($i = $slotindex; $i < $endindex; ++$i) {
       $provstat[$providerid][$i]['res'] = true;
      }
     }
-    // if duration > slot size then mark slots for border control.
+    // If duration > slot size then mark slots for border control.  A slot
+    // marked 'ext' is not to have a border between itself and the slot below.
     if ($durslots > 1) {
      $endindex = $slotindex + $durslots - 1;
      for ($i = $slotindex; $i < $endindex; ++$i) {
@@ -262,6 +292,7 @@ a       { text-decoration:none; }
      }
     }
    }
+   // Finished getting event information for this time slot.
 
    // Write a header row with the provider names if appropriate.
    if ($need_headers) {
@@ -283,6 +314,19 @@ a       { text-decoration:none; }
    foreach ($providers as $provider) {
     $providerid = $provider['id'];
 
+    // Mark this as a no-bottom-border slot if the preferred category
+    // duration extends beyond it.
+    //
+    // echo "<!-- slotindex=$slotindex in=" . $provstat[$providerid]['in'] .
+    //  " in_cat=" . $provstat[$providerid]['in_cat'] .
+    //  " in_slot0=" . $provstat[$providerid]['in_slot0'] .
+    //  " in_slots=" . $provstat[$providerid]['in_slots'] . " -->\n"; // debugging
+    //
+    if ($provstat[$providerid]['in']) {
+     if (($slotindex + 1 - $provstat[$providerid]['in_slot0']) % $provstat[$providerid]['in_slots'])
+      $provstat[$providerid][$slotindex]['ext'] = true;
+    }
+
     $content = ""; // this will be the event cell content
 
     $clsuffix = "acell";
@@ -294,7 +338,8 @@ a       { text-decoration:none; }
     // time slots or when the practitioner is not in-office.  Using "rowspan"
     // would be a difficult and inferior solution to this problem.
     //
-    $tdstyle="";
+    $tdstyle = "";
+    $timelabel = true;
     if ($slotindex < $lastslotindex &&
         ($provstat[$providerid][$slotindex]['ext'] || !$provstat[$providerid]['in'])) {
      $tdstyle .= " nobot";
@@ -302,18 +347,39 @@ a       { text-decoration:none; }
     if ($slotindex > 0 && ($provstat[$providerid][$slotindex-1]['ext'] ||
         !($provstat[$providerid]['in'] || $provstat[$providerid]['wasin']))) {
      $tdstyle .= " notop";
+     $timelabel = false;
     }
 
     $disptimeh = ($starttimeh > 12) ? ($starttimeh - 12) : $starttimeh;
 
-    echo "  <td class='t$clsuffix'";
+    $in_cat_id = 0;
+    if ($provstat[$providerid]['in_cat'] >= 0) {
+     $category =& $A_CATEGORY[$provstat[$providerid]['in_cat']];
+     $in_cat_id = $category['id'];
+    }
+
+    // If a slot omits the top border, then we omit the TOD cell's top border
+    // and skip writing its time-of-day text.  This way we can get some rows
+    // with no content at all, which should produce a more compact and readable
+    // calendar display.
+
+    echo "  <td class='t$clsuffix$tdstyle'";
     if ($slotindex == 0) echo " width='1%'";
     echo ">";
-    echo "<a href='javascript:newEvt($startampm,$starttimeh,$starttimem,$eventdate,$providerid)'>";
-    echo "$disptimeh:$starttimem";
-    echo "</a></td>\n";
+    if ($timelabel) {
+     echo "<a href='javascript:newEvt($startampm,$starttimeh,$starttimem,$eventdate,$providerid,$in_cat_id)'>";
+     echo "$disptimeh:$starttimem</a>";
+    } else {
+     echo "<span style='font-size:1px'>&nbsp;</span>";
+    }
+    echo "</td>\n";
 
-    echo "  <td class='e$clsuffix$tdstyle'>";
+    echo "  <td class='e$clsuffix$tdstyle'";
+    if ($clsuffix == "acell" && $in_cat_id) {
+     echo " style='background-color:" . $category['color'] . "'";
+     echo " title='" . $category['name'] . "'";
+    }
+    echo ">";
 
     // Scan all events for this time slot and generate the associated HTML for
     // this doc.  JavaScript is used in hrefs to reduce the volume of output.
@@ -368,7 +434,7 @@ a       { text-decoration:none; }
      }
     } // end while
 
-    if (! $content) $content = "&nbsp;";
+    if (! $content) $content = "<span style='font-size:1px'>&nbsp;</span>";
     echo $content . "</td>\n";
 
     // Keep track of whether the doc was in during the previous time slot.
diff --git a/interface/main/calendar/modules/PostCalendar/pnuserapi.php b/interface/main/calendar/modules/PostCalendar/pnuserapi.php
index dc7816dba..bc7772261 100644
--- a/interface/main/calendar/modules/PostCalendar/pnuserapi.php
+++ b/interface/main/calendar/modules/PostCalendar/pnuserapi.php
@@ -51,374 +51,370 @@ function postcalendar_userapi_getLongDayName($args)
 /**
  *  postcalendar_userapi_buildView
  *
- *  Builds the month display
+ *  Builds the calendar display
  *  @param string $Date mm/dd/yyyy format (we should use timestamps)
  *  @return string generated html output
  *  @access public
  */
 function postcalendar_userapi_buildView($args)
 {
-    $print = pnVarCleanFromInput('print');
+	$print = pnVarCleanFromInput('print');
 	$show_days = pnVarCleanFromInput('show_days');
 	extract($args); unset($args);
-	$schedule_start =$GLOBALS[schedule_start];
+	$schedule_start = $GLOBALS[schedule_start];
 	$schedule_end = $GLOBALS[schedule_end];
 
+	// $times is an array of associative arrays, where each sub-array
+	// has keys 'hour', 'minute' and 'mer'.
+	//
+	$times = array();
 
+	// For each hour in the schedule...
+	//
+	for($blocknum = $schedule_start; $blocknum <= $schedule_end; $blocknum++){
+		$mer = ($blocknum >= 12) ? 'pm' : 'am';
 
-	//print "$schedule_start ,,, $schedule_end";
-	$times =array();
+		// $minute is an array of time slot strings within this hour.
+		$minute = array('00');
 
-	for($blocknum = ($schedule_start); $blocknum<= ($schedule_end);$blocknum++){
-
-		if($blocknum >= '12'){
-			$mer ='pm';
-		}
-		else{
-			$mer ='am';
-		}
-		$minute =array('00');
-
-		for($minutes =($GLOBALS['calendar_interval']); $minutes <= 60;$minutes +=$GLOBALS['calendar_interval']){
+		for($minutes = $GLOBALS['calendar_interval']; $minutes <= 60; $minutes += $GLOBALS['calendar_interval']) {
 			if($minutes <= '9'){
-			$under_ten ="0".$minutes;
-			array_push($minute,"$under_ten");
+			$under_ten = "0" . $minutes;
+			array_push($minute, "$under_ten");
 			}
-			else if($minutes >='60') {
+			else if($minutes >= '60') {
 				break;
 			}
-			else{
-				array_push($minute,"$minutes");
+			else {
+				array_push($minute, "$minutes");
 			}
-			//print_r($minute);
 		}
 
 		foreach($minute as $m ){
-			//print "$blocknum :$m $mer<br />";
-		array_push($times,array("hour"=>$blocknum,"minute"=>$m,"mer"=>$mer));
-
+			array_push($times, array("hour"=>$blocknum, "minute"=>$m, "mer"=>$mer));
 		}
 	}
 
-
-
-
-
 	//=================================================================
 	//  get the module's information
 	//=================================================================
 	$modinfo = pnModGetInfo(pnModGetIDFromName(__POSTCALENDAR__));
 	$pcDir = $modinfo['directory'];
 	unset($modinfo);
+
 	//=================================================================
 	//  grab the for post variable
 	//=================================================================
-
 	$pc_username = pnVarCleanFromInput('pc_username');
 	$category = pnVarCleanFromInput('pc_category');
 	$topic    = pnVarCleanFromInput('pc_topic');
+
 	//=================================================================
 	//  set the correct date
 	//=================================================================
 	$Date =& postcalendar_getDate();
-    //=================================================================
+
+	//=================================================================
 	//  get the current view
 	//=================================================================
     if(!isset($viewtype)) { $viewtype = 'month'; }
+
 	//=================================================================
-    //  Find out what Template we're using
-    //=================================================================
-    $template_name = _SETTING_TEMPLATE;
-    if(!isset($template_name)) { $template_name = 'default'; }
+	//  Find out what Template we're using
 	//=================================================================
-    //  Find out what Template View to use
-    //=================================================================
-    $template_view = pnVarCleanFromInput('tplview');
-    if(!isset($template_view)) { $template_view = 'default'; }
+	$template_name = _SETTING_TEMPLATE;
+	if(!isset($template_name)) { $template_name = 'default'; }
+
 	//=================================================================
-    //  See if the template view exists
-    //=================================================================
-    if(!file_exists("modules/$pcDir/pntemplates/$template_name/views/$viewtype/$template_view.html")) {
-    	$template_view_load = 'default';
-    } else {
-    	$template_view_load = pnVarPrepForOS($template_view);
-    }
+	//  Find out what Template View to use
 	//=================================================================
-    //  Grab the current theme information
-    //=================================================================
-    pnThemeLoad(pnUserGetTheme());
-    global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5, $bgcolor6, $textcolor1, $textcolor2;
+	$template_view = pnVarCleanFromInput('tplview');
+	if(!isset($template_view)) { $template_view = 'default'; }
+
 	//=================================================================
-    //  Insert necessary JavaScript into the page
-    //=================================================================
-    $output = pnModAPIFunc(__POSTCALENDAR__,'user','pageSetup');
+	//  See if the template view exists
 	//=================================================================
-    //  Setup Smarty Template Engine
-    //=================================================================
-    $tpl =& new pcSmarty();
+	if(!file_exists("modules/$pcDir/pntemplates/$template_name/views/$viewtype/$template_view.html")) {
+		$template_view_load = 'default';
+	} else {
+		$template_view_load = pnVarPrepForOS($template_view);
+	}
+
+	//=================================================================
+	//  Grab the current theme information
+	//=================================================================
+	pnThemeLoad(pnUserGetTheme());
+	global $bgcolor1, $bgcolor2, $bgcolor3, $bgcolor4, $bgcolor5, $bgcolor6, $textcolor1, $textcolor2;
+
+	//=================================================================
+	//  Insert necessary JavaScript into the page
+	//=================================================================
+	$output = pnModAPIFunc(__POSTCALENDAR__, 'user', 'pageSetup');
+
+	//=================================================================
+	//  Setup Smarty Template Engine
+	//=================================================================
+	$tpl =& new pcSmarty();
 
 	//if(!$tpl->is_cached("$template_name/views/$viewtype/$template_view_load.html",$cacheid)) {
 	//diable caching completely
 	if (true) {
 		//=================================================================
-    	//  Let's just finish setting things up
-    	//=================================================================
-    	$the_year   = substr($Date,0,4);
-    	$the_month  = substr($Date,4,2);
-    	$the_day    = substr($Date,6,2);
+		//  Let's just finish setting things up
+		//=================================================================
+		$the_year   = substr($Date,0,4);
+		$the_month  = substr($Date,4,2);
+		$the_day    = substr($Date,6,2);
 		$last_day = Date_Calc::daysInMonth($the_month,$the_year);
 
+		//=================================================================
+		//  populate the template object with information for
+		//  Month Names, Long Day Names and Short Day Names
+		//  as translated in the language files
+		//  (may be adding more here soon - based on need)
+		//=================================================================
+		$pc_month_names = array(_CALJAN,_CALFEB,_CALMAR,_CALAPR,_CALMAY,_CALJUN,
+			_CALJUL,_CALAUG,_CALSEP,_CALOCT,_CALNOV,_CALDEC);
+
+		$pc_short_day_names = array(_CALSUNDAYSHORT, _CALMONDAYSHORT,
+			_CALTUESDAYSHORT, _CALWEDNESDAYSHORT,
+			_CALTHURSDAYSHORT, _CALFRIDAYSHORT,
+			_CALSATURDAYSHORT);
+
+		$pc_long_day_names = array(_CALSUNDAY, _CALMONDAY,
+			_CALTUESDAY, _CALWEDNESDAY,
+			_CALTHURSDAY, _CALFRIDAY,
+			_CALSATURDAY);
+		//=================================================================
+		//  here we need to set up some information for later
+		//  variable creation.  This helps us establish the correct
+		//  date ranges for each view.  There may be a better way
+		//  to handle all this, but my brain hurts, so your comments
+		//  are very appreciated and welcomed.
+		//=================================================================
+		switch (_SETTING_FIRST_DAY_WEEK)
+		{
+			case _IS_MONDAY:
+				$pc_array_pos = 1;
+				$first_day  = date('w',mktime(0,0,0,$the_month,0,$the_year));
+				$week_day   = date('w',mktime(0,0,0,$the_month,$the_day-1,$the_year));
+				$end_dow    = date('w',mktime(0,0,0,$the_month,$last_day,$the_year));
+				if($end_dow != 0) {
+					$the_last_day = $last_day+(7-$end_dow);
+				} else {
+					$the_last_day = $last_day;
+				}
+				break;
+			case _IS_SATURDAY:
+				$pc_array_pos = 6;
+				$first_day  = date('w',mktime(0,0,0,$the_month,2,$the_year));
+				$week_day   = date('w',mktime(0,0,0,$the_month,$the_day+1,$the_year));
+				$end_dow    = date('w',mktime(0,0,0,$the_month,$last_day,$the_year));
+				if($end_dow == 6) {
+					$the_last_day = $last_day+6;
+				} elseif($end_dow != 5) {
+					$the_last_day = $last_day+(5-$end_dow);
+				} else {
+					$the_last_day = $last_day;
+				}
+				break;
+			case _IS_SUNDAY:
+			default:
+				$pc_array_pos = 0;
+				$first_day  = date('w',mktime(0,0,0,$the_month,1,$the_year));
+				$week_day   = date('w',mktime(0,0,0,$the_month,$the_day,$the_year));
+				$end_dow    = date('w',mktime(0,0,0,$the_month,$last_day,$the_year));
+				if($end_dow != 6) {
+					$the_last_day = $last_day+(6-$end_dow);
+				} else {
+					$the_last_day = $last_day;
+				}
+				break;
+		}
+
+		// passing the times array to the tpl the times array is for the days schedule
+		$tpl->assign_by_ref("times",$times);
+		// load the table width to the template
+		$tpl->assign("day_td_width",$GLOBALS['day_view_td_width']);
 
-	//=================================================================
-    	//  populate the template object with information for
-    	//  Month Names, Long Day Names and Short Day Names
-    	//  as translated in the language files
-    	//  (may be adding more here soon - based on need)
-    	//=================================================================
-    	$pc_month_names = array(_CALJAN,_CALFEB,_CALMAR,_CALAPR,_CALMAY,_CALJUN,
-                            	_CALJUL,_CALAUG,_CALSEP,_CALOCT,_CALNOV,_CALDEC);
-
-    	$pc_short_day_names = array(_CALSUNDAYSHORT, _CALMONDAYSHORT,
-                                	_CALTUESDAYSHORT, _CALWEDNESDAYSHORT,
-                                	_CALTHURSDAYSHORT, _CALFRIDAYSHORT,
-                                	_CALSATURDAYSHORT);
-
-    	$pc_long_day_names = array(_CALSUNDAY, _CALMONDAY,
-                            	   _CALTUESDAY, _CALWEDNESDAY,
-                            	   _CALTHURSDAY, _CALFRIDAY,
-                            	   _CALSATURDAY);
 		//=================================================================
-    	//  here we need to set up some information for later
-    	//  variable creation.  This helps us establish the correct
-    	//  date ranges for each view.  There may be a better way
-    	//  to handle all this, but my brain hurts, so your comments
-    	//  are very appreciated and welcomed.
-    	//=================================================================
-    	switch (_SETTING_FIRST_DAY_WEEK)
-    	{
-        	case _IS_MONDAY:
-            	$pc_array_pos = 1;
-            	$first_day  = date('w',mktime(0,0,0,$the_month,0,$the_year));
-            	$week_day   = date('w',mktime(0,0,0,$the_month,$the_day-1,$the_year));
-            	$end_dow    = date('w',mktime(0,0,0,$the_month,$last_day,$the_year));
-            	if($end_dow != 0) {
-                	$the_last_day = $last_day+(7-$end_dow);
-            	} else {
-                	$the_last_day = $last_day;
-            	}
-            	break;
-        	case _IS_SATURDAY:
-            	$pc_array_pos = 6;
-            	$first_day  = date('w',mktime(0,0,0,$the_month,2,$the_year));
-            	$week_day   = date('w',mktime(0,0,0,$the_month,$the_day+1,$the_year));
-            	$end_dow    = date('w',mktime(0,0,0,$the_month,$last_day,$the_year));
-            	if($end_dow == 6) {
-                	$the_last_day = $last_day+6;
-            	} elseif($end_dow != 5) {
-                	$the_last_day = $last_day+(5-$end_dow);
-            	} else {
-                	$the_last_day = $last_day;
-            	}
-            	break;
-        	case _IS_SUNDAY:
-        	default:
-            	$pc_array_pos = 0;
-            	$first_day  = date('w',mktime(0,0,0,$the_month,1,$the_year));
-            	$week_day   = date('w',mktime(0,0,0,$the_month,$the_day,$the_year));
-            	$end_dow    = date('w',mktime(0,0,0,$the_month,$last_day,$the_year));
-            	if($end_dow != 6) {
-                	$the_last_day = $last_day+(6-$end_dow);
-            	} else {
-                	$the_last_day = $last_day;
-            	}
-            	break;
-    	}
-    	// assing the times array to the tpl the times array is for the days schedule
-
-       	$tpl->assign_by_ref("times",$times);
-      	// load the table width to the template
-    	$tpl->assign("day_td_width",$GLOBALS['day_view_td_width']);
-
-    	//=================================================================
-    	//  Week View is a bit of a pain in the ass, so we need to
-    	//  do some extra setup for that view.  This section will
-    	//  find the correct starting and ending dates for a given
-    	//  seven day period, based on the day of the week the
-    	//  calendar is setup to run under (Sunday, Saturday, Monday)
-    	//=================================================================
-    	$first_day_of_week = sprintf('%02d',$the_day-$week_day);
-    	$week_first_day = date('m/d/Y',mktime(0,0,0,$the_month,$first_day_of_week,$the_year));
-    	list($week_first_day_month, $week_first_day_date, $week_first_day_year) = explode('/',$week_first_day);
-    	$week_first_day_month_name  = pnModAPIFunc(__POSTCALENDAR__, 'user', 'getmonthname',
-                                            	  array('Date'=>mktime(0,0,0,$week_first_day_month,$week_first_day_date,$week_first_day_year)));
-    	$week_last_day = date('m/d/Y',mktime(0,0,0,$the_month,$first_day_of_week+6,$the_year));
-    	list($week_last_day_month, $week_last_day_date, $week_last_day_year) = explode('/',$week_last_day);
-    	$week_last_day_month_name = pnModAPIFunc(__POSTCALENDAR__, 'user', 'getmonthname',
-                                            	 array('Date'=>mktime(0,0,0,$week_last_day_month,$week_last_day_date,$week_last_day_year)));
-
-    	//=================================================================
-    	//  Setup some information so we know the actual month's dates
-    	//  also get today's date for later use and highlighting
-    	//=================================================================
-    	$month_view_start = date('Y-m-d',mktime(0,0,0,$the_month,1,$the_year));
-    	$month_view_end   = date('Y-m-t',mktime(0,0,0,$the_month,1,$the_year));
+		//  Week View is a bit of a pain in the ass, so we need to
+		//  do some extra setup for that view.  This section will
+		//  find the correct starting and ending dates for a given
+		//  seven day period, based on the day of the week the
+		//  calendar is setup to run under (Sunday, Saturday, Monday)
+		//=================================================================
+		$first_day_of_week = sprintf('%02d',$the_day-$week_day);
+		$week_first_day = date('m/d/Y',mktime(0,0,0,$the_month,$first_day_of_week,$the_year));
+		list($week_first_day_month, $week_first_day_date, $week_first_day_year) = explode('/',$week_first_day);
+		$week_first_day_month_name = pnModAPIFunc(__POSTCALENDAR__, 'user', 'getmonthname',
+			array('Date'=>mktime(0,0,0,$week_first_day_month,$week_first_day_date,$week_first_day_year)));
+		$week_last_day = date('m/d/Y',mktime(0,0,0,$the_month,$first_day_of_week+6,$the_year));
+		list($week_last_day_month, $week_last_day_date, $week_last_day_year) = explode('/',$week_last_day);
+		$week_last_day_month_name = pnModAPIFunc(__POSTCALENDAR__, 'user', 'getmonthname',
+			array('Date'=>mktime(0,0,0,$week_last_day_month,$week_last_day_date,$week_last_day_year)));
+
+		//=================================================================
+		//  Setup some information so we know the actual month's dates
+		//  also get today's date for later use and highlighting
+		//=================================================================
+		$month_view_start = date('Y-m-d',mktime(0,0,0,$the_month,1,$the_year));
+		$month_view_end   = date('Y-m-t',mktime(0,0,0,$the_month,1,$the_year));
 		$today_date = postcalendar_today('%Y-%m-%d');
+
+		//=================================================================
+		//  Setup the starting and ending date ranges for pcGetEvents()
 		//=================================================================
-    	//  Setup the starting and ending date ranges for pcGetEvents()
-    	//=================================================================
-    	switch($viewtype) {
-        	case 'day' :
-            	$starting_date = date('m/d/Y',mktime(0,0,0,$the_month,$the_day,$the_year));
-            	$ending_date   = date('m/d/Y',mktime(0,0,0,$the_month,$the_day,$the_year));
-            	break;
-        	case 'week' :
-            	$starting_date = "$week_first_day_month/$week_first_day_date/$week_first_day_year";
-            	$ending_date   = "$week_last_day_month/$week_last_day_date/$week_last_day_year";
+		switch($viewtype) {
+			case 'day' :
+				$starting_date = date('m/d/Y',mktime(0,0,0,$the_month,$the_day,$the_year));
+				$ending_date   = date('m/d/Y',mktime(0,0,0,$the_month,$the_day,$the_year));
+				break;
+			case 'week' :
+				$starting_date = "$week_first_day_month/$week_first_day_date/$week_first_day_year";
+				$ending_date   = "$week_last_day_month/$week_last_day_date/$week_last_day_year";
 				$calendarView  = Date_Calc::getCalendarWeek($week_first_day_date,
-			                                            	$week_first_day_month,
-															$week_first_day_year,
-															'%Y-%m-%d');
-            	break;
-        	case 'month' :
-            	$starting_date = date('m/d/Y',mktime(0,0,0,$the_month,1-$first_day,$the_year));
-            	$ending_date   = date('m/d/Y',mktime(0,0,0,$the_month,$the_last_day,$the_year));
+					$week_first_day_month,
+					$week_first_day_year,
+					'%Y-%m-%d');
+				break;
+			case 'month' :
+				$starting_date = date('m/d/Y',mktime(0,0,0,$the_month,1-$first_day,$the_year));
+				$ending_date   = date('m/d/Y',mktime(0,0,0,$the_month,$the_last_day,$the_year));
 				$calendarView  = Date_Calc::getCalendarMonth($the_month, $the_year, '%Y-%m-%d');
-            	break;
-        	case 'year' :
-            	$starting_date = date('m/d/Y',mktime(0,0,0,1,1,$the_year));
-            	$ending_date   = date('m/d/Y',mktime(0,0,0,1,1,$the_year+1));
+				break;
+			case 'year' :
+				$starting_date = date('m/d/Y',mktime(0,0,0,1,1,$the_year));
+				$ending_date   = date('m/d/Y',mktime(0,0,0,1,1,$the_year+1));
 				$calendarView  = Date_Calc::getCalendarYear($the_year, '%Y-%m-%d');
-            	break;
-    	}
+				break;
+		}
+
+		//=================================================================
+		//  Load the events
 		//=================================================================
-    	//  Load the events
-    	//=================================================================
 		if($viewtype != 'year') {
 			$eventsByDate =& postcalendar_userapi_pcGetEvents(array('start'=>$starting_date,'end'=>$ending_date, 'viewtype' => $viewtype));
-
 		} else {
 			$eventsByDate = array();
 		}
 
-
 		//=================================================================
-    	//  Create and array with the day names in the correct order
-    	//=================================================================
-    	$daynames = array();
-    	$numDays = count($pc_long_day_names);
-    	for($i=0; $i < $numDays; $i++)
-    	{   if($pc_array_pos >= $numDays) {
-            	$pc_array_pos = 0;
-        	}
-        	array_push($daynames,$pc_long_day_names[$pc_array_pos]);
-        	$pc_array_pos++;
-    	}
+		//  Create an array with the day names in the correct order
+		//=================================================================
+		$daynames = array();
+		$numDays = count($pc_long_day_names);
+		for($i=0; $i < $numDays; $i++) {
+			if($pc_array_pos >= $numDays) {
+				$pc_array_pos = 0;
+			}
+			array_push($daynames,$pc_long_day_names[$pc_array_pos]);
+			$pc_array_pos++;
+		}
 		unset($numDays);
 		$sdaynames = array();
-    	$numDays = count($pc_short_day_names);
-    	for($i=0; $i < $numDays; $i++)
-    	{   if($pc_array_pos >= $numDays) {
-            	$pc_array_pos = 0;
-        	}
-        	array_push($sdaynames,$pc_short_day_names[$pc_array_pos]);
-        	$pc_array_pos++;
-    	}
+		$numDays = count($pc_short_day_names);
+		for($i=0; $i < $numDays; $i++) {
+			if($pc_array_pos >= $numDays) {
+				$pc_array_pos = 0;
+			}
+			array_push($sdaynames,$pc_short_day_names[$pc_array_pos]);
+			$pc_array_pos++;
+		}
 		unset($numDays);
-    	//=================================================================
-    	//  Prepare some values for the template
-    	//=================================================================
-    	$prev_month = Date_Calc::beginOfPrevMonth(1,$the_month,$the_year,'%Y%m%d');
-    	$next_month = Date_Calc::beginOfNextMonth(1,$the_month,$the_year,'%Y%m%d');
-
-    	$pc_prev = pnModURL(__POSTCALENDAR__,'user','view',
-                        	array('tplview'=>$template_view,
-                            	  'viewtype'=>'month',
-                            	  'Date'=>$prev_month,
-                            	  'pc_username'=>$pc_username,
-								  'pc_category'=>$category,
-								  'pc_topic'=>$topic));
-
-    	$pc_next = pnModURL(__POSTCALENDAR__,'user','view',
-                        	array('tplview'=>$template_view,
-                            	  'viewtype'=>'month',
-                            	  'Date'=>$next_month,
-                            	  'pc_username'=>$pc_username,
-								  'pc_category'=>$category,
-								  'pc_topic'=>$topic));
-
-    	$prev_day = Date_Calc::prevDay($the_day,$the_month,$the_year,'%Y%m%d');
-    	$next_day = Date_Calc::nextDay($the_day,$the_month,$the_year,'%Y%m%d');
-    	$pc_prev_day = pnModURL(__POSTCALENDAR__,'user','view',
-                            	 array('tplview'=>$template_view,
-                                	   'viewtype'=>'day',
-                                	   'Date'=>$prev_day,
-                                	   'pc_username'=>$pc_username,
-								  	   'pc_category'=>$category,
-								  	   'pc_topic'=>$topic));
-
-    	$pc_next_day = pnModURL(__POSTCALENDAR__,'user','view',
-                            	array('tplview'=>$template_view,
-                                	  'viewtype'=>'day',
-                                	  'Date'=>$next_day,
-                                	  'pc_username'=>$pc_username,
-								  	  'pc_category'=>$category,
-								  	  'pc_topic'=>$topic));
-
-    	$prev_week = date('Ymd',mktime(0,0,0,$week_first_day_month,$week_first_day_date-7,$week_first_day_year));
-    	$next_week = date('Ymd',mktime(0,0,0,$week_last_day_month,$week_last_day_date+1,$week_last_day_year));
-    	$pc_prev_week = pnModURL(__POSTCALENDAR__,'user','view',
-                            	 array('viewtype'=>'week',
-                                	   'Date'=>$prev_week,
-                                	   'pc_username'=>$pc_username,
-								  	   'pc_category'=>$category,
-								  	   'pc_topic'=>$topic));
-    	$pc_next_week = pnModURL(__POSTCALENDAR__,'user','view',
-                            	 array('viewtype'=>'week',
-                                	   'Date'=>$next_week,
-                                	   'pc_username'=>$pc_username,
-								  	   'pc_category'=>$category,
-								  	   'pc_topic'=>$topic));
+
+		//=================================================================
+		//  Prepare some values for the template
+		//=================================================================
+		$prev_month = Date_Calc::beginOfPrevMonth(1,$the_month,$the_year,'%Y%m%d');
+		$next_month = Date_Calc::beginOfNextMonth(1,$the_month,$the_year,'%Y%m%d');
+
+		$pc_prev = pnModURL(__POSTCALENDAR__,'user','view',
+			array('tplview'=>$template_view,
+			'viewtype'=>'month',
+			'Date'=>$prev_month,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
+
+		$pc_next = pnModURL(__POSTCALENDAR__,'user','view',
+			array('tplview'=>$template_view,
+			'viewtype'=>'month',
+			'Date'=>$next_month,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
+
+		$prev_day = Date_Calc::prevDay($the_day,$the_month,$the_year,'%Y%m%d');
+		$next_day = Date_Calc::nextDay($the_day,$the_month,$the_year,'%Y%m%d');
+		$pc_prev_day = pnModURL(__POSTCALENDAR__,'user','view',
+			array('tplview'=>$template_view,
+			'viewtype'=>'day',
+			'Date'=>$prev_day,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
+
+		$pc_next_day = pnModURL(__POSTCALENDAR__,'user','view',
+			array('tplview'=>$template_view,
+			'viewtype'=>'day',
+			'Date'=>$next_day,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
+
+		$prev_week = date('Ymd',mktime(0,0,0,$week_first_day_month,$week_first_day_date-7,$week_first_day_year));
+		$next_week = date('Ymd',mktime(0,0,0,$week_last_day_month,$week_last_day_date+1,$week_last_day_year));
+		$pc_prev_week = pnModURL(__POSTCALENDAR__,'user','view',
+			array('viewtype'=>'week',
+			'Date'=>$prev_week,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
+		$pc_next_week = pnModURL(__POSTCALENDAR__,'user','view',
+			array('viewtype'=>'week',
+			'Date'=>$next_week,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
 
 		$prev_year = date('Ymd',mktime(0,0,0,1,1,$the_year-1));
-    	$next_year = date('Ymd',mktime(0,0,0,1,1,$the_year+1));
-    	$pc_prev_year = pnModURL(__POSTCALENDAR__,'user','view',
-                            	 array('viewtype'=>'year',
-                                	   'Date'=>$prev_year,
-                                	   'pc_username'=>$pc_username,
-								  	   'pc_category'=>$category,
-								  	   'pc_topic'=>$topic));
-    	$pc_next_year = pnModURL(__POSTCALENDAR__,'user','view',
-                            	 array('viewtype'=>'year',
-                                	   'Date'=>$next_year,
-                                	   'pc_username'=>$pc_username,
-								  	   'pc_category'=>$category,
-								  	   'pc_topic'=>$topic));
+		$next_year = date('Ymd',mktime(0,0,0,1,1,$the_year+1));
+		$pc_prev_year = pnModURL(__POSTCALENDAR__,'user','view',
+			array('viewtype'=>'year',
+			'Date'=>$prev_year,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
+		$pc_next_year = pnModURL(__POSTCALENDAR__,'user','view',
+			array('viewtype'=>'year',
+			'Date'=>$next_year,
+			'pc_username'=>$pc_username,
+			'pc_category'=>$category,
+			'pc_topic'=>$topic));
 
 		//=================================================================
-    	//  Populate the template
-    	//=================================================================
+		//  Populate the template
+		//=================================================================
 		$all_categories = pnModAPIFunc(__POSTCALENDAR__,'user','getCategories');
 
-
-
 		if(isset($calendarView)) {
-    		$tpl->assign_by_ref('CAL_FORMAT',$calendarView);
+			$tpl->assign_by_ref('CAL_FORMAT',$calendarView);
 		}
 
-
 		if($viewtype == "week") {
 			$last_blocks = array();
-			 foreach($eventsByDate as $cdate => $day) {
-                $tblock = array_reverse($day['blocks']);
-                $last_blocks[$cdate] = count($tblock) -1;
-                for ($i=0;$i<count($tblock);$i++) {
-                  if (!empty($tblock[$i])) {
-                    $last_blocks[$cdate] = count($tblock) - $i;
-                    break;
-                  }
-                }
-			 }
-		  $tpl->assign("last_blocks",$last_blocks);
+			foreach($eventsByDate as $cdate => $day) {
+				$tblock = array_reverse($day['blocks']);
+				$last_blocks[$cdate] = count($tblock) -1;
+				for ($i=0;$i<count($tblock);$i++) {
+					if (!empty($tblock[$i])) {
+						$last_blocks[$cdate] = count($tblock) - $i;
+						break;
+					}
+				}
+			}
+			$tpl->assign("last_blocks",$last_blocks);
 		}
 
 		$tpl->assign('STYLE',$GLOBALS['style']);
@@ -426,22 +422,21 @@ function postcalendar_userapi_buildView($args)
 		$provinfo = getProviderInfo();
 		$single = array();
 
-		 //filter the display on the requested username, the provinfo array is used to build columns in the week view.
+		// filter the display on the requested username, the provinfo array is
+		// used to build columns in the week view.
 
 		foreach($provinfo as $provider) {
 			if(is_array($pc_username)){
-			foreach($pc_username as $uname){
-		  if  (!empty($pc_username) && $provider['username'] == $uname) {
-
-		  	array_push($single,$provider);
-		  }
-
-		}
+				foreach($pc_username as $uname) {
+					if (!empty($pc_username) && $provider['username'] == $uname) {
+						array_push($single,$provider);
+					}
+				}
 			}
-			else{
+			else {
 				if (!empty($pc_username) && $provider['username'] == $pc_username) {
-		 			array_push($single,$provider);
-		  		}
+					array_push($single,$provider);
+				}
 			}
 		}
 		if ($single != null) {
@@ -455,7 +450,6 @@ function postcalendar_userapi_buildView($args)
 			$tpl->assign('showdaysurl',"index.php?" . $_SERVER['QUERY_STRING'] . "&show_days=1");
 		}
 
-
 		$tpl->assign('interval', $GLOBALS['calendar_interval']);
 		$tpl->assign_by_ref('VIEW_TYPE',$viewtype);
 		$tpl->assign_by_ref('A_MONTH_NAMES',$pc_month_names);
@@ -480,6 +474,7 @@ function postcalendar_userapi_buildView($args)
 		$tpl->assign_by_ref('SCHEDULE_BASE_URL', pnModURL(__POSTCALENDAR__,'user','submit'));
 		$tpl->assign_by_ref('interval',$intervals);
 };
+
 	//=================================================================
     //  Parse the template
     //=================================================================
@@ -723,22 +718,25 @@ function &postcalendar_userapi_pcQueryEventsFA($args)	{
   $table      =  $pntable['postcalendar_events'];
   $cattable   =  $pntable['postcalendar_categories'];
 
-  $sql =  "SELECT DISTINCT a.pc_eid,  a.pc_informant, a.pc_catid, a.pc_title, a.pc_time, a.pc_hometext,
-    a.pc_eventDate, a.pc_duration, a.pc_endDate, a.pc_startTime, a.pc_recurrtype,
-    a.pc_recurrfreq, a.pc_recurrspec, a.pc_topic, a.pc_alldayevent, a.pc_location,
-    a.pc_conttel, a.pc_contname, a.pc_contemail, a.pc_website, a.pc_fee,
-    a.pc_sharing, b.pc_catcolor, b.pc_catname, b.pc_catdesc, a.pc_pid, a.pc_aid,
-    concat(u.fname,' ',u.lname) as provider_name, concat(pd.fname,' ',pd.lname) as patient_name,
-    concat(u2.fname, ' ', u2.lname) as owner_name, DOB as patient_dob
-    FROM  ( $table AS a, $cattable AS b )
-    LEFT JOIN users as u ON a.pc_aid = u.id
-    LEFT JOIN users as u2 ON a.pc_aid = u2.id
-    LEFT JOIN patient_data as pd ON a.pc_pid=pd.pid
-    WHERE  b.pc_catid = a.pc_catid
-      AND a.pc_eventstatus = $eventstatus
-      AND (a.pc_endDate >= '$start' OR a.pc_endDate = '0000-00-00')
-      AND a.pc_eventDate <= '$end'
-      AND (a.pc_aid = '" . $provider_id . "' OR a.pc_aid = '')";
+  $sql = "SELECT DISTINCT a.pc_eid,  a.pc_informant, a.pc_catid, a.pc_title, " .
+    "a.pc_time, a.pc_hometext, a.pc_eventDate, a.pc_duration, a.pc_endDate, " .
+    "a.pc_startTime, a.pc_recurrtype, a.pc_recurrfreq, a.pc_recurrspec, " .
+    "a.pc_topic, a.pc_alldayevent, a.pc_location, a.pc_conttel, " .
+    "a.pc_contname, a.pc_contemail, a.pc_website, a.pc_fee, a.pc_sharing, " .
+    "a.pc_prefcatid, " .
+    "b.pc_catcolor, b.pc_catname, b.pc_catdesc, a.pc_pid, a.pc_aid, " .
+    "concat(u.fname,' ',u.lname) as provider_name, " .
+    "concat(pd.fname,' ',pd.lname) as patient_name, " .
+    "concat(u2.fname, ' ', u2.lname) as owner_name, pd.DOB as patient_dob " .
+    "FROM  ( $table AS a, $cattable AS b ) " .
+    "LEFT JOIN users as u ON a.pc_aid = u.id " .
+    "LEFT JOIN users as u2 ON a.pc_aid = u2.id " .
+    "LEFT JOIN patient_data as pd ON a.pc_pid=pd.pid " .
+    "WHERE  b.pc_catid = a.pc_catid " .
+    "AND a.pc_eventstatus = $eventstatus " .
+    "AND (a.pc_endDate >= '$start' OR a.pc_endDate = '0000-00-00') " .
+    "AND a.pc_eventDate <= '$end' " .
+    "AND (a.pc_aid = '" . $provider_id . "' OR a.pc_aid = '')";
 
   //======================================================================
   //  START SEARCH FUNCTIONALITY
@@ -772,16 +770,17 @@ function &postcalendar_userapi_pcQueryEventsFA($args)	{
 
     // get the results from the query
     if(isset($tmp)) { unset($tmp); } $tmp = array();
-    list($tmp['eid'],        $tmp['uname'],       $tmp['catid'],
-         $tmp['title'],      $tmp['time'],        $tmp['hometext'],
-         $tmp['eventDate'],  $tmp['duration'],    $tmp['endDate'],
-         $tmp['startTime'],  $tmp['recurrtype'],  $tmp['recurrfreq'],
-         $tmp['recurrspec'], $tmp['topic'],       $tmp['alldayevent'],
-         $tmp['location'],   $tmp['conttel'],     $tmp['contname'],
-         $tmp['contemail'],  $tmp['website'],     $tmp['fee'], $tmp['sharing'],
-         $tmp['catcolor'],   $tmp['catname'],     $tmp['catdesc'],
-         $tmp['pid'], $tmp['aid'], $tmp['provider_name'], $tmp['patient_name'],
-         $tmp['owner_name'],$tmp['patient_dob']) = $result->fields;
+    list($tmp['eid'],          $tmp['uname'],         $tmp['catid'],
+         $tmp['title'],        $tmp['time'],          $tmp['hometext'],
+         $tmp['eventDate'],    $tmp['duration'],      $tmp['endDate'],
+         $tmp['startTime'],    $tmp['recurrtype'],    $tmp['recurrfreq'],
+         $tmp['recurrspec'],   $tmp['topic'],         $tmp['alldayevent'],
+         $tmp['location'],     $tmp['conttel'],       $tmp['contname'],
+         $tmp['contemail'],    $tmp['website'],       $tmp['fee'],
+         $tmp['sharing'],      $tmp['prefcatid'],     $tmp['catcolor'],
+         $tmp['catname'],      $tmp['catdesc'],       $tmp['pid'],
+         $tmp['aid'],          $tmp['provider_name'], $tmp['patient_name'],
+         $tmp['owner_name'],   $tmp['patient_dob'])   = $result->fields;
 
     // grab the name of the topic
     $topicname = pcGetTopicName($tmp['topic']);
@@ -836,11 +835,12 @@ function &postcalendar_userapi_pcQueryEventsFA($args)	{
     $events[$i]['pid']         = $tmp['pid'];
     $events[$i]['patient_name']= $tmp['patient_name'];
     $events[$i]['provider_name'] = $tmp['provider_name'];
-    $events[$i]['owner_name'] = $tmp['owner_name'];
+    $events[$i]['owner_name']  = $tmp['owner_name'];
     $events[$i]['patient_dob'] = $tmp['patient_dob'];
     $events[$i]['patient_age'] = date("Y") - substr(($tmp['patient_dob']),0,4);
     $events[$i]['sharing']     = $tmp['sharing'];
-    $events[$i]['aid']		   = $tmp['aid'];
+    $events[$i]['prefcatid']   = $tmp['prefcatid'];
+    $events[$i]['aid']         = $tmp['aid'];
     $events[$i]['intervals']   = ceil(($tmp['duration']/60) / $GLOBALS['calendar_interval']);
     if($events[$i]['intervals'] == 0)
       $events[$i]['intervals'] = 1;
@@ -910,12 +910,15 @@ function &postcalendar_userapi_pcQueryEvents($args)
   $end = '0000-00-00';
   extract($args);
 
+  // echo "<!-- args = "; print_r($args); echo " -->\n"; // debugging
+
   $pc_username = pnVarCleanFromInput('pc_username');
-  if (empty($pc_username )) {
+  if (empty($pc_username) || is_array($pc_username)) {
     $pc_username = "__PC_ALL__";
   }
 
-  //pennfirm echo "PC Username: $pc_username";
+  // echo "<!-- pc_username: $pc_username -->\n"; // debugging
+
   $topic = pnVarCleanFromInput('pc_topic');
   $category = pnVarCleanFromInput('pc_category');
 
@@ -940,23 +943,28 @@ function &postcalendar_userapi_pcQueryEvents($args)
   $cattable   =  $pntable['postcalendar_categories'];
   $topictable =  $pntable['postcalendar_topics'];
 
-  $sql =  "SELECT DISTINCT a.pc_eid,  a.pc_informant, a.pc_catid, a.pc_title, a.pc_time, a.pc_hometext,
-    a.pc_eventDate, a.pc_duration, a.pc_endDate, a.pc_startTime, a.pc_recurrtype,
-    a.pc_recurrfreq, a.pc_recurrspec, a.pc_topic, a.pc_alldayevent, a.pc_location,
-    a.pc_conttel, a.pc_contname, a.pc_contemail, a.pc_website, a.pc_fee,
-    a.pc_sharing, b.pc_catcolor, b.pc_catname, b.pc_catdesc, a.pc_pid, a.pc_apptstatus, a.pc_aid,
-    concat(u.fname,' ',u.lname) as provider_name, concat(pd.lname,', ',pd.fname) as patient_name,
-    concat(u2.fname, ' ', u2.lname) as owner_name, DOB as patient_dob, pd.pubpid
-    FROM  ( $table AS a, $cattable AS b )
-    LEFT JOIN users as u ON a.pc_aid = u.id
-    LEFT JOIN users as u2 ON a.pc_aid = u2.id
-    LEFT JOIN patient_data as pd ON a.pc_pid = pd.pid
-    WHERE  b.pc_catid = a.pc_catid
-      AND a.pc_eventstatus = $eventstatus
-      AND ((a.pc_endDate >= '$start' AND a.pc_eventDate <= '$end') OR
-      (a.pc_endDate = '0000-00-00' AND a.pc_eventDate >= '$start' AND a.pc_eventDate <= '$end')) ";
-
-  // The above two lines replace these:
+  $sql = "SELECT DISTINCT a.pc_eid,  a.pc_informant, a.pc_catid, " .
+    "a.pc_title, a.pc_time, a.pc_hometext, a.pc_eventDate, a.pc_duration, " .
+    "a.pc_endDate, a.pc_startTime, a.pc_recurrtype, a.pc_recurrfreq, " .
+    "a.pc_recurrspec, a.pc_topic, a.pc_alldayevent, a.pc_location, " .
+    "a.pc_conttel, a.pc_contname, a.pc_contemail, a.pc_website, a.pc_fee, " .
+    "a.pc_sharing, a.pc_prefcatid, b.pc_catcolor, b.pc_catname, " .
+    "b.pc_catdesc, a.pc_pid, a.pc_apptstatus, a.pc_aid, " .
+    "concat(u.fname,' ',u.lname) as provider_name, " .
+    "concat(pd.lname,', ',pd.fname) as patient_name, " .
+    "concat(u2.fname, ' ', u2.lname) as owner_name, " .
+    "DOB as patient_dob, pd.pubpid " .
+    "FROM  ( $table AS a, $cattable AS b ) " .
+    "LEFT JOIN users as u ON a.pc_aid = u.id " .
+    "LEFT JOIN users as u2 ON a.pc_aid = u2.id " .
+    "LEFT JOIN patient_data as pd ON a.pc_pid = pd.pid " .
+    "WHERE  b.pc_catid = a.pc_catid " .
+    "AND a.pc_eventstatus = $eventstatus " .
+    "AND ((a.pc_endDate >= '$start' AND a.pc_eventDate <= '$end') OR " .
+    "(a.pc_endDate = '0000-00-00' AND a.pc_eventDate >= '$start' AND " .
+    "a.pc_eventDate <= '$end')) ";
+
+  // The above 3 lines replaced these:
   //   AND (a.pc_endDate >= '$start' OR a.pc_endDate = '0000-00-00')
   //   AND a.pc_eventDate <= '$end' ";
 
@@ -980,6 +988,7 @@ function &postcalendar_userapi_pcQueryEvents($args)
     // get all events for logged in user plus global events
     $sql .= "AND (a.pc_aid = " . $_SESSION['authUserID'] . " OR a.pc_sharing = '" . SHARING_GLOBAL . "') ";
   }
+
   //======================================================================
   //  START SEARCH FUNCTIONALITY
   //======================================================================
@@ -988,11 +997,13 @@ function &postcalendar_userapi_pcQueryEvents($args)
   if(!empty($s_topic))    $sql .= "AND ($s_topic) ";
   if(!empty($category))   $sql .= "AND (a.pc_catid = '".pnVarPrepForStore($category)."') ";
   if(!empty($topic))      $sql .= "AND (a.pc_topic = '".pnVarPrepForStore($topic)."') ";
+
   //======================================================================
   //  Search sort and limitation
   //======================================================================
   if(empty($sort)) $sql .= "GROUP BY a.pc_eid ORDER BY a.pc_time DESC";
   else $sql .= "GROUP BY a.pc_eid ORDER BY a.$sort";
+
   //======================================================================
   //  END SEARCH FUNCTIONALITY
   //======================================================================
@@ -1010,18 +1021,22 @@ function &postcalendar_userapi_pcQueryEvents($args)
 
   for($i=0; !$result->EOF; $result->MoveNext()) {
 
+    // WHY are we using an array for intermediate storage???  -- Rod
+
     // get the results from the query
     if(isset($tmp)) { unset($tmp); } $tmp = array();
-    list($tmp['eid'],        $tmp['uname'],       $tmp['catid'],
-         $tmp['title'],      $tmp['time'],        $tmp['hometext'],
-         $tmp['eventDate'],  $tmp['duration'],    $tmp['endDate'],
-         $tmp['startTime'],  $tmp['recurrtype'],  $tmp['recurrfreq'],
-         $tmp['recurrspec'], $tmp['topic'],       $tmp['alldayevent'],
-         $tmp['location'],   $tmp['conttel'],     $tmp['contname'],
-         $tmp['contemail'],  $tmp['website'],     $tmp['fee'], $tmp['sharing'],
-         $tmp['catcolor'],   $tmp['catname'],     $tmp['catdesc'],
-         $tmp['pid'],        $tmp['apptstatus'],  $tmp['aid'], $tmp['provider_name'], $tmp['patient_name'],
-         $tmp['owner_name'],$tmp['patient_dob'],$tmp['pubpid']) = $result->fields;
+    list($tmp['eid'],          $tmp['uname'],       $tmp['catid'],
+         $tmp['title'],        $tmp['time'],        $tmp['hometext'],
+         $tmp['eventDate'],    $tmp['duration'],    $tmp['endDate'],
+         $tmp['startTime'],    $tmp['recurrtype'],  $tmp['recurrfreq'],
+         $tmp['recurrspec'],   $tmp['topic'],       $tmp['alldayevent'],
+         $tmp['location'],     $tmp['conttel'],     $tmp['contname'],
+         $tmp['contemail'],    $tmp['website'],     $tmp['fee'],
+         $tmp['sharing'],      $tmp['prefcatid'],   $tmp['catcolor'],
+         $tmp['catname'],      $tmp['catdesc'],     $tmp['pid'],
+         $tmp['apptstatus'],   $tmp['aid'],         $tmp['provider_name'],
+         $tmp['patient_name'], $tmp['owner_name'],  $tmp['patient_dob'],
+         $tmp['pubpid']) = $result->fields;
 
     // grab the name of the topic
     $topicname = pcGetTopicName($tmp['topic']);
@@ -1078,6 +1093,7 @@ function &postcalendar_userapi_pcQueryEvents($args)
     $events[$i]['patient_dob'] = $tmp['patient_dob'];
     $events[$i]['patient_age'] = date("Y") - substr(($tmp['patient_dob']),0,4);
     $events[$i]['sharing']     = $tmp['sharing'];
+    $events[$i]['prefcatid']   = $tmp['prefcatid'];
     $events[$i]['aid']         = $tmp['aid'];
     $events[$i]['topictext']   = $topicname;
     $events[$i]['intervals']   = ceil(($tmp['duration']/60) / $GLOBALS['calendar_interval']);
diff --git a/sql/2_8_1-to-2_8_2_upgrade.sql b/sql/2_8_1-to-2_8_2_upgrade.sql
index 9dea1d2b3..c612809fe 100644
--- a/sql/2_8_1-to-2_8_2_upgrade.sql
+++ b/sql/2_8_1-to-2_8_2_upgrade.sql
@@ -341,4 +341,6 @@ ALTER TABLE patient_data
 INSERT INTO `lang_languages` (`lang_id`, `lang_code`, `lang_description`) VALUES (4, 'de', 'German');
 INSERT INTO `lang_languages` (`lang_id`, `lang_code`, `lang_description`) VALUES (5, 'du', 'Dutch');
 INSERT INTO `lang_languages` (`lang_id`, `lang_code`, `lang_description`) VALUES (6, 'he', 'Hebrew');
-  
+
+ALTER TABLE openemr_postcalendar_events
+  ADD pc_prefcatid int(11) NOT NULL DEFAULT 0;
diff --git a/sql/database.sql b/sql/database.sql
index 0a6927e0c..b2cac9d7b 100644
--- a/sql/database.sql
+++ b/sql/database.sql
@@ -27179,6 +27179,7 @@ CREATE TABLE `openemr_postcalendar_events` (
   `pc_sharing` int(11) NOT NULL default '0',
   `pc_language` varchar(30) default '',
   `pc_apptstatus` char(1) NOT NULL DEFAULT '-',
+  `pc_prefcatid` int(11) NOT NULL default '0',
   PRIMARY KEY  (`pc_eid`),
   KEY `basic_event` (`pc_catid`,`pc_aid`,`pc_eventDate`,`pc_endDate`,`pc_eventstatus`,`pc_sharing`,`pc_topic`)
 ) ;
-- 
2.11.4.GIT