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

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
StudioTem committed 2023-01-19 10:03:39 +01:00
2 parents 5220ec9bc1 f13649485b
commit 2bedae9318
7 files changed
+63 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/public/mock/v1/overview/tasks.GET.json
+18 -18
View File
@@ -38,8 +38,8 @@
"tasks": [
{
"id": 1,
"starts_at": "2023-01-11T08:01:00+00:00",
"ends_at": "2023-01-11T09:00:00+00:00",
"starts_at": "2023-01-18T08:01:00+00:00",
"ends_at": "2023-01-18T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -48,8 +48,8 @@
{
"id": 2,
"starts_at": "2023-01-12T08:30:00+00:00",
"ends_at": "2023-01-12T09:00:00+00:00",
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -58,8 +58,8 @@
{
"id": 3,
"starts_at": "2023-01-12T10:30:00+00:00",
"ends_at": "2023-01-12T10:45:00+00:00",
"starts_at": "2023-01-19T10:30:00+00:00",
"ends_at": "2023-01-19T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -68,8 +68,8 @@
{
"id": 4,
"starts_at": "2023-01-13T08:00:00+00:00",
"ends_at": "2023-01-13T10:00:00+00:00",
"starts_at": "2023-01-20T08:00:00+00:00",
"ends_at": "2023-01-20T10:00:00+00:00",
"title": "Task 2",
"project_code": "CO-2201",
"master_task_color": "#FDE1FF",
@@ -78,8 +78,8 @@
{
"id": 6,
"starts_at": "2023-01-13T09:00:00+00:00",
"ends_at": "2023-01-13T12:00:00+00:00",
"starts_at": "2023-01-20T09:00:00+00:00",
"ends_at": "2023-01-20T12:00:00+00:00",
"title": "Task 6",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -88,8 +88,8 @@
{
"id": 7,
"starts_at": "2023-01-13T12:00:00+00:00",
"ends_at": "2023-01-13T16:00:00+00:00",
"starts_at": "2023-01-20T12:00:00+00:00",
"ends_at": "2023-01-20T16:00:00+00:00",
"title": "Task 7",
"project_code": "CO-2201",
"master_task_color": "#E7DBF8",
@@ -98,8 +98,8 @@
{
"id": 8,
"starts_at": "2023-01-14T07:00:00+00:00",
"ends_at": "2023-01-14T09:00:00+00:00",
"starts_at": "2023-01-21T07:00:00+00:00",
"ends_at": "2023-01-21T09:00:00+00:00",
"title": "Task 8",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -108,8 +108,8 @@
{
"id": 9,
"starts_at": "2023-01-14T09:00:00+00:00",
"ends_at": "2023-01-14T12:00:00+00:00",
"starts_at": "2023-01-21T09:00:00+00:00",
"ends_at": "2023-01-21T12:00:00+00:00",
"title": "Task 9",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -118,8 +118,8 @@
{
"id": 10,
"starts_at": "2023-01-14T12:00:00+00:00",
"ends_at": "2023-01-14T13:00:00+00:00",
"starts_at": "2023-01-21T12:00:00+00:00",
"ends_at": "2023-01-21T13:00:00+00:00",
"title": "Task 10",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
app/public/mock/v1/overview/teams.GET.json
+18 -18
View File
@@ -10,8 +10,8 @@
"tasks": [
{
"id": 1,
"starts_at": "2023-01-12T08:01:00+00:00",
"ends_at": "2023-01-12T09:00:00+00:00",
"starts_at": "2023-01-19T08:01:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -20,8 +20,8 @@
{
"id": 2,
"starts_at": "2023-01-12T08:30:00+00:00",
"ends_at": "2023-01-12T09:00:00+00:00",
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"title": "Kratky 30min",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -30,8 +30,8 @@
{
"id": 3,
"starts_at": "2023-01-13T10:30:00+00:00",
"ends_at": "2023-01-13T10:45:00+00:00",
"starts_at": "2023-01-20T10:30:00+00:00",
"ends_at": "2023-01-20T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -49,8 +49,8 @@
"tasks": [
{
"id": 4,
"starts_at": "2023-01-12T08:01:00+00:00",
"ends_at": "2023-01-12T09:00:00+00:00",
"starts_at": "2023-01-19T08:01:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -59,8 +59,8 @@
{
"id": 5,
"starts_at": "2023-01-12T08:30:00+00:00",
"ends_at": "2023-01-12T09:00:00+00:00",
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"title": "Kratky 30min",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -69,8 +69,8 @@
{
"id": 6,
"starts_at": "2023-01-12T10:30:00+00:00",
"ends_at": "2023-01-12T10:45:00+00:00",
"starts_at": "2023-01-19T10:30:00+00:00",
"ends_at": "2023-01-19T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
@@ -88,8 +88,8 @@
"tasks": [
{
"id": 1,
"starts_at": "2023-01-13T08:01:00+00:00",
"ends_at": "2023-01-13T09:00:00+00:00",
"starts_at": "2023-01-20T08:01:00+00:00",
"ends_at": "2023-01-20T09:00:00+00:00",
"title": "Task DNES",
"project_code": "CO-2201",
"master_task_color": "#E9FFE6",
@@ -98,8 +98,8 @@
{
"id": 2,
"starts_at": "2023-01-12T08:30:00+00:00",
"ends_at": "2023-01-12T09:00:00+00:00",
"starts_at": "2023-01-19T08:30:00+00:00",
"ends_at": "2023-01-19T09:00:00+00:00",
"title": "Kratky 30min",
"project_code": "CO-2201",
"master_task_color": "#f27e57",
@@ -108,8 +108,8 @@
{
"id": 3,
"starts_at": "2023-01-13T10:30:00+00:00",
"ends_at": "2023-01-13T10:45:00+00:00",
"starts_at": "2023-01-20T10:30:00+00:00",
"ends_at": "2023-01-20T10:45:00+00:00",
"title": "Kratky 15min",
"project_code": "CO-2201",
"master_task_color": "#57e0f2",
app/src/plugins/app@vendor/vue-cal/cell.vue
+1
View File
@@ -106,6 +106,7 @@ export default {
return {
'vuecal__cell-split': true,
'vuecal__cell-split--highlighted': this.highlightedSplit === split.id,
'vuecal__cell-split--weekend': split.isWeekend,
[split.class]: !!split.class
}
},
app/src/plugins/tm@dashboard/_components/z-timeline.vue
+8 -3
View File
@@ -25,7 +25,6 @@
>
<template v-slot:split-label="{ split }">
<div class="w-100 h-100 d-flex flex-column">
<h1 @click="addTimeModal()">Tu mas napojeny modal</h1>
<span v-if="split.date" class="d-flex align-center">
<img v-if="getHeadingDate(split.date) == 'Dnes'" :src="require('./_img/home-icon.svg')" class="mr-2">
<p class="weekday-label">{{ getHeadingDate(split.date) }}</p>
@@ -35,10 +34,10 @@
</span>
<span v-if="split.date">
<p class="day-name" >{{ split.date.toLocaleDateString('sk-SK', { weekday: 'long' }) }}</p>
<p class="day-name" >{{ split.date.toLocaleDateString('en-EN', { weekday: 'long' }) }}</p>
</span>
<div v-if="split.unscheduledTime && split.initials" class="unscheduled-time d-flex align-center text-left">
<div v-if="split.unscheduledTime && split.initials" class="unscheduled-time d-flex align-center text-left" :class="{'vuecal__cell-split--weekend': split.isWeekend}">
<div class="unscheduled-time-initials d-flex align-center justify-center me-4">
<p>{{split.initials}}</p>
</div>
@@ -161,6 +160,7 @@ export default {
async eventMoved(e) {
this.focusedEventId = e.event.id
this.addTimeModal(e.event.id)
this.$emit('eventMoved', e)
},
@@ -356,6 +356,11 @@ export default {
.vuecal__cell--highlighted,
.vuecal__cell--selected
background-color: white
border-radius: 16px
.vuecal__cell-split--weekend
background-color: #F2E7FE !important
border-radius: 16px
// EVENT
app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
+3 -5
View File
@@ -3,7 +3,9 @@
<v-select
v-model="selectedEmployee"
class="subheader-input"
:items="employeesNames"
:items="employees"
item-title="name"
item-value="id"
label="Zamestnanec"
variant="outlined"
></v-select>
@@ -43,7 +45,6 @@ export default {
data() {
return {
employees: [],
employeesNames: [],
selectedDate: "",
// Kaluza: Napojit funkcnost
@@ -73,9 +74,6 @@ export default {
async _getEmployees() {
this.employees = await this.$axios.get_auth_data('v1/employees')
this.employees.forEach(employee => {
this.employeesNames.push(`${employee.name} ${employee.surname} `)
})
},
_getWeek(emitDataChanged = true) {
app/src/plugins/tm@dashboard/tasks/tasks.vue
+7 -1
View File
@@ -56,11 +56,17 @@ export default {
name: this.timelineData.name + " " + this.timelineData.surname,
initials: this.timelineData.name.charAt(0).toUpperCase() + this.timelineData.surname.charAt(0).toUpperCase(),
unscheduledTime: Math.floor(this.timelineData.unscheduled_times[i].time / 60) + "," + String(this.timelineData.unscheduled_times[i].time % 60)[0],
date: addDays(date, i)
date: addDays(date, i),
isWeekend: this.isWeekend(addDays(date, i))
})
}
},
isWeekend(date) {
if (date.getDay() == 6 || date.getDay() == 0) return true
return false
},
formatTimelineDataToTimelineFormat(date) {
// format events
this.timelineData.tasks.forEach(event => {
app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
+8 -6
View File
@@ -3,7 +3,9 @@
<v-select
v-model="selectedTeam"
class="subheader-input"
:items="teamsNames"
:items="teams"
item-title="name"
item-value="id"
label="Tím"
variant="outlined"
></v-select>
@@ -29,6 +31,7 @@
<script>
import { addDays, subDays } from 'date-fns'
import { mapGetters } from 'vuex'
export default {
props: {
@@ -43,7 +46,6 @@ export default {
data() {
return {
teams: [],
teamsNames: [],
// Kaluza: Napojit funkcionalitu
selectedTeam: '',
@@ -55,9 +57,11 @@ export default {
},
computed: {
...mapGetters('auth', ['user']),
time() {
return this.unscheduledTime
}
},
},
created() {
@@ -75,9 +79,7 @@ export default {
async _getTeams() {
this.teams = await this.$axios.get_auth_data('v1/teamsx')
this.teams.forEach(team => {
this.teamsNames.push(team.name)
})
// this.selectedTeam()
},
_getDay(emitDataChanged = true) {