Adding week number to excel export for each worker.

Adding saturday, sunday sum for total export.
Adding any comment from worker to total export.
Adding any message to total export.

Author: renemadsen

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Models/WorkingHours/Index/TimePlanningWorkingHoursModel.cs

@@ -54,6 +54,8 @@ public class TimePlanningWorkingHoursModel
     public double FlexHours { get; set; }
     public double SumFlexStart { get; set; }
     public double SumFlexEnd { get; set; }
+    public bool IsSaturday { get; set; }
+    public bool IsSunday { get; set; }
     public string PaidOutFlex { get; set; }
     public int? Message { get; set; }
     public string CommentWorker { get; set; }

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Resources/Translations.Designer.cs

@@ -120,4 +120,19 @@
     <data name="TokenNotFound" xml:space="preserve">
         <value>Token blen ikke fundet</value>
     </data>
+    <data name="Week number" xml:space="preserve">
+        <value>Uge nr</value>
+    </data>
+    <data name="Hours Saturday" xml:space="preserve">
+        <value>Timer lørdag</value>
+    </data>
+    <data name="Hours Sunday" xml:space="preserve">
+        <value>Timer søndag</value>
+    </data>
+    <data name="Yes" xml:space="preserve">
+        <value>Ja</value>
+    </data>
+    <data name="No" xml:space="preserve">
+        <value>Nej</value>
+    </data>
 </root>

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Resources/Translations.da.Designer.cs

@@ -120,4 +120,19 @@
     <data name="Shift 5: pause" xml:space="preserve">
         <value>Shift 5: pause</value>
     </data>
+    <data name="Week number" xml:space="preserve">
+        <value>Week number</value>
+    </data>
+    <data name="Hours Saturday" xml:space="preserve">
+        <value>Hours Saturday</value>
+    </data>
+    <data name="Hours Sunday" xml:space="preserve">
+        <value>Hours Sunday</value>
+    </data>
+    <data name="Yes" xml:space="preserve">
+        <value>Yes</value>
+    </data>
+    <data name="No" xml:space="preserve">
+        <value>No</value>
+    </data>
 </root>

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Resources/Translations.da.resx

@@ -146,7 +146,9 @@ public async Task<OperationDataResult<List<TimePlanningWorkingHoursModel>>> Inde
                     IsLocked = (x.Date < DateTime.Now.AddDays(-(int)(maxDaysEditable ?? 0)) || x.Date == midnight),
                     IsWeekend = x.Date.DayOfWeek == DayOfWeek.Saturday || x.Date.DayOfWeek == DayOfWeek.Sunday,
                     NettoHoursOverride = x.NettoHoursOverride,
-                    NettoHoursOverrideActive = x.NettoHoursOverrideActive
+                    NettoHoursOverrideActive = x.NettoHoursOverrideActive,
+                    IsSaturday = x.Date.DayOfWeek == DayOfWeek.Saturday,
+                    IsSunday = x.Date.DayOfWeek == DayOfWeek.Sunday
                 })
                 .ToListAsync();
 
@@ -2061,6 +2063,7 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(TimePlanni
                     Translations.Worker,
                     Translations.DayOfWeek,
                     Translations.Date,
+                    Translations.Week_number,
                     Translations.PlanText,
                     Translations.PlanHours,
                     Translations.Shift_1__start,
@@ -2214,6 +2217,7 @@ private void FillDataRow(Row dataRow, Worker worker, Microting.eForm.Infrastruct
             dataRow.Append(CreateCell(site.Name));
             dataRow.Append(CreateCell(planning.Date.ToString("dddd", culture)));
             dataRow.Append(CreateDateCell(planning.Date));
+            dataRow.Append(CreateWeekNumberCell(planning.Date));
             dataRow.Append(CreateCell(planning.PlanText));
             dataRow.Append(CreateNumericCell(planning.PlanHours));
             dataRow.Append(CreateCell(GetShiftTime(plr, planning.Shift1Start)));
@@ -2287,6 +2291,17 @@ private Cell CreateDateCell(DateTime dateValue)
         };
     }
 
+    private Cell CreateWeekNumberCell(DateTime dateValue)
+    {
+        var culture = CultureInfo.CurrentCulture;
+        var weekNumber = culture.Calendar.GetWeekOfYear(dateValue, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
+        return new Cell()
+        {
+            CellValue = new CellValue(weekNumber.ToString()),
+            DataType = CellValues.Number
+        };
+    }
+
 
     private string GetShiftTime(PlanRegistration plr, int? shift)
     {
@@ -2409,7 +2424,11 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(
                     Translations.Worker,
                     Translations.PlanHours,
                     Translations.NettoHours,
-                    Translations.SumFlexStart
+                    Translations.SumFlexStart,
+                    Translations.Hours_Saturday,
+                    Translations.Hours_Sunday,
+                    Translations.Comments,
+                    Translations.Message
                 };
                 List<string> totalHeaderStrings = new List<string>();
                 foreach (var header in totalHeaders)
@@ -2481,6 +2500,7 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(
                         Translations.Worker,
                         Translations.DayOfWeek,
                         Translations.Date,
+                        Translations.Week_number,
                         Translations.PlanText,
                         Translations.PlanHours,
                         Translations.Shift_1__start,
@@ -2637,6 +2657,14 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(
                     var nettoHoursOverrideTotal = content.Model.Skip(1).ToList().Where(x => x.NettoHoursOverrideActive).Sum(x => x.NettoHoursOverride);
                     totalRow.Append(CreateNumericCell(nettoHoursTotal + nettoHoursOverrideTotal));
                     totalRow.Append(CreateNumericCell(content.Model.Last().SumFlexEnd));
+                    var sumHoursSaturday = content.Model.Skip(1).Where(x => x.IsSaturday).Select(x => x.NettoHours).Sum();
+                    var sumHoursSunday = content.Model.Skip(1).Where(x => x.IsSunday).Select(x => x.NettoHours).Sum();
+                    var hasAnyCommentFromWorker = content.Model.Skip(1).ToList().Any(x => !string.IsNullOrEmpty(x.CommentWorker));
+                    var hasAnyMessage = content.Model.Skip(1).ToList().Any(x => x.Message != null);
+                    totalRow.Append(CreateNumericCell(sumHoursSaturday));
+                    totalRow.Append(CreateNumericCell(sumHoursSunday));
+                    totalRow.Append(CreateCell(hasAnyCommentFromWorker ? localizationService.GetString(Translations.Yes) : localizationService.GetString(Translations.No)));
+                    totalRow.Append(CreateCell(hasAnyMessage ? localizationService.GetString(Translations.Yes) : localizationService.GetString(Translations.No)));
                     totalSheetData1.Append(totalRow);
                     totalRowIndex++;