Merge pull request #1926 from NicoPennec/main

Fix days off on the timesheet tab.

Author: NicoPennec

package-lock.json

@@ -26,7 +26,7 @@
     "@fullcalendar/multimonth": "6.1.19",
     "@fullcalendar/vue3": "6.1.19",
     "@google/model-viewer": "4.1.0",
-    "@sentry/vue": "10.31.0",
+    "@sentry/vue": "10.32.0",
     "@unhead/vue": "2.0.19",
     "@vuepic/vue-datepicker": "11.0.3",
     "async": "3.2.6",
@@ -40,7 +40,7 @@
     "exceljs": "4.4.0",
     "fabric": "cgwire/fabric.js",
     "file-saver": "2.0.5",
-    "lucide-vue-next": "0.561.0",
+    "lucide-vue-next": "0.562.0",
     "marked": "17.0.1",
     "marked-emoji": "2.0.2",
     "moment": "2.30.1",

package.json

@@ -6,6 +6,7 @@
           :can-delete="false"
           :min-date="disabledDates.to"
           :max-date="disabledDates.from"
+          utc
           :with-margin="false"
           v-model="selectedDate"
         />
@@ -201,7 +202,7 @@
       "
       :is-error="isDayOffError"
       :error-text="dayOffTextError"
-      @confirm="$emit('unset-day-off')"
+      @confirm="$emit('unset-day-off', personDayOff)"
       @cancel="closeUnsetDayOffModal"
     />
   </div>
@@ -259,6 +260,10 @@ export default {
       default: false,
       type: Boolean
     },
+    daysOff: {
+      default: () => [],
+      type: Array
+    },
     dayOffError: {
       default: false,
       type: [String, Boolean]
@@ -316,13 +321,24 @@ export default {
     ...mapGetters([
       'isCurrentUserArtist',
       'organisation',
-      'personDayOff',
-      'personIsDayOff',
       'productionMap',
       'taskTypeMap',
       'user'
     ]),
 
+    personDayOff() {
+      const selectedDate = moment(this.selectedDate).format('YYYY-MM-DD')
+      return this.daysOff.find(
+        dayOff =>
+          selectedDate >= dayOff.date &&
+          selectedDate <= (dayOff.end_date || dayOff.date)
+      )
+    },
+
+    personIsDayOff() {
+      return Boolean(this.personDayOff)
+    },
+
     displayedTasks() {
       return this.tasks.slice(0, this.page * (PAGE_SIZE / 2))
     },

src/components/lists/TimesheetList.vue

@@ -109,6 +109,7 @@
             :done-tasks="loggableDoneTasks"
             :is-loading="isTasksLoading"
             :is-error="isTasksLoadingError"
+            :days-off="daysOff"
             :day-off-error="dayOffError"
             :time-spent-map="personTimeSpentMap"
             :time-spent-total="personTimeSpentTotal"
@@ -688,6 +689,11 @@ export default {
         this.isTasksLoadingError = true
       }
 
+      this.loadDaysOff()
+    },
+
+    async loadDaysOff() {
+      const personId = this.person.id
       try {
         this.daysOff = await this.loadAggregatedPersonDaysOff({ personId })
       } catch (error) {
@@ -784,16 +790,18 @@ export default {
       } catch (error) {
         this.dayOffError = error.body?.message || true
       }
+      await this.loadDaysOff()
     },
 
-    async onUnsetDayOff() {
+    async onUnsetDayOff(dayOff) {
       this.dayOffError = false
       try {
-        await this.unsetDayOff()
+        await this.unsetDayOff(dayOff)
         this.$refs['timesheet-list']?.closeUnsetDayOffModal()
       } catch (error) {
         this.dayOffError = error.body?.message || true
       }
+      await this.loadDaysOff()
     },
 
     saveTaskScheduleItem(item) {

src/components/pages/Person.vue

@@ -109,6 +109,7 @@
           :done-tasks="loggableDoneTasks"
           :is-loading="loading.timesheets || isTodosLoading"
           :is-error="isTodosLoadingError"
+          :days-off="daysOff"
           :day-off-error="dayOffError"
           :time-spent-map="timeSpentMap"
           :time-spent-total="timeSpentTotal"
@@ -514,7 +515,7 @@ export default {
       await this.loadData(true)
     },
 
-    async onUnsetDayOff(dayOff = null) {
+    async onUnsetDayOff(dayOff) {
       this.dayOffError = false
       try {
         await this.unsetDayOff(dayOff)

src/components/pages/Todos.vue

@@ -34,7 +34,6 @@ import {
   CLEAR_SELECTED_TASKS,
   SET_TIME_SPENT,
   PEOPLE_TIMESHEET_LOADED,
-  PERSON_SET_DAY_OFF,
   PERSON_LOAD_TIME_SPENTS_END,
   SET_ORGANISATION,
   SET_PERSON_TASKS_SCROLL_POSITION,
@@ -209,8 +208,6 @@ const getters = {
   timesheet: state => state.timesheet,
   personTimeSpentMap: state => state.personTimeSpentMap,
   personTimeSpentTotal: state => state.personTimeSpentTotal,
-  personDayOff: state => state.personDayOff,
-  personIsDayOff: state => Boolean(state.personDayOff?.id),
   dayOffMap: state => state.dayOffMap,
   daysOff: state => state.daysOff
 }
@@ -359,13 +356,11 @@ const actions = {
     })
     commit(LOAD_PERSON_DONE_TASKS_END, [])
 
-    const [tasks, timeSpents, dayOff] = await Promise.all([
+    const [tasks, timeSpents] = await Promise.all([
       peopleApi.getPersonTasks(personId).catch(() => []),
-      peopleApi.getTimeSpents(personId, date),
-      peopleApi.getDayOff(personId, date)
+      peopleApi.getTimeSpents(personId, date)
     ])
     commit(PERSON_LOAD_TIME_SPENTS_END, timeSpents || [])
-    commit(PERSON_SET_DAY_OFF, dayOff || {})
     commit(LOAD_PERSON_TASKS_END, {
       personId,
       tasks,
@@ -471,30 +466,14 @@ const actions = {
     commit(SET_TIME_SPENT, timeSpent)
   },
 
-  async setDayOff({ commit }, { id, personId, date, end_date, description }) {
-    let dayOff
-    if (id) {
-      dayOff = await peopleApi.updateDayOff(
-        id,
-        personId,
-        date,
-        end_date,
-        description
-      )
-    } else {
-      dayOff = await peopleApi.createDayOff(
-        personId,
-        date,
-        end_date,
-        description
-      )
-    }
-    commit(PERSON_SET_DAY_OFF, dayOff)
+  setDayOff(_, { id, personId, date, end_date, description }) {
+    return id
+      ? peopleApi.updateDayOff(id, personId, date, end_date, description)
+      : peopleApi.createDayOff(personId, date, end_date, description)
   },
 
-  async unsetDayOff({ commit }, dayOff = null) {
-    await peopleApi.deleteDayOff(dayOff || state.personDayOff)
-    commit(PERSON_SET_DAY_OFF, {})
+  async unsetDayOff(_, dayOff) {
+    await peopleApi.deleteDayOff(dayOff)
   },
 
   setPersonTasksScrollPosition({ commit }, scrollPosition) {
@@ -852,10 +831,6 @@ const mutations = {
       ) / 60
   },
 
-  [PERSON_SET_DAY_OFF](state, dayOff) {
-    state.personDayOff = dayOff
-  },
-
   [PEOPLE_SET_DAYS_OFF](state, daysOff) {
     state.daysOff = daysOff
   },

src/store/modules/people.js

@@ -37,7 +37,6 @@ import {
   USER_LOAD_DONE_TASKS_END,
   USER_LOAD_TIME_SPENTS_END,
   REGISTER_USER_TASKS,
-  PERSON_SET_DAY_OFF,
   SET_TODOS_SEARCH,
   LOAD_USER_FILTERS_END,
   LOAD_USER_FILTERS_ERROR,
@@ -281,11 +280,9 @@ const actions = {
       try {
         const tasks = await peopleApi.loadTodos()
         const timeSpents = await peopleApi.loadTimeSpents(date)
-        const dayOff = await peopleApi.getDayOff(state.user.id, date)
         commit(USER_LOAD_TODOS_END, { tasks, userFilters, taskTypeMap })
         commit(REGISTER_USER_TASKS, { tasks })
         commit(USER_LOAD_TIME_SPENTS_END, timeSpents)
-        commit(PERSON_SET_DAY_OFF, dayOff)
         return tasks
       } catch (err) {
         console.error(err)