| @@ -211,11 +211,8 @@ | ||
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | public function getEndInDay() |
| 214 | 214 | { |
| 215 | - $start = $this->getStart(); | |
| 216 | - $end = $this->getEnd(); | |
| 217 | - | |
| 218 | 215 | $full = $this->getEnd(); |
| 219 | 216 | |
| 220 | 217 | $hour = substr( $full, 8, 2 ); |
| 221 | 218 | $minute = substr( $full, 10, 2 ); |
| @@ -221,32 +218,13 @@ | ||
| 221 | 218 | $minute = substr( $full, 10, 2 ); |
| 222 | 219 | $return = $hour * 60 * 60 + $minute * 60; |
| 223 | 220 | |
| 224 | 221 | if( $return ){ |
| 225 | - $d1 = substr( $start, 0, 8 ); | |
| 226 | - $d2 = substr( $end, 0, 8 ); | |
| 227 | - | |
| 222 | + $startInDay = $this->getStartInDay(); | |
| 228 | 223 | // overnight shifts |
| 229 | - if( $d2 > $d1 ){ | |
| 230 | - if (function_exists('gregoriantojd')) { | |
| 231 | - $days = gregoriantojd((int) substr($end, 4, 2), (int) substr($end, 6, 2), (int) substr($end, 0, 4)) - gregoriantojd((int) substr($start, 4, 2), (int) substr($start, 6, 2), (int) substr($start, 0, 4)); | |
| 232 | - $return = $return + $days * 24*60*60; | |
| 233 | - } else { | |
| 234 | - $string1 = substr($start, 0, 4) . '-' . substr($start, 4, 2) . '-' . substr($start, 6, 2) . ' ' . '00:00:00'; | |
| 235 | - $string2 = substr($end, 0, 4) . '-' . substr($end, 4, 2) . '-' . substr($end, 6, 2) . ' ' . substr($end, 8, 2) . ':' . substr($end, 10, 2) . ':00'; | |
| 236 | - $date = new DateTime( $string1 ); | |
| 237 | - $date2 = new DateTime( $string2 ); | |
| 238 | - $return = $date2->getTimestamp() - $date->getTimestamp(); | |
| 239 | - } | |
| 240 | - } | |
| 241 | - | |
| 242 | - // overnight shifts | |
| 243 | - /* | |
| 244 | - $startInDay = $this->getStartInDay(); | |
| 245 | 224 | if( $return <= $startInDay ){ |
| 246 | 225 | $return = 24*60*60 + $return; |
| 247 | 226 | } |
| 248 | - */ | |
| 249 | 227 | } |
| 250 | 228 | |
| 251 | 229 | if( 0 == $return ){ |
| 252 | 230 | $return = 24*60*60; |
| @@ -256,40 +234,40 @@ | ||
| 256 | 234 | } |
| 257 | 235 | |
| 258 | 236 | public function getBreakStartInDay() |
| 259 | 237 | { |
| 260 | - $ret = null; | |
| 238 | + $return = NULL; | |
| 261 | 239 | |
| 262 | - $full = (string) $this->getBreakStart(); | |
| 263 | - if( ! $full ){ | |
| 264 | - return $ret; | |
| 240 | + $full = $this->getBreakStart(); | |
| 241 | + if( NULL === $full ){ | |
| 242 | + return $return; | |
| 265 | 243 | } |
| 266 | 244 | |
| 267 | - $hour = (int) substr( $full, 8, 2 ); | |
| 268 | - $minute = (int) substr( $full, 10, 2 ); | |
| 269 | - $ret = $hour * 60 * 60 + $minute * 60; | |
| 245 | + $hour = substr( $full, 8, 2 ); | |
| 246 | + $minute = substr( $full, 10, 2 ); | |
| 247 | + $return = $hour * 60 * 60 + $minute * 60; | |
| 270 | 248 | |
| 271 | - return $ret; | |
| 249 | + return $return; | |
| 272 | 250 | } |
| 273 | 251 | |
| 274 | 252 | public function getBreakEndInDay() |
| 275 | 253 | { |
| 276 | - $ret = null; | |
| 254 | + $return = NULL; | |
| 277 | 255 | |
| 278 | - $full = (string) $this->getBreakEnd(); | |
| 279 | - if( ! $full ){ | |
| 280 | - return $ret; | |
| 256 | + $full = $this->getBreakEnd(); | |
| 257 | + if( NULL === $full ){ | |
| 258 | + return $return; | |
| 281 | 259 | } |
| 282 | 260 | |
| 283 | - $hour = (int) substr( $full, 8, 2 ); | |
| 284 | - $minute = (int) substr( $full, 10, 2 ); | |
| 285 | - $ret = $hour * 60 * 60 + $minute * 60; | |
| 261 | + $hour = substr( $full, 8, 2 ); | |
| 262 | + $minute = substr( $full, 10, 2 ); | |
| 263 | + $return = $hour * 60 * 60 + $minute * 60; | |
| 286 | 264 | |
| 287 | - if( 0 == $ret ){ | |
| 288 | - $ret = 24*60*60; | |
| 265 | + if( 0 == $return ){ | |
| 266 | + $return = 24*60*60; | |
| 289 | 267 | } |
| 290 | 268 | |
| 291 | - return $ret; | |
| 269 | + return $return; | |
| 292 | 270 | } |
| 293 | 271 | |
| 294 | 272 | public function getDateStart() |
| 295 | 273 | { |
