diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index e133373..95c3136 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -269,7 +269,7 @@ async function fetchDataDetail(id: string) {
       formData.dear = data.dear ?? "-";
       checkLeaveType(
         formData.leaveTypeId,
-        formData.ordainDayLocationName,
+        data.hajjDayStatus,
         formData.studyDayTrainingSubject
       );
     })
@@ -289,7 +289,7 @@ async function fetchDataDetail(id: string) {
  */
 function checkLeaveType(
   leaveTypeId: string,
-  ordainDayLocationName: string,
+  hajjDayStatus: boolean,
   studyDayTrainingSubject: string
 ) {
   if (props.leaveType) {
@@ -301,9 +301,9 @@ function checkLeaveType(
       checkForm.value = "FormChildbirth";
     } else if (type === "LV-005") {
       checkForm.value = "FormHoliday";
-    } else if (type === "LV-006" && ordainDayLocationName === "") {
+    } else if (type === "LV-006" && hajjDayStatus === true) {
       checkForm.value = "FormHajj";
-    } else if (type === "LV-006") {
+    } else if (type === "LV-006" && hajjDayStatus === false) {
       checkForm.value = "FormUpasom";
     } else if (type === "LV-007") {
       checkForm.value = "FormCheckSelect";
@@ -432,7 +432,7 @@ watch(
 
       <q-separator />
 
-      <q-card-section class="scroll" style="max-height: 60vh;">
+      <q-card-section class="scroll" style="max-height: 60vh">
         <div class="row">
           <div
             flat
@@ -564,10 +564,7 @@ watch(
       </q-card-section>
     </q-card>
 
-    <q-card
-      v-if="props.leaveStatus === 'DELETE'"
-      style="min-width: 40vw"
-    >
+    <q-card v-if="props.leaveStatus === 'DELETE'" style="min-width: 40vw">
       <DialogHeader
         :tittle="`${titleMainCancle} ${titleName}`"
         :close="props.onClickClose"