Changed the offsite booking hours to 12 to 12

bcgov · Jul 29, 2024 · f2e5272 · f2e5272
1 parent 6c1c1b9
commit f2e5272
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/frontend/src/components/Booking/calendar.vue b/frontend/src/components/Booking/calendar.vue
@@ -79,10 +79,10 @@
             :now="currentDay"
             color="primary"
             v-model="value"
-            first-time="08:30"
+            :first-time="startTime"
             interval-minutes="30"
             interval-height="40"
-            interval-count="17"
+            :interval-count="intervalCount"
             :type="type"
             category-show-all
             :categories="categories"
@@ -258,6 +258,8 @@ export default class Calendar extends Vue {
   mode: any = 'stack'
   weekday: any = [1, 2, 3, 4, 5]
   start: any = moment().format('YYYY-MM-DD')
+  startTime : string = '08:30'
+  intervalCount : string = '17'
 
   value: any = ''
   eventsList: any = []
@@ -692,10 +694,15 @@ export default class Calendar extends Vue {
 
   toggleOffsite (bool) {
     this.toggleOffsiteVisible(bool)
+  
     if (bool) {
       // I assume this empty block is intentional
+      this.startTime = "00:00"
+      this.intervalCount = "48"
     }
     if (!bool) {
+      this.startTime = "08:30"
+    this.intervalCount = "17"
       if (this.offsiteOnly) {
         // I assume this empty block is intentional
       }

diff --git a/frontend/src/components/exams/edit-exam-confirmation-modal.vue b/frontend/src/components/exams/edit-exam-confirmation-modal.vue
@@ -3,8 +3,8 @@
     <div class="modal-content">
       <p>Room booking for the exam will be deleted. Are you sure you want to proceed?</p>
       <div class="button-container">
-        <b-btn class="btn-primary" @click="$emit('cancel')">Cancel</b-btn>
-        <b-btn class="btn-danger mr-2" @click="$emit('confirm')">Confirm</b-btn>
+        <b-btn class="btn-primary mr-2" @click="$emit('cancel')">Cancel</b-btn>
+        <b-btn class="btn-danger ml-2" @click="$emit('confirm')">Confirm</b-btn>
       </div>
     </div>
   </div>
@@ -51,6 +51,7 @@ export default {
 .button-container {
   display: flex;
   justify-content: center;
-  margin-top: 20px; /* Adjust margin as needed */
+  margin-top: 20px;
+  gap: 20 px
 }
 </style>
diff --git a/frontend/src/components/exams/edit-exam-form-modal.vue b/frontend/src/components/exams/edit-exam-form-modal.vue
@@ -804,7 +804,7 @@ export default class EditExamModal extends Vue {
   }
 
   submit () {
-    if (this.isITAExam && this.actionedExam.booking_id !== null) {
+    if (this.isITAExam && this.actionedExam.booking_id !== null && this.actionedExam.exam_type_id !== this.objectItem.exam_type_id) {
       this.showConfirmationModal = true
     } else {
       this.submitExamDetails()