[Merge] API

app/src/plugins/app/_config/App.vue

@@ -5,11 +5,11 @@
 		</v-main>
 	</v-app>
 
-	<Z-team-modal 			ref="z-team-modal" />
+	<Z-team-modal 			ref="z-team-modal"  @update="onTeamUpdate" />
-	<Z-delete-team-modal 	ref="z-delete-team-modal" @deleted="onTeamDeleted" />
+	<Z-delete-team-modal 	ref="z-delete-team-modal" @update="onTeamUpdate" />
 
 	<Z-task-modal 			ref="z-task-modal" />
-	<Z-delete-task-modal 	ref="z-delete-task-modal" @deleted="onTaskDeleted" />
+	<Z-delete-task-modal 	ref="z-delete-task-modal" @update="onTaskDeleted" />
 	<Z-complete-task-modal 	ref="z-complete-task-modal" />
 	<Z-task-add-time-modal 	ref="z-task-add-time-modal" />
 	<Z-blocker-modal 		ref="z-blocker-modal" />
@@ -76,7 +76,7 @@ export default {
 	},
 
 	methods: {
-		onTeamDeleted(team) {
+		onTeamUpdate(team) {
 			this.$events.emit('on-team-deleted', team)
 		},
 

app/src/plugins/app/_config/main.ts

@@ -47,8 +47,8 @@ const options: Options = {
 			'POST v1/auth/login': true,
 			'POST v1/auth/post': true,
 
-			'GET v1/master-tasks/(id)': true,
+			// 'GET v1/master-tasks/(id)': true,
-			'GET v1/master-tasks': true,
+			// 'GET v1/master-tasks': true,
 			'POST v1/master-tasks/(id)': true,
 			'DELETE v1/master-tasks/(id)': true,
 			'POST v1/master-tasks': true,
@@ -64,11 +64,11 @@ const options: Options = {
 			'DELETE v1/tasks/(id)': true,
 
 			// 'GET v1/teams/(id)': true,
-			'POST v1/teams/(id)': true,
+			// 'POST v1/teams/(id)': true,
-			'DELETE v1/teams/(id)': true,
+			// 'DELETE v1/teams/(id)': true,
 			// 'GET v1/teams': true,
 			// 'GET v1/teamsx': true,
-			'POST v1/teams': true,
+			// 'POST v1/teams': true,
 
 			// 'GET v1/employees': true,
 			'GET v1/search': true,

app/src/plugins/tm@dashboard/projects/projects.vue

@@ -53,7 +53,7 @@ export default {
 
 			// format masterTasks to event format for calendar
 			events = events.map(event => {
-				const color = this._stringToHexColor(`${event.project_code}${event.name}`)
+				const color = this._stringToHexColor(event.color)
 
 				return {
 					id: event.id,
@@ -81,7 +81,7 @@ export default {
 			try {
 				this.teams 			= await this.$axios.get_auth_data('v1/teams')
 				this.employees 		= await this.$axios.get_auth_data('v1/employees')
-				this.masterTasks 	= await this.$axios.get_auth_data('v1/master-tasks')
+				this.masterTasks 	= await this.$axios.get_auth_data('v1/mastertasks')
 			} catch (error) {
 				this.masterTasks = {error}
 			}
@@ -98,19 +98,19 @@ export default {
 		},
 
 		_stringToHexColor(string) {
-			let hash = 0;
+			let hash = 0
 
 			for (let i = 0; i < string.length; i++) {
-				hash = string.charCodeAt(i) + ((hash << 5) - hash);
+				hash = string.charCodeAt(i) + ((hash << 5) - hash)
 			}
 
-			let color = '#';
+			let color = '#'
 			for (let i = 0; i < 3; i++) {
-				let value = (hash >> (i * 8)) & 0xFF;
+				let value = (hash >> (i * 8)) & 0xFF
-				color += ('00' + value.toString(16)).substr(-2);
+				color += ('00' + value.toString(16)).substr(-2)
 			}
-			return color;
+			return color
 		}
 	}
 }
-</script>
+</script>

app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue

@@ -3,7 +3,7 @@
 		<v-select
 			v-model="selectedEmployee"
 			class="subheader-input"
-			:items="employees"
+			:items="[null, ...employees]"
 			item-title="fullName"
 			item-value="id"
 			label="Zamestnanec"

app/src/plugins/tm@modal/master-task/z-master-task-modal.vue

@@ -393,10 +393,10 @@ export default {
 
 			try {
 				if (this.masterTask.id)
-					await this.$axios.post_auth(`v1/master-tasks/${this.masterTask.id}`, this.masterTask)
+					await this.$axios.patch_auth(`v1/master-tasks/${this.masterTask.id}`, this.masterTask)
 
 				else
-					await this.$axios.post_auth('v1/mastertasks')
+					await this.$axios.post_auth('v1/mastertasks', this.masterTask)
 
 				this.closeModal()
 				// this.$router.push({ name: 'Dashboard - Tasks' })

app/src/plugins/tm@modal/task/z-complete-task-modal.vue

@@ -37,9 +37,10 @@ export default {
 
 		async complete() {
 			try {
-				await this.$axios.post(`v1/tasks/${this.task.id}`, {...this.task, is_finished: true})
+				const task = {...this.task, is_finished: true}
+				await this.$axios.patch_auth(`v1/tasks/${this.task.id}`, task)
 				this.visible = false
-				this.$emit('task-completed', this.task)
+				this.$emit('task-completed', task)
 			} catch (error) {
 				this.$toast.error(error)
 			}

app/src/plugins/tm@modal/task/z-task-modal.vue

@@ -418,9 +418,9 @@ export default {
 
 			try {
 				if (this.task.id) {
-					await this.$axios.post_auth(`v1/master-tasks/${this.task.id}`)
+					await this.$axios.patch_auth(`v1/master-tasks/${this.task.id}`, this.task)
 				} else {
-					await this.$axios.post_auth('v1/mastertasks')
+					await this.$axios.post_auth('v1/mastertasks', this.task)
 				}
 
 				this.closeModal()

app/src/plugins/tm@modal/team/z-delete-team-modal.vue

@@ -18,7 +18,7 @@
 
 <script>
 export default {
-	emits: ['deleted'],
+	emits: ['update'],
 
 	data() {
 		return {
@@ -39,9 +39,9 @@ export default {
 
 		async deleteTeam() {
 			try {
-				await this.$axios.delete(`v1/teams/${this.team.id}`)
+				await this.$axios.delete_auth(`v1/teams/${this.team.id}`)
 				this.visible = false
-				this.$emit('deleted', this.team)
+				this.$emit('update', this.team)
 			} catch (error) {
 				this.$toast.error(error)
 			}

app/src/plugins/tm@modal/team/z-team-modal.vue

@@ -70,7 +70,7 @@ import tmUtils 				from '@/plugins/tm@_utils/tm.utils'
 const atLeastOne = (value) => value.length
 
 export default {
-	emits: ['close'],
+	emits: ['close', 'update'],
 
 	components: {
 		ZAutocomplete,

app/src/plugins/tm@overview/teams/teams.vue

@@ -1,6 +1,6 @@
 <template>
 	<W-loadable :content="teams">
-		<A-teams-table :teams="teams" />
+		<A-teams-table :teams="teams" @reloadData="_loadData" />
 	</W-loadable>
 </template>
 

app/src/plugins/w/axios/models/axios.ts

@@ -34,7 +34,7 @@ export default {
 
 	async post(url: string, params = null, config?: any) {
 
-		return axios.post(url, params, config)
+		return axios.post(url, {data: params}, config)
 			.then(response => response.data)
 			.catch(error => Promise.reject(error))
 	},
@@ -42,14 +42,14 @@ export default {
 	async post_auth(url: string, params = null, config?: any) {
 		config = this._config(config)
 
-		return axios.post(url, params, config)
+		return axios.post(url, {data: params}, config)
 			.then(response => response.data)
 			.catch(error => Promise.reject(error))
 	},
 
 	async post_data(url: string, params = null, config?: any) {
 
-		return axios.post(url, params, config)
+		return axios.post(url, {data: params}, config)
 			.then(response => response.data.data)
 			.catch(error => Promise.reject(error.response || error))
 	},
@@ -57,7 +57,7 @@ export default {
 	async post_auth_data(url: string, params = null, config?: any) {
 		config = this._config(config)
 
-		return axios.post(url, params, config)
+		return axios.post(url, {data: params}, config)
 			.then(response => response.data.data)
 			.catch(error => Promise.reject(error.response || error))
 	},