diff --git a/src/modules/timesheet-approval/components/overview-list-filters.vue b/src/modules/timesheet-approval/components/overview-list-filters.vue
new file mode 100644
index 0000000..46728a4
--- /dev/null
+++ b/src/modules/timesheet-approval/components/overview-list-filters.vue
@@ -0,0 +1,12 @@
+
+
+
+
+ test
+ test
+ test
+ test
+
+
\ No newline at end of file
diff --git a/src/modules/timesheet-approval/components/overview-list.vue b/src/modules/timesheet-approval/components/overview-list.vue
index 46153d8..848c2ef 100644
--- a/src/modules/timesheet-approval/components/overview-list.vue
+++ b/src/modules/timesheet-approval/components/overview-list.vue
@@ -26,10 +26,7 @@
overview_column_names.IS_APPROVED,
]);
- const overview_rows = computed(() => timesheet_store.pay_period_overviews[0]?.regular_hours === -1 ?
- [] :
- timesheet_store.pay_period_overviews
- )
+ const overview_rows = computed(() => timesheet_store.pay_period_overviews.filter(overview => overview))
const onClickedDetails = async (row: TimesheetOverview) => {
timesheet_store.current_pay_period_overview = row;
diff --git a/src/pages/timesheet-approval-page.vue b/src/pages/timesheet-approval-page.vue
index 562a618..a4c60b4 100644
--- a/src/pages/timesheet-approval-page.vue
+++ b/src/pages/timesheet-approval-page.vue
@@ -3,19 +3,23 @@
lang="ts"
>
/* eslint-disable */
- import { onMounted, ref } from 'vue';
- import { date } from 'quasar';
- import { useTimesheetApprovalApi } from 'src/modules/timesheet-approval/composables/use-timesheet-approval-api';
- import { useTimesheetStore } from 'src/stores/timesheet-store';
import PageHeaderTemplate from 'src/modules/shared/components/page-header-template.vue';
import OverviewList from 'src/modules/timesheet-approval/components/overview-list.vue';
import DetailsDialog from 'src/modules/timesheet-approval/components/details-dialog.vue';
import QTableFilters from 'src/modules/shared/components/q-table-filters.vue';
import PayPeriodNavigator from 'src/modules/shared/components/pay-period-navigator.vue';
+ import OverviewListFilters from 'src/modules/timesheet-approval/components/overview-list-filters.vue';
+
+ import { date } from 'quasar';
+ import { onMounted, ref } from 'vue';
+ import { useTimesheetApprovalApi } from 'src/modules/timesheet-approval/composables/use-timesheet-approval-api';
+ import { useTimesheetStore } from 'src/stores/timesheet-store';
const timesheet_approval_api = useTimesheetApprovalApi();
const timesheet_store = useTimesheetStore();
+ const is_showing_filters = ref(false);
+
onMounted(async () => {
await timesheet_approval_api.getTimesheetOverviewsByDate(date.formatDate(new Date(), 'YYYY-MM-DD'));
});
@@ -40,14 +44,15 @@
/>
@@ -59,27 +64,49 @@
color="white"
text-color="accent"
toggle-color="accent"
- :class="$q.screen.lt.md ? 'q-mb-sm' : 'q-mr-md'"
+ class="col-auto"
+ :class="$q.platform.is.mobile ? 'q-mb-sm' : 'q-mr-md'"
:options="[
{ icon: 'grid_view', value: true },
{ icon: 'view_list', value: false },
]"
+ style="height: 40px;"
/>
-
-
+
-
+
+
+
+
+
+
+
\ No newline at end of file