Changeset 1453 for Scheduling/branches

Timestamp:

Jun 21, 2012, 6:15:08 PM (12 years ago)

Author:

Sam Habiel

Message:

CGView.cs: modified IsThisARadiologyResource to handle the possibility of Unlinked Resources (not linked to PIMS).

Location:

Scheduling/branches/BMX4Support

Files:

• CGView.cs (modified) (2 diffs)
• ClinicalScheduling.csproj (modified) (1 diff)
• ClinicalScheduling.csproj.user (modified) (1 diff)
• ClinicalScheduling.sln (modified) (1 diff)
• ClinicalScheduling.suo (modified) ( previous)
• bin/Release/BMXNET40.dll (modified) ( previous)
• bin/Release/BMXWIN40.dll (modified) ( previous)
• bin/Release/ClinicalScheduling.exe (modified) ( previous)
• bin/Release/ar/ClinicalScheduling.resources.dll (modified) ( previous)

Scheduling/branches/BMX4Support/CGView.cs

@@ -1564 +1564 @@
         private bool IsThisARadiologyResource(string sResource)
         {
+            //smh - change in v 1.7... if the resource is not linked to a PIMS clinic, this method fails.
+            //This happens if there is just one resource that is not linked, which makes it impossible to
+            //make any appointments, because this method gets called at any time a menu is opened.
+            //So we change res.Field<int> to res.Field<int?> 
+           
             // see if resource is mapped to a Radiology Hospital Location.
             return (   //select all Hospital Locations which are radiology locations
@@ -1570 +1575 @@
                        //join this to the resources table using the foreign ID (plain jane relational join)
                        join res in CGDocumentManager.Current.GlobalDataSet.Tables["Resources"].AsEnumerable()
-                       on hl.Field<int>("HOSPITAL_LOCATION_ID") equals res.Field<int>("HOSPITAL_LOCATION_ID")
+                       //on hl.Field<int>("HOSPITAL_LOCATION_ID") equals res.Field<int>("HOSPITAL_LOCATION_ID") //change in 1.7
+                       on hl.Field<int>("HOSPITAL_LOCATION_ID") equals res.Field<int?>("HOSPITAL_LOCATION_ID")
                        //then filter this down to the resource that we have
                        where res.Field<string>("RESOURCE_NAME") == sResource

Scheduling/branches/BMX4Support/ClinicalScheduling.csproj

@@ -489 +489 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\BMX4\IHS BMX Framework\IndianHealthService.BMXNet.WinForm\IndianHealthService.BMXNet.WinForm.csproj">
+    <ProjectReference Include="..\BMX4\IndianHealthService.BMXNet.WinForm\IndianHealthService.BMXNet.WinForm.csproj">
       <Project>{3B9011B5-59F4-4F6B-ADC7-54ADC6948F4D}</Project>
       <Name>IndianHealthService.BMXNet.WinForm</Name>
     </ProjectReference>
-    <ProjectReference Include="..\BMX4\IHS BMX Framework\IndianHealthService.BMXNet\IndianHealthService.BMXNet.csproj">
+    <ProjectReference Include="..\BMX4\IndianHealthService.BMXNet\IndianHealthService.BMXNet.csproj">
       <Project>{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}</Project>
       <Name>IndianHealthService.BMXNet</Name>

Scheduling/branches/BMX4Support/ClinicalScheduling.csproj.user

@@ -37 +37 @@
     </RemoteDebugMachine>
     <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
+    <StartArguments>/s=10.0.1.3 /p=9431 /a=shabiel12 /v=catdog.22</StartArguments>
     <StartPage>
     </StartPage>

Scheduling/branches/BMX4Support/ClinicalScheduling.sln

@@ -3 +3 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClinicalScheduling", "ClinicalScheduling.csproj", "{8C05C4F7-FE81-479F-87A0-44E04C7F6E0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndianHealthService.BMXNet", "..\BMX4\IHS BMX Framework\IndianHealthService.BMXNet\IndianHealthService.BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndianHealthService.BMXNet", "..\BMX4\IndianHealthService.BMXNet\IndianHealthService.BMXNet.csproj", "{DE8E4CC9-4F3A-4E32-8DFE-EE5692E8FC45}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndianHealthService.BMXNet.WinForm", "..\BMX4\IHS BMX Framework\IndianHealthService.BMXNet.WinForm\IndianHealthService.BMXNet.WinForm.csproj", "{3B9011B5-59F4-4F6B-ADC7-54ADC6948F4D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IndianHealthService.BMXNet.WinForm", "..\BMX4\IndianHealthService.BMXNet.WinForm\IndianHealthService.BMXNet.WinForm.csproj", "{3B9011B5-59F4-4F6B-ADC7-54ADC6948F4D}"
 EndProject
 Global