Przeglądaj źródła

More timesheet work

Kenric Nugteren 2 lat temu
rodzic
commit
a34499c739

+ 32 - 0
prs.classes/EnclosedEntities/UTCTimeBlock/UTCTimeBlock.cs

@@ -0,0 +1,32 @@
+using InABox.Core;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Comal.Classes
+{
+    public class UTCTimeBlock : EnclosedEntity
+    {
+        public DateTime UTCStart { get; set; }
+
+        /// <summary>
+        /// TimeZone as an IANA identifier
+        /// </summary>
+        public string TimeZoneStart { get; set; }
+
+        public DateTime UTCFinish { get; set; }
+
+        /// <summary>
+        /// TimeZone as an IANA identifier
+        /// </summary>
+        public string TimeZoneFinish { get; set; }
+
+        protected override void Init()
+        {
+            base.Init();
+
+            TimeZoneStart = "";
+            TimeZoneFinish = "";
+        }
+    }
+}

+ 2 - 18
prs.classes/Entities/Timesheet/Timesheet.cs

@@ -27,25 +27,9 @@ namespace Comal.Classes
         [EditorSequence(4)]
         public TimeSheetActivityLink ActivityLink { get; set; }
 
-        [NullEditor]
-        public DateTime UTCStart { get; set; }
-
-        [NullEditor]
-        public DateTime UTCFinish { get; set; }
-
-        [CoreTimeEditor]
-        public TimeBlock ActualTime { get; set; }
-
-        [CoreTimeEditor]
-        public TimeBlock ApprovedTime { get; set; }
-
-        [TextBoxEditor]
-        [EditorSequence(6)]
-        public string TimeZoneStart { get; set; }
+        public UTCTimeBlock ActualTime { get; set; }
 
-        [TextBoxEditor]
-        [EditorSequence(8)]
-        public string TimeZoneFinish { get; set; }
+        public UTCTimeBlock ApprovedTime { get; set; }
 
         [MemoEditor]
         [EditorSequence(11)]

+ 1 - 1
prs.desktop/Panels/Attendance/AttendancePanel.xaml.cs

@@ -86,7 +86,7 @@ namespace PRSDesktop
                 var query = new MultiQuery();
 
                 query.Add(
-                    new Filter<TimeSheet>(x => x.Date).IsEqualTo(DateTime.Today),
+                    new Filter<TimeSheet>(x => x.ActualTime.UTCStart).IsLessThan(DateTime.UtcNow).And(),
                     new Columns<TimeSheet>(x => x.EmployeeLink.ID)
                         .Add(x => x.Start)
                         .Add(x => x.Finish)