GT-Volk /
working-time
| @@ 285-301 (lines=17) @@ | ||
| 282 | $jobMinutesInDay = $this->getJobMinutesInDay($nextJobDT->format('Y-m-d H:i')); |
|
| 283 | ||
| 284 | // Если длинна дня больше чем время модификации |
|
| 285 | if ($jobMinutesInDay > $minutes) { |
|
| 286 | $nextJobDT->modify("+$minutes minutes"); |
|
| 287 | } else { // Если длинна дня меньше чем время модификации |
|
| 288 | ||
| 289 | do { |
|
| 290 | $nextJobDT->modify("+$jobMinutesInDay minutes"); |
|
| 291 | $minutes -= $jobMinutesInDay; |
|
| 292 | $nextWorkingTime = $this->nextWorkingTime($nextJobDT->format('Y-m-d H:i')); |
|
| 293 | $nextJobDT = new \DateTime($nextWorkingTime); |
|
| 294 | $jobMinutesInDay = $this->getJobMinutesInDay($nextJobDT->format('Y-m-d H:i')); |
|
| 295 | if ($jobMinutesInDay > $minutes) { |
|
| 296 | $nextJobDT->modify("+$minutes minutes"); |
|
| 297 | $minutes = 0; |
|
| 298 | } |
|
| 299 | } while ($minutes > 0); |
|
| 300 | } |
|
| 301 | ||
| 302 | if ($date === null) { |
|
| 303 | $this->dateTime->setTimestamp($nextJobDT->getTimestamp()); |
|
| 304 | } |
|
| @@ 311-327 (lines=17) @@ | ||
| 308 | ||
| 309 | $jobMinutesInDay = $this->getJobMinutesInDay($dateTime->format('Y-m-d H:i')); |
|
| 310 | ||
| 311 | if ($jobMinutesInDay > $minutes) { |
|
| 312 | $dateTime->modify("+$minutes minutes"); |
|
| 313 | } else { // Если длинна дня меньше чем время модификации |
|
| 314 | ||
| 315 | do { |
|
| 316 | $dateTime->modify("+$jobMinutesInDay minutes"); |
|
| 317 | $minutes -= $jobMinutesInDay; |
|
| 318 | $nextWorkingTime = $this->nextWorkingTime($dateTime->format('Y-m-d H:i')); |
|
| 319 | $dateTime = new \DateTime($nextWorkingTime); |
|
| 320 | $jobMinutesInDay = $this->getJobMinutesInDay($dateTime->format('Y-m-d H:i')); |
|
| 321 | if ($jobMinutesInDay > $minutes) { |
|
| 322 | $dateTime->modify("+$minutes minutes"); |
|
| 323 | $minutes = 0; |
|
| 324 | } |
|
| 325 | } while ($minutes > 0); |
|
| 326 | } |
|
| 327 | ||
| 328 | if ($date === null) { |
|
| 329 | $this->dateTime->setTimestamp($dateTime->getTimestamp()); |
|
| 330 | } |
|
