server/AyaNova/models/PM.cs

@@ -26,8 +26,10 @@ namespace AyaNova.Models
         public bool[] ExcludeDaysOfWeek { get; set; }//Monday to Sunday (0-6 index)        
         public bool Active { get; set; }
         public DateTime NextServiceDate { get; set; }
-        public TimeSpan Repeat { get; set; }//was generate span
-        public TimeSpan GenerateBefore { get; set; }//was threshold span 
+        public PMTimeUnit RepeatUnit { get; set; }
+        public PMTimeUnit GenerateBeforeUnit { get; set; }
+        public int RepeatInterval { get; set; }
+        public int GenerateBeforeInterval { get; set; }
         public DateTime? GenerateDate { get; set; }//Internal, not exposed to UI and is the date to do the next generate on that takes into account generatebefore and next service date and is calcd when generate happens for next time see pmbiz top with reference v7 code
         //----
 
@@ -73,7 +75,7 @@ namespace AyaNova.Models
 
 
         //UTILITY FIELDS    
-       
+
         [NotMapped]
         public string AlertViz { get; set; } = null;