From 52611beaf1ffe50d220510839189fca5dc5c57c9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Apr 2024 08:57:25 -0300
Subject: [PATCH] Changes in isHimSelf computed and FormPopup buttons order

---
 src/components/FormPopup.vue                   | 16 ++++++++--------
 src/pages/Worker/Card/WorkerTimeControl.vue    |  2 +-
 src/pages/Worker/Card/WorkerTimeReasonForm.vue |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index b6eff5d80..e203a7c75 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -56,14 +56,6 @@ const closeForm = () => {
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    v-if="defaultSubmitButton"
-                    :label="customSubmitButtonLabel || t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     v-if="defaultCancelButton"
                     :label="t('globals.cancel')"
@@ -74,6 +66,14 @@ const closeForm = () => {
                     :loading="isLoading"
                     v-close-popup
                 />
+                <QBtn
+                    v-if="defaultSubmitButton"
+                    :label="customSubmitButtonLabel || t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
                 <slot name="customButtons" />
             </div>
         </QCard>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 819efa9a9..6b16f5bff 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -64,7 +64,7 @@ const worker = computed(() => arrayData.store?.data);
 
 const isHr = computed(() => hasAny(['hr']));
 
-const isHimSelf = computed(() => user.value.id == route.params.id);
+const isHimSelf = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
     return weekdayStore.getLocales?.map((day, index) => {
diff --git a/src/pages/Worker/Card/WorkerTimeReasonForm.vue b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
index 23bdba15e..5c1ab9118 100644
--- a/src/pages/Worker/Card/WorkerTimeReasonForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
@@ -9,7 +9,7 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    isHimself: {
+    isHimSelf: {
         type: Boolean,
         default: false,
     },
@@ -40,7 +40,7 @@ const closeForm = () => {
                 v-model="reasonFormData"
                 type="textarea"
                 autogrow
-                :disable="!isHimself"
+                :disable="!isHimSelf"
             />
         </template>
     </FormPopup>