SBCQ-100 exam booking issue - other exams

frontend/src/components/exams/add-exam-final-step.vue

@@ -99,17 +99,11 @@
       <b-col cols="3">
         <span class="confirm-header">Received Date</span>
       </b-col>
-      <b-col align-self="end" v-if="setup === 'individual'">
+      <b-col align-self="end" v-if="setup === 'individual' || setup === 'other'">
         <span class="confirm-item">{{
           formatDate(exam.exam_received_date)
         }}</span>
       </b-col>
-      <b-col align-self="end" v-else>
-        <span v-if="!tab.showRadio" class="confirm-item">{{
-          formatDate(exam.exam_received_date)
-        }}</span>
-        <span v-if="tab.showRadio" class="confirm-item">Not Yet Received</span>
-      </b-col>
     </b-row>
     <b-row no-gutters align-h="between" align-v="end">
       <b-col cols="1" />

frontend/src/components/exams/add-exam-form-components.ts

@@ -357,17 +357,17 @@ export class DropdownQuestion extends Vue {
   template: `
   <b-row no-gutters>
     <b-col cols="6">
-      <b-form-group v-if="showRadio">
+      <b-form-group>
         <label>{{ q.text1 }}
           <span v-if="error" style="color: red">{{ validationObj[q.key].message }}</span>
         </label><br>
         <b-form-radio-group v-model="showRadio"
                             @input="preSetDate()"
                             @change="unsetDate"
                             autocomplete="off"
-                            :options="['other', 'pesticide'].includes(modalSetup) ? otherOptions : options"/>
+                            :options="options"/>
       </b-form-group>
-      <b-form-group v-else>
+      <b-form-group v-if="!showRadio">
         <label>{{ q.text2 }}
           <span v-if="error" style="color: red">{{ validationObj[q.key].message }}</span>
         </label>
@@ -417,7 +417,7 @@ export class ExamReceivedQuestion extends Vue {
   }
 
   set showRadio (e) {
-    this.captureExamDetail({ key: 'exam_received_date', value: null })
+    this.captureExamDetail({ key: 'exam_received_date', value: moment(new Date()).format() })
     this.toggleIndividualCaptureTabRadio(e)
   }
 
@@ -458,6 +458,13 @@ export class ExamReceivedQuestion extends Vue {
       }
     })
   }
+
+  mounted() {
+    // Check if the radio button is initially set to true
+    if (this.modalSetup === 'other' || this.modalSetup === 'pesticide') {
+      this.exam[this.q['exam_received_date']] = moment().format()
+    }
+  }
 }
 
 // InputQuestion
@@ -1104,4 +1111,4 @@ export class TimeQuestion extends Vue {
       }
     })
   }
-}
+}

frontend/src/components/exams/add-exam-form-controller.vue

@@ -311,6 +311,10 @@ export default class AddExamFormController extends Vue {
         messages[key] = ''
         return
       }
+      if (key === 'exam_received_date') {
+        valid[key] = true
+        return
+      }
       // To turn this on for event ID checks only on group exams,
       // add && group_exam_indicator to the if block
       // below as well

frontend/src/components/exams/add-exam-modal.vue

@@ -337,6 +337,7 @@ export default class AddExamModal extends Vue {
       return
     case 'other':
       this.resetModal()
+      this.captureExamDetail({ key: 'exam_received_date', value: moment(new Date()).format('YYYY-MM-DD') })
       this.captureExamDetail({ key: 'on_or_off', value: 'on' })
       this.captureExamDetail({ key: 'expiry_date', value: '' })
       return

frontend/src/store/actions/actions-model.ts

@@ -2138,12 +2138,6 @@ export const commonActions: any = {
     if (responses.notes === null) {
       responses.notes = ''
     }
-    if (context.state.addExamModal.setup === 'other') {
-      if (context.state.captureITAExamTabSetup.showRadio === true) {
-        delete responses.exam_received_date
-      }
-    }
-
     if (context.state.addExamModal.setup === 'pesticide') {
       responses.exam_name = 'Environment'
       responses.is_pesticide = 1