@@ -551,14 +551,6 @@ export class WorkdayEntityDialogComponent implements OnInit {
551551 }
552552 }
553553
554- // Disallow pause = 00:00
555- if ( breakMin === 0 ) {
556- setError ( pauseControl , 'invalidPause' , 'Pause cannot be 00:00' ) ;
557- } else {
558- removeError ( pauseControl , 'invalidPause' ) ;
559- }
560-
561-
562554 if ( duration > 24 * 60 ) {
563555 setError ( group , 'shiftTooLong' , 'Shift duration cannot exceed 24 hours' ) ;
564556 } else {
@@ -754,11 +746,11 @@ export class WorkdayEntityDialogComponent implements OnInit {
754746 if ( isSet ( p2Stop ) ) {
755747 this . setDisabled ( 'planned.shift2.break' , false ) ;
756748 if ( this . data . assignedSiteModel . thirdShiftActive )
757- { this . setDisabled ( 'planned.shift3.start' , false ) ; }
749+ { this . setDisabled ( 'planned.shift3.start' , false ) ; }
758750 } else {
759751 this . setDisabled ( 'planned.shift2.break' , true ) ;
760752 if ( this . data . assignedSiteModel . thirdShiftActive )
761- { this . setDisabled ( 'planned.shift3.start' , true ) ; }
753+ { this . setDisabled ( 'planned.shift3.start' , true ) ; }
762754 }
763755
764756 // Shift 3
@@ -772,11 +764,11 @@ export class WorkdayEntityDialogComponent implements OnInit {
772764 if ( isSet ( p3Stop ) ) {
773765 this . setDisabled ( 'planned.shift3.break' , false ) ;
774766 if ( this . data . assignedSiteModel . fourthShiftActive )
775- { this . setDisabled ( 'planned.shift4.start' , false ) ; }
767+ { this . setDisabled ( 'planned.shift4.start' , false ) ; }
776768 } else {
777769 this . setDisabled ( 'planned.shift3.break' , true ) ;
778770 if ( this . data . assignedSiteModel . fourthShiftActive )
779- { this . setDisabled ( 'planned.shift4.start' , true ) ; }
771+ { this . setDisabled ( 'planned.shift4.start' , true ) ; }
780772 }
781773 }
782774
@@ -791,11 +783,11 @@ export class WorkdayEntityDialogComponent implements OnInit {
791783 if ( isSet ( p4Stop ) ) {
792784 this . setDisabled ( 'planned.shift4.break' , false ) ;
793785 if ( this . data . assignedSiteModel . fifthShiftActive )
794- { this . setDisabled ( 'planned.shift5.start' , false ) ; }
786+ { this . setDisabled ( 'planned.shift5.start' , false ) ; }
795787 } else {
796788 this . setDisabled ( 'planned.shift4.break' , true ) ;
797789 if ( this . data . assignedSiteModel . fifthShiftActive )
798- { this . setDisabled ( 'planned.shift5.start' , true ) ; }
790+ { this . setDisabled ( 'planned.shift5.start' , true ) ; }
799791 }
800792 }
801793
@@ -1272,16 +1264,18 @@ export class WorkdayEntityDialogComponent implements OnInit {
12721264 this . data . planningPrDayModels . nettoHoursOverride = this . workdayForm . get ( 'nettoHoursOverride' ) ?. value ;
12731265 this . data . planningPrDayModels . commentOffice = this . workdayForm . get ( 'commentOffice' ) ?. value ;
12741266 // Rens paidOutFlex
1267+ this . data . planningPrDayModels . paidOutFlex =
1268+ this . data . planningPrDayModels . paidOutFlex === null ? 0 : this . data . planningPrDayModels . paidOutFlex ;
12751269
1276- // let paidOutFlex = this.data.planningPrDayModels.paidOutFlex.toString();
12771270 if ( this . data . planningPrDayModels . paidOutFlex . toString ( ) . includes ( ',' ) ) {
12781271 this . data . planningPrDayModels . paidOutFlex = parseFloat (
12791272 this . data . planningPrDayModels . paidOutFlex . toString ( ) . replace ( ',' , '.' )
12801273 ) ;
12811274 }
12821275 }
12831276
1284- private getPlannedShiftMinutes (
1277+
1278+ private getPlannedShiftMinutes (
12851279 start : number | null ,
12861280 end : number | null ,
12871281 breakMinutes : number | null
0 commit comments