edit roles in automatic shifts

LitusProject · Oct 23, 2023 · b4df856 · b4df856
1 parent 073999f
commit b4df856
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 34 deletions.
diff --git a/module/CalendarBundle/Controller/Admin/CalendarController.php b/module/CalendarBundle/Controller/Admin/CalendarController.php
@@ -88,7 +88,7 @@ public function addAction()
 
     public function templateAction()
     {
-        $form = $this->getForm('calendar_event_add');
+        $form = $this->getForm('calendar_event_schedule');
         $shiftForm = $this->getForm('shift_shift_add');
 
         if ($this->getRequest()->isPost()) {
@@ -104,6 +104,7 @@ public function templateAction()
                 $data = array(
                     'manager'               => false,
                     'unit'                  => 3,
+                    'edit_roles'            => array('activiteiten',),
                     'event'                 => $event->getId(),
                     'location'              => 2,
                     'nb_responsibles'       => 0,

diff --git a/module/CalendarBundle/Form/Admin/Event/Schedule.php b/module/CalendarBundle/Form/Admin/Event/Schedule.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace CalendarBundle\Form\Admin\Event;
+
+/**
+ * Add multiple standardized shifts at once; simplified version of add
+ *
+ * @author Pedro Devogelaere <[email protected]>
+ */
+class Schedule extends \CalendarBundle\Form\Admin\Event\Add
+{
+    protected $hydrator = 'CalendarBundle\Hydrator\Node\Event';
+
+    public function init()
+    {
+        parent::init();
+
+        $this->remove('is_hidden')
+            ->remove('is_career')
+            ->remove('is_international');
+    }
+}
+
diff --git a/module/CudiBundle/Controller/Admin/Sale/Session/OpeningHourController.php b/module/CudiBundle/Controller/Admin/Sale/Session/OpeningHourController.php
@@ -126,8 +126,8 @@ public function editAction()
     public function scheduleAction()
     {
         $form = $this->getForm('cudi_sale_session_opening-hour_schedule');
-        $shiftForm = $this->getForm('shift_shift_schedule');
-        $registrationForm = $this->getForm('shift_registration-shift_schedule');
+        $shiftForm = $this->getForm('shift_shift_add');
+        $registrationForm = $this->getForm('shift_registration-shift_add');
 
         $now = (new DateTime())->format('d/m/Y H:i');
 
@@ -160,6 +160,7 @@ public function scheduleAction()
 (Er is altijd begeleiding dus wees niet bang als je voor de eerste keer komt ;))',
                             'manager'               => false,
                             'unit'                  => 1,
+                            'edit_roles'            => array('cursusdienst',),
                             'event'                 => '',
                             'location'              => 1,
                             'nb_responsibles'       => 0,

diff --git a/module/ShiftBundle/Entity/Shift.php b/module/ShiftBundle/Entity/Shift.php
@@ -186,14 +186,14 @@ class Shift
     private $points;
 
     /**
-     * @var boolean Wheter or not the reward is payed at the event itself
+     * @var boolean Whether the reward is payed at the event itself
      *
      * @ORM\Column(name="handled_on_event", type="boolean")
      */
     private $handledOnEvent;
 
     /**
-     * @var boolean wheter or not a ticket is needed to do the shift
+     * @var boolean whether a ticket is needed to do the shift
      *
      * @ORM\Column(name="ticket_needed", type="boolean",options={"default" = false})
      */

diff --git a/module/ShiftBundle/Form/Admin/RegistrationShift/Schedule.php b/module/ShiftBundle/Form/Admin/RegistrationShift/Schedule.php
diff --git a/module/ShiftBundle/Form/Admin/Shift/Schedule.php b/module/ShiftBundle/Form/Admin/Shift/Schedule.php
diff --git a/module/ShiftBundle/Hydrator/Shift.php b/module/ShiftBundle/Hydrator/Shift.php
@@ -80,10 +80,12 @@ protected function doHydrate(array $data, $object = null)
 
         $editRoles = array();
         if (isset($data['edit_roles'])) {
+
             $roleRepository = $this->getEntityManager()
                 ->getRepository('CommonBundle\Entity\Acl\Role');
 
             foreach ($data['edit_roles'] as $editRole) {
+
                 $editRoles[] = $roleRepository->findOneByName($editRole);
             }
         }

diff --git a/module/ShopBundle/Controller/Admin/OpeningHourController.php b/module/ShopBundle/Controller/Admin/OpeningHourController.php
@@ -125,7 +125,7 @@ public function editAction()
     public function scheduleAction()
     {
         $form = $this->getForm('shop_admin_session_opening-hour_schedule');
-        $shiftForm = $this->getForm('shift_shift_schedule');
+        $shiftForm = $this->getForm('shift_shift_add');
 
         $monday = new DateTime();                                                                   // create DateTime object with current time
         $monday->setISODate($monday->format('o'), $monday->format('W') + 1);     // set object to Monday on next week
@@ -152,6 +152,7 @@ public function scheduleAction()
                             'description'           => '',
                             'manager'               => false,
                             'unit'                  => 2,
+                            'edit_roles'            => array('theokot',),
                             'event'                 => '',
                             'location'              => 1,
                             'nb_responsibles'       => 0,