add new user and role table in app (in progress)

src/vueLib/tables/members/MembersTable.ts

@@ -28,7 +28,7 @@ export function useMemberTable() {
     {
       name: 'lastName',
       align: 'left' as const,
-      label: i18n.global.t('lastname'),
+      label: i18n.global.t('lastName'),
       field: 'lastName',
       sortable: true,
     },
@@ -196,6 +196,7 @@ export function useMemberTable() {
         loading.value = false;
       });
   }
+
   return {
     members,
     pagination,

src/vueLib/tables/members/MembersTable.vue

@@ -104,8 +104,8 @@
       </template>
     </q-table>
   </div>
-  <EditOneDialog ref="editOneDialog" v-on:update-member="updateMembers"></EditOneDialog>
-  <EditAllDialog ref="editAllDialog" v-on:update-member="updateMembers"></EditAllDialog>
+  <EditOneDialog ref="editOneDialog" v-on:update="updateMembers"></EditOneDialog>
+  <EditAllDialog ref="editAllDialog" v-on:update="updateMembers"></EditAllDialog>
   <OkDialog
     ref="okDialog"
     :dialog-label="$t('delete')"
@@ -125,7 +125,7 @@ import { appApi } from 'src/boot/axios';
 import { ref, onMounted } from 'vue';
 import type { Member, Members } from 'src/vueLib/models/member';
 import EditOneDialog from 'src/components/EditOneDialog.vue';
-import EditAllDialog from 'src/components/EditAllDialog.vue';
+import EditAllDialog from 'src/components/MemberEditAllDialog.vue';
 import OkDialog from 'src/components/dialog/OkDialog.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { useMemberTable } from './MembersTable';

src/vueLib/tables/roles/RoleTable.ts

@@ -0,0 +1,79 @@
+import { appApi } from 'src/boot/axios';
+import { ref, computed } from 'vue';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { i18n } from 'boot/lang';
+import type { Roles } from 'src/vueLib/models/roles';
+
+export const roles = ref<Roles>([]);
+
+export function useRoleTable() {
+  const pagination = ref({
+    sortBy: 'role',
+    descending: false,
+    page: 1,
+    rowsPerPage: 10,
+  });
+
+  const columns = computed(() => [
+    {
+      name: 'id',
+      align: 'left' as const,
+      label: 'Id',
+      field: 'id',
+      sortable: true,
+      style: 'width: 50px; max-width: 50px;',
+    },
+    {
+      name: 'role',
+      align: 'left' as const,
+      label: i18n.global.t('role'),
+      field: 'role',
+      sortable: true,
+    },
+    {
+      name: 'rights',
+      align: 'left' as const,
+      label: i18n.global.t('rights'),
+      field: 'rights',
+      sortable: true,
+      style: 'width: 120px; max-width: 120px;',
+    },
+    { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
+  ]);
+
+  const { NotifyResponse } = useNotify();
+
+  const loading = ref(false);
+
+  //updates user list from database
+  function updateRoles() {
+    loading.value = true;
+    appApi
+      .get('secure/roles')
+      .then((resp) => {
+        if (resp.data === null) {
+          roles.value = [];
+          return;
+        }
+        roles.value = resp.data as Roles;
+        if (roles.value === null) {
+          roles.value = [];
+          return;
+        }
+      })
+
+      .catch((err) => {
+        NotifyResponse(err, 'error');
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  }
+  return {
+    roles,
+    pagination,
+    columns,
+    loading,
+    updateRoles,
+  };
+}

src/vueLib/tables/roles/RoleTable.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="q-pa-md">
+    <q-table
+      flat
+      bordered
+      ref="tableRef"
+      title="Roles"
+      title-class="text-bold text-blue-9"
+      :no-data-label="$t('noDataAvailable')"
+      :loading-label="$t('loading')"
+      :rows-per-page-label="$t('recordsPerPage')"
+      :selected-rows-label="(val) => val + $t('recordSelected')"
+      :rows="roles"
+      :columns="columns"
+      row-key="id"
+      v-model:pagination="pagination"
+      :loading="loading"
+      :filter="filter"
+      :selection="selectOption ? 'multiple' : 'none'"
+      v-model:selected="selected"
+      binary-state-sort
+      class="bigger-table-text"
+    >
+      <template v-slot:top-left>
+        <q-btn-group push flat style="color: grey">
+          <q-btn dense flat icon="add" @click="openAllValueDialog(null)">
+            <q-tooltip>{{ $t('addNewRole') }}</q-tooltip>
+          </q-btn>
+          <q-btn
+            dense
+            flat
+            style="color: grey"
+            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
+            @click="selectOption = !selectOption"
+          >
+            <q-tooltip>{{ $t('selectRoleOptions') }}</q-tooltip>
+          </q-btn>
+        </q-btn-group>
+        <div v-if="selectOption && selected.length > 0">
+          <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
+          <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
+            <q-item
+              clickable
+              v-close-popup
+              @click="openRemoveDialog(...selected)"
+              class="text-negative"
+              >{{ $t('delete') }}</q-item
+            >
+          </q-menu>
+        </div>
+        <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
+          {{ $t('selected') }}: {{ selected.length }}
+        </div>
+      </template>
+      <template v-slot:top-right>
+        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <template v-slot:body-cell="props">
+        <q-td
+          :props="props"
+          @click="openSingleValueDialog(props.col.label, props.col.name, props.row)"
+        >
+          {{ props.value }}
+        </q-td>
+      </template>
+      <template v-slot:body-cell-option="props">
+        <q-td :props="props">
+          <q-btn flat dense icon="delete" color="negative" @click="openRemoveDialog(props.row)">
+            <q-tooltip> {{ $t('delete') }} </q-tooltip>
+          </q-btn>
+        </q-td>
+      </template>
+    </q-table>
+  </div>
+  <EditOneDialog ref="editOneDialog" v-on:update="updateRoles"></EditOneDialog>
+  <EditAllDialog ref="editAllDialog" v-on:update="updateRoles"></EditAllDialog>
+  <OkDialog
+    ref="okDialog"
+    :dialog-label="$t('delete')"
+    :text="$t('doYouWantToDelete') + ' ' + deleteText"
+    label-color="red"
+    :button-cancel-label="$t('cancel')"
+    :button-ok-label="$t('confirm')"
+    :button-ok-flat="false"
+    button-ok-color="red"
+    v-on:update-confirm="(val) => removeRole(...val)"
+  ></OkDialog>
+</template>
+
+<script setup lang="ts">
+import { appApi } from 'src/boot/axios';
+import { ref, onMounted } from 'vue';
+import type { Roles, Role } from 'src/vueLib/models/roles';
+import EditOneDialog from 'src/components/EditOneDialog.vue';
+import EditAllDialog from 'src/components/RoleEditAllDialog.vue';
+import OkDialog from 'src/components/dialog/OkDialog.vue';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { useRoleTable } from './RoleTable';
+import { useLogin } from 'src/vueLib/login/useLogin';
+
+const { NotifyResponse } = useNotify();
+const editOneDialog = ref();
+const editAllDialog = ref();
+const okDialog = ref();
+const deleteText = ref('');
+const selectOption = ref(false);
+const selected = ref<Roles>([]);
+const openSubmenu = ref(false);
+const filter = ref('');
+
+const { roles, pagination, loading, columns, updateRoles } = useRoleTable();
+
+//load on mounting page
+onMounted(() => {
+  loading.value = true;
+  updateRoles();
+});
+
+// opens dialog for all role values
+function openSingleValueDialog(label: string, field: string, role: Role) {
+  editOneDialog.value?.open(label, field, role);
+}
+
+//opens dialog for one value
+function openAllValueDialog(role: Role | null) {
+  editAllDialog.value?.open(role);
+}
+
+//opens remove dialog
+function openRemoveDialog(...roles: Roles) {
+  if (roles.length === 1) {
+    deleteText.value = "'" + roles[0]?.role + "'";
+  } else {
+    deleteText.value = String(roles.length) + ' roles';
+  }
+  okDialog.value?.open(roles);
+}
+
+//remove role from database
+function removeRole(...removeRoles: Roles) {
+  const roles: string[] = [];
+
+  removeRoles.forEach((role: Role) => {
+    if (role.role) {
+      roles.push(role.role);
+    }
+  });
+
+  const login = useLogin();
+  const user = login.getUser();
+
+  appApi
+    .post('secure/roles/delete?role=' + user?.role, { roles: roles })
+    .then(() => {
+      updateRoles();
+      selected.value = [];
+    })
+    .catch((err) => NotifyResponse(err, 'error'))
+    .finally(() => {
+      loading.value = false;
+    });
+}
+
+function getSelected(): Roles {
+  if (selected.value.length === 0) return [];
+  return selected.value;
+}
+defineExpose({
+  getSelected,
+});
+</script>
+
+<style>
+@keyframes blink-yellow {
+  0%,
+  100% {
+    background-color: yellow;
+  }
+  50% {
+    background-color: transparent;
+  }
+}
+
+.blink-yellow {
+  animation: blink-yellow 1.5s step-start 6 !important;
+}
+
+.bigger-table-text .q-table__middle td {
+  font-size: 14px;
+}
+
+.bigger-table-text .q-table__top,
+.bigger-table-text .q-table__bottom,
+.bigger-table-text th {
+  font-size: 14px;
+}
+</style>

src/vueLib/tables/users/UserTable.ts

@@ -8,68 +8,26 @@ export function useUserTable() {
   const users = ref<Users>([]);
 
   const pagination = ref({
-    sortBy: 'firstName',
+    sortBy: 'user',
     descending: false,
     page: 1,
     rowsPerPage: 10,
   });
 
   const columns = computed(() => [
-    { name: 'cake', align: 'center' as const, label: '', field: 'cake', icon: 'cake' },
     {
-      name: 'firstName',
+      name: 'id',
       align: 'left' as const,
-      label: i18n.global.t('prename'),
-      field: 'firstName',
+      label: 'Id',
+      field: 'id',
       sortable: true,
+      style: 'width: 50px; max-width: 50px;',
     },
     {
-      name: 'lastName',
+      name: 'user',
       align: 'left' as const,
-      label: i18n.global.t('lastname'),
-      field: 'lastName',
-      sortable: true,
-    },
-    {
-      name: 'birthday',
-      align: 'left' as const,
-      label: i18n.global.t('birthday'),
-      field: 'birthday',
-      sortable: true,
-    },
-    {
-      name: 'age',
-      align: 'left' as const,
-      label: i18n.global.t('age'),
-      field: 'age',
-      sortable: true,
-    },
-    {
-      name: 'address',
-      align: 'left' as const,
-      label: i18n.global.t('address'),
-      field: 'address',
-      sortable: true,
-    },
-    {
-      name: 'town',
-      align: 'left' as const,
-      label: i18n.global.t('town'),
-      field: 'town',
-      sortable: true,
-    },
-    {
-      name: 'zip',
-      align: 'left' as const,
-      label: i18n.global.t('zipCode'),
-      field: 'zip',
-      sortable: true,
-    },
-    {
-      name: 'phone',
-      align: 'left' as const,
-      label: i18n.global.t('phone'),
-      field: 'phone',
+      label: i18n.global.t('user'),
+      field: 'user',
       sortable: true,
     },
     {
@@ -80,32 +38,12 @@ export function useUserTable() {
       sortable: true,
     },
     {
-      name: 'group',
+      name: 'role',
       align: 'left' as const,
-      label: i18n.global.t('group'),
-      field: 'group',
-      sortable: true,
-    },
-    {
-      name: 'responsiblePerson',
-      align: 'left' as const,
-      label: i18n.global.t('responsible'),
-      field: 'responsiblePerson',
-      sortable: true,
-    },
-    {
-      name: 'firstVisit',
-      align: 'left' as const,
-      label: i18n.global.t('firstVisit'),
-      field: 'firstVisit',
-      sortable: true,
-    },
-    {
-      name: 'lastVisit',
-      align: 'left' as const,
-      label: i18n.global.t('lastVisit'),
-      field: 'lastVisit',
+      label: i18n.global.t('role'),
+      field: 'role',
       sortable: true,
+      style: 'width: 120px; max-width: 120px;',
     },
     { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
   ]);
@@ -119,7 +57,7 @@ export function useUserTable() {
     loading.value = true;
 
     appApi
-      .get('users')
+      .get('secure/users')
       .then((resp) => {
         if (resp.data === null) {
           users.value = [];

src/vueLib/tables/users/UserTable.vue

@@ -35,9 +35,6 @@
           >
             <q-tooltip>{{ $t('selectUserOptions') }}</q-tooltip>
           </q-btn>
-          <q-btn dense flat icon="upload" @click="openUploadDialog">
-            <q-tooltip>{{ $t('importCSV') }}</q-tooltip>
-          </q-btn>
         </q-btn-group>
         <div v-if="selectOption && selected.length > 0">
           <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
@@ -63,7 +60,11 @@
         </q-input>
       </template>
       <template v-slot:body-cell="props">
+        <q-td v-if="props.col.name === 'role'" :props="props">
+          <q-select dense v-model="props.row.role" :options="localRoles"></q-select>
+        </q-td>
         <q-td
+          v-else
           :props="props"
           @click="openSingleValueDialog(props.col.label, props.col.name, props.row)"
         >
@@ -72,30 +73,15 @@
       </template>
       <template v-slot:body-cell-option="props">
         <q-td :props="props">
-          <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
-          <q-menu v-if="openSubmenu" anchor="top right" self="top left">
-            <q-item
-              clickable
-              v-close-popup
-              @click="openAllValueDialog(props.row)"
-              class="text-primary"
-              >{{ $t('edit') }}</q-item
-            >
-            <q-item
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(props.row)"
-              class="text-negative"
-              title="zu"
-              >{{ $t('delete') }}</q-item
-            >
-          </q-menu>
+          <q-btn flat dense icon="delete" color="negative" @click="openRemoveDialog(props.row)">
+            <q-tooltip> {{ $t('delete') }} </q-tooltip>
+          </q-btn>
         </q-td>
       </template>
     </q-table>
   </div>
-  <EditOneDialog ref="editOneDialog" v-on:update-member="updateUsers"></EditOneDialog>
-  <EditAllDialog ref="editAllDialog" v-on:update-member="updateUsers"></EditAllDialog>
+  <EditOneDialog ref="editOneDialog" v-on:update="updateUsers"></EditOneDialog>
+  <EditAllDialog ref="editAllDialog" v-on:update="updateUsers"></EditAllDialog>
   <OkDialog
     ref="okDialog"
     :dialog-label="$t('delete')"
@@ -107,27 +93,26 @@
     button-ok-color="red"
     v-on:update-confirm="(val) => removeUser(...val)"
   ></OkDialog>
-  <UploadDialog ref="uploadDialog" @update-upload="updateUsers"> </UploadDialog>
 </template>
 
 <script setup lang="ts">
 import { appApi } from 'src/boot/axios';
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, computed } from 'vue';
 import type { Users, User } from 'src/vueLib/models/users';
 import EditOneDialog from 'src/components/EditOneDialog.vue';
-import EditAllDialog from 'src/components/EditAllDialog.vue';
+import EditAllDialog from 'src/components/UserEditAllDialog.vue';
 import OkDialog from 'src/components/dialog/OkDialog.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
-import UploadDialog from 'src/components/UploadDialog.vue';
-import { databaseName } from '../members/MembersTable';
 import { useUserTable } from './UserTable';
+import { useLogin } from 'src/vueLib/login/useLogin';
+import { roles } from '../roles/RoleTable';
 
 const { NotifyResponse } = useNotify();
 const editOneDialog = ref();
 const editAllDialog = ref();
-const uploadDialog = ref();
 const okDialog = ref();
 const deleteText = ref('');
+const localRoles = computed(() => roles.value.map((role) => role.role));
 const selectOption = ref(false);
 const selected = ref<Users>([]);
 const openSubmenu = ref(false);
@@ -138,17 +123,7 @@ const { users, pagination, loading, columns, updateUsers } = useUserTable();
 //load on mounting page
 onMounted(() => {
   loading.value = true;
-
-  appApi
-    .post('secure/database/open', { dbPath: databaseName.value, create: true })
-    .then(() => {
-      updateUsers();
-    })
-    .catch((err) => NotifyResponse(err, 'error'))
-
-    .finally(() => {
-      loading.value = false;
-    });
+  updateUsers();
 });
 
 // opens dialog for all user values
@@ -164,28 +139,28 @@ function openAllValueDialog(user: User | null) {
 //opens remove dialog
 function openRemoveDialog(...users: Users) {
   if (users.length === 1) {
-    deleteText.value = "'" + users[0]?.name + "'";
+    deleteText.value = "'" + users[0]?.user + "'";
   } else {
     deleteText.value = String(users.length) + ' users';
   }
   okDialog.value?.open(users);
 }
 
-//opens uploader dialog
-function openUploadDialog() {
-  uploadDialog.value?.open();
-}
-
 //remove user from database
 function removeUser(...removeUsers: Users) {
   const userIds: number[] = [];
 
   removeUsers.forEach((user: User) => {
-    userIds.push(user.id);
+    if (user.id) {
+      userIds.push(user.id);
+    }
   });
 
+  const login = useLogin();
+  const user = login.getUser();
+
   appApi
-    .post('users/delete', { ids: userIds })
+    .post('secure/users/delete?id=' + user?.id, { ids: userIds })
     .then(() => {
       updateUsers();
       selected.value = [];
@@ -196,17 +171,6 @@ function removeUser(...removeUsers: Users) {
     });
 }
 
-//const blinkingId = ref<number | null>(null);
-
-// function triggerBlink(id: number) {
-//   blinkingId.value = id;
-
-//   // Optional: stop blinking after 3 seconds
-//   setTimeout(() => {
-//     blinkingId.value = null;
-//   }, 3000);
-// }
-
 function getSelected(): Users {
   if (selected.value.length === 0) return [];
   return selected.value;