diff --git a/src/assets/village.png b/src/assets/village.png index 7b6ead1..cb17b50 100644 Binary files a/src/assets/village.png and b/src/assets/village.png differ diff --git a/src/modules/timesheets/components/expense-dialog-form.vue b/src/modules/timesheets/components/expense-dialog-form.vue index a75888e..7dc8b05 100644 --- a/src/modules/timesheets/components/expense-dialog-form.vue +++ b/src/modules/timesheets/components/expense-dialog-form.vue @@ -232,7 +232,6 @@ color="primary" type="text" class="col q-px-sm" - :counter="true" :maxlength="COMMENT_MAX_LENGTH" lazy-rules="ondemand" :rules="[rules.commentRequired]" @@ -289,7 +288,7 @@ push color="accent" :icon="expenses_store.mode === 'update' ? 'save' : 'upload'" - :label="$q.screen.gt.sm ? (expenses_store.mode === 'update' ? $t('shared.label.update') : $t('shared.label.add')) : ''" + :label="expenses_store.mode === 'update' ? $t('shared.label.update') : $t('shared.label.add')" class="q-px-sm " :class="expenses_store.mode === 'create' ? 'q-mr-lg q-mb-md' : 'q-mb-sm q-ml-lg'" type="submit" diff --git a/src/modules/timesheets/components/expense-dialog-header.vue b/src/modules/timesheets/components/expense-dialog-header.vue index a34a182..c7c6f3c 100644 --- a/src/modules/timesheets/components/expense-dialog-header.vue +++ b/src/modules/timesheets/components/expense-dialog-header.vue @@ -48,20 +48,20 @@ {{ $t('timesheet.expense.total_amount') }} : - - {{ weekly_totals.expenses.toFixed(2) }} + +
@@ -72,20 +72,20 @@ {{ $t('timesheet.expense.total_mileage') }} : - - {{ weekly_totals.mileage.toFixed(1) }} + +
diff --git a/src/modules/timesheets/components/expense-dialog-list-item.vue b/src/modules/timesheets/components/expense-dialog-list-item.vue index 6b6bf68..d3cf9e9 100644 --- a/src/modules/timesheets/components/expense-dialog-list-item.vue +++ b/src/modules/timesheets/components/expense-dialog-list-item.vue @@ -96,7 +96,9 @@ class="text-uppercase text-weight-light" :class="approved_class" > - {{ $d(date.extractDate(expense.date, 'YYYY-MM-DD'), { month: 'short', day: 'numeric', weekday: 'long' }) }} + {{ $d(date.extractDate(expense.date, 'YYYY-MM-DD'), { + month: 'short', day: 'numeric', weekday: + 'long' }) }} @@ -194,7 +196,10 @@ @hide="expenses_store.is_hiding_create_form = false" :duration="200" > - + \ No newline at end of file diff --git a/src/modules/timesheets/components/expense-dialog-list.vue b/src/modules/timesheets/components/expense-dialog-list.vue index 2d0b364..8d32e57 100644 --- a/src/modules/timesheets/components/expense-dialog-list.vue +++ b/src/modules/timesheets/components/expense-dialog-list.vue @@ -5,6 +5,7 @@ import { computed } from 'vue'; import { useTimesheetStore } from 'src/stores/timesheet-store'; import ExpenseDialogListItem from 'src/modules/timesheets/components/expense-dialog-list-item.vue'; + import ExpenseDialogListItemMobile from 'src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue'; const timesheet_store = useTimesheetStore(); @@ -38,14 +39,25 @@ - - + > + + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/expense-dialog.vue b/src/modules/timesheets/components/expense-dialog.vue index d0a94fc..16cad31 100644 --- a/src/modules/timesheets/components/expense-dialog.vue +++ b/src/modules/timesheets/components/expense-dialog.vue @@ -5,6 +5,7 @@ import { useExpensesStore } from 'src/stores/expense-store'; import ExpenseDialogList from 'src/modules/timesheets/components/expense-dialog-list.vue'; import ExpenseDialogForm from 'src/modules/timesheets/components/expense-dialog-form.vue'; + import ExpenseDialogFormMobile from 'src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue'; import ExpenseDialogHeader from 'src/modules/timesheets/components/expense-dialog-header.vue'; const expense_store = useExpensesStore(); @@ -18,8 +19,10 @@ transition-hide="jump-down" > @@ -38,8 +41,13 @@ + + - +
+ + +
diff --git a/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue new file mode 100644 index 0000000..59f84a2 --- /dev/null +++ b/src/modules/timesheets/components/mobile/expense-dialog-form-mobile.vue @@ -0,0 +1,317 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue new file mode 100644 index 0000000..03fba5b --- /dev/null +++ b/src/modules/timesheets/components/mobile/expense-dialog-list-item-mobile.vue @@ -0,0 +1,150 @@ + + + \ No newline at end of file diff --git a/src/pages/login-page.vue b/src/pages/login-page.vue index 539f0ee..d77229c 100644 --- a/src/pages/login-page.vue +++ b/src/pages/login-page.vue @@ -4,10 +4,10 @@