shared-ritm 1.3.102 → 1.3.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.3.102",
+  "version": "1.3.103",
   "private": false,
   "files": [
     "dist",

package/src/api/services/EquipmentService.ts

@@ -1,52 +1,56 @@
-import ApiService from '../settings/ApiService'
-import { ResponseApi } from '../types/Api_Service'
-import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
-import { Api_Equipment_Create, Api_Equipment_Type, Api_Equipment_Type_Body } from '@/api/types/Api_Equipment'
-
-class EquipmentService extends ApiService {
-  public fetchEquipment(params?: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
-    return this.get<ResponseApi<Api_Equipment_Full_Dto[]>>('repairs/equipment/list', { params })
-  }
-
-  public createEquipment(body: Api_Equipment_Create): Promise<Api_Equipment_Full_Dto> {
-    return this.post<Api_Equipment_Create, Api_Equipment_Full_Dto>('repairs/equipment', body)
-  }
-
-  public editEquipment(id: string, body: Partial<Api_Equipment_Create>): Promise<Api_Equipment_Full_Dto> {
-    return this.put<Partial<Api_Equipment_Create>, Api_Equipment_Full_Dto>(`repairs/equipment/${id}`, body)
-  }
-
-  public deleteEquipment(id: string): Promise<{ data: boolean; status: number }> {
-    return this.delete(`repairs/equipment/${id}`)
-  }
-
-  public fetchEquipmentTypeList(params?: any): Promise<ResponseApi<Api_Equipment_Type[]>> {
-    return this.get<ResponseApi<Api_Equipment_Type[]>>('repairs/equipments/get_equipment_type_list', { params })
-  }
-
-  public fetchEquipmentType(id: string): Promise<Api_Equipment_Type> {
-    return this.get<Api_Equipment_Type>(`repairs/equipments/get_equipment_type/${id}`)
-  }
-
-  public createEquipmentType(body: Api_Equipment_Type_Body): Promise<Api_Equipment_Type> {
-    return this.post<Api_Equipment_Type_Body, Api_Equipment_Type>('repairs/equipments/create_equipment_type', body)
-  }
-
-  public editEquipmentType(id: string, body: Partial<Api_Equipment_Type_Body>): Promise<Api_Equipment_Type> {
-    return this.put<Partial<Api_Equipment_Type_Body>, Api_Equipment_Type>(
-      `repairs/equipments/update_equipment_type/${id}`,
-      body,
-    )
-  }
-
-  public deleteEquipmentType(id: string): Promise<{ data: boolean; status: number }> {
-    return this.delete(`repairs/equipments/delete_equipment_type/${id}`)
-  }
-}
-
-let api: EquipmentService
-
-export default function useEquipmentService() {
-  if (!api) api = new EquipmentService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import { ResponseApi } from '../types/Api_Service'
+import {
+  Api_Create_Equipment_Dto,
+  Api_Equipment_Dto,
+  Api_Equipment_Type,
+  Api_Equipment_Type_Body,
+} from '@/api/types/Api_Equipment'
+
+class EquipmentService extends ApiService {
+  public fetchEquipment(params?: any): Promise<ResponseApi<Api_Equipment_Dto[]>> {
+    return this.get<ResponseApi<Api_Equipment_Dto[]>>('repairs/equipment/list', { params })
+  }
+
+  public createEquipment(payload: Api_Create_Equipment_Dto): Promise<Api_Equipment_Dto> {
+    return this.post<Api_Create_Equipment_Dto, Api_Equipment_Dto>('repairs/equipment', payload)
+  }
+
+  public editEquipment(id: string, payload: Api_Create_Equipment_Dto): Promise<Api_Equipment_Dto> {
+    return this.put<Partial<Api_Create_Equipment_Dto>, Api_Equipment_Dto>(`repairs/equipment/${id}`, payload)
+  }
+
+  public deleteEquipment(id: string): Promise<{ data: boolean; status: number }> {
+    return this.delete(`repairs/equipment/${id}`)
+  }
+
+  public fetchEquipmentTypeList(params?: any): Promise<ResponseApi<Api_Equipment_Type[]>> {
+    return this.get<ResponseApi<Api_Equipment_Type[]>>('repairs/equipments/get_equipment_type_list', { params })
+  }
+
+  public fetchEquipmentType(id: string): Promise<Api_Equipment_Type> {
+    return this.get<Api_Equipment_Type>(`repairs/equipments/get_equipment_type/${id}`)
+  }
+
+  public createEquipmentType(body: Api_Equipment_Type_Body): Promise<Api_Equipment_Type> {
+    return this.post<Api_Equipment_Type_Body, Api_Equipment_Type>('repairs/equipments/create_equipment_type', body)
+  }
+
+  public editEquipmentType(id: string, body: Partial<Api_Equipment_Type_Body>): Promise<Api_Equipment_Type> {
+    return this.put<Partial<Api_Equipment_Type_Body>, Api_Equipment_Type>(
+      `repairs/equipments/update_equipment_type/${id}`,
+      body,
+    )
+  }
+
+  public deleteEquipmentType(id: string): Promise<{ data: boolean; status: number }> {
+    return this.delete(`repairs/equipments/delete_equipment_type/${id}`)
+  }
+}
+
+let api: EquipmentService
+
+export default function useEquipmentService() {
+  if (!api) api = new EquipmentService()
+  return api
+}

package/src/api/types/Api_Equipment.ts

@@ -1,13 +1,40 @@
-import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
-
-export type Api_Equipment_Create = Omit<Api_Equipment_Full_Dto, 'id'>
-
-export type Api_Equipment_Type = {
-  id: string
-  name: string
-  model?: string | null
-  description?: string | null
-  updated_at: string
-}
-
-export type Api_Equipment_Type_Body = Omit<Api_Equipment_Type, 'id' | 'updated_at'>
+import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
+
+export type Api_Equipment_Create = Omit<Api_Equipment_Full_Dto, 'id'>
+
+export type Api_Equipment_Element_Dto = {
+  id: string
+  name: string
+  model: string
+  registration_number: string
+}
+
+export type Api_Equipment_Dto = {
+  id: string
+  name: string
+  model: string
+  registration_number: string
+  repair_frequency: number
+  repair_range: number
+  parent: Api_Equipment_Element_Dto
+  root: Api_Equipment_Element_Dto
+}
+
+export type Api_Create_Equipment_Dto = {
+  equipment_type_id: string
+  parent_id: string
+  children: string[]
+  registration_number: string
+  repair_frequency: number
+  repair_range: number
+}
+
+export type Api_Equipment_Type = {
+  id: string
+  name: string
+  model?: string | null
+  description?: string | null
+  updated_at: string
+}
+
+export type Api_Equipment_Type_Body = Omit<Api_Equipment_Type, 'id' | 'updated_at'>

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

@@ -1,159 +1,159 @@
-<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" #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
-}
-
-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) && !selected.value.length) return true
-  return typeof selected.value === 'string' && !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" #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
+}
+
+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) && !selected.value.length) return true
+  return typeof selected.value === 'string' && !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>