Fix alarm note/file foreign keys and query

2019-01-14 14:57:30 +01:00
parent 4146b49856
commit 50dc27d480
12 changed files with 228 additions and 210 deletions
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using static Step.Model.Constants;

 namespace Step.Model.DatabaseModels
 {
@@ -21,10 +22,13 @@ namespace Step.Model.DatabaseModels
        public UserModel User { get; set; }

        [Column("alarm_desc_id")]
-        public int AlarmDescriptionId { get; set; }
+        public int AlarmId { get; set; }

-        [ForeignKey("AlarmDescriptionId")]
-        public virtual AlarmDescriptionsModel AlarmDescription { get; set; }
+        [ForeignKey("AlarmId")]
+        public virtual AlarmOccurrencesModel AlarmOccurrence { get; set; }
+
+        [Column("source")]
+        public ALARM_SOURCE Source { get; set; }

        [Column("timestamp")]
        public DateTime DateTime { get; set; }