mudancas escala

src/components/modals/EditShiftModal.vue

@@ -112,49 +112,49 @@
         <div class="mb-4">
           <v-checkbox
             v-model="form.dias_semana"
-            :value="0"
+            :value="1"
             label="Domingo"
             hide-details
             class="d-inline-block mr-4"
           ></v-checkbox>
           <v-checkbox
             v-model="form.dias_semana"
-            :value="1"
+            :value="2"
             label="Segunda"
             hide-details
             class="d-inline-block mr-4"
           ></v-checkbox>
           <v-checkbox
             v-model="form.dias_semana"
-            :value="2"
+            :value="3"
             label="Terça"
             hide-details
             class="d-inline-block mr-4"
           ></v-checkbox>
           <v-checkbox
             v-model="form.dias_semana"
-            :value="3"
+            :value="4"
             label="Quarta"
             hide-details
             class="d-inline-block mr-4"
           ></v-checkbox>
           <v-checkbox
             v-model="form.dias_semana"
-            :value="4"
+            :value="5"
             label="Quinta"
             hide-details
             class="d-inline-block mr-4"
           ></v-checkbox>
           <v-checkbox
             v-model="form.dias_semana"
-            :value="5"
+            :value="6"
             label="Sexta"
             hide-details
             class="d-inline-block mr-4"
           ></v-checkbox>
           <v-checkbox
             v-model="form.dias_semana"
-            :value="6"
+            :value="7"
             label="Sábado"
             hide-details
             class="d-inline-block"
@@ -219,13 +219,13 @@ watch(isOpen, (val) => emit('update:modelValue', val));
 
 // Mapeamento de nomes para valores de dias
 const diaSemanaMap = {
-  'Domingo': 0,
+  'Domingo': 1,
-  'Segunda-feira': 1,
+  'Segunda-feira': 2,
-  'Terça-feira': 2,
+  'Terça-feira': 3,
-  'Quarta-feira': 3,
+  'Quarta-feira': 4,
-  'Quinta-feira': 4,
+  'Quinta-feira': 5,
-  'Sexta-feira': 5,
+  'Sexta-feira': 6,
-  'Sábado': 6
+  'Sábado': 7
 };
 
 // Atualiza os dados do formulário com shiftData recebido
@@ -255,6 +255,7 @@ function fechar() {
 async function submit() {
   try {
     loading.value = true;
+    console.log('Dados do formulário:', form.value);
     await shiftStore.updateShift(form.value.id, form.value);
     emit('save', form.value); // notifica o pai
     fechar();

src/components/modals/HolidayModal.vue

@@ -135,6 +135,9 @@ const handleSave = async () => {
       ...localHoliday.value,
       adicional_he: parseInt(localHoliday.value.adicional_he) || 0,
       parent_id: authStore.userId,
+      date: typeof localHoliday.value.date === 'string'
+        ? localHoliday.value.date
+        : new Date(localHoliday.value.date).toISOString().split('T')[0],
       service_instance_id: authStore.service_instance_id
     };
 

src/components/modals/HolidayModalCreate.vue

@@ -146,6 +146,9 @@ const handleSave = async () => {
       ...localHoliday.value,
       adicional_he: parseInt(localHoliday.value.adicional_he) || 0,
       parent_id: authStore.userId,
+      date: typeof localHoliday.value.date === 'string'
+        ? localHoliday.value.date
+        : new Date(localHoliday.value.date).toISOString().split('T')[0],
       service_instance_id: authStore.service_instance_id
     };
 

src/stores/shift.js

@@ -153,18 +153,24 @@ export const useShiftStore = defineStore('shifts', {
     /**
      * Atualiza os dados de um turno
      */
-    async updateShift(id, shift) {
+    async updateShift(id, shiftData) {
       const url = `/shift/${id}`;
       this.loading = true;
       this.error = null;
-
+      const authStore = useAuthStore();
+     
       try {
         const response = await api.put(url, {
-          name: shift.name,
+          name: shiftData.nome,
-          days: shift.days,
+          description: shiftData.descricao,
-          break_time: shift.break_time,
+          start_time: shiftData.entrada,
-          break_type: shift.break_type,
+          end_time: shiftData.saida_final,
-          status: shift.status,
+          interval_start: shiftData.saida_almoco,
+          interval_end: shiftData.retorno_almoco,
+          type_interval: shiftData.almoco_automatico ? 'automatic' : 'manual',
+          tolerance: shiftData.tolerancia || 0,
+          service_instance_id: authStore.service_instance_id,
+          time_schedule_ids: shiftData.dias_semana || []
         });
 
         const index = this.shifts.findIndex((s) => s.id === id);

src/views/Shifts.vue

@@ -65,8 +65,9 @@
           </div>
         </template>
         <template v-slot:item.almoco_type="{ item }">
-          {{ item.type_interval === 'auto' ? 'Automático' : 'Manual' }}
+          {{ item.type_interval === 'automatic' ? 'Automático' : 'Manual' }}
         </template>
+
         <template v-slot:item.actions="{ item }">
           <v-icon size="small" class="mr-2" @click="openEditShiftDialog(item.id)">mdi-pencil</v-icon>
           <v-icon size="small" @click="confirmDelete('shift', item)">mdi-delete</v-icon>
@@ -200,7 +201,9 @@ export default {
         interval_start: data.interval_start || '',
         interval_end: data.interval_end || '',
         type_interval: data.type_interval || '',
-        tolerance: data.tolerance || ''
+        tolerance: data.tolerance || '',
+        description: data.description || '' ,
+        time_schedules: data.time_schedules || []
       };
       dialogs.value.editShift = true;
     };
@@ -219,8 +222,8 @@ export default {
     };
 
     const submitEdit = async (data) => {
-      await shiftStore.updateShift(data.id, data);
+      //await shiftStore.updateShift(data.id, data);
-      await fetchShifts();
+      await shiftStore.fetchShifts();
       showNotification('Escala atualizada com sucesso');
       dialogs.value.editShift = false;
     };
@@ -264,7 +267,7 @@ export default {
       dialogs, loading, filters, shifts, snackbar, forms,
       page, itemsPerPage, headers, itemToDelete,
       formatTimeRange, openCreateShiftDialog, openEditShiftDialog,
-      confirmDelete, deleteItem, submitEdit, handleCreatedShift, filteredshifts
+      confirmDelete, deleteItem, submitEdit, handleCreatedShift,handleEditedShift, filteredshifts
     };
   }
 };