Added Persistent column to event types.

3 files changed, 7 insertions, 32 deletions

diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx
deleted file mode 100644
index a9183ec04..000000000
--- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Events.xlsx
+++ /dev/null
diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
index ef2e67909..e5f94d95e 100644
--- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
@@ -33,6 +33,7 @@ namespace Tango.EventsTypesGenerator
             public String ActionsEmbedded { get; set; }
             public String NotificationTime { get; set; }
             public String Guidance { get; set; }
+            public String Persistent { get; set; }
 
             public override string ToString()
             {
@@ -143,6 +144,7 @@ namespace Tango.EventsTypesGenerator
             if (te.NotificationTime != ev.NotificationTime) return true;
             if (te.Guidance != ev.Guidance) return true;
             if (te.RequiresUserIntervention != ev.RequiresUserIntervention) return true;
+            if (te.Persistent != ev.Persistent) return true;
 
             return false;
         }
@@ -160,6 +162,7 @@ namespace Tango.EventsTypesGenerator
             ev.NotificationTime = (EventTypeNotificationTimes)Enum.Parse(typeof(EventTypeNotificationTimes), evx.NotificationTime.Replace(" ", ""), true);
             ev.Guidance = !String.IsNullOrWhiteSpace(evx.Guidance) ? evx.Guidance : null;
             ev.RequiresUserIntervention = evx.UserInterventionRequired == "Yes";
+            ev.Persistent = evx.Persistent == "Yes";
         }
     }
 }
diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj
index 9bb8729dc..7461a88a8 100644
--- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj
+++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj
@@ -56,43 +56,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\Resources\Tango alarm events handling chart_Rev11.xlsx">
-      <Link>Tango alarm events handling chart_Rev11.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev12.xlsx">
-      <Link>Tango alarm events handling chart_Rev12.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev13.xlsx">
-      <Link>Tango alarm events handling chart_Rev13.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev17.xlsx">
-      <Link>Tango alarm events handling chart_Rev17.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev21.xlsx">
-      <Link>Tango alarm events handling chart_Rev21.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev23.xlsx">
-      <Link>Tango alarm events handling chart_Rev23.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev24.xlsx">
-      <Link>Tango alarm events handling chart_Rev24.xlsx</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Resources\Tango alarm events handling chart_Rev25.xlsx">
+    <None Include="..\..\Resources\Events Revisions\Tango alarm events handling chart_Rev25.xlsx">
       <Link>Tango alarm events handling chart_Rev25.xlsx</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="..\..\Resources\Events Revisions\Tango alarm events handling chart_Rev25_Persistent.xlsx">
+      <Link>Tango alarm events handling chart_Rev25_Persistent.xlsx</Link>
+    </None>
     <None Include="App.config" />
     <None Include="packages.config" />
-    <None Include="Events.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Tango.BL\Tango.BL.csproj">