JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-04-11 21:58:08 +02:00
1 parent e2a401b938
commit 8ab5e5b34d
2 files changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
+2 -1
View File
@@ -83,7 +83,8 @@ export default {
_updateFilters() { _updateFilters() {
this.filter.start = this.date this.filter.start = this.date
this.filter.end = addDays(this.date, 1) this.filter.end = this.date
// this.filter.end = addDays(this.date, 1)
this.selectedDate = String(this.filter.start?.toLocaleDateString('sk-SK')) this.selectedDate = String(this.filter.start?.toLocaleDateString('sk-SK'))
this._emitFilterChanged() this._emitFilterChanged()
app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
+3 -1
View File
@@ -11,6 +11,8 @@ export default {
const blockers = this._generateBlockers() const blockers = this._generateBlockers()
console.log([...this._generateNonWorking(), ...this._generateTasks(), ...blockers.filter(blocker => blocker.type != 'home_office')])
return { return {
unscheduledTime: 333, unscheduledTime: 333,
tasks: [...this._generateNonWorking(), ...this._generateTasks(), ...blockers.filter(blocker => blocker.type != 'home_office')], tasks: [...this._generateNonWorking(), ...this._generateTasks(), ...blockers.filter(blocker => blocker.type != 'home_office')],
@@ -26,7 +28,7 @@ export default {
let workingHours = 0 let workingHours = 0
this.calendarData.tasks.forEach(task => { this.calendarData.tasks.forEach(task => {
if ((task.subtask?.employee.id != employee.id) && (task.blocker?.employee?.id != employee.id)) if ((task.subtask?.employee?.id != employee.id) && (task.blocker?.employee?.id != employee.id))
return return
workingHours += timelineUtils._getDifferenceInHours(task.end, task.start) workingHours += timelineUtils._getDifferenceInHours(task.end, task.start)