Resolves resolves #21, resolves #23, resolves #24

HeHang0 · HeHang0 · commit 49e609e9f788 · 2025-03-26T22:49:01.000+08:00
diff --git a/PunchPal.Core/Services/AttendanceTypeService.cs b/PunchPal.Core/Services/AttendanceTypeService.cs
@@ -65,6 +65,7 @@ public async Task<List<AttendanceType>> List()
             }
         }
         public static readonly string[] AskForLeaveIds = new string[] { "AL", "SL", "PL", "ML", "PPL", "BL", "FL", "CL", "GL", "RL", "TL", "BD", "IW" };
+        public static readonly string[] PunchInRecordIds = new string[] { "NA", "CP" };
         private static readonly KeyValuePair<string, string>[] initialTyps = new KeyValuePair<string, string>[]
         {
                 // 考勤类型
diff --git a/PunchPal.Core/Services/WorkHourService.cs b/PunchPal.Core/Services/WorkHourService.cs
@@ -23,23 +23,34 @@ public async Task<List<WorkingHours>> List(int dayStartHour, Expression<Func<Pun
             var records = await PunchRecordService.Instance.List(predicate);
             return await List(dayStartHour, records);
         }
-        public async Task<List<WorkingHours>> List(int dayStartHour, IEnumerable<PunchRecord> punchRecords)
+        public async Task<List<WorkingHours>> List(int dayStartHour, IEnumerable<PunchRecord> punchRecordEnumerables)
         {
             var result = new List<WorkingHours>();
-            if (punchRecords == null || punchRecords.Count() == 0)
+            if (punchRecordEnumerables == null || punchRecordEnumerables.Count() == 0)
             {
                 return result;
             }
-            var lastRecord = punchRecords.FirstOrDefault();
+            var lastRecord = punchRecordEnumerables.FirstOrDefault();
+            var punchRecords = punchRecordEnumerables.ToList();
             var lastDate = lastRecord.PunchDateTime;
             var monthStartDay = new DateTime(lastDate.Year, lastDate.Month, 1);
             var monthEndDay = monthStartDay.AddMonths(1).AddDays(-1);
             var now = DateTime.Now;
             var startUnix = monthStartDay.TimestampUnix();
             var endUnix = monthEndDay.TimestampUnix();
             var workingTimeRanges = await WorkingTimeRangeService.Instance.Items(startUnix, endUnix);
-            var attendanceRecords = await AttendanceRecordService.Instance.List(m => m.StartTime >= startUnix && m.StartTime < endUnix && AttendanceTypeService.AskForLeaveIds.Contains(m.AttendanceTypeId));
+            var attendances = await AttendanceRecordService.Instance.List(m => m.StartTime >= startUnix && m.StartTime < endUnix && AttendanceTypeService.AskForLeaveIds.Contains(m.AttendanceTypeId));
+            var punchInRecords = await AttendanceRecordService.Instance.List(m => m.StartTime >= startUnix && m.StartTime < endUnix && (m.EndTime <= 0 || m.EndTime < endUnix) && AttendanceTypeService.PunchInRecordIds.Contains(m.AttendanceTypeId));
+            var attendanceRecords = ParseAttendance(attendances, workingTimeRanges);
             var calendars = await CalendarService.Instance.ListAll(m => m.Date >= startUnix && m.Date < endUnix);
+            foreach (var item in punchInRecords)
+            {
+                if (item.StartTime <= 0 && item.EndTime <= 0) continue;
+                punchRecords.Add(new PunchRecord()
+                {
+                    PunchTime = item.StartTime > 0 ? item.StartTime : item.EndTime,
+                });
+            }
             for (var i = 1; i <= monthEndDay.Day; i++)
             {
                 if (monthEndDay.Year == now.Year && monthEndDay.Month == now.Month && i > now.Day)
@@ -61,6 +72,60 @@ public async Task<List<WorkingHours>> List(int dayStartHour, IEnumerable<PunchRe
             return result.OrderByDescending(m => m.WorkingDate).ToList();
         }
 
+        private List<AttendanceRecord> ParseAttendance(List<AttendanceRecord> attendances, Dictionary<long, WorkingTimeRangeItems> workingTimeRanges)
+        {
+            var result = new List<AttendanceRecord>();
+            foreach (var item in attendances)
+            {
+                var startDate = item.StartDateTime;
+                var endDate = item.EndDateTime;
+                var startDateUnix = startDate?.TimestampUnix() ?? 0;
+                var endDateUnix = endDate?.TimestampUnix() ?? 0;
+                var diff = endDateUnix - startDateUnix;
+                if (diff > DateTimeTools.DaySeconds)
+                {
+                    var ranges = GetDateRanges(startDate.Value, endDate.Value, workingTimeRanges);
+                    foreach (var range in ranges)
+                    {
+                        result.Add(new AttendanceRecord()
+                        {
+                            AttendanceId = item.AttendanceId,
+                            AttendanceTypeId = item.AttendanceTypeId,
+                            AttendanceType = item.AttendanceType,
+                            UserId = item.UserId,
+                            StartTime = range.Item1,
+                            EndTime = range.Item2,
+                            AttendanceTime = item.AttendanceTime,
+                            Remark = item.Remark
+                        });
+                    }
+                }
+                else
+                {
+                    result.Add(item);
+                }
+            }
+            return result;
+        }
+
+        private List<(int, int)> GetDateRanges(DateTime startTime, DateTime endTime, Dictionary<long, WorkingTimeRangeItems> workingTimeRanges)
+        {
+            var result = new List<(int, int)>();
+            var endTimeUnix = endTime.TimestampUnix();
+            for (var start = startTime; start < endTime; start = start.AddDays(1))
+            {
+                var dateUnix = start.Date.TimestampUnix();
+                if (!workingTimeRanges.TryGetValue(dateUnix, out WorkingTimeRangeItems work))
+                {
+                    continue;
+                }
+                var startWorkDate = new DateTime(start.Year, start.Month, start.Day, work.Work.StartHour, work.Work.StartMinute, 0);
+                var endWorkDate = new DateTime(start.Year, start.Month, start.Day, work.Work.EndHour, work.Work.EndMinute, 0);
+                result.Add((Math.Max(startWorkDate.TimestampUnix(), start.TimestampUnix()), Math.Min(endWorkDate.TimestampUnix(), endTimeUnix)));
+            }
+            return result;
+        }
+
         private List<AttendanceRecord> GetAttendanceRecords(List<AttendanceRecord> attendanceRecords, long timeStart, long timeEnd, WorkingTimeRangeItems workingTime)
         {
             var currentRecords = attendanceRecords.Where(m => m.StartTime >= timeStart && m.StartTime < timeEnd).ToList();
@@ -73,7 +138,7 @@ private List<AttendanceRecord> GetAttendanceRecords(List<AttendanceRecord> atten
             var startWorkDate = new DateTime(date.Year, date.Month, date.Day, workingTime.Work.StartHour, 0, 0);
             if (currentRecords.Count == 0)
             {
-                var currentCrossRecords = attendanceRecords.Where(m => m.StartTime < timeStart && m.EndTime > timeStart).ToList();
+                var currentCrossRecords = attendanceRecords.Where(m => m.StartTime <= timeStart && m.EndTime >= timeStart).ToList();
                 foreach (var item in currentCrossRecords)
                 {
                     item.StartTime = Math.Max(item.StartTime, startWorkDate.TimestampUnix());
diff --git a/PunchPal.Core/ViewModels/CalendarItem.cs b/PunchPal.Core/ViewModels/CalendarItem.cs
@@ -117,7 +117,7 @@ public float BackgroundOpacity
         public bool IsWorkOvertime { get; set; }
 
         private List<string> _textList = null;
-        private List<string> _remarks = null;
+        private readonly List<string> _remarks = new List<string>();
         private string _lunarDate = string.Empty;
         public string TextListText
         {
@@ -128,20 +128,25 @@ public string TextListText
                 {
                     result.Add(DaySchedule);
                 }
+                var textList = TextList;
+                if (_remarks.Count > 0)
+                {
+                    result.AddRange(_remarks);
+                }
                 var settings = SettingsModel.Load();
                 var lunarSolarTermVisible = settings.Calendar.LunarSolarTermVisible;
                 var otherFestivalVisible = settings.Calendar.OtherFestivalVisible;
                 if (lunarSolarTermVisible && otherFestivalVisible)
                 {
-                    result.AddRange(TextList);
+                    result.AddRange(textList);
                 }
                 else if (lunarSolarTermVisible)
                 {
-                    result.AddRange(TextList.Where(m => CalendarService.ChineseHolidays.Contains(m) && CalendarService.SolarTerms.Contains(m)));
+                    result.AddRange(textList.Where(m => CalendarService.ChineseHolidays.Contains(m) || CalendarService.SolarTerms.Contains(m)));
                 }
                 else if (otherFestivalVisible)
                 {
-                    result.AddRange(TextList.Where(m => !CalendarService.ChineseHolidays.Contains(m) && !CalendarService.SolarTerms.Contains(m)));
+                    result.AddRange(textList.Where(m => !CalendarService.ChineseHolidays.Contains(m) && !CalendarService.SolarTerms.Contains(m)));
                 }
                 if (result.Count == 0 && !string.IsNullOrWhiteSpace(_lunarDate))
                 {
@@ -171,10 +176,6 @@ public List<string> TextList
                         _remarks.Add(item.Trim());
                     }
                 }
-                else
-                {
-                    _remarks = new List<string>();
-                }
                 var festivalEmpty = string.IsNullOrWhiteSpace(record.Festival);
                 var solarTermEmpty = string.IsNullOrWhiteSpace(record.SolarTerm);
                 if (!solarTermEmpty && record.SolarTerm != record.Festival && !_textList.Contains(record.SolarTerm))
@@ -211,7 +212,14 @@ public string TextListToolTip
         {
             get
             {
-                var text = string.Join(Environment.NewLine, TextList);
+                var result = new List<string>();
+                var textList = TextList;
+                if (_remarks != null && _remarks.Count > 0)
+                {
+                    result.AddRange(_remarks);
+                }
+                result.AddRange(textList);
+                var text = string.Join(Environment.NewLine, result.Distinct());
                 if (!SettingsModel.Load().Calendar.LunarSolarTermVisible ||
                     _calendarData == null ||
                     string.IsNullOrWhiteSpace(_calendarData.LunarYear) ||
@@ -225,7 +233,7 @@ public string TextListToolTip
                 {
                     return lunarDate;
                 }
-                return string.Join(Environment.NewLine, TextList) + Environment.NewLine + lunarDate;
+                return text + Environment.NewLine + lunarDate;
             }
         }
 
diff --git a/PunchPal.Core/ViewModels/DataSourceModel.cs b/PunchPal.Core/ViewModels/DataSourceModel.cs
@@ -349,6 +349,12 @@ public void Save()
             _ = SaveReal(saveCts.Token);
         }
 
+        public async Task OnSave()
+        {
+            saveCts?.Cancel();
+            await SaveReal();
+        }
+
         public async Task SaveReal(CancellationToken? token = null)
         {
             try
diff --git a/PunchPal.Core/ViewModels/SettingsModel.cs b/PunchPal.Core/ViewModels/SettingsModel.cs
@@ -163,8 +163,15 @@ public void Save()
 
         private async void OnSave()
         {
-            saveCts?.Cancel();
-            await SaveReal();
+            if (CurrentSettingPage == PageType.DataSource)
+            {
+                await DataSource.OnSave();
+            }
+            else
+            {
+                saveCts?.Cancel();
+                await SaveReal();
+            }
             EventManager.ShowTips(new Models.TipsOption("提示", "保存成功"));
         }
 
diff --git a/PunchPal.WPF/PunchPal.WPF.csproj b/PunchPal.WPF/PunchPal.WPF.csproj
@@ -13,7 +13,7 @@
     <RepositoryType>git</RepositoryType>
     <Product>PunchPal</Product>
     <Authors>PicaPico</Authors>
-    <Version>2.0.7</Version>
+    <Version>2.0.8</Version>
     <AssemblyTitle>PunchPal</AssemblyTitle>
     <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
     <PackageIcon>logo.ico</PackageIcon>

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public async Task<List<AttendanceType>> List()`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`public static readonly string[] AskForLeaveIds = new string[] { "AL", "SL", "PL", "ML", "PPL", "BL", "FL", "CL", "GL", "RL", "TL", "BD", "IW" };`
	`68`	`+ public static readonly string[] PunchInRecordIds = new string[] { "NA", "CP" };`
`68`	`69`	`private static readonly KeyValuePair<string, string>[] initialTyps = new KeyValuePair<string, string>[]`
`69`	`70`	`{`
`70`	`71`	`// 考勤类型`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public float BackgroundOpacity`
`117`	`117`	`public bool IsWorkOvertime { get; set; }`
`118`	`118`
`119`	`119`	`private List<string> _textList = null;`
`120`		`- private List<string> _remarks = null;`
	`120`	`+ private readonly List<string> _remarks = new List<string>();`
`121`	`121`	`private string _lunarDate = string.Empty;`
`122`	`122`	`public string TextListText`
`123`	`123`	`{`
`@@ -128,20 +128,25 @@ public string TextListText`
`128`	`128`	`{`
`129`	`129`	`result.Add(DaySchedule);`
`130`	`130`	`}`
	`131`	`+ var textList = TextList;`
	`132`	`+ if (_remarks.Count > 0)`
	`133`	`+ {`
	`134`	`+ result.AddRange(_remarks);`
	`135`	`+ }`
`131`	`136`	`var settings = SettingsModel.Load();`
`132`	`137`	`var lunarSolarTermVisible = settings.Calendar.LunarSolarTermVisible;`
`133`	`138`	`var otherFestivalVisible = settings.Calendar.OtherFestivalVisible;`
`134`	`139`	`if (lunarSolarTermVisible && otherFestivalVisible)`
`135`	`140`	`{`
`136`		`- result.AddRange(TextList);`
	`141`	`+ result.AddRange(textList);`
`137`	`142`	`}`
`138`	`143`	`else if (lunarSolarTermVisible)`
`139`	`144`	`{`
`140`		`- result.AddRange(TextList.Where(m => CalendarService.ChineseHolidays.Contains(m) && CalendarService.SolarTerms.Contains(m)));`
	`145`	`+ result.AddRange(textList.Where(m => CalendarService.ChineseHolidays.Contains(m) \|\| CalendarService.SolarTerms.Contains(m)));`
`141`	`146`	`}`
`142`	`147`	`else if (otherFestivalVisible)`
`143`	`148`	`{`
`144`		`- result.AddRange(TextList.Where(m => !CalendarService.ChineseHolidays.Contains(m) && !CalendarService.SolarTerms.Contains(m)));`
	`149`	`+ result.AddRange(textList.Where(m => !CalendarService.ChineseHolidays.Contains(m) && !CalendarService.SolarTerms.Contains(m)));`
`145`	`150`	`}`
`146`	`151`	`if (result.Count == 0 && !string.IsNullOrWhiteSpace(_lunarDate))`
`147`	`152`	`{`
`@@ -171,10 +176,6 @@ public List<string> TextList`
`171`	`176`	`_remarks.Add(item.Trim());`
`172`	`177`	`}`
`173`	`178`	`}`
`174`		`- else`
`175`		`- {`
`176`		`- _remarks = new List<string>();`
`177`		`- }`
`178`	`179`	`var festivalEmpty = string.IsNullOrWhiteSpace(record.Festival);`
`179`	`180`	`var solarTermEmpty = string.IsNullOrWhiteSpace(record.SolarTerm);`
`180`	`181`	`if (!solarTermEmpty && record.SolarTerm != record.Festival && !_textList.Contains(record.SolarTerm))`
`@@ -211,7 +212,14 @@ public string TextListToolTip`
`211`	`212`	`{`
`212`	`213`	`get`
`213`	`214`	`{`
`214`		`- var text = string.Join(Environment.NewLine, TextList);`
	`215`	`+ var result = new List<string>();`
	`216`	`+ var textList = TextList;`
	`217`	`+ if (_remarks != null && _remarks.Count > 0)`
	`218`	`+ {`
	`219`	`+ result.AddRange(_remarks);`
	`220`	`+ }`
	`221`	`+ result.AddRange(textList);`
	`222`	`+ var text = string.Join(Environment.NewLine, result.Distinct());`
`215`	`223`	`if (!SettingsModel.Load().Calendar.LunarSolarTermVisible \|\|`
`216`	`224`	`_calendarData == null \|\|`
`217`	`225`	`string.IsNullOrWhiteSpace(_calendarData.LunarYear) \|\|`
`@@ -225,7 +233,7 @@ public string TextListToolTip`
`225`	`233`	`{`
`226`	`234`	`return lunarDate;`
`227`	`235`	`}`
`228`		`- return string.Join(Environment.NewLine, TextList) + Environment.NewLine + lunarDate;`
	`236`	`+ return text + Environment.NewLine + lunarDate;`
`229`	`237`	`}`
`230`	`238`	`}`
`231`	`239`
Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,12 @@ public void Save()`
`349`	`349`	`_ = SaveReal(saveCts.Token);`
`350`	`350`	`}`
`351`	`351`
	`352`	`+ public async Task OnSave()`
	`353`	`+ {`
	`354`	`+ saveCts?.Cancel();`
	`355`	`+ await SaveReal();`
	`356`	`+ }`
	`357`	`+`
`352`	`358`	`public async Task SaveReal(CancellationToken? token = null)`
`353`	`359`	`{`
`354`	`360`	`try`