diff --git a/src/assets/en-CA.png b/src/assets/en-CA.png new file mode 100644 index 0000000..cd42ab8 Binary files /dev/null and b/src/assets/en-CA.png differ diff --git a/src/assets/fr-FR.png b/src/assets/fr-FR.png new file mode 100644 index 0000000..cb902f7 Binary files /dev/null and b/src/assets/fr-FR.png differ diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index e9e1b3d..ddfe9a3 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -93,6 +93,7 @@ export default { 'en-CA': "English", dark_mode: "dark", light_mode: "light", + auto_mode: "auto", update_successful: "Preferences saved", update_failed: "Failed to save preferences", }, diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index 48e3201..ff0b192 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -93,6 +93,7 @@ export default { 'en-CA': "Anglais", dark_mode: "sombre", light_mode: "clair", + auto_mode: "automatique", update_successful: "Préférences enregistrées", update_failed: "Échec de sauvegarde", }, diff --git a/src/modules/employee-list/components/employee-list-table.vue b/src/modules/employee-list/components/employee-list-table.vue index e500814..67e6d9b 100644 --- a/src/modules/employee-list/components/employee-list-table.vue +++ b/src/modules/employee-list/components/employee-list-table.vue @@ -8,7 +8,7 @@ import { useUiStore } from 'src/stores/ui-store'; import { useEmployeeStore } from 'src/stores/employee-store'; import { useEmployeeListApi } from 'src/modules/employee-list/composables/use-employee-api'; - import { employee_list_columns, getCompanyName } from 'src/modules/employee-list/models/employee-profile.models'; + import { employee_list_columns } from 'src/modules/employee-list/models/employee-profile.models'; const employee_list_api = useEmployeeListApi(); const employee_store = useEmployeeStore(); @@ -126,8 +126,7 @@ :props="scope" class="text-weight-medium" > - {{ getCompanyName(scope.value) }} - {{ scope.value }} + {{ scope.value }} diff --git a/src/modules/employee-list/components/employee/add-modify-dialog.vue b/src/modules/employee-list/components/employee/add-modify-dialog.vue index f9c2adf..2e78a00 100644 --- a/src/modules/employee-list/components/employee/add-modify-dialog.vue +++ b/src/modules/employee-list/components/employee/add-modify-dialog.vue @@ -26,22 +26,24 @@ full-width @beforeShow="current_step = 'form'" > - - -
+
+
{{ $t('employee_management.' + employee_store.management_mode) }}
+
{{ `${employee_store.employee.first_name} ${employee_store.employee.last_name}` }}
+
{{ $t('employee_management.module_access.usage_description') }}
- - - -
-
- -
- -
- - - -
+
- -
- - - - - +
+ +
-
-
- + class="rounded-5 q-pb-sm bg-dark shadow-10" + > + +
+ + +
+ + + +
+ + + + + +
+
+ + + + - + \ No newline at end of file diff --git a/src/modules/employee-list/models/employee-profile.models.ts b/src/modules/employee-list/models/employee-profile.models.ts index ed8f7e2..01ca854 100644 --- a/src/modules/employee-list/models/employee-profile.models.ts +++ b/src/modules/employee-list/models/employee-profile.models.ts @@ -1,13 +1,14 @@ import type { QSelectOption, QTableColumn } from "quasar"; export type ModuleAccessName = 'dashboard' | 'employee_list' | 'employee_management' | 'personal_profile' | 'timesheets' | 'timesheets_approval'; -export type ModuleAccessPreset = 'admin' | 'employee' | 'none'; +export type ModuleAccessPreset = 'admin' | 'supervisor' | 'employee' | 'none'; +export type CompanyNames = 'Targo' | 'Solucom'; export class EmployeeProfile { first_name: string; last_name: string; supervisor_full_name: string; - company_name: number; + company_name: CompanyNames; job_title: string; email: string; phone_number: string; @@ -22,7 +23,7 @@ export class EmployeeProfile { this.first_name = ''; this.last_name = ''; this.supervisor_full_name = ''; - this.company_name = 271583; + this.company_name = 'Targo'; this.job_title = ''; this.email = ''; this.phone_number = ''; @@ -85,14 +86,7 @@ export const employee_access_options: QSelectOption[] = [ export const employee_access_presets: Record = { 'admin' : ['dashboard', 'employee_list', 'employee_management', 'personal_profile', 'timesheets', 'timesheets_approval'], + 'supervisor' : ['dashboard', 'employee_list', 'personal_profile', 'timesheets', 'timesheets_approval'], 'employee' : ['dashboard', 'timesheets', 'personal_profile', 'employee_list'], 'none' : [], -} - -export const getCompanyName = (company_code: number) => { - switch (company_code) { - case 271583: return 'Targo'; - case 271585: return 'Solucom'; - default: return 'N / A'; - } } \ No newline at end of file diff --git a/src/modules/profile/components/employee/menu-employee.vue b/src/modules/profile/components/employee/menu-employee.vue index 0d3ef78..1637ee1 100644 --- a/src/modules/profile/components/employee/menu-employee.vue +++ b/src/modules/profile/components/employee/menu-employee.vue @@ -5,7 +5,6 @@ import MenuPanelPersonal from 'src/modules/profile/components/employee/menu-panel-personal.vue'; import MenuPanelEmployee from 'src/modules/profile/components/employee/menu-panel-employee.vue'; import MenuPanelPreferences from 'src/modules/profile/components/shared/menu-panel-preferences.vue'; - import MenuPanelSchedulePresets from 'src/modules/profile/components/shared/menu-panel-schedule-presets.vue'; import MenuTemplate from 'src/modules/profile/components/shared/menu-template.vue'; import { EmployeeProfile } from 'src/modules/employee-list/models/employee-profile.models'; import { useAuthStore } from 'src/stores/auth-store'; @@ -16,7 +15,6 @@ PERSONAL_INFO: 'personal_info', EMPLOYEE_INFO: 'employee_info', PREFERENCES: 'references', - SCHEDULE_PRESETS: 'schedule_presets', }; const employee_profile = defineModel({ default: new EmployeeProfile }); @@ -24,66 +22,57 @@ \ No newline at end of file diff --git a/src/modules/profile/components/employee/menu-panel-employee.vue b/src/modules/profile/components/employee/menu-panel-employee.vue index 99dee07..cf6649a 100644 --- a/src/modules/profile/components/employee/menu-panel-employee.vue +++ b/src/modules/profile/components/employee/menu-panel-employee.vue @@ -3,102 +3,42 @@ lang="ts" > import MenuPanelInputField from 'src/modules/profile/components/shared/menu-panel-input-field.vue'; - import MenuPanelSelectField from 'src/modules/profile/components/shared/menu-panel-select-field.vue'; - import { ref } from 'vue'; - import { deepEqual } from 'src/utils/deep-equal'; - import { unwrapAndClone } from 'src/utils/unwrap-and-clone'; - import { useAuthStore } from 'src/stores/auth-store'; import { useEmployeeStore } from 'src/stores/employee-store'; - import { CAN_APPROVE_PAY_PERIODS } from 'src/modules/shared/models/user.models'; - import type { EmployeeProfile } from 'src/modules/employee-list/models/employee-profile.models'; - const COMPANY_OPTIONS = [ - { label: 'Targo', value: 271583 }, - { label: 'Solucom', value: 271585 } - ]; - const SUPERVISOR_OPTIONS = [{ label: 'AAA', value: '1' }, { label: 'BBB', value: '2' }, { label: 'CCC', value: '3' }, { label: 'DDD', value: '4' }]; - - const auth_store = useAuthStore(); const employee_store = useEmployeeStore(); - - const is_editing = ref(false); - const current_company_option = ref(COMPANY_OPTIONS.find(option => option.value === employee_store.employee.company_name) ?? { label: '', value: 0 }) - let initial_info: EmployeeProfile = unwrapAndClone(employee_store.employee); - - - const onSubmit = () => { - if (!is_editing.value) { - is_editing.value = true; - return; - } - - is_editing.value = false; - initial_info = unwrapAndClone(employee_store.employee); // update initial value for future possible resets - employee_store.employee.company_name = current_company_option.value.value; - - if (!deepEqual(employee_store.employee, initial_info)) { - // save the new data here - return; - } - }; - - const onReset = () => { - employee_store.employee = unwrapAndClone(initial_info); - is_editing.value = false; - } \ No newline at end of file diff --git a/src/modules/profile/components/employee/menu-panel-personal.vue b/src/modules/profile/components/employee/menu-panel-personal.vue index 516f2e9..4264348 100644 --- a/src/modules/profile/components/employee/menu-panel-personal.vue +++ b/src/modules/profile/components/employee/menu-panel-personal.vue @@ -4,90 +4,44 @@ > import MenuPanelInputField from 'src/modules/profile/components/shared/menu-panel-input-field.vue'; - import { ref } from 'vue'; - import { deepEqual } from 'src/utils/deep-equal'; - import { unwrapAndClone } from 'src/utils/unwrap-and-clone'; import { useEmployeeStore } from 'src/stores/employee-store'; - import type { EmployeeProfile } from 'src/modules/employee-list/models/employee-profile.models'; const employee_store = useEmployeeStore(); - const is_editing = ref(false); - const initial_info = ref(unwrapAndClone(employee_store.employee)); - - const onSubmit = () => { - if (!is_editing.value) { - is_editing.value = true; - initial_info.value = unwrapAndClone(employee_store.employee); - return; - } - - is_editing.value = false; - initial_info.value = unwrapAndClone(employee_store.employee); // update initial value for future possible resets - - if (!deepEqual(employee_store.employee, initial_info)) { - // save the new data here - return; - } - }; - - const onReset = () => { - employee_store.employee = unwrapAndClone(initial_info.value); - is_editing.value = false; - } \ No newline at end of file diff --git a/src/modules/profile/components/shared/menu-header.vue b/src/modules/profile/components/shared/menu-header.vue index b98ec9d..39ae2fa 100644 --- a/src/modules/profile/components/shared/menu-header.vue +++ b/src/modules/profile/components/shared/menu-header.vue @@ -12,8 +12,7 @@
- import type { ValidationRule } from 'quasar'; - const model = defineModel({ required: true }); - const { readonly = false, hint = '' } = defineProps<{ + defineProps<{ labelString: string; - isEditing: boolean; - readonly?: boolean; - type?: "number" | "textarea" | "time" | "text" | "tel" | "password" | "email" | "search" | "file" | "url" | "date" | "datetime-local" | undefined; - hint?: string; - mask?: string; - rules?: ValidationRule[]; }>(); \ No newline at end of file + + + \ No newline at end of file diff --git a/src/modules/profile/components/shared/menu-panel-preferences.vue b/src/modules/profile/components/shared/menu-panel-preferences.vue index 743575f..e6c9614 100644 --- a/src/modules/profile/components/shared/menu-panel-preferences.vue +++ b/src/modules/profile/components/shared/menu-panel-preferences.vue @@ -2,66 +2,72 @@ setup lang="ts" > + import { dark_mode_options } from 'src/modules/profile/models/preferences.models'; import LanguageSwitch from 'src/modules/shared/components/language-switch.vue'; - import { ref } from 'vue'; - import { Dark } from 'quasar'; + import { useUiStore } from 'src/stores/ui-store'; + const ui_store = useUiStore(); - const initial_dark_mode_value = Dark.isActive; - const is_dark_mode = ref(initial_dark_mode_value); - - const toggle_dark_mode = (value: boolean) => { - if (ui_store.user_preferences) ui_store.user_preferences.is_dark_mode = value; - Dark.set(value); - } - \ No newline at end of file diff --git a/src/modules/profile/components/shared/menu-panel-select-field.vue b/src/modules/profile/components/shared/menu-panel-select-field.vue deleted file mode 100644 index 39d7640..0000000 --- a/src/modules/profile/components/shared/menu-panel-select-field.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - \ No newline at end of file diff --git a/src/modules/profile/components/shared/menu-template.vue b/src/modules/profile/components/shared/menu-template.vue index b795f50..ef6ad45 100644 --- a/src/modules/profile/components/shared/menu-template.vue +++ b/src/modules/profile/components/shared/menu-template.vue @@ -16,44 +16,46 @@ \ No newline at end of file diff --git a/src/modules/profile/models/preferences.models.ts b/src/modules/profile/models/preferences.models.ts index 5fc25bf..c9e0a82 100644 --- a/src/modules/profile/models/preferences.models.ts +++ b/src/modules/profile/models/preferences.models.ts @@ -1,5 +1,17 @@ import type { MessageLanguages } from "src/boot/i18n"; +export interface DarkModeOption { + label: string; + value: boolean | null; + quasar_value: boolean | "auto"; + icon: string; +} +export const dark_mode_options: DarkModeOption[] = [ + { label: 'profile.preferences.dark_mode', value: true, quasar_value: true, icon: 'dark_mode'}, + { label: 'profile.preferences.light_mode', value: false, quasar_value: false, icon: 'light_mode'}, + { label: 'profile.preferences.auto_mode', value: null, quasar_value: "auto", icon: 'brightness_auto'}, +] + export class Preferences { id: number; notifications: boolean; diff --git a/src/modules/shared/components/language-switch.vue b/src/modules/shared/components/language-switch.vue index 00c8c23..b284038 100644 --- a/src/modules/shared/components/language-switch.vue +++ b/src/modules/shared/components/language-switch.vue @@ -26,13 +26,18 @@ clickable dense v-ripple - class="col rounded-5 q-ma-sm shadow-1 " + class="col rounded-5 q-ma-sm shadow-4" :class="locale === $i18n.locale ? 'bg-accent text-white text-weight-bolder' : ''" @click="setDisplayLanguage(locale as MessageLanguages)" > + + + + {{ $t(`profile.preferences.${locale}`) }} + \ No newline at end of file diff --git a/src/stores/ui-store.ts b/src/stores/ui-store.ts index f991db7..1285099 100644 --- a/src/stores/ui-store.ts +++ b/src/stores/ui-store.ts @@ -64,9 +64,11 @@ export const useUiStore = defineStore('ui', () => { const setPreferences = () => { if (user_preferences.value !== undefined) { - Dark.set(user_preferences.value.is_dark_mode ?? 'auto'); + // if user_preferences.value.is_dark_mode === null + Dark.set(user_preferences.value.is_dark_mode ?? "auto"); locale.value = user_preferences.value.display_language; } + console.log('quasar dark mode: ', q.dark.mode, 'preferences: ', user_preferences.value.is_dark_mode); } return {