Fixing the parsing from empty values, so we reset the planned shifts.

renemadsen · renemadsen · commit a4d3e01c2da5 · 2025-11-07T05:27:22.000+01:00
diff --git a/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs b/eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Infrastructure/Helpers/PlanRegistrationHelper.cs
@@ -185,9 +185,9 @@ IPluginDbOptions<TimePlanningBaseSettings> options
                 {
                     if (dbAssignedSite.UseGoogleSheetAsDefault)
                     {
-                        if (!string.IsNullOrEmpty(planRegistration.PlanText))
+                        if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)
                         {
-                            if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)
+                            if (!string.IsNullOrEmpty(planRegistration.PlanText))
                             {
                                 var splitList = planRegistration.PlanText.Split(';');
                                 var firsSplit = splitList[0];
@@ -541,6 +541,24 @@ IPluginDbOptions<TimePlanningBaseSettings> options
 
                                 }
                             }
+                            else
+                            {
+                                planRegistration.PlannedStartOfShift1 = 0;
+                                planRegistration.PlannedEndOfShift1 = 0;
+                                planRegistration.PlannedBreakOfShift1 = 0;
+                                planRegistration.PlannedStartOfShift2 = 0;
+                                planRegistration.PlannedEndOfShift2 = 0;
+                                planRegistration.PlannedBreakOfShift2 = 0;
+                                planRegistration.PlannedStartOfShift3 = 0;
+                                planRegistration.PlannedEndOfShift3 = 0;
+                                planRegistration.PlannedBreakOfShift3 = 0;
+                                planRegistration.PlannedStartOfShift4 = 0;
+                                planRegistration.PlannedEndOfShift4 = 0;
+                                planRegistration.PlannedBreakOfShift4 = 0;
+                                planRegistration.PlannedStartOfShift5 = 0;
+                                planRegistration.PlannedEndOfShift5 = 0;
+                                planRegistration.PlannedBreakOfShift5 = 0;
+                            }
                         }
 
                         var preTimePlanning =
@@ -1187,10 +1205,10 @@ DateTime dayOfPayment
             {
                 if (dbAssignedSite.UseGoogleSheetAsDefault)
                 {
+                    if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)
+                    {
                     if (!string.IsNullOrEmpty(planRegistration.PlanText))
                     {
-                        if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)
-                        {
                             var splitList = planRegistration.PlanText.Split(';');
                             var firsSplit = splitList[0];
 
@@ -1524,6 +1542,24 @@ DateTime dayOfPayment
 
                             }
                         }
+                        else
+                        {
+                            planRegistration.PlannedStartOfShift1 = 0;
+                            planRegistration.PlannedEndOfShift1 = 0;
+                            planRegistration.PlannedBreakOfShift1 = 0;
+                            planRegistration.PlannedStartOfShift2 = 0;
+                            planRegistration.PlannedEndOfShift2 = 0;
+                            planRegistration.PlannedBreakOfShift2 = 0;
+                            planRegistration.PlannedStartOfShift3 = 0;
+                            planRegistration.PlannedEndOfShift3 = 0;
+                            planRegistration.PlannedBreakOfShift3 = 0;
+                            planRegistration.PlannedStartOfShift4 = 0;
+                            planRegistration.PlannedEndOfShift4 = 0;
+                            planRegistration.PlannedBreakOfShift4 = 0;
+                            planRegistration.PlannedStartOfShift5 = 0;
+                            planRegistration.PlannedEndOfShift5 = 0;
+                            planRegistration.PlannedBreakOfShift5 = 0;
+                        }
                     }
 
                     var preTimePlanning =

Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,9 @@ IPluginDbOptions<TimePlanningBaseSettings> options`
`185`	`185`	`{`
`186`	`186`	`if (dbAssignedSite.UseGoogleSheetAsDefault)`
`187`	`187`	`{`
`188`		`- if (!string.IsNullOrEmpty(planRegistration.PlanText))`
	`188`	`+ if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)`
`189`	`189`	`{`
`190`		`- if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)`
	`190`	`+ if (!string.IsNullOrEmpty(planRegistration.PlanText))`
`191`	`191`	`{`
`192`	`192`	`var splitList = planRegistration.PlanText.Split(';');`
`193`	`193`	`var firsSplit = splitList[0];`
`@@ -541,6 +541,24 @@ IPluginDbOptions<TimePlanningBaseSettings> options`
`541`	`541`
`542`	`542`	`}`
`543`	`543`	`}`
	`544`	`+ else`
	`545`	`+ {`
	`546`	`+ planRegistration.PlannedStartOfShift1 = 0;`
	`547`	`+ planRegistration.PlannedEndOfShift1 = 0;`
	`548`	`+ planRegistration.PlannedBreakOfShift1 = 0;`
	`549`	`+ planRegistration.PlannedStartOfShift2 = 0;`
	`550`	`+ planRegistration.PlannedEndOfShift2 = 0;`
	`551`	`+ planRegistration.PlannedBreakOfShift2 = 0;`
	`552`	`+ planRegistration.PlannedStartOfShift3 = 0;`
	`553`	`+ planRegistration.PlannedEndOfShift3 = 0;`
	`554`	`+ planRegistration.PlannedBreakOfShift3 = 0;`
	`555`	`+ planRegistration.PlannedStartOfShift4 = 0;`
	`556`	`+ planRegistration.PlannedEndOfShift4 = 0;`
	`557`	`+ planRegistration.PlannedBreakOfShift4 = 0;`
	`558`	`+ planRegistration.PlannedStartOfShift5 = 0;`
	`559`	`+ planRegistration.PlannedEndOfShift5 = 0;`
	`560`	`+ planRegistration.PlannedBreakOfShift5 = 0;`
	`561`	`+ }`
`544`	`562`	`}`
`545`	`563`
`546`	`564`	`var preTimePlanning =`
`@@ -1187,10 +1205,10 @@ DateTime dayOfPayment`
`1187`	`1205`	`{`
`1188`	`1206`	`if (dbAssignedSite.UseGoogleSheetAsDefault)`
`1189`	`1207`	`{`
	`1208`	`+ if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)`
	`1209`	`+ {`
`1190`	`1210`	`if (!string.IsNullOrEmpty(planRegistration.PlanText))`
`1191`	`1211`	`{`
`1192`		`- if (planRegistration.Date > dayOfPayment && !planRegistration.PlanChangedByAdmin)`
`1193`		`- {`
`1194`	`1212`	`var splitList = planRegistration.PlanText.Split(';');`
`1195`	`1213`	`var firsSplit = splitList[0];`
`1196`	`1214`
`@@ -1524,6 +1542,24 @@ DateTime dayOfPayment`
`1524`	`1542`
`1525`	`1543`	`}`
`1526`	`1544`	`}`
	`1545`	`+ else`
	`1546`	`+ {`
	`1547`	`+ planRegistration.PlannedStartOfShift1 = 0;`
	`1548`	`+ planRegistration.PlannedEndOfShift1 = 0;`
	`1549`	`+ planRegistration.PlannedBreakOfShift1 = 0;`
	`1550`	`+ planRegistration.PlannedStartOfShift2 = 0;`
	`1551`	`+ planRegistration.PlannedEndOfShift2 = 0;`
	`1552`	`+ planRegistration.PlannedBreakOfShift2 = 0;`
	`1553`	`+ planRegistration.PlannedStartOfShift3 = 0;`
	`1554`	`+ planRegistration.PlannedEndOfShift3 = 0;`
	`1555`	`+ planRegistration.PlannedBreakOfShift3 = 0;`
	`1556`	`+ planRegistration.PlannedStartOfShift4 = 0;`
	`1557`	`+ planRegistration.PlannedEndOfShift4 = 0;`
	`1558`	`+ planRegistration.PlannedBreakOfShift4 = 0;`
	`1559`	`+ planRegistration.PlannedStartOfShift5 = 0;`
	`1560`	`+ planRegistration.PlannedEndOfShift5 = 0;`
	`1561`	`+ planRegistration.PlannedBreakOfShift5 = 0;`
	`1562`	`+ }`
`1527`	`1563`	`}`
`1528`	`1564`
`1529`	`1565`	`var preTimePlanning =`