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

app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue

@@ -26,7 +26,8 @@
 						
 						<div class="d-flex align-center flex-start width-100">
 							<p class="task-badge rounded-pill">{{ timesheet.time }}</p>
-							<p class="ml-5">{{ timesheet.employee_name }} ({{ moment(timesheet.timestamp).format('D.M.YYYY') }})</p>
+							<!-- <p class="ml-5">{{ timesheet.employee_name }} ({{ moment(timesheet.timestamp).format('D.M.YYYY') }})</p> -->
+							<p class="ml-5">{{ timesheet.employee_name }} ({{ timesheet.timestamp }})</p>
 						</div>
 					</div>
 				</template>
@@ -50,11 +51,12 @@
 </template>
 
 <script>
-import moment from 'moment'
-import errorUtils 	from '@/plugins/lib@auth/_utils/error.utils'
-import useVuelidate from '@vuelidate/core'
+import moment 							from 'moment'
+import errorUtils 						from '@/plugins/lib@auth/_utils/error.utils'
+import useVuelidate 					from '@vuelidate/core'
 import { required, numeric, minValue } 	from '@vuelidate/validators'
-import tmUtils 		from '@/plugins/tm@_utils/tm.utils'
+import tmUtils 							from '@/plugins/tm@_utils/tm.utils'
+import { mapGetters } 					from 'vuex'
 
 export default {
 	props: {
@@ -89,6 +91,10 @@ export default {
 		}
 	},
 
+	computed: {
+		...mapGetters('auth', ['user'])
+	},
+
 	methods: {
 		async submit() {
 			if (!await this.v$.$validate())
@@ -98,7 +104,7 @@ export default {
 
 			subtask.timesheets.push({
 				id: null,
-				employee_id: subtask.employee_id,
+				employee_id: this.user.id,
 				time: typeof this.form.hours == 'string' ? parseFloat(this.form.hours) : this.form.hours
 			})