bugs + CR's

This commit is contained in:
romankko2 committed 2023-10-12 17:28:05 +02:00
1 parent 9974d8b9e4
commit bb7b59cc0e
15 files changed
+258 -20

No files matched your search

@@ -58,6 +58,7 @@ export default {
},
}
</script>
<style lang="sass" scoped>
#calendar
&:deep(.fc-media-screen)
@@ -112,4 +113,4 @@ export default {
right: 4px
&:deep(.fc-daygrid-day-frame)
min-height: 100px
</style>
</style>
@@ -58,6 +58,12 @@ export default {
mounted() {
const monthIndex = new Date().getMonth()
this.filter.month = monthIndex < 9 ? `0${monthIndex + 1}` : `${monthIndex + 1}`
const savedTeamMT = localStorage.getItem('savedTeamMT')
const savedCreatedBy = localStorage.getItem('savedCreatedBy')
const savedEmployee = localStorage.getItem('savedEmployee')
if(savedTeamMT) this.filter.teamId = JSON.parse(savedTeamMT)
if(savedCreatedBy) this.filter.createdById = JSON.parse(savedCreatedBy)
if(savedEmployee) this.filter.employeeId = JSON.parse(savedEmployee)
},
computed: {
@@ -88,6 +94,9 @@ export default {
filter: {
handler() {
this.$emit('filterChanged', this.filter)
localStorage.setItem('savedTeamMT', this.filter.teamId)
localStorage.setItem('savedCreatedBy', this.filter.createdById)
localStorage.setItem('savedEmployee', this.filter.employeeId)
},
deep: true
}
@@ -59,6 +59,19 @@ export default {
// };
// });
return this.mastertasks.map(event => {
// const currentDate = new Date()
// const eventDeadline = new Date(event.deadline)
// const isEventOnCurrentDate =
// eventDeadline.getFullYear() === currentDate.getFullYear() &&
// eventDeadline.getMonth() === currentDate.getMonth() &&
// eventDeadline.getDate() === currentDate.getDate()
// console.log("isEventOnCurrentDate:", isEventOnCurrentDate)
// console.log("eventDeadline:", eventDeadline)
// const backgroundColor = isEventOnCurrentDate ? 'red' : event.color
// console.log("backgroundColor:", backgroundColor)
return {
id: event.id,
title: `${event.project_code} - ${event.name}`,