shared-ritm 1.3.132 → 1.3.133

package/src/api/types/Api_User.ts

@@ -1,161 +1,186 @@
-import { Api_Tasks_Status_Dto } from '@/api/types/Api_Tasks'
-import { Api_Instrument } from '@/api/types/Api_Instruments'
-import { Api_Search_User_Passes, Api_Search_User_Positions } from '@/api/types/Api_Search'
-
-export type Api_User_Team = {
-  id: string
-  name: string
-  display_name: string
-  description: string
-  created_at: string
-  updated_at: string
-  pivot?: {
-    team_id: string
-    user_id: string
-  }
-  roles?: Api_User_Role[]
-}
-
-export type Api_User_Team_Search = {
-  id: string
-  name: string
-  display_name: string
-}
-
-export type Api_User_Photo = {
-  id: string
-  name: string
-  path: string
-  type: string
-}
-
-export type Api_User_Archive_History_Item = {
-  user_id: string
-  responsible_id: string
-  archived_at: string
-  reason: string | null
-  restored_at: string | null
-}
-
-export type Api_User_Task = {
-  id: string
-  name: string
-  project_id: string
-  status: Api_Tasks_Status_Dto
-}
-
-export type Api_User = {
-  id: string
-  RFID: string
-  avatar: unknown | null
-  avatar_id: string | null
-  change_password: string
-  created_at: string
-  updated_at: string
-  deleted_at: string | null
-  dismissal_at: string | null
-  email_verified_at: string
-  divisions: string
-  email: string
-  face_recognition_id: string | null
-  first_name: string
-  full_name: string
-  last_name: string
-  patronymic: string
-  personnel_number: number
-  phone: string
-  profession: string
-  teams: Api_User_Team[]
-  photos: Api_User_Photo[]
-  archiveHistory: Api_User_Archive_History_Item[]
-  assigned_tasks?: Api_User_Task[]
-  responsible_tasks?: Api_User_Task[]
-  passes?: Api_Search_User_Passes[]
-  positions: Api_Search_User_Positions[]
-  warehouses?: Partial<Api_User_Warehouse>[]
-  brigades: { id: string; name: string }[]
-  password_change_available_at: string
-  password_change_due_at: string
-  password_last_changed_at: string
-  has_video_analytics_photo?: boolean
-  calc_performance_median?: number | null
-}
-
-export type Api_User_Change_Password_Payload = {
-  email: string
-  password: string
-  currentPassword: string
-  passwordConfirmation: string
-}
-
-export type Api_User_Create = {
-  last_name?: string
-  first_name?: string
-  patronymic?: string
-  email?: string
-  phone?: string
-  divisions?: string
-  positions?: [string]
-  teams?: {
-    team_id: string
-    roles: string[]
-  }[]
-  current_password?: string
-  password?: string
-  password_confirmation?: string
-}
-
-export type Api_User_Permission = {
-  id: string
-  name: string
-  display_name: string
-}
-
-export type Api_User_Role = {
-  id: string
-  name: string
-  display_name: string
-  permissions?: Api_User_Permission[]
-}
-
-export type Api_User_Position_Type = 'admin' | 'worker' | null
-
-export type Api_User_Position = {
-  id: string
-  name: string
-  display_name: string
-  description?: string
-  type?: Api_User_Position_Type
-}
-
-export type Api_User_Delete_Body = {
-  user_id: string
-  archive_reason?: string
-}
-
-export type Api_User_Delete_Photos_Body = {
-  user_id: string
-  photos?: string[]
-}
-
-export type Api_User_Warehouse = Pick<
-  Api_Instrument,
-  | 'id'
-  | 'RFID'
-  | 'instrument_type'
-  | 'inventory_number'
-  | 'location'
-  | 'misplacement'
-  | 'module'
-  | 'name'
-  | 'responsible'
-  | 'status'
-  | 'storage'
-  | 'updated_at'
-> & {
-  issued_in: string | null
-  registry: {
-    id: string
-    title: string
-  } | null
-}
+import { Api_Tasks_Status_Dto } from '@/api/types/Api_Tasks'
+import { Api_Instrument } from '@/api/types/Api_Instruments'
+import { Api_Search_User_Passes, Api_Search_User_Positions } from '@/api/types/Api_Search'
+
+export type Api_Visitor_Dto = {
+  id: string
+  entry_at: string
+  exit_at: null | string
+  in_zone: boolean
+  is_auto: boolean
+  user: {
+    id: string
+    email: string
+    full_name: string
+    divisions: string
+  }
+  task: {
+    id: string
+    name: string
+    state_id: string
+    project_id: string
+    status: {
+      id: string
+      name: string
+      title: string
+    }
+  }
+}
+
+export type Api_User_Team = {
+  id: string
+  name: string
+  display_name: string
+  description: string
+  created_at: string
+  updated_at: string
+  pivot?: {
+    team_id: string
+    user_id: string
+  }
+  roles?: Api_User_Role[]
+}
+
+export type Api_User_Team_Search = {
+  id: string
+  name: string
+  display_name: string
+}
+
+export type Api_User_Photo = {
+  id: string
+  name: string
+  path: string
+  type: string
+}
+
+export type Api_User_Archive_History_Item = {
+  user_id: string
+  responsible_id: string
+  archived_at: string
+  reason: string | null
+  restored_at: string | null
+}
+
+export type Api_User_Task = {
+  id: string
+  name: string
+  project_id: string
+  status: Api_Tasks_Status_Dto
+}
+
+export type Api_User = {
+  id: string
+  RFID: string
+  avatar: unknown | null
+  avatar_id: string | null
+  change_password: string
+  created_at: string
+  updated_at: string
+  deleted_at: string | null
+  dismissal_at: string | null
+  email_verified_at: string
+  divisions: string
+  email: string
+  face_recognition_id: string | null
+  first_name: string
+  full_name: string
+  last_name: string
+  patronymic: string
+  personnel_number: number
+  phone: string
+  profession: string
+  teams: Api_User_Team[]
+  photos: Api_User_Photo[]
+  archiveHistory: Api_User_Archive_History_Item[]
+  assigned_tasks?: Api_User_Task[]
+  responsible_tasks?: Api_User_Task[]
+  passes?: Api_Search_User_Passes[]
+  positions: Api_Search_User_Positions[]
+  warehouses?: Partial<Api_User_Warehouse>[]
+  brigades: { id: string; name: string }[]
+  password_change_available_at: string
+  password_change_due_at: string
+  password_last_changed_at: string
+  has_video_analytics_photo?: boolean
+  calc_performance_median?: number | null
+}
+
+export type Api_User_Change_Password_Payload = {
+  email: string
+  password: string
+  currentPassword: string
+  passwordConfirmation: string
+}
+
+export type Api_User_Create = {
+  last_name?: string
+  first_name?: string
+  patronymic?: string
+  email?: string
+  phone?: string
+  divisions?: string
+  positions?: [string]
+  teams?: {
+    team_id: string
+    roles: string[]
+  }[]
+  current_password?: string
+  password?: string
+  password_confirmation?: string
+}
+
+export type Api_User_Permission = {
+  id: string
+  name: string
+  display_name: string
+}
+
+export type Api_User_Role = {
+  id: string
+  name: string
+  display_name: string
+  permissions?: Api_User_Permission[]
+}
+
+export type Api_User_Position_Type = 'admin' | 'worker' | null
+
+export type Api_User_Position = {
+  id: string
+  name: string
+  display_name: string
+  description?: string
+  type?: Api_User_Position_Type
+}
+
+export type Api_User_Delete_Body = {
+  user_id: string
+  archive_reason?: string
+}
+
+export type Api_User_Delete_Photos_Body = {
+  user_id: string
+  photos?: string[]
+}
+
+export type Api_User_Warehouse = Pick<
+  Api_Instrument,
+  | 'id'
+  | 'RFID'
+  | 'instrument_type'
+  | 'inventory_number'
+  | 'location'
+  | 'misplacement'
+  | 'module'
+  | 'name'
+  | 'responsible'
+  | 'status'
+  | 'storage'
+  | 'updated_at'
+> & {
+  issued_in: string | null
+  registry: {
+    id: string
+    title: string
+  } | null
+}

package/src/common/app-select/AppSelect.vue

@@ -1,167 +1,167 @@
-<template>
-  <q-select
-    ref="select"
-    v-model="selected"
-    :data-test="dataTest"
-    :options="filteredOptions"
-    :option-value="optionValue"
-    :option-label="optionLabel"
-    emit-value
-    map-options
-    :disable="isDisabled"
-    :multiple="multiple"
-    outlined
-    stack-label
-    :use-input="search"
-    :class="[$style.select]"
-    :label="label"
-    input-debounce="100"
-    :popup-content-class="$style['app-select__menu']"
-    :clearable="clearable"
-    rounded
-    autocomplete=""
-    @filter="filterFn"
-  >
-    <template v-if="multiple && hideChips" #selected>
-      <div v-if="Array.isArray(selected) && selected.length" class="q-field__input">
-        <span class="selected-counter">Выбрано: {{ selected.length }} </span>
-      </div>
-    </template>
-
-    <template v-else-if="multiple" #selected-item="scope">
-      <q-chip
-        v-if="scope.opt"
-        removable
-        class="q-ma-none"
-        dense
-        :tabindex="scope.tabindex"
-        color="white"
-        text-color="secondary"
-        @remove="scope.removeAtIndex(scope.index)"
-      >
-        {{ scope.opt[`${optionLabel}`] }}
-      </q-chip>
-    </template>
-    <template #no-option>
-      <q-item>{{ emptyText }}</q-item>
-    </template>
-    <q-item v-if="!lcText && type()">{{ placeholder }}</q-item>
-  </q-select>
-</template>
-<script setup lang="ts">
-import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
-
-import { QSelect } from 'quasar'
-
-type Option = Record<string, any>
-
-interface AppQSelectProps {
-  modelValue: any
-  options: Option[]
-  placeholder: string
-  emptyText: string
-  optionLabel?: string
-  optionValue?: string
-  label?: string
-  multiple?: boolean
-  borderColor: string
-  isDisabled?: boolean
-  clearable?: boolean
-  search?: boolean
-  dataTest?: string
-  hideChips?: boolean
-}
-
-const props = defineProps<AppQSelectProps>()
-const select = ref({})
-const emit = defineEmits(['update:modelValue'])
-const selected = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emit('update:modelValue', value)
-  },
-})
-
-const type = () => {
-  if (Array.isArray(selected.value) || props.multiple) return !selected.value?.length
-
-  return !selected.value
-}
-
-const lcText: Ref<string> = ref('')
-const filteredOptions = computed(() => {
-  return props.options.filter(x => (x[props?.optionLabel || 'label'] || '-').toLowerCase().includes(lcText.value))
-})
-
-function filterFn(val: string, update: (arg0: () => void) => void) {
-  update(() => {
-    lcText.value = val.toLowerCase()
-  })
-}
-</script>
-<style module lang="scss">
-.wrap {
-  position: relative;
-
-  &:global(.--option-tree) {
-    cursor: pointer;
-  }
-}
-
-.select {
-  &:global(.q-field--outlined.q-field--rounded .q-field__control) {
-    border-radius: 14px;
-  }
-  &:global(.q-field--outlined .q-field__control:before) {
-    border-color: v-bind(borderColor);
-  }
-  &:global(.q-select .q-field__input) {
-    padding: 0 6px;
-  }
-  //&:global(.q-field--filled .q-field__control) {
-  //  //color: red;
-  //}
-  //&:global(.q-field--filled.q-field--focused .q-field__control) {
-  //}
-  //&:global(.q-field--filled .q-field__control:after) {
-  //  left: 8px;
-  //  right: 8px;
-  //}
-  &:global(.q-field--outlined .q-item) {
-    color: #1d1d1d;
-    position: absolute;
-    padding: 0 4px;
-    top: 18px;
-    left: 0;
-  }
-}
-
-.append-wrapper {
-  display: flex;
-  align-items: center;
-  column-gap: 4px;
-}
-
-.menu-wrap {
-  padding: 8px;
-}
-
-.search-wrapper {
-  position: sticky;
-  top: 0;
-  padding: 4px;
-  background: var(--main-bg);
-  z-index: 1;
-}
-.app-select__menu {
-  border-radius: 14px;
-  .q-item__label {
-    word-break: break-word;
-  }
-  &:global(.q-menu) {
-    max-height: 200px !important;
-  }
-}
-</style>
+<template>
+  <q-select
+    ref="select"
+    v-model="selected"
+    :data-test="dataTest"
+    :options="filteredOptions"
+    :option-value="optionValue"
+    :option-label="optionLabel"
+    emit-value
+    map-options
+    :disable="isDisabled"
+    :multiple="multiple"
+    outlined
+    stack-label
+    :use-input="search"
+    :class="[$style.select]"
+    :label="label"
+    input-debounce="100"
+    :popup-content-class="$style['app-select__menu']"
+    :clearable="clearable"
+    rounded
+    autocomplete=""
+    @filter="filterFn"
+  >
+    <template v-if="multiple && hideChips" #selected>
+      <div v-if="Array.isArray(selected) && selected.length" class="q-field__input">
+        <span class="selected-counter">Выбрано: {{ selected.length }} </span>
+      </div>
+    </template>
+
+    <template v-else-if="multiple" #selected-item="scope">
+      <q-chip
+        v-if="scope.opt"
+        removable
+        class="q-ma-none"
+        dense
+        :tabindex="scope.tabindex"
+        color="white"
+        text-color="secondary"
+        @remove="scope.removeAtIndex(scope.index)"
+      >
+        {{ scope.opt[`${optionLabel}`] }}
+      </q-chip>
+    </template>
+    <template #no-option>
+      <q-item>{{ emptyText }}</q-item>
+    </template>
+    <q-item v-if="!lcText && type()">{{ placeholder }}</q-item>
+  </q-select>
+</template>
+<script setup lang="ts">
+import { computed, defineEmits, defineProps, ref, Ref } from 'vue'
+
+import { QSelect } from 'quasar'
+
+type Option = Record<string, any>
+
+interface AppQSelectProps {
+  modelValue: any
+  options: Option[]
+  placeholder: string
+  emptyText: string
+  optionLabel?: string
+  optionValue?: string
+  label?: string
+  multiple?: boolean
+  borderColor: string
+  isDisabled?: boolean
+  clearable?: boolean
+  search?: boolean
+  dataTest?: string
+  hideChips?: boolean
+}
+
+const props = defineProps<AppQSelectProps>()
+const select = ref({})
+const emit = defineEmits(['update:modelValue'])
+const selected = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+
+const type = () => {
+  if (Array.isArray(selected.value) || props.multiple) return !selected.value?.length
+
+  return !selected.value
+}
+
+const lcText: Ref<string> = ref('')
+const filteredOptions = computed(() => {
+  return props.options.filter(x => (x[props?.optionLabel || 'label'] || '-').toLowerCase().includes(lcText.value))
+})
+
+function filterFn(val: string, update: (arg0: () => void) => void) {
+  update(() => {
+    lcText.value = val.toLowerCase()
+  })
+}
+</script>
+<style module lang="scss">
+.wrap {
+  position: relative;
+
+  &:global(.--option-tree) {
+    cursor: pointer;
+  }
+}
+
+.select {
+  &:global(.q-field--outlined.q-field--rounded .q-field__control) {
+    border-radius: 14px;
+  }
+  &:global(.q-field--outlined .q-field__control:before) {
+    border-color: v-bind(borderColor);
+  }
+  &:global(.q-select .q-field__input) {
+    padding: 0 6px;
+  }
+  //&:global(.q-field--filled .q-field__control) {
+  //  //color: red;
+  //}
+  //&:global(.q-field--filled.q-field--focused .q-field__control) {
+  //}
+  //&:global(.q-field--filled .q-field__control:after) {
+  //  left: 8px;
+  //  right: 8px;
+  //}
+  &:global(.q-field--outlined .q-item) {
+    color: #1d1d1d;
+    position: absolute;
+    padding: 0 4px;
+    top: 18px;
+    left: 0;
+  }
+}
+
+.append-wrapper {
+  display: flex;
+  align-items: center;
+  column-gap: 4px;
+}
+
+.menu-wrap {
+  padding: 8px;
+}
+
+.search-wrapper {
+  position: sticky;
+  top: 0;
+  padding: 4px;
+  background: var(--main-bg);
+  z-index: 1;
+}
+.app-select__menu {
+  border-radius: 14px;
+  .q-item__label {
+    word-break: break-word;
+  }
+  &:global(.q-menu) {
+    max-height: 200px !important;
+  }
+}
+</style>