| @@ -6,9 +6,8 @@ | ||
| 6 | 6 | public $appQuery; |
| 7 | 7 | |
| 8 | 8 | public function __construct( |
| 9 | 9 | HC3_Hooks $hooks, |
| 10 | - HC3_Dic $dic, | |
| 11 | 10 | HC3_Time $t, |
| 12 | 11 | |
| 13 | 12 | HC3_IPermission $permission, |
| 14 | 13 | HC3_Translate $translate, |
| @@ -29,9 +28,8 @@ | ||
| 29 | 28 | SH4_Shifts_Command $shiftsCommand |
| 30 | 29 | ) |
| 31 | 30 | { |
| 32 | 31 | $this->t = $t; |
| 33 | - $this->dic = $dic; | |
| 34 | 32 | $this->translate = $translate; |
| 35 | 33 | $this->permission = $hooks->wrap( $permission ); |
| 36 | 34 | |
| 37 | 35 | $this->employeesQuery = $hooks->wrap( $employeesQuery ); |
| @@ -493,28 +491,8 @@ | ||
| 493 | 491 | |
| 494 | 492 | $this->shiftsCommand->draft( $shift ); |
| 495 | 493 | } |
| 496 | 494 | |
| 497 | - if (class_exists('SH4_CFields_Model') or class_exists('SH4_CFields2_Model')) { | |
| 498 | - $cfieldsQuery = $this->dic->make('SH4_CFields_Query'); | |
| 499 | - $cfieldsCommand = $this->dic->make('SH4_CFields_Command'); | |
| 500 | - $cal = $calendar; | |
| 501 | - $cfields = $cfieldsQuery->findByCalendar($cal); | |
| 502 | - | |
| 503 | - $cvals = array(); | |
| 504 | - foreach ($cfields as $cfield) { | |
| 505 | - $cfieldName = $cfield->getName(); | |
| 506 | - $cfieldId = $cfield->getId(); | |
| 507 | - if (isset($values[$cfieldName])) { | |
| 508 | - $cvals[$cfieldId] = $values[$cfieldName]; | |
| 509 | - } | |
| 510 | - } | |
| 511 | - | |
| 512 | - if ($cvals) { | |
| 513 | - $cfieldsCommand->updateShift($shift, $cvals); | |
| 514 | - } | |
| 515 | - } | |
| 516 | - | |
| 517 | 495 | return $shiftId; |
| 518 | 496 | } |
| 519 | 497 | |
| 520 | 498 | public function shiftsDeleteById( $id ) |
| @@ -696,29 +674,8 @@ | ||
| 696 | 674 | |
| 697 | 675 | if( $newStatus && (SH4_Shifts_Model::STATUS_DRAFT == $newStatus) && ( ! $shift->isDraft() ) ){ |
| 698 | 676 | $this->shiftsCommand->unpublish( $shift ); |
| 699 | 677 | } |
| 700 | - | |
| 701 | - if (class_exists('SH4_CFields_Model') or class_exists('SH4_CFields2_Model')) { | |
| 702 | - $cfieldsQuery = $this->dic->make('SH4_CFields_Query'); | |
| 703 | - $cfieldsCommand = $this->dic->make('SH4_CFields_Command'); | |
| 704 | - $cal = $newCalendar ? $newCalendar : $calendar; | |
| 705 | - $cfields = $cfieldsQuery->findByCalendar($cal); | |
| 706 | - | |
| 707 | - | |
| 708 | - $cvals = array(); | |
| 709 | - foreach ($cfields as $cfield) { | |
| 710 | - $cfieldName = $cfield->getName(); | |
| 711 | - $cfieldId = $cfield->getId(); | |
| 712 | - if (isset($values[$cfieldName])) { | |
| 713 | - $cvals[$cfieldId] = $values[$cfieldName]; | |
| 714 | - } | |
| 715 | - } | |
| 716 | - | |
| 717 | - if ($cvals) { | |
| 718 | - $cfieldsCommand->updateShift($shift, $cvals); | |
| 719 | - } | |
| 720 | - } | |
| 721 | 678 | |
| 722 | 679 | return; |
| 723 | 680 | } |
| 724 | 681 | |
