Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Step.Core/ThreadsHandler.cs

@@ -29,13 +29,13 @@ namespace Step.Core
             };
 
         private volatile static List<Thread> RunningThreadsList = new List<Thread>();
-        internal volatile static Dictionary<String, String> RunningThreadStatus = new Dictionary<String, String>();
+        internal volatile static Dictionary<string, string> RunningThreadStatus = new Dictionary<string, string>();
 
         public static void Start()
         {
             ThreadsFunctions.RestoreConnection();
 
-            //Start THread Network monitor
+            // Start Thread Network monitor
             Action Monitor = new Action(ThreadsFunctions.MonitorPanelPCResources);
             Thread t = new Thread(() => Monitor());
             t.Start();

Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs

@@ -42,7 +42,7 @@ namespace Step.Model.DTOModels.AlarmModels
             return new DTOAlarmHistoricModel()
             {
                 Id = obj.AlarmOccurrenceId,
-                AlarmId = obj.AlarmOccurrenceId,
+                AlarmId = obj.AlarmDescriptionId != null ? obj.AlarmDescriptionId.Value : obj.PlcMessageId.Value,
                 Title = obj.AlarmDescription == null ? "" : obj.AlarmDescription.Title,
                 // Description = obj.AlarmDescription == null ? "" : obj.AlarmDescription.Description,
                 Processes = processes,

Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts

@@ -28,8 +28,10 @@ export default class AlarmHistory extends Vue {
   filter: {
     user: number,
     title: string,
+    type: number,
     interval?: Date[]
   } = {
+      type: 0,
       user: null,
       title: null,
     };
@@ -44,7 +46,7 @@ export default class AlarmHistory extends Vue {
     let from = this.filter.interval && this.filter.interval.length ? this.filter.interval[0] : null;
     let to = this.filter.interval && this.filter.interval.length ? this.filter.interval[1] : null;
 
-    this.data = await alarmsService.getAlarms(this.filter.title, null, this.filter.user, from, to, 0, 100);
+    this.data = await alarmsService.getAlarms(this.filter.title, this.filter.type, this.filter.user, from, to, 0, 100);
   }
 
   async mounted() {

Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue

@@ -15,8 +15,9 @@
             </div>
             <div class="filter-type">
               <label>{{'alarm_history_body_filter_type' | localize("Tipo")}}</label>
-              <select>
-                <option>{{'alarm_history_body_select_type_option' | localize("Tutti")}}</option>
+              <select v-model="filter.type">
+                <option :value="0">{{'alarm_history_body_select_type_nc' | localize("NC")}}</option>
+                <option :value="1">{{'alarm_history_body_select_type_plc' | localize("PLC")}}</option>
               </select>
             </div>
             <div class="filter-date-range">
@@ -176,7 +177,7 @@
                 </accordion>
               </div>
             </div>
-          </div> -->
+          </div>-->
         </div>
       </div>
     </div>