OHRM5X-756: Fix work shift screen issues (orangehrm#975)

* OHRM5X-756 - After adding new work shift, loader and navigation back issue fixed. * OHRM5X-758 - Time Picker interval 15 min added.
RajithaKumara · Nov 17, 2021 · 377ada4 · 377ada4
1 parent 5438aa6
commit 377ada4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/symfony/client/src/orangehrmAdminPlugin/pages/workShift/EditWorkShift.vue b/symfony/client/src/orangehrmAdminPlugin/pages/workShift/EditWorkShift.vue
@@ -45,6 +45,7 @@
               <oxd-input-field
                 type="time"
                 :rules="rules.fromTime"
+                :step="15"
                 :label="$t('general.from')"
                 v-model="workShift.startTime"
               />
@@ -54,6 +55,7 @@
               <oxd-input-field
                 type="time"
                 :rules="rules.endTime"
+                :step="15"
                 :label="$t('general.to')"
                 v-model="workShift.endTime"
               />

diff --git a/symfony/client/src/orangehrmAdminPlugin/pages/workShift/SaveWorkShift.vue b/symfony/client/src/orangehrmAdminPlugin/pages/workShift/SaveWorkShift.vue
@@ -45,6 +45,7 @@
               <oxd-input-field
                 type="time"
                 :rules="rules.fromTime"
+                :step="15"
                 :label="$t('general.from')"
                 v-model="workShift.startTime"
               />
@@ -54,6 +55,7 @@
               <oxd-input-field
                 type="time"
                 :rules="rules.endTime"
+                :step="15"
                 :label="$t('general.to')"
                 v-model="workShift.endTime"
               />
@@ -164,7 +166,6 @@ export default {
         })
         .then(() => {
           this.workShift = {...workShiftModel};
-          this.isLoading = false;
           this.onCancel();
         });
     },

diff --git a/symfony/plugins/orangehrmAdminPlugin/Service/WorkShiftService.php b/symfony/plugins/orangehrmAdminPlugin/Service/WorkShiftService.php
@@ -46,7 +46,6 @@ public function getWorkShiftDefaultStartAndEndTime(): WorkShiftStartAndEndTime
     /**
      * @param $id
      * @return WorkShift|null
-     * @throws DaoException
      */
     public function getWorkShiftById($id): WorkShift
     {