Changeset 843 for Scheduling/trunk

Timestamp:

Jul 8, 2010, 8:46:18 AM (14 years ago)

Author:

Sam Habiel

Message:

Some refactoring of code into DAL.cs for Data Access.
Addition of Fileman date code (not used yet).
Removal of .config and .xml file from bin/Release/
Removal of BMXNet20.dll to replace with BMXNet21.dll

Location:

Scheduling/trunk/cs/bsdx0200GUISourceCode

Files:

• CGDocumentManager.cs (modified) (12 diffs)
• ClinicalScheduling.csproj (modified) (7 diffs)
• ClinicalScheduling.suo (modified) ( previous)
• DAL.cs (added)
• DManagement.cs (modified) (4 diffs)
• FMDateTime.cs (added)
• bin/Release/BMXNet20.dll (deleted)
• bin/Release/BMXNet21.dll (modified) ( previous)
• bin/Release/ClinicalScheduling.XML (deleted)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)
• bin/Release/ClinicalScheduling.exe.config (deleted)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CGDocumentManager.cs

@@ -34 +34 @@
         private string                      m_Encoding="";
 
+        //Data Access Layer
+        private DAL                         _dal = null;
+
                 //M Connection member variables
                 private DataSet                                                                 m_dsGlobal = null;
@@ -177 +180 @@
                 }
 
+        public DAL DAL
+        {
+            get { return this._dal; }
+        }
+
 
                 #endregion
@@ -206 +214 @@
                 private void InitializeComponent()
                 {
-                        // 
-                        // CGDocumentManager
-                        // 
-                        this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-                        this.ClientSize = new System.Drawing.Size(292, 266);
-                        this.Name = "CGDocumentManager";
-
                 }
 
@@ -231 +232 @@
                 {
             m_ConnectInfo = new BMXNetConnectInfo(m_Encoding); // Encoding is "" unless passed in command line
+            _dal = new DAL(m_ConnectInfo);   // Data access layer
             //m_ConnectInfo.bmxNetLib.StartLog();    //This line turns on logging of messages
             CDocMgrEventDelegate = new BMXNetConnectInfo.BMXNetEventDelegate(CDocMgrEventHandler);
@@ -321 +323 @@
                                 m_ds.SetStatus("Getting Version Info...");
                 m_ds.Refresh();
-                String sCmd = "BMX VERSION INFO^BSDX^";
-                this.m_ConnectInfo.RPMSDataTable(sCmd, "VersionInfo", m_dsGlobal);
-
-                                //Keep the following commented code for future use:
+
+                DataTable ver = _dal.GetVersion("BSDX"); //sCmd, "VersionInfo", m_dsGlobal);
+                ver.TableName = "VersionInfo";
+                m_dsGlobal.Tables.Add(ver);
+
+                //Keep the following commented code for future use:
                                 //How to extract the version numbers:
                 //DataTable dtVersion = m_dsGlobal.Tables["VersionInfo"];
@@ -435 +439 @@
                 }
 
-                public void LoadAccessTypesTable()
-                {
-                        string sCommandText = "SELECT * FROM BSDX_ACCESS_TYPE";
-                        ConnectInfo.RPMSDataTable(sCommandText, "AccessTypes", m_dsGlobal);
-                        Debug.Write("LoadGlobalRecordsets -- AccessTypes loaded\n");
-                }
 
                 public void LoadAccessGroupsTable()
@@ -455 +453 @@
                         Debug.Write("LoadGlobalRecordsets -- AccessGroupTypes loaded\n");
                 }
-
-        //TODO:REMOVE THIS
-                /*public void LoadClinicSetupTable()
-                {
-                        string sCommandText = "BSDX CLINIC SETUP";
-                        ConnectInfo.RPMSDataTable(sCommandText, "ClinicSetupParameters", m_dsGlobal);
-                        Debug.Write("LoadGlobalRecordsets -- ClinicSetupParameters loaded\n");
-                }*/
 
                 public void LoadBSDXResourcesTable()
@@ -521 +511 @@
                 private bool LoadGlobalRecordsets() 
                 {
-                        //Schedule User Info
-                        string sCommandText = "BSDX SCHEDULING USER INFO^" + m_ConnectInfo.DUZ;
-                        DataTable dtUser = ConnectInfo.RPMSDataTable(sCommandText, "SchedulingUser", m_dsGlobal);
-
+                        
+            string sCommandText;
+
+            //Schedule User Info
+                        DataTable dtUser = _dal.GetUserInfo(m_ConnectInfo.DUZ);
+            dtUser.TableName = "SchedulingUser";
+            m_dsGlobal.Tables.Add(dtUser);
                         Debug.Assert(dtUser.Rows.Count == 1);
+
+            // Only one row and one column named "MANAGER". Set local var m_bSchedManager to true if Manager.
                         DataRow rUser = dtUser.Rows[0];
                         Object oUser = rUser["MANAGER"];
@@ -531 +526 @@
                         m_bSchedManager = (sUser == "YES")?true:false;
 
-                        //AccessTypes
-                        LoadAccessTypesTable();
-
-                        //Build Primary Key for AccessTypes table
-                        DataTable dtTypes = m_dsGlobal.Tables["AccessTypes"];
-                        DataColumn dcKey = dtTypes.Columns["BMXIEN"];
-                        DataColumn[] dcKeys = new DataColumn[1];
-                        dcKeys[0] = dcKey;
-                        dtTypes.PrimaryKey = dcKeys;
+            //Get Access Types
+            DataTable dtAccessTypes = _dal.GetAccessTypes();
+            dtAccessTypes.TableName = "AccessTypes";
+            m_dsGlobal.Tables.Add(dtAccessTypes);
 
                         //AccessGroups
@@ -546 +536 @@
                         //Build Primary Key for AccessGroup table
                         DataTable dtGroups = m_dsGlobal.Tables["AccessGroup"];
-                        dcKey = dtGroups.Columns["ACCESS_GROUP"];
-                        dcKeys = new DataColumn[1];
+            DataColumn dcKey = dtGroups.Columns["ACCESS_GROUP"];
+            DataColumn[] dcKeys = new DataColumn[1];
                         dcKeys[0] = dcKey;
                         dtGroups.PrimaryKey = dcKeys;
@@ -1044 +1034 @@
                         //Retrieves a recordset from RPMS
                         string                  sErrorMessage = "";
+            DataTable dtOut;
+
+#if TRACE
+            DateTime sendTime = DateTime.Now;
+#endif
                         try
                         {
                                 System.IntPtr pHandle = this.Handle;
-                                DataTable dtOut;
                                 RPMSDataTableDelegate rdtd = new RPMSDataTableDelegate(ConnectInfo.RPMSDataTable);
-                                //dtOut = (DataTable) this.Invoke(rdtd, new object[] {sSQL, sTableName});
-                dtOut = ConnectInfo.RPMSDataTable(sSQL, sTableName);
-                                return dtOut;
-                        }
+                                dtOut = (DataTable) this.Invoke(rdtd, new object[] {sSQL, sTableName});
+                        }
+
                         catch (Exception ex)
                         {
@@ -1058 +1051 @@
                                 throw ex;
                         }
+
+#if TRACE
+            DateTime receiveTime = DateTime.Now;
+            TimeSpan executionTime = receiveTime - sendTime;
+            Debug.Write("CGDocumentManager::RPMSDataTable Execution Time: " + executionTime.Milliseconds + " ms.\n");
+#endif
+
+            return dtOut;
+
                 }
 

Scheduling/trunk/cs/bsdx0200GUISourceCode/ClinicalScheduling.csproj

@@ -67 +67 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>bin\Release\ClinicalScheduling.XML</DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -90 +90 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>
-    </DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DocumentationFile>bin\Release\ClinicalScheduling.XML</DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
@@ -108 +107 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BMXNet21, Version=2.0.3839.7911, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\bin\Release\BMXNet21.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -146 +141 @@
     <None Include="ClassDiagram1.cd" />
     <None Include="ClassDiagram2.cd" />
-    <None Include="ClinicalScheduling_TemporaryKey.pfx" />
     <None Include="dsPatientApptDisplay2.xsc">
       <DependentUpon>dsPatientApptDisplay2.xsd</DependentUpon>
@@ -227 +221 @@
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="DAL.cs" />
     <Compile Include="DAppointPage.cs">
       <SubType>Form</SubType>
@@ -294 +289 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>dsRebookAppts.xsd</DependentUpon>
+    </Compile>
+    <Compile Include="FMDateTime.cs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Compile>
     <Compile Include="Options.cs" />
@@ -435 +433 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\BMX\bmx_0200scr\BMX2\BMXNet\BMXNet.csproj">
+      <Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project>
+      <Name>BMXNet</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>

Scheduling/trunk/cs/bsdx0200GUISourceCode/DManagement.cs

@@ -1884 +1884 @@
                                 }
 
-                                m_DocManager.LoadAccessTypesTable();
-                                m_DocManager.UpdateViews();
+                RefreshAccessTypesTables();
                         }
                         catch (Exception ex)
@@ -1892 +1891 @@
                         }
                 }
+
+        private void RefreshAccessTypesTables()
+        {
+            m_dsGlobal.Tables["AccessTypes"].Clear();
+            m_dsGlobal.Tables["AccessGroupType"].Clear();
+            DataTable dt1 = m_DocManager.DAL.GetAccessTypes();
+            m_dsGlobal.Tables["AccessTypes"].Merge(dt1);
+            m_dsGlobal.Tables.Add(dt1);
+            //Fix Groups
+            //m_DocManager.LoadAccessTypesTable();
+            m_DocManager.LoadAccessGroupTypesTable();
+            m_DocManager.UpdateViews();
+        }
 
                 private void cmdAddAT_Click(object sender, System.EventArgs e)
@@ -1928 +1940 @@
                                 }
 
-                                m_DocManager.LoadAccessTypesTable();
-                                m_DocManager.UpdateViews();
+                RefreshAccessTypesTables();
+
                         }
                         catch (Exception ex)
@@ -2187 +2199 @@
                                 this.cmdRemoveAccessGroup.Enabled = true;
 
-                                m_dsGlobal.Tables["AccessTypes"].Clear();
-                                m_dsGlobal.Tables["AccessGroupType"].Clear();
-                                m_DocManager.LoadAccessTypesTable();
-                                m_DocManager.LoadAccessGroupTypesTable();
-                        
-                                m_DocManager.UpdateViews();
+                RefreshAccessTypesTables();
+
                         }
                         catch (Exception ex)