shared-ritm 1.2.82 → 1.2.83

package/src/api/types/Api_Tasks.ts

@@ -1,3 +1,73 @@
+import { Api_Comment_Dto } from '../types/Api_Comment'
+export type Api_Tasks_InstrumentHistory_Item_Dto = {
+  interval: {
+    start_interval: string
+    end_interval: string
+    minutes: number | null
+    user: {
+      id: string
+      first_name: string
+      last_name: string
+      patronymic: string | null
+      full_name: string
+    }
+  }[]
+  minutes: number
+  warehouse: {
+    id: string
+    name: string
+    status: {
+      id: string
+      name: string
+      title: string
+    }
+  }
+}
+
+export type Api_Tasks_AllPersonalUser_Dto = {
+  users: Api_Tasks_Personal_User_Dto[]
+  unrecognized_users: Api_PersonalUnrecognizedUser[]
+}
+
+export type Api_Tasks_Personal_User_Dto = {
+  user: Api_Tasks_Position_Assigned_User_Dto
+  sum_minutes_interval: number
+  interval: {
+    start_interval: string
+    end_interval: string
+  }[]
+}
+
+export type Api_PersonalUnrecognizedUser = {
+  user_id: string
+  start_interval: string
+  end_interval: string
+  minutes: number
+}
+
+export type Api_Tasks_ReplaceInstrument_Request_Dto = {
+  equivalent: string
+  origin: string
+  task: string
+}
+
+export type Api_QualityMetric_Request_Dto = {
+  id: string
+  task_id: string
+  name: string
+  unit: string
+  norm_from: number
+  norm_to: number
+  metric_before: number | null
+  metric_after: number | null
+  is_normal: boolean
+}
+
+export type Api_Task_ChangeStatusVerification_Dto = {
+  id: string
+  name: string
+}
+
 export type Api_Tasks_Responsible_Dto = {
   id: string
   first_name: string
@@ -30,13 +100,15 @@ export type Api_Tasks_Position_Dto = {
   display_name: string
 }
 
+export type Api_Tasks_Position_Assigned_User_Dto = {
+  id: string
+  full_name: string
+}
+
 export type Api_Tasks_Position_Assigned_Dto = {
-  id: number
-  user: {
-    id: string
-    full_name: string
-  }
-  position: Api_Tasks_Position_Dto
+  id?: number
+  user?: Api_Tasks_Position_Assigned_User_Dto | null
+  position?: Api_Tasks_Position_Dto
 }
 
 export type Api_Tasks_Teams_Dto = {
@@ -56,6 +128,28 @@ export type Api_Tasks_Equipment_Dto = {
   repair_range: number
 }
 
+export type Api_Task_VideoSource_Dto = {
+  id: string
+  name: string
+  url: string
+  work_zone_by_task: {
+    id: string
+    title: string
+  }
+}
+
+export type Api_Task_QualityMetric_Dto = {
+  id: string
+  task_id: string
+  name: string
+  unit: string
+  norm_from: number
+  norm_to: number
+  metric_before: number | null
+  metric_after: number | null
+  is_normal: boolean
+}
+
 export type Api_Tasks_Task_Dto = {
   id: string
   name: string
@@ -63,29 +157,20 @@ export type Api_Tasks_Task_Dto = {
   project_id: string
   description: string
   subtask_counter: number
-  subtasks: Api_Tasks_Task_Dto[]
   state_id: null | string
   start_date: string
   end_date: string
   deadline: string
   plan_date: string
   time_to_complete: null | string | number
-  time_to_complete_sec: number
+  time_to_complete_sec: number | null
   priority: number
   work_zone_id: null | string
   location_id: null | string
   target: any
-  status: Api_Tasks_Status_Dto
-  project: Api_Tasks_Project_Dto
-  position: Api_Tasks_Position_Dto[]
-  assigned: Api_Tasks_Assigned_Dto[]
-  instruments: any[]
+  instruments?: any[]
   warehouse: any[]
-  responsible: Api_Tasks_Responsible_Dto[]
-  position_assigned: Api_Tasks_Position_Assigned_Dto[]
-  comments: any[]
   files: any[]
-  teams: Api_Tasks_Teams_Dto[]
   work_zone: string
   planned_start: null | string
   planned_end: null | string
@@ -95,7 +180,48 @@ export type Api_Tasks_Task_Dto = {
   pause_sec: number
   repair_object: null | string
   isPause: boolean
+  defect: string | null
+  subtasks: Api_Tasks_Task_Dto[]
+  status: Api_Tasks_Status_Dto
+  project: Api_Tasks_Project_Dto
+  position: Api_Tasks_Position_Dto[]
+  assigned: Api_Tasks_Assigned_Dto[]
+  responsible: Api_Tasks_Responsible_Dto[]
+  position_assigned: Api_Tasks_Position_Assigned_Dto[]
+  comments: Api_Comment_Dto[]
+  teams: Api_Tasks_Teams_Dto[]
   equipment: Api_Tasks_Equipment_Dto[]
+  instrument_types: Api_Task_Instrument_From_Warehouse[]
+  quality_metrics: Api_Task_QualityMetric_Dto[]
+  video_source: Api_Task_VideoSource_Dto
+}
+
+export type Api_Tasks_Task_Edit_Request_Dto = {
+  name: string
+  description?: string
+  instruments?: string[]
+  responsible?: string[]
+  equipment?: string
+  status: string
+  assigned?: string[]
+  position_assigned?: unknown[]
+  files?: string[]
+  position?: unknown[]
+  warehouse?: string[]
+  teams?: string[]
+  video_source_id?: string
+  work_zone_id?: string
+  state_id?: string
+  location_id?: string
+  project_id?: string
+  priority?: number
+  start_date?: string // YYYY-MM-DD HH:MM
+  plan_date?: string // YYYY-MM-DD HH:MM
+  deadline?: string // YYYY-MM-DD HH:MM
+  time_to_complete?: number
+  time_to_complete_sec?: number
+  target?: string
+  repair_object_id?: string
 }
 
 export type Api_Task_Instrument_Dto = {
@@ -164,7 +290,7 @@ export type Api_VideoSource_DTO = {
   work_zone_by_task: { id: string; title: string }
 }
 
-export type Api_Task_DTO = {
+export type Api_Task_Dto = {
   id: string
   name: string
   plan_date: string

package/src/common/app-dialogs/AppConfirmDialog.vue

@@ -72,7 +72,7 @@ const props = defineProps<Props>()
   align-items: center;
   justify-content: center;
   border-radius: 0px 0px 2px 2px;
-  background: #F4F9FD;
+  background: #f4f9fd;
   padding: 18px 12px;
   &__btn--ok,
   &__btn--cancel {

package/src/index.ts

@@ -1,44 +1,46 @@
-import '@/shared/styles/general.css'
-import AppButton from '@/common/app-button/AppButton.vue'
-import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue'
-import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
-import AppDatepicker from '@/common/app-datepicker/AppDatepicker.vue'
-import AppInput from '@/common/app-input/AppInput.vue'
-import AppInputNew from '@/common/app-input-new/AppInputNew.vue'
-import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue'
-import AppLayout from '@/common/app-layout/AppLayout.vue'
-import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
-import AppLayoutPage from '@/common/app-layout/components/AppLayoutPage.vue'
-import AppLoader from '@/common/app-loader/index.vue'
-import AppSelect from '@/common/app-select/AppSelect.vue'
-import AppSheet from '@/common/app-sheet/AppSheet.vue'
+import './shared/styles/general.css'
+import AppButton from './common/app-button/AppButton.vue'
+import AppCheckbox from './common/app-checkbox/AppCheckbox.vue'
+import AppDatePicker from './common/app-date-picker/AppDatePicker.vue'
+import AppDatepicker from './common/app-datepicker/AppDatepicker.vue'
+import AppInput from './common/app-input/AppInput.vue'
+import AppInputNew from './common/app-input-new/AppInputNew.vue'
+import AppInputSearch from './common/app-input-search/AppInputSearch.vue'
+import AppLayout from './common/app-layout/AppLayout.vue'
+import AppLayoutHeader from './common/app-layout/components/AppLayoutHeader.vue'
+import AppLayoutPage from './common/app-layout/components/AppLayoutPage.vue'
+import AppLoader from './common/app-loader/index.vue'
+import AppSelect from './common/app-select/AppSelect.vue'
+import AppSheet from './common/app-sheet/AppSheet.vue'
 import AppSheetNew from '@/common/app-sheet-new/AppSheetNew.vue'
-import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
-import AppToggle from '@/common/app-toggle/AppToggle.vue'
-import AppWrapper from '@/common/app-wrapper/AppWrapper.vue'
-import AppConfirmDialog from '@/common/app-dialogs/AppConfirmDialog.vue'
-import AppDropdown from '@/common/app-dropdown/AppDropdown.vue'
-import AppTablePagination from '@/common/app-table/components/TablePagination.vue'
-import AppTableSearch from '@/common/app-table/components/TableSearch.vue'
-import AppTableModal from '@/common/app-table/components/TableModal.vue'
-import AppTable from '@/common/app-table/AppTable.vue'
-import AppTableLayout from '@/common/app-table/AppTableLayout.vue'
-import AppModalSelect from '@/common/app-table/components/ModalSelect.vue'
+import AppSidebar from './common/app-sidebar/AppSidebar.vue'
+import AppToggle from './common/app-toggle/AppToggle.vue'
+import AppWrapper from './common/app-wrapper/AppWrapper.vue'
+import AppConfirmDialog from './common/app-dialogs/AppConfirmDialog.vue'
+import AppDropdown from './common/app-dropdown/AppDropdown.vue'
+import AppTablePagination from './common/app-table/components/TablePagination.vue'
+import AppTableSearch from './common/app-table/components/TableSearch.vue'
+import AppTableModal from './common/app-table/components/TableModal.vue'
+import AppTable from './common/app-table/AppTable.vue'
+import AppTableLayout from './common/app-table/AppTableLayout.vue'
+import AppModalSelect from './common/app-table/components/ModalSelect.vue'
 
-import ApiService from '@/api/settings/ApiService'
-import useGanttService from '@/api/services/GanttService'
-import useMetricsService from '@/api/services/MetricsService'
-import useProjectsService from '@/api/services/ProjectsService'
-import useRepairsService from '@/api/services/RepairsService'
-import useTasksService from '@/api/services/TasksService'
-import useAuthService from '@/api/services/AuthService'
-import useFileService from '@/api/services/FileService'
-import useVideoService from '@/api/services/VideoService'
-import useUserService from '@/api/services/UserService'
-import usePhotoService from '@/api/services/PhotoService'
-import useInstrumentsService from '@/api/services/InstrumentsService'
-import useControlsService from '@/api/services/ControlsService'
-import useSearchService from '@/api/services/SearchService'
+import ApiService from './api/settings/ApiService'
+import useGanttService from './api/services/GanttService'
+import useMetricsService from './api/services/MetricsService'
+import useProjectsService from './api/services/ProjectsService'
+import useRepairsService from './api/services/RepairsService'
+import useTasksService from './api/services/TasksService'
+import useAuthService from './api/services/AuthService'
+import useFileService from './api/services/FileService'
+import useVideoService from './api/services/VideoService'
+import useUserService from './api/services/UserService'
+import useInstrumentsService from './api/services/InstrumentsService'
+import useControlsService from './api/services/ControlsService'
+import useSearchService from './api/services/SearchService'
+import useCommentsService from './api/services/CommentsService'
+
+import useFaceApiHelper from './utils/faceApiHelper'
 
 export {
   AppButton,
@@ -80,10 +82,12 @@ export {
   useControlsService,
   useVideoService,
   useUserService,
-  usePhotoService,
   useInstrumentsService,
   useSearchService,
+  useCommentsService,
+  useFaceApiHelper,
 }
+
 export { useBaseTable } from './common/app-table/controllers/useBaseTable'
 export { useTableModel } from './common/app-table/controllers/useTableModel'
 export { useColumnSelector } from './common/app-table/controllers/useColumnSelector'
@@ -92,6 +96,7 @@ export type { FilterOption, TableModel, TableColumn } from './common/app-table/c
 
 export type { NotificationType } from './utils/notification'
 export { notificationSettings } from './utils/notification'
+
 export * from './utils/helpers'
 
 export * from './api/types/Api_Service'
@@ -102,4 +107,6 @@ export * from './api/types/Api_Controls'
 export * from './api/types/Api_Instruments'
 export * from './api/types/Api_Search'
 export * from './api/types/Api_User'
-// export * from '@/api/types/Api_Metrics'
+export * from './api/types/Api_Comment'
+export * from './api/types/Api_Files'
+// export * from '../types/Api_Metrics'

package/src/shared/styles/general.css

@@ -122,4 +122,3 @@ html {
   font-weight: 900;
   font-style: normal;
 }
-

package/src/styles/variables.sass

@@ -1,12 +1,12 @@
-$primary    : #1976D2
-$secondary  : #C4C4C4
-$accent     : #665BA6
-$positive   : #3B9F69
-$negative   : #C10015
-$info       : #31CCEC
-$warning    : #F2C037
-
-$dark       : #1D1D1D
-$dark-page  : #121212
-
-$secondary: #1D1D1D
+$primary    : #1976D2
+$secondary  : #C4C4C4
+$accent     : #665BA6
+$positive   : #3B9F69
+$negative   : #C10015
+$info       : #31CCEC
+$warning    : #F2C037
+
+$dark       : #1D1D1D
+$dark-page  : #121212
+
+$secondary: #1D1D1D

package/src/{api/services/PhotoService.ts → utils/faceApiHelper.ts}

@@ -1,6 +1,6 @@
 import * as faceapi from 'face-api.js'
 
-class PhotoService {
+class FaceApiHelper {
   //  async  getFaceSnapshot(inputImage: any, box: any) {
   //   const regionsToExtract = [new faceapi.Rect(box.x, box.y, box.width, box.height)]
   //   const faceImages = await faceapi.extractFaces(inputImage, regionsToExtract)
@@ -129,9 +129,9 @@ class PhotoService {
   }
 }
 
-let api: PhotoService
+let helper: FaceApiHelper
 
-export default function usePhotoService() {
-  if (!api) api = new PhotoService()
-  return api
+export default function useFaceApiHelper() {
+  if (!helper) helper = new FaceApiHelper()
+  return helper
 }

package/src/utils/helpers.ts

@@ -1,3 +1,4 @@
+// Эти все функции есть в квазаре, меняйте на них
 /**
  * Сравнивает два значения на глубокое равенство.
  * Поддерживает массивы, объекты и примитивы.