Fixed Health enumeration issue where existing faculties were shifted.

uwcbc · Sep 15, 2022 · 8b38ee2 · 8b38ee2
1 parent 4ae686f
commit 8b38ee2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Marimba/Marimba.csproj b/Marimba/Marimba.csproj
@@ -15,7 +15,7 @@
     <TargetFrameworkProfile />
     <ExpressionBlendVersion>12.0.50429.0</ExpressionBlendVersion>
     <StyleCopTreatErrorsAsWarnings>False</StyleCopTreatErrorsAsWarnings>
-    <PublishUrl>C:\Users\natha\Documents\Marimba\Builds\</PublishUrl>
+    <PublishUrl>C:\Users\nathan\Documents\Marimba\Builds\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -27,7 +27,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <TargetCulture>en-CA</TargetCulture>
     <ProductName>Marimba</ProductName>
-    <ApplicationRevision>15</ApplicationRevision>
+    <ApplicationRevision>16</ApplicationRevision>
     <ApplicationVersion>2.3.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/Marimba/Properties/AssemblyInfo.cs b/Marimba/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("2.3.2.2")]
-[assembly: AssemblyFileVersion("2.3.2.2")]
+[assembly: AssemblyVersion("2.3.2.3")]
+[assembly: AssemblyFileVersion("2.3.2.3")]
diff --git a/Marimba/member.cs b/Marimba/member.cs
@@ -197,7 +197,7 @@ public Member(
 
         public enum MemberType { UWUnderGrad = 0, UWGrad = 1, UWAlumni = 2, Other = 3 }
 
-        public enum Faculty { AHS, Arts, Engineering, Environment, Health, Mathematics, Science, Unknown = -1 }
+        public enum Faculty { AHS, Arts, Engineering, Environment, Mathematics, Science, Health, Unknown = -1 }
 
         public enum ShirtSize { XS, S, M, L, XL, XXL, Unknown = -1 }
 
@@ -366,15 +366,15 @@ public static string ToString(Faculty fac)
                     return "Engineering";
                 case Faculty.Environment:
                     return "Environment";
-                case Faculty.Health:
-                    return "Health";
                 case Faculty.Mathematics:
                     return "Mathematics";
                 case Faculty.Science:
                     return "Science";
+                case Faculty.Health:
+                    return "Health";
+                default:
+                    return "Unknown";            
             }
-
-            return "Unknown";
         }
 
         public static int ParseFaculty(string strFaculty)
@@ -390,13 +390,13 @@ public static int ParseFaculty(string strFaculty)
                     return (int)Faculty.Engineering;
                 case "environment":
                     return (int)Faculty.Environment;
-                case "health":
-                    return (int)Faculty.Health;
                 case "mathematics":
                 case "math":
                     return (int)Faculty.Mathematics;
                 case "science":
                     return (int)Faculty.Science;
+                case "health":
+                    return (int)Faculty.Health;
                 default:
                     return (int)Faculty.Unknown;
             }