← All changes | sh4/shifts/duration.php +9 -14 4.9.77 → 4.9.66 View file →

		@@ -83,24 +83,19 @@
83	83	}
84	84
85	85	$noBreak = $this->settings->get( 'shifttypes_nobreak' );
86	86	if( ! $noBreak ){
87		- $breakStart = (string) $model->getBreakStart();
88		- $breakEnd = (string) $model->getBreakEnd();
	87	+ $breakStart = $model->getBreakStart();
	88	+ $breakEnd = $model->getBreakEnd();
89	89
90		- if( $breakStart OR $breakEnd ){
91		- // if( $breakStart < $start ) $breakStart = $start;
92		- // if( $breakEnd > $end ) $breakEnd = $end;
	90	+ if( ! ((NULL === $breakStart) && (NULL === $breakEnd)) ){
	91	+ $this->t->setDateTimeDb( $breakStart );
	92	+ $breakStartTs = $this->t->getTimestamp();
	93	+ $this->t->setDateTimeDb( $breakEnd );
	94	+ $breakEndTs = $this->t->getTimestamp();
93	95
94		- if( ($breakStart >= $start) && ($breakEnd <= $end) ){
95		- $this->t->setDateTimeDb( $breakStart );
96		- $breakStartTs = $this->t->getTimestamp();
97		- $this->t->setDateTimeDb( $breakEnd );
98		- $breakEndTs = $this->t->getTimestamp();
99		-
100		- $breakDuration = abs( $breakEndTs - $breakStartTs );
101		- $duration = $duration - $breakDuration;
102		- }
	96	+ $breakDuration = abs( $breakEndTs - $breakStartTs );
	97	+ $duration = $duration - $breakDuration;
103	98	}
104	99	}
105	100
106	101	$this->qty++;