Changeset 1070 for Scheduling/trunk/cs

Timestamp:

Jan 18, 2011, 9:15:22 AM (14 years ago)

Author:

Sam Habiel

Message:

LoadingSplash: New Form that does... pretty much nothing. Just shows a splash when updating data from server.
CGView:

• Refactoring for OpenSelectedSchedule. No major changes.
• Splash Screen and Wait Cursor support in RequestRefershGrid

CGDocumentManager:

• Use lambda (hurray!) for ParameterizedThreadStart

CGDocument:

• AddResource no longer updates views (they are empty at the point they added.)
• Removed unused SetDate method.
• Property SelectedDate no longer triggers updates to the database. Now you have to use RefershDocument instead.

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGDocument.cs (modified) (4 diffs)
• CGDocumentManager.cs (modified) (3 diffs)
• CGView.cs (modified) (7 diffs)
• ClinicalScheduling.csproj (modified) (5 diffs)
• ClinicalScheduling.csproj.user (modified) (2 diffs)
• ClinicalScheduling.suo (modified) ( previous)
• LoadingSplash.Designer.cs (added)
• LoadingSplash.cs (added)
• LoadingSplash.resx (added)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocument.cs

@@ -113 +113 @@
                         {
                                 this.m_dSelectedDate = value;
-                                bool bRet = false;
-                                if (m_sResourcesArray.Count == 1)
-                                {
-                                        bRet = this.WeekNeedsRefresh(1, m_dSelectedDate, out this.m_dStartDate, out this.m_dEndDate);
-                                }
-                                else
-                                {
-                                        this.m_dStartDate = m_dSelectedDate;
-                                        this.m_dEndDate = m_dSelectedDate;
-                                        this.m_dEndDate = this.m_dEndDate.AddHours(23);
-                                        this.m_dEndDate = this.m_dEndDate.AddMinutes(59);
-                                        this.m_dEndDate = this.m_dEndDate.AddSeconds(59);
-                                }
-
-                                bRet = RefreshSchedule();
                         }
                 }
@@ -303 +288 @@
                 }
 
-                private void SetDate(DateTime dDate)
-                {
-                        bool bRet = false;
-                        if (m_ScheduleType == ScheduleType.Resource)
-                        {
-                                bRet = this.WeekNeedsRefresh(2,dDate, out this.m_dStartDate, out this.m_dEndDate);
-                        }
-                        else
-                        {
-                                this.m_dStartDate = dDate;
-                                this.m_dEndDate = dDate;
-                                this.m_dEndDate = this.m_dEndDate.AddHours(23);
-                                this.m_dEndDate = this.m_dEndDate.AddMinutes(59);
-                                this.m_dEndDate = this.m_dEndDate.AddSeconds(59);
-                        }
+                public void RefreshDocument()
+                {
+            bool bRet = false;
+            if (m_sResourcesArray.Count == 1)
+            {
+                bRet = this.WeekNeedsRefresh(1, m_dSelectedDate, out this.m_dStartDate, out this.m_dEndDate);
+            }
+            else
+            {
+                this.m_dStartDate = m_dSelectedDate;
+                this.m_dEndDate = m_dSelectedDate;
+                this.m_dEndDate = this.m_dEndDate.AddHours(23);
+                this.m_dEndDate = this.m_dEndDate.AddMinutes(59);
+                this.m_dEndDate = this.m_dEndDate.AddSeconds(59);
+            }
 
                         bRet = RefreshSchedule();
-                        this.UpdateAllViews();
-                }
-
-                public void RefreshDocument()
-                {
-                        bool bRet = RefreshSchedule();
                         this.UpdateAllViews();
                 }
@@ -356 +335 @@
                                 CGView view = null;
                                 //If this document already has a view, the use it
+                //SAM: Why do this again???
                                 Hashtable h = CGDocumentManager.Current.Views;          
                                 CGDocument d;
@@ -590 +570 @@
                         //TODO:  Test that resource is not currently in list, that it IS a resource, etc
                         this.m_sResourcesArray.Add(sResource);
-            //UpdateAllViews: Redraws all the open views. But does not call server.
-                        this.UpdateAllViews();
+            //SAM: removing: Remove UpdateAllViews: Redraws all the open views. But does not call server.
+                        //this.UpdateAllViews();
                 }
 

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocumentManager.cs

@@ -198 +198 @@
 
             //Create the first empty document
+            //SAM: Good place for break point
             CGDocument doc = new CGDocument();
             doc.DocManager = _current;
@@ -281 +282 @@
                 #region Methods & Events
 
-        
-                private void StartSplash(object form)
-                {
-            ((DSplash)form).ShowDialog();
-                }
-
         /// <summary>
         /// See InitializeApp(bool) below
@@ -325 +320 @@
 
             //Start new thread for the Splash screen.
-            Thread threadSplash = new Thread(new ParameterizedThreadStart(StartSplash));
+            Thread threadSplash = new Thread(new ParameterizedThreadStart(frm => ((DSplash)frm).ShowDialog()));
             threadSplash.IsBackground = true; //expendable thread -- exit even if still running.
             threadSplash.Name = "Splash Thread";

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGView.cs

@@ -651 +651 @@
             this.tvSchedules.Sorted = true;
             this.tvSchedules.TabIndex = 1;
-            this.tvSchedules.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.tvSchedules_BeforeSelect);
             this.tvSchedules.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvSchedules_AfterSelect);
             this.tvSchedules.Click += new System.EventHandler(this.tvSchedules_Click);
@@ -820 +819 @@
             this.calendarGrid1.TabIndex = 0;
             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);
             // 
@@ -1494 +1493 @@
                 }
 
-
+        /// <summary>
+        /// Opens a view of the Schedule a user requested to open at a specific date
+        /// </summary>
+        /// <param name="sSelectedTreeResourceArray">A set of resources to open (?pending more investigation)</param>
+        /// <param name="dDate">Date at which to show the Grid</param>
                 private void OpenSelectedSchedule(ArrayList sSelectedTreeResourceArray, DateTime dDate)
                 {
                         //If resource already open, then navigate to its window
-            //XXX: Why is this doc definition here? Should be under else scope
-            //XXX: Use Bananna peeling instead of if/else
-                        CGDocument doc;
                         CGView v =this.DocManager.GetViewByResource(sSelectedTreeResourceArray);
                         if (v != null) 
@@ -1506 +1506 @@
                                 v.Activate();
                                 v.dateTimePicker1.Value = dDate;
+                return;
+                        }
+
+                        //If this Document has no resources then use it (happens when the GUI has nothing open, typically after log-in)
+                        //Else, create a new document
+            CGDocument doc;
+            if (this.Document.m_sResourcesArray.Count == 0)
+                        {
+                doc = this.Document;
                         }
                         else 
                         {
-                                //If not already open, open it
-                                //If current document has a resource, then open a new window 
-                                //with the selected resource.
-                                //Otherwise just use the current document.
-                                if (this.Document.m_sResourcesArray.Count > 0)
-                                {
-                                        doc = new CGDocument();
-                                        doc.DocManager = this.DocManager;
-                                }
-                                else 
-                                {
-                                        doc = this.Document;
-                                }
-                                for (int j=0; j < sSelectedTreeResourceArray.Count; j++)
-                                {
-                    // Investigate this. This draws the grid when there is nothing to draw!!!
-                                        doc.AddResource((string) sSelectedTreeResourceArray[j]);
-                                }
-
-                                doc.DocName = this.m_sDocName;
+                doc = new CGDocument();
+                doc.DocManager = this.DocManager;                               
+                        }
+
+            //Add resources to Document
+                        for (int j=0; j < sSelectedTreeResourceArray.Count; j++)
+                        {
+                                doc.AddResource((string) sSelectedTreeResourceArray[j]);
+                        }
+
+                        doc.DocName = this.m_sDocName;
                                 
-                try
-                                {
-                                        doc.OnOpenDocument();
-                                }
+            try
+                        {
+                                doc.OnOpenDocument();
+                        }
                                 
-                catch (Exception ex)
-                                {
-                                        MessageBox.Show("Unable to open " + m_sDocName + " schedule.  " +  ex.Message, "Clinical Scheduling");
-                                        this.m_DocManager.CloseAllViews(doc);
-                                        return;
-                                }
-                                v =this.DocManager.GetViewByResource(sSelectedTreeResourceArray);
-                                v.dateTimePicker1.Value = dDate;
-
-                                //Get preferred time scale from resource info
-                                //If more than one resource, get smallest time scale
-                                CalendarGrid cg = v.CGrid;
-                                DataTable dt = this.DocManager.GlobalDataSet.Tables["Resources"];
-                                DataView dv = new DataView(dt, "", "RESOURCE_NAME ASC", DataViewRowState.OriginalRows);
-                                int nScale = 60;
-                                int nTest=0;
-                                string sResource;
-                                int nDataRow;
-                                DataRowView drv;
-                                for (int j=0; j < sSelectedTreeResourceArray.Count; j++)
-                                {
-                                        sResource = (string) sSelectedTreeResourceArray[j];
-                                        nDataRow = dv.Find(sResource);
-                                        Debug.Assert(nDataRow != -1);
-                                        drv = dv[nDataRow];
-                                        if (drv["TIMESCALE"].ToString() == "")
-                                        {
-                                                nTest = 15; //15 minute default
-                                        }
-                                        else
-                                        {
-                                                nTest = (int) drv["TIMESCALE"];
-                                        }
-                                        nScale = (nTest < nScale)?nTest : nScale ;
-                                }
-
-                                cg.TimeScale = nScale;
-
-                                cg.PositionGrid(7);
-
-                                //Get the OverBook and ModifySchedule permissions from ResourceUser table
-                                //and populate the hashtables
-                                string  sOverbook;
-                                string  sModSchedule;
-                                string  sModAppts;
-                                bool    bOverbook;
-                                bool    bModSchedule;
-                                bool    bModAppts;
-                                v.m_htOverbook = new Hashtable(sSelectedTreeResourceArray.Count);
-                                v.m_htModifySchedule = new Hashtable(sSelectedTreeResourceArray.Count);
-                                v.m_htChangeAppts = new Hashtable(sSelectedTreeResourceArray.Count);
-                                dt = this.DocManager.GlobalDataSet.Tables["ResourceUser"];
-                                dv = new DataView(dt, "", "RESOURCENAME ASC", DataViewRowState.OriginalRows);
-                                dv.RowFilter = "USERNAME = '" + this.DocManager.ConnectInfo.UserName + "'";
-                                for (int j=0; j < dv.Count; j++)
-                                {
-                                        drv = dv[j];
-                                        sResource = drv["RESOURCENAME"].ToString();
-                                        sOverbook = drv["OVERBOOK"].ToString();
-                                        bOverbook = (sOverbook == "YES")?true:false;
-                                        sModSchedule = drv["MODIFY_SCHEDULE"].ToString();
-                                        bModSchedule = (sModSchedule == "YES")?true:false;
-                                        sModAppts = drv["MODIFY_APPOINTMENTS"].ToString();
-                                        bModAppts = (sModAppts == "YES")?true:false;
-                                        v.m_htOverbook[sResource] = bOverbook;
-                                        v.m_htModifySchedule[sResource] = bModSchedule;
-                                        v.m_htChangeAppts[sResource] = bModAppts;
-                                }
-
-                                //For programmers and scheduling managers, set all permissions for all resources
-                                if (this.DocManager.ScheduleManager == true)
-                                {
-                                        dt = this.DocManager.GlobalDataSet.Tables["Resources"];
-                                        foreach (DataRow dr in dt.Rows)
-                                        {
-                                                sResource = dr["RESOURCE_NAME"].ToString();
-                                                v.m_htOverbook[sResource] = true;
-                                                v.m_htModifySchedule[sResource] = true;
-                                                v.m_htChangeAppts[sResource] = true;
-                                        }
-                                }
-
-                                v.calendarGrid1.SetOverlapTable();
-                                v.calendarGrid1.Refresh();
-                        }
+            catch (Exception ex)
+                        {
+                                MessageBox.Show("Unable to open " + m_sDocName + " schedule.  " +  ex.Message, "Clinical Scheduling");
+                                this.m_DocManager.CloseAllViews(doc);
+                                return;
+                        }
+
+            //We are doing this--Again?
+                        v =this.DocManager.GetViewByResource(sSelectedTreeResourceArray);
+                        v.dateTimePicker1.Value = dDate;
+
+                        //Get preferred time scale from resource info
+                        //If more than one resource, get smallest time scale
+                        CalendarGrid cg = v.CGrid;
+                        DataTable dt = this.DocManager.GlobalDataSet.Tables["Resources"];
+                        DataView dv = new DataView(dt, "", "RESOURCE_NAME ASC", DataViewRowState.OriginalRows);
+                        int nScale = 60;
+                        int nTest=0;
+                        string sResource;
+                        int nDataRow;
+                        DataRowView drv;
+                        for (int j=0; j < sSelectedTreeResourceArray.Count; j++)
+                        {
+                                sResource = (string) sSelectedTreeResourceArray[j];
+                                nDataRow = dv.Find(sResource);
+                                Debug.Assert(nDataRow != -1);
+                                drv = dv[nDataRow];
+                                if (drv["TIMESCALE"].ToString() == "")
+                                {
+                                        nTest = 15; //15 minute default
+                                }
+                                else
+                                {
+                                        nTest = (int) drv["TIMESCALE"];
+                                }
+                                nScale = (nTest < nScale)?nTest : nScale ;
+                        }
+
+                        cg.TimeScale = nScale;
+
+                        cg.PositionGrid(7);
+
+                        //Get the OverBook and ModifySchedule permissions from ResourceUser table
+                        //and populate the hashtables
+                        string  sOverbook;
+                        string  sModSchedule;
+                        string  sModAppts;
+                        bool    bOverbook;
+                        bool    bModSchedule;
+                        bool    bModAppts;
+                        v.m_htOverbook = new Hashtable(sSelectedTreeResourceArray.Count);
+                        v.m_htModifySchedule = new Hashtable(sSelectedTreeResourceArray.Count);
+                        v.m_htChangeAppts = new Hashtable(sSelectedTreeResourceArray.Count);
+                        dt = this.DocManager.GlobalDataSet.Tables["ResourceUser"];
+                        dv = new DataView(dt, "", "RESOURCENAME ASC", DataViewRowState.OriginalRows);
+                        dv.RowFilter = "USERNAME = '" + this.DocManager.ConnectInfo.UserName + "'";
+                        for (int j=0; j < dv.Count; j++)
+                        {
+                                drv = dv[j];
+                                sResource = drv["RESOURCENAME"].ToString();
+                                sOverbook = drv["OVERBOOK"].ToString();
+                                bOverbook = (sOverbook == "YES")?true:false;
+                                sModSchedule = drv["MODIFY_SCHEDULE"].ToString();
+                                bModSchedule = (sModSchedule == "YES")?true:false;
+                                sModAppts = drv["MODIFY_APPOINTMENTS"].ToString();
+                                bModAppts = (sModAppts == "YES")?true:false;
+                                v.m_htOverbook[sResource] = bOverbook;
+                                v.m_htModifySchedule[sResource] = bModSchedule;
+                                v.m_htChangeAppts[sResource] = bModAppts;
+                        }
+
+                        //For programmers and scheduling managers, set all permissions for all resources
+                        if (this.DocManager.ScheduleManager == true)
+                        {
+                                dt = this.DocManager.GlobalDataSet.Tables["Resources"];
+                                foreach (DataRow dr in dt.Rows)
+                                {
+                                        sResource = dr["RESOURCE_NAME"].ToString();
+                                        v.m_htOverbook[sResource] = true;
+                                        v.m_htModifySchedule[sResource] = true;
+                                        v.m_htChangeAppts[sResource] = true;
+                                }
+                        }
+
+                        v.calendarGrid1.SetOverlapTable();
+                        v.calendarGrid1.Refresh();
                 }
 
@@ -2491 +2492 @@
         }
 
-                private void tvSchedules_BeforeSelect(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
-                {
-
-                }
-
                 private void tvSchedules_AfterSelect(object sender, System.Windows.Forms.TreeViewEventArgs e)
                 {
@@ -3095 +3091 @@
         void RequestRefreshGrid()
         {
-            DateTime dDate = dateTimePicker1.Value;
-            dDate = dDate.Date;
-            // This below is responsible for redrawing the grid when you change the date.
+            DateTime dDate = dateTimePicker1.Value.Date;
+            // Change Date on Document
             this.Document.SelectedDate = dDate;
+            
+            //Splash when loading and change Cursor
+            this.Cursor = Cursors.WaitCursor;
+            LoadSplash();
+
+            this.Cursor = Cursors.Default;
+            this.Document.RefreshDocument();
             
             if (this.Document.Resources.Count == 1)
@@ -3115 +3117 @@
                 this.StartDate = this.Document.SelectedDate;
             }
-            //Is this needed?
+
+            //Is this needed? -- Yes it is. There is a bug in the drawing code for the calendar
+            //First time it draws, it draws appointments, but not availability slots
+            //Second time it draws, it both appointments and availabilites
+            //XXX: Need to investigate
             this.Document.UpdateAllViews();
-            //Is this needed?
-            this.calendarGrid1.Invalidate();
+
+            StopSplash();
+            this.Cursor = Cursors.Default;
+        }
+
+        LoadingSplash _loadingSplash; // Splash object a data point in class
+
+        /// <summary>
+        /// Loads a splash that says "Loading"
+        /// </summary>
+        private void LoadSplash()
+        {
+            _loadingSplash = new LoadingSplash();
+            _loadingSplash.StartPosition = FormStartPosition.CenterScreen;  //XXX: Don't like this, but will do for now.
+            _loadingSplash.UseWaitCursor = true;    // tell user we are working
+            Thread threadSplash = new Thread(new ThreadStart(() => _loadingSplash.ShowDialog())); // lambda
+            threadSplash.IsBackground = true; //expendable thread -- exit even if still running.
+            threadSplash.Name = "Loading Thread";
+            threadSplash.Start();
+        }
+
+        private void StopSplash()
+        {
+            _loadingSplash.RemoteClose();
         }
 

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj

@@ -67 +67 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
@@ -178 +178 @@
     <Compile Include="CGAppointment.cs" />
     <Compile Include="CGAppointmentChangedArgs.cs" />
-    <Compile Include="CGAppointmentChangedHandler.cs" />
     <Compile Include="CGAppointments.cs" />
     <Compile Include="CGAvailability.cs" />
@@ -199 +198 @@
     </Compile>
     <Compile Include="CGSelectionChangedArgs.cs" />
-    <Compile Include="CGSelectionChangedHandler.cs" />
     <Compile Include="CGView.cs">
       <SubType>Form</SubType>
@@ -296 +294 @@
       <DependentUpon>DMassSlotDelete.cs</DependentUpon>
     </Compile>
+    <Compile Include="LoadingSplash.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LoadingSplash.Designer.cs">
+      <DependentUpon>LoadingSplash.cs</DependentUpon>
+    </Compile>
     <Compile Include="Options.cs" />
     <Compile Include="Printing.cs" />
@@ -402 +406 @@
       <DependentUpon>DSplash.cs</DependentUpon>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LoadingSplash.resx">
+      <DependentUpon>LoadingSplash.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UCPatientAppts.resx">

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

@@ -37 +37 @@
     </RemoteDebugMachine>
     <StartAction>Project</StartAction>
-    <StartArguments>/s=172.16.16.108 /p=9250 /a=abeer12 /v=abc,4321</StartArguments>
+    <StartArguments>
+    </StartArguments>
     <StartPage>
     </StartPage>
@@ -56 +57 @@
     </RemoteDebugMachine>
     <StartAction>Project</StartAction>
-    <StartArguments>/s=172.16.17.51 /p=9260 /a=shabiel12 /v=abc,123!</StartArguments>
+    <StartArguments>
+    </StartArguments>
     <StartPage>
     </StartPage>