Merge pull request #81 from ciffc-devops/dev-dylan

Dev dylan
ciffc-devops · Apr 23, 2024 · 370e76b · 370e76b
2 parents 6039f4f + f47a67e
commit 370e76b
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 73 deletions.
diff --git a/CIAPPO Installer Project/Product.wxs b/CIAPPO Installer Project/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-	<Product Id="2B013C4C-1160-42CE-B226-FA0235364023" Name="Canadian Incident Action Plan Program" Language="1033" Version="1.0.5.0" Manufacturer="CIFFC" UpgradeCode="14f3f8c0-721f-4c77-9daa-d33b6accf00d">
+	<Product Id="6B6045CC-EC89-44D6-A5D4-7DAACF28CED9" Name="Canadian Incident Action Plan Program" Language="1033" Version="1.0.6.0" Manufacturer="CIFFC" UpgradeCode="14f3f8c0-721f-4c77-9daa-d33b6accf00d">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"  Keywords='Installer' Description="CIFFC Incident Action Plan Program"
          Manufacturer='CIFFC' />
 

diff --git a/WF-ICS-ClassLibrary/Globals.cs b/WF-ICS-ClassLibrary/Globals.cs
@@ -25,7 +25,7 @@ public static class Globals
         static Globals()
         {
             //Gets the connection string from the calling website and uses it throughout the class library
-            ProgramName = "Canadian Incident Action Plan Producer";
+            ProgramName = "Canadian Incident Action Plan Program";
             ProgramURL = "https://www.icscanada.ca";
         }
 

diff --git a/WF-ICS-ClassLibrary/Properties/AssemblyInfo.cs b/WF-ICS-ClassLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.1")]
-[assembly: AssemblyFileVersion("1.0.5.1")]
+[assembly: AssemblyVersion("1.0.6.1")]
+[assembly: AssemblyFileVersion("1.0.6.1")]
diff --git a/Wildfire ICS Assist/AirOperationsForm.cs b/Wildfire ICS Assist/AirOperationsForm.cs
@@ -147,10 +147,12 @@ private void Program_OpPeriodChanged(IncidentOpPeriodChangedEventArgs e)
 
         private void LoadPreparedBy()
         {
-            cboPreparedBy.DataSource = null;
-            cboPreparedBy.DataSource = CurrentOrgChart.Clone().ActiveRoles; cboPreparedBy.DisplayMember = "RoleNameWithIndividualAndDepth"; cboPreparedBy.ValueMember = "RoleID";
-            if (CurrentAirOpsSummary.PreparedByPositionID != Guid.Empty && CurrentOrgChart.ActiveRoles.Any(o => o.RoleID == CurrentAirOpsSummary.PreparedByPositionID)) { cboPreparedBy.SelectedValue = CurrentAirOpsSummary.PreparedByPositionID; }
-
+            if (cboPreparedBy != null && CurrentAirOpsSummary != null && CurrentOrgChart != null)
+            {
+                cboPreparedBy.DataSource = null;
+                cboPreparedBy.DataSource = CurrentOrgChart.Clone().ActiveRoles; cboPreparedBy.DisplayMember = "RoleNameWithIndividualAndDepth"; cboPreparedBy.ValueMember = "RoleID";
+                if (CurrentAirOpsSummary.PreparedByPositionID != Guid.Empty && CurrentOrgChart.ActiveRoles.Any(o => o.RoleID == CurrentAirOpsSummary.PreparedByPositionID)) { cboPreparedBy.SelectedValue = CurrentAirOpsSummary.PreparedByPositionID; }
+            }
         }
 
         private void LoadMainData()

diff --git a/Wildfire ICS Assist/CheckedInResourcesForm.Designer.cs b/Wildfire ICS Assist/CheckedInResourcesForm.Designer.cs