Skip to content

Commit

Permalink
fix: fix project time tracking not working (#816)
Browse files Browse the repository at this point in the history
  • Loading branch information
djaiss committed Apr 22, 2021
1 parent ad5d93d commit d4b85e1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- if no status yet -->
<p v-else>{{ $t('project.summary_project_latest_update_no_status') }}</p>

<inertia-link v-if="permissions.can_edit_latest_update" :href="'/' + $page.props.auth.company.id + '/company/projects/' + project.id + '/status'" class="btn f5" data-cy="add-recent-ship-entry">{{ $t('project.summary_project_latest_update_cta') }}</inertia-link>
<inertia-link v-if="permissions.can_edit_latest_update" :href="'/' + $page.props.auth.company.id + '/company/projects/' + project.id + '/status'" class="btn f5">{{ $t('project.summary_project_latest_update_cta') }}</inertia-link>
</div>

<!-- description + author -->
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/Company/Project/Tasks/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ input[type=checkbox] {
<form @submit.prevent="logTime">
<div class="mb3">
<span class="lh-copy mb2 dib">
How much time have you worked on this today?
{{ $t('project.task_edit_time') }}
</span>
<text-duration
@update="updateDuration($event)"
@update:model-value="updateDuration($event)"
/>
</div>

Expand Down
2 changes: 2 additions & 0 deletions resources/js/Shared/TextDuration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ export default {
this.updateModelValue();
}
},
updateMinutes(e) {
if (e.isTrusted) {
let value = parseInt(e.target.value);
Expand All @@ -162,6 +163,7 @@ export default {
this.updateModelValue();
}
},
updateModelValue() {
let value = 0;
if (this.localHours !== undefined) {
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/project.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
'task_blank_desc' => 'Tasks let you track progress and assign work so everyone is accountable to move things forward.',
'task_edit_cta' => 'Edit task',
'task_edit_assignee' => 'Who is responsible',
'task_edit_time' => 'How much time have you worked on this today?',
'task_add_cta' => 'Add new task',
'task_add_title' => 'Name of the task',
'task_create_title' => 'Name of the list',
Expand Down

0 comments on commit d4b85e1

Please sign in to comment.