mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app
This commit is contained in:
commit
8a4a919a29
2 files changed
+13
-2
No files matched your search
@@ -34,6 +34,10 @@
|
||||
<p class="weekday-label">{{ split.firstName }}</p>
|
||||
</span>
|
||||
|
||||
<span v-if="split.date">
|
||||
<p class="day-name" >{{ split.date.toLocaleDateString('sk-SK', { weekday: 'long' }) }}</p>
|
||||
</span>
|
||||
|
||||
<div v-if="split.unscheduledTime && split.initials" class="unscheduled-time d-flex align-center text-left">
|
||||
<div class="unscheduled-time-initials d-flex align-center justify-center me-4">
|
||||
<p>{{split.initials}}</p>
|
||||
@@ -305,6 +309,12 @@ export default {
|
||||
font-size: 24px
|
||||
font-weight: 700
|
||||
|
||||
.day-name
|
||||
text-align: left
|
||||
font-size: 18px
|
||||
font-weight: 500
|
||||
text-transform: capitalize
|
||||
|
||||
.unscheduled-time
|
||||
background: rgba(0, 0, 0, 0.04)
|
||||
border-radius: 24px
|
||||
|
||||
@@ -65,11 +65,12 @@ export default {
|
||||
methods: {
|
||||
async _getData() {
|
||||
await this._getEmployees()
|
||||
this._getWeek()
|
||||
this._getWeek(false)
|
||||
this.$nextTick(() => {
|
||||
this.$emit('dataChanged', {firstDay: this.firstDay, employeeId: this.selectedEmployee})
|
||||
})
|
||||
},
|
||||
|
||||
async _getEmployees() {
|
||||
this.employees = await this.$axios.get_auth_data('v1/employees')
|
||||
this.employees.forEach(employee => {
|
||||
@@ -97,7 +98,7 @@ export default {
|
||||
},
|
||||
|
||||
watch: {
|
||||
selectedTeam() {
|
||||
selectedEmployee() {
|
||||
this.$emit('dataChanged', {firstDay: this.firstDay, employeeId: this.selectedEmployee})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user