← All changes | sh4/shifts/controller/time.php +13 -16 4.9.74 → 4.9.66 View file →

		@@ -45,10 +45,10 @@
45	45	$shiftType = $this->shiftTypesQuery->findById( $shiftTypeId );
46	46
47	47	$timeStart = $shiftType->getStart();
48	48	$timeEnd = $shiftType->getEnd();
49		- $startBreak = (string) $shiftType->getBreakStart();
50		- $endBreak = (string) $shiftType->getBreakEnd();
	49	+ $startBreak = $shiftType->getBreakStart();
	50	+ $endBreak = $shiftType->getBreakEnd();
51	51	}
52	52	else {
53	53	$time = $this->post->get('time');
54	54
		@@ -60,9 +60,9 @@
60	60	}
61	61
62	62	list( $timeStart, $timeEnd ) = explode( '-', $time );
63	63
64		- $startBreak = $endBreak = '';
	64	+ $startBreak = $endBreak = NULL;
65	65	$breakOn = $this->post->get('break_on');
66	66	if( $breakOn ){
67	67	$break = $this->post->get('break');
68	68	list( $startBreak, $endBreak ) = explode( '-', $break );
		@@ -79,22 +79,19 @@
79	79	->modify( '+' . $timeEnd . ' seconds' )
80	80	->formatDateTimeDb()
81	81	;
82	82
83		- if( strlen($startBreak) ){
84		- $this->t->setDateDb( $date );
85		- if( $startBreak ){
86		- $this->t->modify( '+' . $startBreak . ' seconds' );
87		- }
88		- $startBreak = $this->t->formatDateTimeDb();
	83	+ if( NULL !== $startBreak ){
	84	+ $startBreak = $this->t->setDateDb( $date )
	85	+ ->modify( '+' . $startBreak . ' seconds' )
	86	+ ->formatDateTimeDb()
	87	+ ;
89	88	}
90		-
91		- if( strlen($endBreak) ){
92		- $this->t->setDateDb( $date );
93		- if( $endBreak ){
94		- $this->t->modify( '+' . $endBreak . ' seconds' );
95		- }
96		- $endBreak = $this->t->formatDateTimeDb();
	89	+ if( NULL !== $endBreak ){
	90	+ $endBreak = $this->t->setDateDb( $date )
	91	+ ->modify( '+' . $endBreak . ' seconds' )
	92	+ ->formatDateTimeDb()
	93	+ ;
97	94	}
98	95
99	96	// check if it creates a conflict
100	97	$calendar = $shift->getCalendar();