Changeset 1097

Timestamp:

Mar 3, 2011, 4:44:18 AM (13 years ago)

Author:

Sam Habiel

Message:

DPatientLookup.cs: Usings Cleanup
DApptSearch: Extensive refactoring. Now uses new algorithm to find appointments. Now outputs CGAvailability
CGView: Appointments checked in now set the Checkin time on the appointment structure; changes to support DApptSearch modified output.
CGSchedLib: Extensive refactoring; only 2 methods remain: CreateAppointmentSchedule and CreateAvailabilitySchedule
CGDocument: SlotsAvailable uses a new algorithm
CGAVView: Uses CalendarGrid.TimesOverlap instead of the removed one in CGSchedLib
CGAVDocument: Uses CalendarGrid.TimesOverlap instead of the removed one in CGSchedLib; CreateAssignedSlotSchedule reassigned to CreateAvailabilitySchedule

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGAVDocument.cs (modified) (3 diffs)
• CGAVView.cs (modified) (9 diffs)
• CGAVView.resx (modified) (2 diffs)
• CGDocument.cs (modified) (3 diffs)
• CGSchedLib.cs (modified) (28 diffs)
• CGView.cs (modified) (12 diffs)
• ClinicalScheduling.csproj.user (modified) (1 diff)
• ClinicalScheduling.suo (modified) ( previous)
• DApptSearch.cs (modified) (24 diffs)
• DApptSearch.resx (modified) (1 diff)
• DPatientLookup.cs (modified) (1 diff)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVDocument.cs

@@ -169 +169 @@
                                         DateTime sStart2 = a.StartTime;
                                         DateTime sEnd2 = a.EndTime;
-                                        if ((a.AppointmentKey != pAppt.AppointmentKey) && (CGSchedLib.TimesOverlap(dNewStart, dNewEnd, a.StartTime, a.EndTime)))
+                                        if ((a.AppointmentKey != pAppt.AppointmentKey) && (CalendarGrid.TimesOverlap(dNewStart, dNewEnd, a.StartTime, a.EndTime)))
                                         {
                                                 MessageBox.Show("Access blocks may not overlap.","Clinical Scheduling", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
@@ -298 +298 @@
                                         DateTime sStart2 = a.StartTime;
                                         DateTime sEnd2 = a.EndTime;
-                                        if (CGSchedLib.TimesOverlap(aCopy.StartTime, aCopy.EndTime, a.StartTime, a.EndTime))
+                                        if (CalendarGrid.TimesOverlap(aCopy.StartTime, aCopy.EndTime, a.StartTime, a.EndTime))
                                         {
                                                 //                                              throw new Exception("Access blocks may not overlap.");
@@ -374 +374 @@
                         ArrayList apptTypeIDs = new ArrayList();
 
-                        rAppointmentSchedule = CGSchedLib.CreateAssignedSlotSchedule(m_DocManager, (string) m_sResourcesArray[0], this.m_dStartDate, this.m_dEndDate, apptTypeIDs,/* */ this.m_ScheduleType, "0");
+                        rAppointmentSchedule = CGSchedLib.CreateAvailabilitySchedule(m_DocManager, m_sResourcesArray, this.m_dStartDate, this.m_dEndDate, apptTypeIDs,/* */ this.m_ScheduleType, "0");
 
                         foreach (DataRow r in rAppointmentSchedule.Rows) 

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVView.cs

@@ -106 +106 @@
             this.panelRight.Location = new System.Drawing.Point(728, 0);
             this.panelRight.Name = "panelRight";
-            this.panelRight.Size = new System.Drawing.Size(120, 364);
+            this.panelRight.Size = new System.Drawing.Size(120, 343);
             this.panelRight.TabIndex = 1;
             // 
@@ -167 +167 @@
             this.panelBottom.Controls.Add(this.statusBar1);
             this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelBottom.Location = new System.Drawing.Point(8, 340);
+            this.panelBottom.Location = new System.Drawing.Point(8, 319);
             this.panelBottom.Name = "panelBottom";
             this.panelBottom.Size = new System.Drawing.Size(720, 24);
@@ -195 +195 @@
             this.dateTimePicker1.Dock = System.Windows.Forms.DockStyle.Right;
             this.dateTimePicker1.DropDownAlign = System.Windows.Forms.LeftRightAlignment.Right;
-            this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dateTimePicker1.Location = new System.Drawing.Point(592, 0);
+            this.dateTimePicker1.Location = new System.Drawing.Point(517, 0);
             this.dateTimePicker1.Name = "dateTimePicker1";
-            this.dateTimePicker1.Size = new System.Drawing.Size(128, 20);
+            this.dateTimePicker1.Size = new System.Drawing.Size(203, 20);
             this.dateTimePicker1.TabIndex = 4;
             this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
@@ -219 +218 @@
             this.panelCenter.Location = new System.Drawing.Point(8, 24);
             this.panelCenter.Name = "panelCenter";
-            this.panelCenter.Size = new System.Drawing.Size(712, 316);
+            this.panelCenter.Size = new System.Drawing.Size(712, 295);
             this.panelCenter.TabIndex = 4;
             // 
@@ -255 +254 @@
             this.tvSchedules.Location = new System.Drawing.Point(0, 0);
             this.tvSchedules.Name = "tvSchedules";
-            this.tvSchedules.Size = new System.Drawing.Size(8, 364);
+            this.tvSchedules.Size = new System.Drawing.Size(8, 343);
             this.tvSchedules.Sorted = true;
             this.tvSchedules.TabIndex = 5;
@@ -456 +455 @@
             this.splitter1.Location = new System.Drawing.Point(720, 24);
             this.splitter1.Name = "splitter1";
-            this.splitter1.Size = new System.Drawing.Size(8, 316);
+            this.splitter1.Size = new System.Drawing.Size(8, 295);
             this.splitter1.TabIndex = 6;
             this.splitter1.TabStop = false;
@@ -486 +485 @@
             this.calendarGrid1.Resources = ((System.Collections.ArrayList)(resources.GetObject("calendarGrid1.Resources")));
             this.calendarGrid1.SelectedAppointment = 0;
-            this.calendarGrid1.Size = new System.Drawing.Size(712, 316);
+            this.calendarGrid1.Size = new System.Drawing.Size(712, 295);
             this.calendarGrid1.StartDate = new System.DateTime(2003, 1, 27, 0, 0, 0, 0);
             this.calendarGrid1.TabIndex = 2;
             this.calendarGrid1.TimeScale = 20;
-            this.calendarGrid1.CGAppointmentAdded += new CalendarGrid.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentAdded);
-            this.calendarGrid1.CGAppointmentChanged += new CalendarGrid.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentChanged);
-            this.calendarGrid1.CGSelectionChanged += new CalendarGrid.CGSelectionChangedHandler(this.calendarGrid1_CGSelectionChanged);
+            this.calendarGrid1.CGAppointmentChanged += new IndianHealthService.ClinicalScheduling.CalendarGrid.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentChanged);
+            this.calendarGrid1.CGAppointmentAdded += new IndianHealthService.ClinicalScheduling.CalendarGrid.CGAppointmentChangedHandler(this.calendarGrid1_CGAppointmentAdded);
+            this.calendarGrid1.CGSelectionChanged += new IndianHealthService.ClinicalScheduling.CalendarGrid.CGSelectionChangedHandler(this.calendarGrid1_CGSelectionChanged);
             this.calendarGrid1.DoubleClick += new System.EventHandler(this.calendarGrid1_DoubleClick);
             // 
@@ -498 +497 @@
             // 
             this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-            this.ClientSize = new System.Drawing.Size(848, 364);
+            this.ClientSize = new System.Drawing.Size(848, 343);
             this.Controls.Add(this.panelCenter);
             this.Controls.Add(this.splitter1);
@@ -727 +726 @@
                                         DateTime sStart2 = a.StartTime;
                                         DateTime sEnd2 = a.EndTime;
-                                        if (CGSchedLib.TimesOverlap(dStart, dEnd, a.StartTime, a.EndTime))
+                                        if (CalendarGrid.TimesOverlap(dStart, dEnd, a.StartTime, a.EndTime))
                                         {
                                                 MessageBox.Show("Access blocks may not overlap.","Clinical Scheduling", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGAVView.resx

@@ -113 +113 @@
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ctxApptClipMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ctxApptClipMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="ctxCalendarGrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ctxCalendarGrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>151, 17</value>
   </metadata>
@@ -130 +130 @@
 </value>
   </data>
-  <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>281, 17</value>
   </metadata>
-  <metadata name="saveAccessBlocksWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="saveAccessBlocksWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>398, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs

@@ -7 +7 @@
 using System.Windows.Forms;
 using IndianHealthService.BMXNet;
+using System.Linq;
 
 namespace IndianHealthService.ClinicalScheduling
@@ -627 +628 @@
         }
 
+        /// <summary>
+        /// Gets number of slots left in a certain selection on the grid. Used in Multiple Places.
+        /// </summary>
+        /// <param name="dSelStart">Selection Start Date</param>
+        /// <param name="dSelEnd">Selection End Date</param>
+        /// <param name="sResource">Resource Name</param>
+        /// <param name="sAccessType">Out: Name of Access Type</param>
+        /// <param name="sAvailabilityMessage">Out: Access Note</param>
+        /// <returns>Number of slots</returns>
         public int SlotsAvailable(DateTime dSelStart, DateTime dSelEnd, string sResource, out string sAccessType, out string sAvailabilityMessage)
         {
+
+
+            sAccessType = "";               //default out value
+            sAvailabilityMessage = "";      //default out value
+
+            double slotsAvailable = 0;      //defalut return value
+
+            //NOTE: What's this lock? This lock makes sure that nobody is editing the availability array
+            //when we are looking at it. Since the availability array could potentially be updated on
+            //a different thread, we are can be potentially left stuck with an empty array.
+            //
+            //The other place that uses this lock is the RefershAvailabilitySchedule method
+            //
+            //This is a temporary fix until I figure out how to divorce the availbilities here from those drawn
+            //on the calendar. Appointments are cloned b/c they are in an object that supports that; and b/c I
+            //don't need to suddenly query them at runtime like I do with Availabilities.
+
+            //Let's Try Linq
+            lock (this.m_pAvArray)
+            {
+                //This foreach loop looks for an availability that overlaps where the user clicked.
+                //There can only be one, as availabilites cannot overlap each other (enforced at the DB level)
+                //If selection hits multiple blocks, get the block with the most slots (reflected by the sorting here)
+                CGAvailability[] pAVs = (from pAV in this.m_pAvArray.Cast<CGAvailability>()
+                                         where (sResource == pAV.ResourceList && CalendarGrid.TimesOverlap(dSelStart, dSelEnd, pAV.StartTime, pAV.EndTime))
+                                         orderby pAV.Slots descending
+                                         select pAV)
+                                         .ToArray<CGAvailability>();
+
+                if ((pAVs.Length) == 0) return 0;
+
+                slotsAvailable = pAVs[0].Slots;
+                sAccessType = pAVs[0].AccessTypeName;
+                sAvailabilityMessage = pAVs[0].Note;
+
+                //Subtract total slots current appointments take up.
+                slotsAvailable -= (from appt in this.Appointments.AppointmentTable.Values.Cast<CGAppointment>()
+                                   //If the resource is the same and the user selection overlaps, then...
+                                   where (sResource == appt.Resource && CalendarGrid.TimesOverlap(pAVs[0].StartTime, pAVs[0].EndTime, appt.StartTime, appt.EndTime))
+                                   // if appt starttime is before avail start time, only count against the avail starting from the availability start time
+                                   let startTimeToCountAgainstBlock = appt.StartTime < pAVs[0].StartTime ? pAVs[0].StartTime : appt.StartTime
+                                   // if appt endtime is after the avail ends, only count against the avail up to where the avail ends
+                                   let endTimeToCountAgainstBlock = appt.EndTime > pAVs[0].EndTime ? pAVs[0].EndTime : appt.EndTime
+                                   // theoretical minutes per slot for the availability
+                                   let minPerSlot = (pAVs[0].EndTime - pAVs[0].StartTime).TotalMinutes / pAVs[0].Slots
+                                   // how many minutes does this appointment take away from the slot
+                                   let minPerAppt = (endTimeToCountAgainstBlock - startTimeToCountAgainstBlock).TotalMinutes
+                                   // how many slots the appointment takes up using this availability's scale
+                                   let slotsConsumed = minPerAppt / minPerSlot
+                                   select slotsConsumed)
+                                   // add up SlotsConsumed to substract from slotsAvailable
+                                   .Sum();
+            }
+
+            return (int)slotsAvailable;
+
+            /* OLD ALGOTHRIM 2
+
+            lock (this.m_pAvArray)
+            {
+                //This foreach loop looks for an availability that overlaps where the user clicked.
+                //There can only be one, as availabilites cannot overlap each other (enforced at the DB level)
+                //Therefore, we loop, and once we find it, we break.
+                foreach (CGAvailability pAV in this.m_pAvArray)
+                {
+                    //If the resource is the same and the user selection overlaps, then...
+                    if (sResource == pAV.ResourceList && CalendarGrid.TimesOverlap(dSelStart, dSelEnd, pAV.StartTime, pAV.EndTime))
+                    {
+                        slotsAvailable = pAV.Slots;         //variable now holds the total number of slots
+                        sAccessType = pAV.AccessTypeName;   //Access Name
+                        sAvailabilityMessage = pAV.Note;    //Access Block Note
+                        
+                        //Here we substract each appointment weight in slots from slotsAvailable
+                        foreach (DictionaryEntry apptDict in this.m_appointments.AppointmentTable)
+                        {
+                            CGAppointment appt = (CGAppointment)apptDict.Value;
+                            //If the appointment is in the same resource and overlaps with this availablity
+                            if (sResource == appt.Resource && CalendarGrid.TimesOverlap(pAV.StartTime, pAV.EndTime, appt.StartTime, appt.EndTime))
+                            {
+                                // if appt starttime is before avail start time, only count against the avail starting from the availability start time
+                                DateTime startTimeToCountAgainstBlock = appt.StartTime < pAV.StartTime ? pAV.StartTime : appt.StartTime;
+                                // if appt endtime is after the avail ends, only count against the avail up to where the avail ends
+                                DateTime endTimeToCountAgainstBlock = appt.EndTime > pAV.EndTime ? pAV.EndTime : appt.EndTime;
+                                // theoretical minutes per slot for the availability
+                                double minPerSlot = (pAV.EndTime - pAV.StartTime).TotalMinutes/pAV.Slots;
+                                // how many minutes does this appointment take away from the slot
+                                double minPerAppt = (endTimeToCountAgainstBlock - startTimeToCountAgainstBlock).TotalMinutes;
+                                // how many slots the appointment takes up using this availability's scale
+                                double slotsConsumed = minPerAppt / minPerSlot;
+                                // subscract that from the total slots for the availability
+                                slotsAvailable -= slotsConsumed;
+                            } //end if
+                            //now go to the next appointment in foreach
+                        } 
+                        // As I said above, we can match only one availability. Once we found it and substracted from it; we are done.
+                        break;
+                    }
+                }
+                // We return the integer portion of the variable for display to the user or for calculations.
+                // That means, if 2.11 slots are left, the user sees 2. If 2.66, still 2.
+                return (int)slotsAvailable;
+            }
+            */
+
+            /* ORIGINAL ALGORITHM
             sAccessType = "";
             sAvailabilityMessage = "";
@@ -695 +810 @@
             }
             return nAvailableSlots;
+            */
         }
 

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGSchedLib.cs

@@ -1 +1 @@
 using System;
 using System.Data;
-//using System.Data.OleDb;
 using System.Collections;
 using System.Diagnostics;
 using System.Drawing;
-using IndianHealthService.BMXNet;
 
 namespace IndianHealthService.ClinicalScheduling
@@ -24 +22 @@
         /// Gets appointments from VISTA to display in Grid
         /// </summary>
-        /// <param name="docManager"></param>
-        /// <param name="saryResNames"></param>
-        /// <param name="StartTime"></param>
-        /// <param name="EndTime"></param>
+        /// <param name="docManager">God Class</param>
+        /// <param name="saryResNames">Resource Names Array</param>
+        /// <param name="StartTime">Self Explanatory</param>
+        /// <param name="EndTime">Self Explanatory</param>
         /// <returns></returns>
                 public static DataTable CreateAppointmentSchedule(CGDocumentManager docManager, ArrayList saryResNames, DateTime StartTime, DateTime EndTime)
                 {
-                        string sResName = "";
-                        for  (int i = 0; i < saryResNames.Count; i++)
-                        {
-                                sResName += saryResNames[i];
-                                if ((i+1) < saryResNames.Count)
-                                        sResName += "|";
-                        }
-                        
-                        
+            string sResName = string.Join("|", saryResNames.ToArray());                 
             string sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
             string sEnd = FMDateTime.Create(EndTime).FMDateString;
@@ -45 +35 @@
                         DataTable dtRet = docManager.RPMSDataTable(sSql, "AppointmentSchedule");
                         return dtRet;
-                        
                 }
 
@@ -57 +46 @@
         /// <param name="EndTime">Self-Explanatory</param>
         /// <param name="saryApptTypes">Array of Access Type IDs</param>
-        /// <param name="stType"></param>
-        /// <param name="sSearchInfo"></param>
+        /// <param name="stType">Not used</param>
+        /// <param name="sSearchInfo">Specific Search Parameters</param>
         /// <returns></returns>
-                public static DataTable CreateAvailabilitySchedule(CGDocumentManager docManager, 
-                        ArrayList saryResourceNames, DateTime StartTime, DateTime EndTime, 
-                        ArrayList saryApptTypes,/**/ ScheduleType stType, string sSearchInfo) 
-                {
-                        DataTable rsOut;
-                        rsOut = new DataTable("AvailabilitySchedule");
-
-                        DataTable rsSlotSchedule;
-                        DataTable rsApptSchedule;
-                        DataTable rsTemp1;
-
-                        int nSize = saryResourceNames.Count;
-                        if (nSize == 0) 
-                        {
-                                return rsOut;
-                        }
-                        
-                        string sResName;
+        public static DataTable CreateAvailabilitySchedule(CGDocumentManager docManager,
+            ArrayList saryResourceNames, DateTime StartTime, DateTime EndTime,
+            ArrayList saryApptTypes,/**/ ScheduleType stType, string sSearchInfo)
+        {
+            DataTable rsOut = new DataTable("AvailabilitySchedule");
+            if (saryResourceNames.Count == 0) return rsOut;
+            string sResNames = string.Join("|", saryResourceNames.ToArray());
+            string sApptTypeIDs = string.Join("|", saryApptTypes.ToArray());
+            string sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
+            string sEnd = FMDateTime.Create(EndTime).FMDateString;
+            string sSql = "BSDX CREATE ASGND SLOT SCHED^" + sResNames + "^" + sStart + "^" + sEnd + "^" + sApptTypeIDs + "^" + sSearchInfo; //+ "^" + sSTType ;
+            rsOut = docManager.RPMSDataTable(sSql, "AssignedSlotSchedule");
+
+            return rsOut;
+        }
+
+            /*NOT USED ANYMORE
             //TODO: Optimize: no need to keep looping through resources.
             // for each resource
@@ -84 +72 @@
                                 sResName = saryResourceNames[i].ToString();
                 //Gets all the slots (or Availabities, or AV Blocks if you like)
-                                rsSlotSchedule = CGSchedLib.CreateAssignedSlotSchedule(docManager, sResName, StartTime, EndTime, saryApptTypes,/**/ stType, sSearchInfo);
-                                
+                                rsSlotSchedule = CGSchedLib.CreateAssignedSlotSchedule(docManager, sResName, StartTime, EndTime, saryApptTypes, stType, sSearchInfo);
+                rsTemp1 = rsSlotSchedule;
+
                 //if we have slots
-                                if (rsSlotSchedule.Rows.Count > 0 ) 
-                                {
+                if (rsSlotSchedule.Rows.Count > 0 ) 
+                {
                     // Get appointment count to substract from the slots
-                                        rsApptSchedule = CGSchedLib.CreateAppointmentSlotSchedule(docManager, sResName, StartTime, EndTime, stType);
+                    rsApptSchedule = CGSchedLib.CreateAppointmentSlotSchedule(docManager, sResName, StartTime, EndTime, stType);
 
                     // Perform the substraction
-                                        rsTemp1 = CGSchedLib.SubtractSlotsRS2(rsSlotSchedule, rsApptSchedule, sResName);
-
-                                }
+                    rsTemp1 = CGSchedLib.SubtractSlotsRS2(rsSlotSchedule, rsApptSchedule, sResName);
+
+                }
                 //otherwise, just return the slot schedule we have.
-                                else 
-                                {
-                                        rsTemp1 = rsSlotSchedule;
-
-                                }
+                else 
+                {
+                    rsTemp1 = rsSlotSchedule;
+
+                }
+
 
                 // if only one resource was passed in, its availablility is what we want
@@ -117 +107 @@
                         return rsOut;
                 }               
-
+                */
 
         /* NOT USED ANYMORE!!!
@@ -281 +271 @@
         /// D00030START_TIME^D00030END_TIME^I00010SLOTS^T00030RESOURCE^T00010ACCESS_TYPE^T00250NOTE^I00030AVAILABILITYID
         /// </returns>
-                public static DataTable CreateAssignedSlotSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, 
-            DateTime EndTime, ArrayList rsaryApptTypeIDs, /**/ ScheduleType stType, string sSearchInfo) 
+                /*
+         * public static DataTable CreateAssignedSlotSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, 
+            DateTime EndTime, ArrayList rsaryApptTypeIDs, ScheduleType stType, string sSearchInfo) 
                 {
             //Appointment type ids is now always "" so that all appointment types are returned.
-                        string sApptTypeIDs = "";
-                        
-            //flatten types by '|'
-                        int nSize = rsaryApptTypeIDs.Count;  //nSize is used to decide where to put the '|' sent in the RPC as we flatten sApptTypeIDs
-                        for (int i=0; i < nSize; i++) 
-                        {
-                                sApptTypeIDs += rsaryApptTypeIDs[i];
-                                if (i < (nSize-1))
-                                        sApptTypeIDs += "|";
-                        }       
-        
+            string sApptTypeIDs = string.Join("|", rsaryApptTypeIDs.ToArray());
             string sStart = FMDateTime.Create(StartTime).DateOnly.FMDateString;
             string sEnd = FMDateTime.Create(EndTime).FMDateString;
@@ -303 +284 @@
             return dtRet;
                 }
-
+        */
+
+        /*
                 public static DataTable CreateCopyTable()
                 {
@@ -358 +341 @@
                         return dtCopy;
                 }
+         */
 
         /// <summary>
@@ -368 +352 @@
         /// <param name="stType"></param>
         /// <returns>DataTable with 4 columns: START_TIME, END_TIME, SLOTS, RESOURCE </returns>
-                public static DataTable CreateAppointmentSlotSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
+                /*
+        public static DataTable CreateAppointmentSlotSchedule(CGDocumentManager docManager, string sResourceName, DateTime StartTime, DateTime EndTime, ScheduleType stType)
                 {
             //Change Dates to FM Format
@@ -424 +409 @@
                         ScheduleFromArray(cdtArray, StartTime, EndTime, ref ctbApptSchedule);
 
-            /*So far, we have the following:
+            So far, we have the following:
              * dtRet -> List of Appointments Start and End times, one row per appointment
              * cdtArray -> Linear 1 dimensional Array of dtRet Start and End times, sorted
@@ -432 +417 @@
              *      2 appts as 10:10-10:30 and 10:20-10:40 get converted into 10:10-10:20,
              *      10:20-10:30, 10:30-10:40).
-            */
+            
 
             //Find number of TimeBlocks in ctbApptSchedule that overlap the TimeBlocks in ctbAppointments
@@ -498 +483 @@
 
                 }
-
+        */
+
+        /*
                 public static int BlocksOverlap(CGAvailability rBlock, ArrayList rTBArray)
                 {
@@ -542 +529 @@
                         return nCount;
                 }
+        */
 
                 /// <summary>
@@ -552 +540 @@
                 /// <returns>true or false</returns>
         /// <remarks>Draws 2 rectangles and sees if they overlap using minutes from 1980 as the start point</remarks>
-                public static bool TimesOverlap(DateTime dStart1, DateTime dEnd1, DateTime dStart2, DateTime dEnd2)
+                /*
+        public static bool TimesOverlap(DateTime dStart1, DateTime dEnd1, DateTime dStart2, DateTime dEnd2)
                 {
                         Rectangle rect1 = new Rectangle();
@@ -568 +557 @@
                         return bRet;
                 }
-
+        */
+
+        /*
                 public static void ConsolidateBlocks(ArrayList rTBArray)
                 {
@@ -607 +598 @@
                         }
                         while (!((bDirty == false) || (rTBArray.Count == 1)));
-                }
+                } */
 
         /// <summary>
@@ -616 +607 @@
         /// <param name="sResource"></param>
         /// <returns></returns>
-                public static DataTable SubtractSlotsRS2(DataTable rsBlocks1, DataTable rsBlocks2, string sResource)
+                /*
+        public static DataTable SubtractSlotsRS2(DataTable rsBlocks1, DataTable rsBlocks2, string sResource)
                 {
                         //Subtract slots in rsBlocks2 from rsBlocks1
@@ -680 +672 @@
 
                 }
-
+         */
+
+        /*
                 public static DataTable UnionBlocks(DataTable rs1, DataTable rs2)
                 {
@@ -714 +708 @@
                         return rsCopy;
                 }
-
+        */
+
+        /*
                 public static DataTable IntersectBlocks(DataTable rs1, DataTable rs2)
                 {
@@ -770 +766 @@
 //                                                      rect2.Height = CGSchedLib.MinSince80(dEnd2) - rect2.Y;
                                                         if (
-                                                                /*(rect2.IntersectsWith(rect1) == true)*/
+                                                                /*(rect2.IntersectsWith(rect1) == true)
                                                                 (CGSchedLib.TimesOverlap(dStart1, dEnd1, dStart2, dEnd2) == true)
                                                                 && 
@@ -797 +793 @@
                         return rsCopy;
                 }//end IntersectBlocks
-
+        */
+        
         /// <summary>
         /// Number of minutes since Jan 1 1980
@@ -803 +800 @@
         /// <param name="d">Date to compare</param>
         /// <returns>Minutes as integer</returns>
-                public static int MinSince80(DateTime d)
+                /*
+        public static int MinSince80(DateTime d)
                 {
                         //Returns the total minutes between d and 1 Jan 1980
@@ -814 +812 @@
                         return nMinutes;
                 }
-
+        */
+
+        /*
         /// <summary>
         /// Converts an Array of Times like this:
@@ -909 +909 @@
 
                 }//end ScheduleFromArray
-
-                //long CResourceLink::SlotsInBlock(CTimeBlock &rTimeBlock, _RecordsetPtr rsBlock)
+        */
+                
+        /*
+        //long CResourceLink::SlotsInBlock(CTimeBlock &rTimeBlock, _RecordsetPtr rsBlock)
                 public static int SlotsInBlock(CGAvailability rTimeBlock, DataTable rsBlock)
                 {
@@ -952 +954 @@
                         return nSlots;
                 }//end SlotsInBlock
-
+        */
+
+        /*
                 public static string ClinicInBlock(CGAvailability rTimeBlock, DataTable rsBlock)
                 {
@@ -991 +995 @@
                         return sClinic;
                 }//end ClinicInBlock
-
+        */
+
+        /*
                 public static bool ResourceRulesInBlock(CGAvailability rTimeBlock, DataTable rsBlock, ref string sResourceList, ref string sAccessRuleList, ref string sNote)
                 {
@@ -1059 +1065 @@
                         return true;
                 }//End ResourceRulesInBlock
+        */
 
         

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs

@@ -617 +617 @@
             this.tvSchedules.Location = new System.Drawing.Point(0, 0);
             this.tvSchedules.Name = "tvSchedules";
-            this.tvSchedules.Size = new System.Drawing.Size(128, 400);
+            this.tvSchedules.Size = new System.Drawing.Size(128, 358);
             this.tvSchedules.Sorted = true;
             this.tvSchedules.TabIndex = 1;
@@ -664 +664 @@
             this.panelRight.Location = new System.Drawing.Point(941, 0);
             this.panelRight.Name = "panelRight";
-            this.panelRight.Size = new System.Drawing.Size(128, 400);
+            this.panelRight.Size = new System.Drawing.Size(128, 358);
             this.panelRight.TabIndex = 3;
             this.panelRight.Visible = false;
@@ -737 +737 @@
             this.dateTimePicker1.Dock = System.Windows.Forms.DockStyle.Right;
             this.dateTimePicker1.DropDownAlign = System.Windows.Forms.LeftRightAlignment.Right;
-            this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dateTimePicker1.Location = new System.Drawing.Point(685, 0);
+            this.dateTimePicker1.Location = new System.Drawing.Point(607, 0);
             this.dateTimePicker1.Name = "dateTimePicker1";
-            this.dateTimePicker1.Size = new System.Drawing.Size(128, 20);
+            this.dateTimePicker1.Size = new System.Drawing.Size(206, 20);
             this.dateTimePicker1.TabIndex = 1;
             this.dateTimePicker1.CloseUp += new System.EventHandler(this.dateTimePicker1_CloseUp);
@@ -761 +760 @@
             this.panelCenter.Location = new System.Drawing.Point(136, 24);
             this.panelCenter.Name = "panelCenter";
-            this.panelCenter.Size = new System.Drawing.Size(802, 352);
+            this.panelCenter.Size = new System.Drawing.Size(802, 310);
             this.panelCenter.TabIndex = 7;
             // 
@@ -847 +846 @@
             this.panelBottom.Controls.Add(this.statusBar1);
             this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelBottom.Location = new System.Drawing.Point(136, 376);
+            this.panelBottom.Location = new System.Drawing.Point(136, 334);
             this.panelBottom.Name = "panelBottom";
             this.panelBottom.Size = new System.Drawing.Size(802, 24);
@@ -865 +864 @@
             this.splitter1.Location = new System.Drawing.Point(128, 24);
             this.splitter1.Name = "splitter1";
-            this.splitter1.Size = new System.Drawing.Size(8, 376);
+            this.splitter1.Size = new System.Drawing.Size(8, 334);
             this.splitter1.TabIndex = 9;
             this.splitter1.TabStop = false;
@@ -874 +873 @@
             this.splitter2.Location = new System.Drawing.Point(938, 24);
             this.splitter2.Name = "splitter2";
-            this.splitter2.Size = new System.Drawing.Size(3, 376);
+            this.splitter2.Size = new System.Drawing.Size(3, 334);
             this.splitter2.TabIndex = 10;
             this.splitter2.TabStop = false;
@@ -902 +901 @@
             this.calendarGrid1.Resources = ((System.Collections.ArrayList)(resources.GetObject("calendarGrid1.Resources")));
             this.calendarGrid1.SelectedAppointment = 0;
-            this.calendarGrid1.Size = new System.Drawing.Size(802, 352);
+            this.calendarGrid1.Size = new System.Drawing.Size(802, 310);
             this.calendarGrid1.StartDate = new System.DateTime(2003, 1, 27, 0, 0, 0, 0);
             this.calendarGrid1.TabIndex = 0;
@@ -915 +914 @@
             // 
             this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-            this.ClientSize = new System.Drawing.Size(1069, 400);
+            this.ClientSize = new System.Drawing.Size(1069, 358);
             this.Controls.Add(this.panelCenter);
             this.Controls.Add(this.panelBottom);
@@ -1988 +1987 @@
                 this.Document.CheckInAppointment(nApptID, dtCheckIn);
 
-                //Tell appointment that it is checked in--smh cancel that!
-                //a.CheckInTime = DateTime.Now;
+                //Tell appointment that it is checked in
+                a.CheckInTime = DateTime.Now;
 
                 //smh new code
@@ -1996 +1995 @@
                 // end new code
 
-                //redraw grid (would this work???)
+                //redraw grid
                                 this.calendarGrid1.Invalidate();
                         }
@@ -2475 +2474 @@
                 return;
 
-            string sResource = dSearch.SelectedResource;
+            CGAvailability av = dSearch.SelectedAvailability;
+
             ArrayList alResource = new ArrayList();
-            alResource.Add(sResource);
-            DateTime sDate = dSearch.SelectedDate;
-            m_sDocName = sResource;
+            alResource.Add(av.ResourceList);
+            DateTime sDate = av.StartTime;
+            m_sDocName = av.ResourceList;
             OpenSelectedSchedule(alResource, sDate);
 

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj.user

@@ -37 +37 @@
     </RemoteDebugMachine>
     <StartAction>Project</StartAction>
-    <StartArguments>/s=192.168.56.101 /p=9260 /a=shabiel12 /v=catdog.77</StartArguments>
+    <StartArguments>/s=172.16.16.108 /p=9250 /a=s.habiel /v=catdog.66</StartArguments>
     <StartPage>
     </StartPage>

Scheduling/trunk/cs/bsdx0200GUISourceCode/DApptSearch.cs

@@ -1 +1 @@
 using System;
-using System.Drawing;
 using System.Collections;
-using System.ComponentModel;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Data;
+using System.Linq;
 //using System.Data.OleDb;
-using IndianHealthService.BMXNet;
 
 namespace IndianHealthService.ClinicalScheduling
 {
         /// <summary>
-        /// Summary description for DApptSearch.
+        /// Modal Dialog for searching for Patient Slots
         /// </summary>
         public class DApptSearch : System.Windows.Forms.Form
@@ -17 +16 @@
                 private System.Windows.Forms.Panel panel1;
                 private System.Windows.Forms.Button cmdCancel;
-                private System.Windows.Forms.Button cmdOK;
+                private System.Windows.Forms.Button btnAccept;
                 private System.Windows.Forms.Panel pnlDescription;
                 private System.Windows.Forms.GroupBox grpDescription;
@@ -38 +37 @@
                 private System.Windows.Forms.RadioButton rdoPM;
                 private System.Windows.Forms.RadioButton rdoAM;
-                private System.Windows.Forms.Label label1;
-                private System.Windows.Forms.MonthCalendar calStartDate;
-                private System.Windows.Forms.GroupBox groupBox2;
-                private System.Windows.Forms.DataGrid grdResult;
-                private System.Windows.Forms.Button cmdSearch;
-                /// <summary>
-                /// Required designer variable.
-                /// </summary>
-                private System.ComponentModel.Container components = null;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Button cmdSearch;
+        private ListView lstResults;
+        private ColumnHeader colStartTime;
+        private ColumnHeader colEndTime;
+        private ColumnHeader colResource;
+        private ColumnHeader colSlots;
+        private ColumnHeader colAccessType;
+        private ColumnHeader colDate;
+        private Label lblEnd;
+        private Label lblStart;
+        private DateTimePicker dtEnd;
+        private DateTimePicker dtStart;
+        private ColumnHeader colDOW;
+        private ColumnHeader colID;
+      
+        private System.ComponentModel.IContainer components;
 
                 public DApptSearch()
@@ -60 +68 @@
                 DataTable               m_dtTypes;
                 DataView                m_dvTypes;
-
+        List<CGAvailability> lstResultantAvailabilities;
+        private CGAvailability _selectedAvailability;
                 DateTime                m_dStart;
                 DateTime                m_dEnd;
                 ArrayList               m_alResources;
                 ArrayList               m_alAccessTypes;
-                string                  m_sWeekDays;
-                string                  m_sAmpm;
-
-                DataTable               m_dtResult;
-                DataView                m_dvResult;
-
-                string                  m_sSelectedResource;
-                DateTime                m_sSelectedDate;
+                string                  m_sWeekDays; //only practical use now is for sending to server
+                string                  m_sAmpm; // same here.
 
                 #endregion Fields
@@ -110 +113 @@
                 {
 
-                        this.m_DocManager = docManager;
+            this.Text = "Searching for Appointments in: " + string.Join(" | ", alResources.Cast<string>());
+            
+            this.m_DocManager = docManager;
                         this.m_dsGlobal = m_DocManager.GlobalDataSet;
-                        System.IntPtr pHandle = this.Handle;
+                        
                         LoadListBox("ALL");
 
@@ -136 +141 @@
                         cboAccessTypeFilter.Refresh();
 
-                        //Create DataGridTableStyle for Result grid
+
+            /* OLD CODE 
+            //Create DataGridTableStyle for Result grid
                         DataGridTableStyle tsResult = new DataGridTableStyle();
                         tsResult.MappingName = "Result";
                         tsResult.ReadOnly = true;
+
                         // Add START_TIME column style.
                         DataGridTextBoxColumn colStartTime = new DataGridTextBoxColumn();
-                        colStartTime.MappingName = "START_TIME";
+            colStartTime.MappingName = "StartTime";
                         colStartTime.HeaderText = "Start Time";
                         colStartTime.Width = 200;
@@ -150 +158 @@
                         // Add END_TIME column style.
                         DataGridTextBoxColumn colEndTime = new DataGridTextBoxColumn();
-                        colEndTime.MappingName = "END_TIME";
+            colEndTime.MappingName = "EndTime";
                         colEndTime.HeaderText = "End Time";
                         colEndTime.Width = 75;
@@ -158 +166 @@
                         // Add RESOURCE column style.
                         DataGridTextBoxColumn colResource = new DataGridTextBoxColumn();
-                        colResource.MappingName = "RESOURCE";
+            colResource.MappingName = "ResourceList";
                         colResource.HeaderText = "Resource";
                         colResource.Width = 200;
@@ -176 +184 @@
                         colAccess.Width = 200;
                         tsResult.GridColumnStyles.Add(colAccess);
-                        grdResult.TableStyles.Add(tsResult);
-
+                        //grdResult.TableStyles.Add(tsResult);
+            */
+            
                         this.UpdateDialogData(true);
                 
@@ -232 +241 @@
 
                                 //Start
-                                this.m_dStart = this.calStartDate.SelectionStart;
+                this.m_dStart = this.dtStart.Value;
 
                                 //End
-                                m_dEnd = calStartDate.SelectionEnd;
-                                m_dEnd = m_dEnd.AddHours(23);
-                                m_dEnd = m_dEnd.AddMinutes(59);
-
+                                this.m_dEnd = this.dtEnd.Value;
                         }               
                 }
@@ -270 +276 @@
             this.cmdSearch = new System.Windows.Forms.Button();
             this.cmdCancel = new System.Windows.Forms.Button();
-            this.cmdOK = new System.Windows.Forms.Button();
+            this.btnAccept = new System.Windows.Forms.Button();
             this.pnlDescription = new System.Windows.Forms.Panel();
             this.grpDescription = new System.Windows.Forms.GroupBox();
             this.lblDescription = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lblEnd = new System.Windows.Forms.Label();
+            this.lblStart = new System.Windows.Forms.Label();
+            this.dtEnd = new System.Windows.Forms.DateTimePicker();
+            this.dtStart = new System.Windows.Forms.DateTimePicker();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -292 +302 @@
             this.rdoAM = new System.Windows.Forms.RadioButton();
             this.label1 = new System.Windows.Forms.Label();
-            this.calStartDate = new System.Windows.Forms.MonthCalendar();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.grdResult = new System.Windows.Forms.DataGrid();
+            this.lstResults = new System.Windows.Forms.ListView();
+            this.colID = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colDate = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colDOW = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colStartTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colEndTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colResource = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colSlots = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.colAccessType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.panel1.SuspendLayout();
             this.pnlDescription.SuspendLayout();
@@ -302 +319 @@
             this.grpTimeOfDay.SuspendLayout();
             this.groupBox2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.grdResult)).BeginInit();
             this.SuspendLayout();
             // 
@@ -309 +325 @@
             this.panel1.Controls.Add(this.cmdSearch);
             this.panel1.Controls.Add(this.cmdCancel);
-            this.panel1.Controls.Add(this.cmdOK);
+            this.panel1.Controls.Add(this.btnAccept);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.panel1.Location = new System.Drawing.Point(0, 461);
@@ -334 +350 @@
             this.cmdCancel.Text = "Cancel";
             // 
-            // cmdOK
-            // 
-            this.cmdOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.cmdOK.Location = new System.Drawing.Point(128, 8);
-            this.cmdOK.Name = "cmdOK";
-            this.cmdOK.Size = new System.Drawing.Size(64, 24);
-            this.cmdOK.TabIndex = 0;
-            this.cmdOK.Text = "OK";
-            this.cmdOK.Visible = false;
-            this.cmdOK.Click += new System.EventHandler(this.cmdOK_Click);
+            // btnAccept
+            // 
+            this.btnAccept.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnAccept.Location = new System.Drawing.Point(128, 8);
+            this.btnAccept.Name = "btnAccept";
+            this.btnAccept.Size = new System.Drawing.Size(176, 24);
+            this.btnAccept.TabIndex = 0;
+            this.btnAccept.Text = "Select Slot for Appointment";
+            this.btnAccept.Click += new System.EventHandler(this.btnAccept_Click);
             // 
             // pnlDescription
@@ -378 +393 @@
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.lblEnd);
+            this.groupBox1.Controls.Add(this.lblStart);
+            this.groupBox1.Controls.Add(this.dtEnd);
+            this.groupBox1.Controls.Add(this.dtStart);
             this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.label2);
@@ -385 +404 @@
             this.groupBox1.Controls.Add(this.grpTimeOfDay);
             this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Controls.Add(this.calStartDate);
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupBox1.Location = new System.Drawing.Point(0, 0);
@@ -393 +411 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Search Parameters";
+            // 
+            // lblEnd
+            // 
+            this.lblEnd.AutoSize = true;
+            this.lblEnd.Location = new System.Drawing.Point(12, 124);
+            this.lblEnd.Name = "lblEnd";
+            this.lblEnd.Size = new System.Drawing.Size(153, 13);
+            this.lblEnd.TabIndex = 67;
+            this.lblEnd.Text = "End Date to Search (Inclusive)";
+            // 
+            // lblStart
+            // 
+            this.lblStart.AutoSize = true;
+            this.lblStart.Location = new System.Drawing.Point(12, 35);
+            this.lblStart.Name = "lblStart";
+            this.lblStart.Size = new System.Drawing.Size(159, 13);
+            this.lblStart.TabIndex = 66;
+            this.lblStart.Text = "Start Date to Search (Inclusive)";
+            // 
+            // dtEnd
+            // 
+            this.dtEnd.Location = new System.Drawing.Point(12, 141);
+            this.dtEnd.Name = "dtEnd";
+            this.dtEnd.Size = new System.Drawing.Size(200, 20);
+            this.dtEnd.TabIndex = 65;
+            // 
+            // dtStart
+            // 
+            this.dtStart.Location = new System.Drawing.Point(12, 54);
+            this.dtStart.Name = "dtStart";
+            this.dtStart.Size = new System.Drawing.Size(200, 20);
+            this.dtStart.TabIndex = 64;
             // 
             // label3
@@ -542 +592 @@
             // 
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(16, 24);
+            this.label1.Location = new System.Drawing.Point(6, 16);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(136, 16);
@@ -548 +598 @@
             this.label1.Text = "Date Range:";
             // 
-            // calStartDate
-            // 
-            this.calStartDate.Location = new System.Drawing.Point(16, 40);
-            this.calStartDate.MaxSelectionCount = 62;
-            this.calStartDate.Name = "calStartDate";
-            this.calStartDate.TabIndex = 56;
-            // 
             // groupBox2
             // 
-            this.groupBox2.Controls.Add(this.grdResult);
+            this.groupBox2.Controls.Add(this.lstResults);
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox2.Location = new System.Drawing.Point(0, 208);
@@ -566 +609 @@
             this.groupBox2.Text = "Search Result";
             // 
-            // grdResult
-            // 
-            this.grdResult.CaptionVisible = false;
-            this.grdResult.DataMember = "";
-            this.grdResult.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.grdResult.HeaderForeColor = System.Drawing.SystemColors.ControlText;
-            this.grdResult.Location = new System.Drawing.Point(3, 16);
-            this.grdResult.Name = "grdResult";
-            this.grdResult.ReadOnly = true;
-            this.grdResult.Size = new System.Drawing.Size(917, 170);
-            this.grdResult.TabIndex = 0;
-            this.grdResult.DoubleClick += new System.EventHandler(this.grdResult_DoubleClick);
-            this.grdResult.CurrentCellChanged += new System.EventHandler(this.grdResult_CurrentCellChanged);
+            // lstResults
+            // 
+            this.lstResults.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colID,
+            this.colDate,
+            this.colDOW,
+            this.colStartTime,
+            this.colEndTime,
+            this.colResource,
+            this.colSlots,
+            this.colAccessType});
+            this.lstResults.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lstResults.FullRowSelect = true;
+            this.lstResults.GridLines = true;
+            this.lstResults.Location = new System.Drawing.Point(3, 16);
+            this.lstResults.MultiSelect = false;
+            this.lstResults.Name = "lstResults";
+            this.lstResults.Size = new System.Drawing.Size(917, 170);
+            this.lstResults.TabIndex = 0;
+            this.lstResults.UseCompatibleStateImageBehavior = false;
+            this.lstResults.View = System.Windows.Forms.View.Details;
+            this.lstResults.DoubleClick += new System.EventHandler(this.lstResults_DoubleClick);
+            // 
+            // colID
+            // 
+            this.colID.Text = "ID";
+            this.colID.Width = 0;
+            // 
+            // colDate
+            // 
+            this.colDate.Text = "Date";
+            this.colDate.Width = 91;
+            // 
+            // colDOW
+            // 
+            this.colDOW.Text = "Day of Week";
+            this.colDOW.Width = 80;
+            // 
+            // colStartTime
+            // 
+            this.colStartTime.Text = "Start Time";
+            this.colStartTime.Width = 87;
+            // 
+            // colEndTime
+            // 
+            this.colEndTime.Text = "End Time";
+            this.colEndTime.Width = 116;
+            // 
+            // colResource
+            // 
+            this.colResource.Text = "Resource";
+            this.colResource.Width = 370;
+            // 
+            // colSlots
+            // 
+            this.colSlots.Text = "Slots";
+            this.colSlots.Width = 47;
+            // 
+            // colAccessType
+            // 
+            this.colAccessType.Text = "Access Type";
+            this.colAccessType.Width = 101;
             // 
             // DApptSearch
@@ -596 +688 @@
             this.grpDescription.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
             this.grpDayOfWeek.ResumeLayout(false);
             this.grpTimeOfDay.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.grdResult)).EndInit();
             this.ResumeLayout(false);
 
@@ -606 +698 @@
 
         #region Event Handlers
-        private void cmdOK_Click(object sender, System.EventArgs e)
-                {
-
-                }
 
                 private void cmdSearch_Click(object sender, System.EventArgs e)
                 {
-                        //Get the control data into local vars
+                        //Tell user we are processing
+            this.Cursor = Cursors.WaitCursor;
+            
+            //Get the control data into local vars
                         UpdateDialogData(false);
                         //Resource array, Begin date, Access type array, MTWTF , AM PM
-                        //Assemble |-delimited resource string
-                        string sResources = "";
-                        for (int j=0; j < m_alResources.Count; j++)
-                        {
-                                sResources = sResources + m_alResources[j];
-                                if (j < (m_alResources.Count - 1))
-                                        sResources = sResources + "|";
-                        }
-
-                        //Access Types Array
-                        string sTypes = "";
-                        if (m_alAccessTypes.Count > 0) 
-                        {
-                                for (int j=0; j < m_alAccessTypes.Count; j++)
-                                {
-                                        sTypes = sTypes + (string) m_alAccessTypes[j];
-                                        if (j < (m_alAccessTypes.Count-1))
-                                                sTypes = sTypes + "|";
-                                }
-                        }
-
+
+            //Get Availabilities and Appointments from the DB
+            //NB: m_sAmpm and m_sWeekDays don't have an effect on the M side side right now
                         string sSearchInfo = "1|" + m_sAmpm + "|" + m_sWeekDays;
-                        m_dtResult = CGSchedLib.CreateAvailabilitySchedule(m_DocManager, m_alResources, m_dStart, m_dEnd, m_alAccessTypes, ScheduleType.Resource, sSearchInfo);
-
-                        if (m_dtResult.Rows.Count == 0)
-                        {
-                                MessageBox.Show("No availability found.");
-                                return;
-                        }
-
-                        m_dtResult.TableName = "Result";
-                        m_dtResult.Columns.Add("AMPM", System.Type.GetType("System.String") ,"Convert(START_TIME, 'System.String')" );
-                        m_dtResult.Columns.Add("DAYOFWEEK", System.Type.GetType("System.String"));
-                        m_dtResult.Columns.Add("ACCESSNAME", System.Type.GetType("System.String"));
-
-                        DataRow drAT;
-                        DateTime dt;
-                        string sDOW;
-                        int nAccessTypeID;
-                        string sAccessType;
-
-                        foreach (DataRow dr in m_dtResult.Rows)
-                        {
-                                dt = (DateTime) dr["START_TIME"];
-                                sDOW = dt.DayOfWeek.ToString();
-                                dr["DAYOFWEEK"] = sDOW;
-                                if (dr["ACCESS_TYPE"].ToString() != "") 
-                                {
-                                        nAccessTypeID =Convert.ToInt16(dr["ACCESS_TYPE"].ToString());
-                                        drAT = m_dsGlobal.Tables["AccessTypes"].Rows.Find(nAccessTypeID);
-                                        if (drAT != null)
-                                        {
-                                                sAccessType = drAT["ACCESS_TYPE_NAME"].ToString();
-                                                dr["ACCESSNAME"] = sAccessType;
-                                        }
-                                }
-                        }
-
-
-                        m_dvResult = new DataView(m_dtResult);
-
-                        string sFilter = "(SLOTS > 0)";
-                        if (m_sAmpm != "")
-                        {
-                                if (m_sAmpm == "AM")
-                                        sFilter = sFilter + " AND (AMPM LIKE '*AM*')";
-                                if (m_sAmpm == "PM")
-                                        sFilter = sFilter + " AND (AMPM LIKE '*PM*')";
-                        }
-
-                        bool sOr = false;
-                        if (m_sWeekDays != "")
-                        {
-                                sFilter += " AND (";
-                                if (chkMon.Checked == true)
-                                {
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Monday*')";
-                                        sOr = true;
-                                }
-                                if (chkTue.Checked == true)
-                                {
-                                        sFilter = (sOr == true)?sFilter + " OR ":sFilter;
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Tuesday*')";
-                                        sOr = true;
-                                }
-                                if (chkWed.Checked == true)
-                                {
-                                        sFilter = (sOr == true)?sFilter + " OR ":sFilter;
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Wednesday*')";
-                                        sOr = true;
-                                }
-                                if (chkThu.Checked == true)
-                                {
-                                        sFilter = (sOr == true)?sFilter + " OR ":sFilter;
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Thursday*')";
-                                        sOr = true;
-                                }
-                                if (chkFri.Checked == true)
-                                {
-                                        sFilter = (sOr == true)?sFilter + " OR ":sFilter;
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Friday*')";
-                                        sOr = true;
-                                }
-                                if (chkSat.Checked == true)
-                                {
-                                        sFilter = (sOr == true)?sFilter + " OR ":sFilter;
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Saturday*')";
-                                        sOr = true;
-                                }
-                                if (chkSun.Checked == true)
-                                {
-                                        sFilter = (sOr == true)?sFilter + " OR ":sFilter;
-                                        sFilter = sFilter + "(DAYOFWEEK LIKE '*Sunday*')";
-                                        sOr = true;
-                                }
-                                sFilter += ")";
-                        }
-
-                        if (m_alAccessTypes.Count > 0) 
-                        {
-                                sFilter += " AND (";
-                                sOr = false;
-                                foreach (string sType in m_alAccessTypes)
-                                {
-                                        if (sOr == true)
-                                                sFilter += " OR ";
-                                        sOr = true;
-                                        sFilter += "(ACCESSNAME = '" + sType + "')";
-                                }
-                                sFilter += ")";
-                        }       
-
-                        m_dvResult.RowFilter = sFilter;
-                        this.grdResult.DataSource = m_dvResult;
-
+                        DataTable m_availTable = CGSchedLib.CreateAvailabilitySchedule(m_DocManager, m_alResources, m_dStart, m_dEnd, m_alAccessTypes, ScheduleType.Resource, sSearchInfo);
+            DataTable m_apptTable = CGSchedLib.CreateAppointmentSchedule(m_DocManager, m_alResources, m_dStart, m_dEnd);
+
+#if DEBUG            
+            System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();
+            stopwatch.Start();
+#endif
+            lstResultantAvailabilities = (from rowAV in m_availTable.AsEnumerable()
+                         
+                         // Calculate the number of slots consumed in this availability by appointments
+                         let slotsConsumed = (from appt in m_apptTable.AsEnumerable()
+                                              //If the resource is the same and the user selection overlaps, then...
+                                              where (rowAV.Field<string>("RESOURCE") == appt.Field<string>("RESOURCENAME")
+                                                && CalendarGrid.TimesOverlap(rowAV.Field<DateTime>("START_TIME"), rowAV.Field<DateTime>("END_TIME"), appt.Field<DateTime>("START_TIME"), appt.Field<DateTime>("END_TIME")))
+                                              // if appt starttime is before avail start time, only count against the avail starting from the availability start time
+                                              let startTimeToCountAgainstBlock = appt.Field<DateTime>("START_TIME") < rowAV.Field<DateTime>("START_TIME") ? rowAV.Field<DateTime>("START_TIME") : appt.Field<DateTime>("START_TIME")
+                                              // if appt endtime is after the avail ends, only count against the avail up to where the avail ends
+                                              let endTimeToCountAgainstBlock = appt.Field<DateTime>("END_TIME") > rowAV.Field<DateTime>("END_TIME") ? rowAV.Field<DateTime>("END_TIME") : appt.Field<DateTime>("END_TIME")
+                                              // theoretical minutes per slot for the availability
+                                              let minPerSlot = (rowAV.Field<DateTime>("END_TIME") - rowAV.Field<DateTime>("START_TIME")).TotalMinutes / rowAV.Field<int>("SLOTS")
+                                              // how many minutes does this appointment take away from the slot
+                                              let minPerAppt = (endTimeToCountAgainstBlock - startTimeToCountAgainstBlock).TotalMinutes
+                                              // how many slots the appointment takes up using this availability's scale
+                                              let slotsConsumed = minPerAppt / minPerSlot
+                                              select slotsConsumed).Sum()
+                         
+                         // Subtract the number consumed from the original ones
+                         let slotsLeft = (float)rowAV.Field<int>("SLOTS") - slotsConsumed
+                         // filter by that value if it is at least one slot
+                         where slotsLeft >= 1
+                         // Sort by Start Time, then by Resource Name
+                         orderby rowAV.Field<DateTime>("START_TIME"), rowAV.Field<string>("RESOURCE")
+                          //return as a CGAvailability
+                          select new CGAvailability
+                         {
+                             ResourceList = rowAV.Field<string>("RESOURCE"),
+                             StartTime = rowAV.Field<DateTime>("START_TIME"),
+                             EndTime = rowAV.Field<DateTime>("END_TIME"),
+                             Slots = (int)slotsLeft,
+                             // AccessTypeName is grabbed from the Access Type Table using a psuedojoin syntax.
+                             // "ACCESS_TYPE" is the IEN of the AcceesType.
+                             // Single or default is b/c we are expecting one result.
+                             AccessTypeName = (from at in m_dsGlobal.Tables["AccessTypes"].AsEnumerable() 
+                                              where at.Field<int>("BMXIEN")==Int32.Parse(rowAV.Field<string>("ACCESS_TYPE"))
+                                              select at.Field<string>("ACCESS_TYPE_NAME")).SingleOrDefault<string>(),
+                             AvailabilityType = rowAV.Field<int>("AVAILABILITYID")
+                         })
+                         // convert to Generic List
+                         .ToList<CGAvailability>();
+
+            // if specific access types are chosen, filter the results based on a join against them.
+            if (m_alAccessTypes.Count > 0)
+                lstResultantAvailabilities = (from av in lstResultantAvailabilities
+                                              join at in m_alAccessTypes.Cast<string>() on av.AccessTypeName equals at
+                                              select av).ToList<CGAvailability>();
+
+            // if user chose AM radio button, get morning appointments
+            // TimeSpan.FromHours(12) gets the number of ticks since Midnight
+            if (rdoAM.Checked) // less than 12 pm
+            {
+                lstResultantAvailabilities = (from av in lstResultantAvailabilities
+                                              where av.StartTime.TimeOfDay < TimeSpan.FromHours(12)
+                                              select av).ToList<CGAvailability>();
+            }
+            // if user chose PM radio button, get morning appointments
+            if (rdoPM.Checked) // after or equal to 12 pm
+            {
+                lstResultantAvailabilities = (from av in lstResultantAvailabilities
+                                              where av.StartTime.TimeOfDay >= TimeSpan.FromHours(12)
+                                              select av).ToList<CGAvailability>();
+            }
+
+            // if any of the days of week are checked, create a new list based on them
+            // and clear the original list, and join the new lists together
+            if (chkMon.Checked || chkTue.Checked || chkWed.Checked || chkThu.Checked || chkFri.Checked || chkSat.Checked || chkSun.Checked)
+            {
+
+                var lstMonday = new List<CGAvailability>();
+                var lstTuesday = new List<CGAvailability>();
+                var lstWednesday = new List<CGAvailability>();
+                var lstThursday = new List<CGAvailability>();
+                var lstFriday = new List<CGAvailability>();
+                var lstSaturday = new List<CGAvailability>();
+                var lstSunday = new List<CGAvailability>();
+
+                if (chkMon.Checked == true)
+                {
+                    lstMonday = (from av in lstResultantAvailabilities
+                                 where av.StartTime.DayOfWeek == DayOfWeek.Monday
+                                 select av).ToList<CGAvailability>();
+                }
+
+                if (chkTue.Checked == true)
+                {
+                    lstTuesday = (from av in lstResultantAvailabilities
+                                  where av.StartTime.DayOfWeek == DayOfWeek.Tuesday
+                                  select av).ToList<CGAvailability>();
+                }
+
+                if (chkWed.Checked == true)
+                {
+                    lstWednesday = (from av in lstResultantAvailabilities
+                                    where av.StartTime.DayOfWeek == DayOfWeek.Wednesday
+                                    select av).ToList<CGAvailability>();
+
+                }
+
+                if (chkThu.Checked == true)
+                {
+                    lstThursday = (from av in lstResultantAvailabilities
+                                   where av.StartTime.DayOfWeek == DayOfWeek.Thursday
+                                   select av).ToList<CGAvailability>();
+
+                }
+
+                if (chkFri.Checked == true)
+                {
+                    lstFriday = (from av in lstResultantAvailabilities
+                                 where av.StartTime.DayOfWeek == DayOfWeek.Friday
+                                 select av).ToList<CGAvailability>();
+                }
+
+                if (chkSat.Checked == true)
+                {
+                    lstSaturday = (from av in lstResultantAvailabilities
+                                   where av.StartTime.DayOfWeek == DayOfWeek.Saturday
+                                   select av).ToList<CGAvailability>();
+
+                }
+
+                if (chkSun.Checked == true)
+                {
+                    lstSunday = (from av in lstResultantAvailabilities
+                                 where av.StartTime.DayOfWeek == DayOfWeek.Sunday
+                                 select av).ToList<CGAvailability>();
+
+                }
+
+
+                lstResultantAvailabilities.Clear();
+                lstResultantAvailabilities.AddRange(lstMonday);
+                lstResultantAvailabilities.AddRange(lstTuesday);
+                lstResultantAvailabilities.AddRange(lstWednesday);
+                lstResultantAvailabilities.AddRange(lstThursday);
+                lstResultantAvailabilities.AddRange(lstFriday);
+                lstResultantAvailabilities.AddRange(lstSaturday);
+                lstResultantAvailabilities.AddRange(lstSunday);
+
+                lstResultantAvailabilities.OrderBy(av => av.StartTime).ThenBy(av => av.ResourceList);
+            }
+
+            
+
+#if DEBUG
+            System.Diagnostics.Debug.Write("LINQ took this long: " + stopwatch.ElapsedMilliseconds + "\n");
+            stopwatch = null;
+#endif
+            
+            //Then, convert the availabilities to ListViewItems
+            var items = (from item in lstResultantAvailabilities
+                        let s = new string[] {item.AvailabilityType.ToString(), item.StartTime.ToShortDateString(), item.StartTime.DayOfWeek.ToString(),item.StartTime.ToShortTimeString() ,item.EndTime.ToShortTimeString() ,item.ResourceList,item.Slots.ToString(),item.AccessTypeName}
+                        let lvItem = new ListViewItem(s)
+                        select lvItem).ToArray<ListViewItem>();
+
+            //--Updating Listview
+            lstResults.BeginUpdate(); //tell listview to suspend drawing for now
+            lstResults.Items.Clear(); //empty it from old data
+
+            //if (items.Length == 0) lstResults.Items.Add(new ListViewItem(new string[] { "", "", "", "" , "", "No Slots found", "", "" })); // no results
+            if (items.Length > 0) lstResults.Items.AddRange(items); // add new data
+
+            lstResults.EndUpdate(); // ok done adding items, draw now.
+            //--End Update Listview
+
+            //We are done
+            this.Cursor = Cursors.Default;
                 }
 
@@ -770 +906 @@
                 private void grdResult_DoubleClick(object sender, System.EventArgs e)
                 {
-                        if (grdResult.DataSource == null)
+                        /*
+            if (lstResults.DataSource == null)
                                 return;
 
-                        DataGridCell dgCell;
+                        DataGridViewCell dgCell;
                         dgCell = this.grdResult.CurrentCell;
-                        dgCell.ColumnNumber = 2;
-                        this.m_sSelectedResource = grdResult[dgCell.RowNumber, dgCell.ColumnNumber].ToString();
-                        this.m_sSelectedDate = (DateTime) grdResult[dgCell.RowNumber,0];
+            this.m_sSelectedResource = grdResult.SelectedRows[0].Cells[2].ToString();
+            this.m_sSelectedDate = (DateTime)grdResult.SelectedRows[0].Cells[0].Value;
                         this.DialogResult = DialogResult.OK;
                         this.Close();
+             */
                 }
 
                 private void grdResult_CurrentCellChanged(object sender, System.EventArgs e)
                 {
-                        DataGridCell dgCell;
-                        dgCell = this.grdResult.CurrentCell;
-                        this.grdResult.Select(dgCell.RowNumber);
-
+                        /*
+            DataGridViewCell dgCell;
+            dgCell = this.grdResult.CurrentCell;
+             */
         }
 
+        /// <summary>
+        /// BAAAAAAAAAAAAAAAAAD. Use a shared method instead.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void lstResults_DoubleClick(object sender, EventArgs e)
+        {
+            btnAccept_Click(sender, e);
+        }
+
+        private void btnAccept_Click(object sender, EventArgs e)
+        {
+            if (lstResults.SelectedIndices.Count == 0)
+            {
+                this.DialogResult = DialogResult.None;
+                return;
+            }
+
+            long availabilityKey = long.Parse(lstResults.SelectedItems[0].SubItems[0].Text);
+            _selectedAvailability = (from av in lstResultantAvailabilities
+                                     where av.AvailabilityType == availabilityKey
+                                     select av).Single<CGAvailability>();
+            this.DialogResult = DialogResult.OK;
+        }
+
         #endregion  Event Handlers
 
         #region Properties
+
+        
         /// <summary>
-                /// Gets the resource selected by the user
-                /// </summary>
-                public string SelectedResource
-                {
-                        get
-                        {
-                                return this.m_sSelectedResource;
-                        }
-                }
-
-                /// <summary>
-                /// Gets the date selected by the user
-                /// </summary>
-                public DateTime SelectedDate
-                {
-                        get
-                        {
-                                return this.m_sSelectedDate;
-                        }
-                }
+        /// Gets the Availability Selected by the User in which to put an appointment
+        /// </summary>
+        public CGAvailability SelectedAvailability
+        {
+            get { return this._selectedAvailability; }
+        }
+
                 #endregion Properties
-
-        }
+    }
 }

Scheduling/trunk/cs/bsdx0200GUISourceCode/DApptSearch.resx

@@ -113 +113 @@
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
 </root>

Scheduling/trunk/cs/bsdx0200GUISourceCode/DPatientLookup.cs

@@ -1 +1 @@
 using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
 using System.Windows.Forms;
 using System.Data;
-//using System.Data.OleDb;
-using IndianHealthService.BMXNet;
+
 
 namespace IndianHealthService.ClinicalScheduling