shared-ritm 1.2.30 → 1.2.32

package/src/api/services/GanttService.ts

@@ -1,17 +1,17 @@
-import ApiService from '@/api/settings/ApiService'
-
-class GanttService extends ApiService {
-  public async fetchCriticalPathTasks(params: string): Promise<any> {
-    return await this.get(`gantt/get_list_task_on_critical_path?${params}`)
-  }
-  public async fetchGanttList(params: string): Promise<any> {
-    return await this.get(`/list/tasks/search?${params}&gantt=1`)
-  }
-}
-
-let api: GanttService
-
-export default function useGanttService() {
-  if (!api) api = new GanttService()
-  return api
-}
+import ApiService from '@/api/settings/ApiService'
+
+class GanttService extends ApiService {
+  public async fetchCriticalPathTasks(params: string): Promise<any> {
+    return await this.get(`gantt/get_list_task_on_critical_path?${params}`)
+  }
+  public async fetchGanttList(params: string): Promise<any> {
+    return await this.get(`/list/tasks/search?${params}&gantt=1`)
+  }
+}
+
+let api: GanttService
+
+export default function useGanttService() {
+  if (!api) api = new GanttService()
+  return api
+}

package/src/api/services/MetricsService.ts

@@ -1,101 +1,101 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-
-class MetricsService extends ApiService {
-  public async fetchPieProjects(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/pie/projects' + '?' + queryString)
-  }
-
-  public async fetchPieTasks(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/pie/tasks' + '?' + queryString)
-  }
-
-  public async fetchPiePersonnel(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/metrics/get_list_position' + '?' + queryString)
-  }
-
-  public async fetchPersonnelData(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/metrics/list_position_intersection_group_by_status' + '?' + queryString)
-  }
-
-  public async fetchPersonnelInfo(params: string): Promise<ResponseApi<any>> {
-    return await this.get(`repairs/metrics/list_position_intersection_details?${params}`)
-  }
-
-  public async fetchPiePersonnelInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_user_by_position?${params}`)
-  }
-
-  public async fetchPieCriticalPath(queryString: string): Promise<any[]> {
-    return await this.get('repairs/metrics/get_critical_path_group_by_status' + '?' + queryString)
-  }
-
-  public async fetchPieCriticalPathInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_task_critical_path_by_status?${params}`)
-  }
-
-  public async fetchPieTmc(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/metrics/get_list_instrument_type' + '?' + queryString)
-  }
-
-  public async fetchPieTmcInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_warehouse_by_instrument_type?${params}`)
-  }
-
-  public async fetchPieUntimelyClosedTask(queryString: string): Promise<any[]> {
-    return await this.get('repairs/metrics/get_list_comment_type' + '?' + queryString)
-  }
-
-  public async fetchPieUntimelyClosedTaskInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_task_by_comment_type?${params}`)
-  }
-
-  public async fetchPieAdditionalTasks(queryString: string): Promise<any[]> {
-    return await this.get('repairs/metrics/get_list_task_after_plan_fixate_group_by_status' + '?' + queryString)
-  }
-
-  public async fetchPieAdditionalTasksInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_task_after_plan_fixate_by_status?${params}`)
-  }
-
-  public async fetchPersonnel(queryString: string): Promise<any[]> {
-    return await this.get('repairs/statistic/personnel' + '?' + queryString)
-  }
-
-  public async fetchPieExpired(queryString: string): Promise<any[]> {
-    return await this.get('repairs/metrics/get_list_task_expired_group_by_status' + '?' + queryString)
-  }
-
-  public async fetchPieExpiredInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_task_expired?${params}`)
-  }
-
-  public async fetchEconomicsPerformance(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_economic_performance?${params}`)
-  }
-
-  public async fetchEconomicsInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_task_economic_performance?${params}`)
-  }
-  public async fetchQualityMetrics(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_quality_metrics?${params}`)
-  }
-
-  public async fetchQualityInfo(params: string): Promise<any> {
-    return await this.get(`repairs/metrics/get_list_task_by_quality?${params}`)
-  }
-
-  public async fetchPieWorkZone(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/metrics/get_list_work_zone_instrument' + '?' + queryString)
-  }
-
-  public async fetchWorkZoneInfo(queryString: string): Promise<ResponseApi<any>> {
-    return await this.get('repairs/metrics/get_list_work_zone_instrument_by_status' + '?' + queryString)
-  }
-}
-
-let api: MetricsService
-
-export default function useMetricsService() {
-  if (!api) api = new MetricsService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+
+class MetricsService extends ApiService {
+  public async fetchPieProjects(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/pie/projects' + '?' + queryString)
+  }
+
+  public async fetchPieTasks(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/pie/tasks' + '?' + queryString)
+  }
+
+  public async fetchPiePersonnel(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/get_list_position' + '?' + queryString)
+  }
+
+  public async fetchPersonnelData(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/list_position_intersection_group_by_status' + '?' + queryString)
+  }
+
+  public async fetchPersonnelInfo(params: string): Promise<ResponseApi<any>> {
+    return await this.get(`repairs/metrics/list_position_intersection_details?${params}`)
+  }
+
+  public async fetchPiePersonnelInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_user_by_position?${params}`)
+  }
+
+  public async fetchPieCriticalPath(queryString: string): Promise<any[]> {
+    return await this.get('repairs/metrics/get_critical_path_group_by_status' + '?' + queryString)
+  }
+
+  public async fetchPieCriticalPathInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_task_critical_path_by_status?${params}`)
+  }
+
+  public async fetchPieTmc(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/get_list_instrument_type' + '?' + queryString)
+  }
+
+  public async fetchPieTmcInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_warehouse_by_instrument_type?${params}`)
+  }
+
+  public async fetchPieUntimelyClosedTask(queryString: string): Promise<any[]> {
+    return await this.get('repairs/metrics/get_list_comment_type' + '?' + queryString)
+  }
+
+  public async fetchPieUntimelyClosedTaskInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_task_by_comment_type?${params}`)
+  }
+
+  public async fetchPieAdditionalTasks(queryString: string): Promise<any[]> {
+    return await this.get('repairs/metrics/get_list_task_after_plan_fixate_group_by_status' + '?' + queryString)
+  }
+
+  public async fetchPieAdditionalTasksInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_task_after_plan_fixate_by_status?${params}`)
+  }
+
+  public async fetchPersonnel(queryString: string): Promise<any[]> {
+    return await this.get('repairs/statistic/personnel' + '?' + queryString)
+  }
+
+  public async fetchPieExpired(queryString: string): Promise<any[]> {
+    return await this.get('repairs/metrics/get_list_task_expired_group_by_status' + '?' + queryString)
+  }
+
+  public async fetchPieExpiredInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_task_expired?${params}`)
+  }
+
+  public async fetchEconomicsPerformance(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_economic_performance?${params}`)
+  }
+
+  public async fetchEconomicsInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_task_economic_performance?${params}`)
+  }
+  public async fetchQualityMetrics(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_quality_metrics?${params}`)
+  }
+
+  public async fetchQualityInfo(params: string): Promise<any> {
+    return await this.get(`repairs/metrics/get_list_task_by_quality?${params}`)
+  }
+
+  public async fetchPieWorkZone(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/get_list_work_zone_instrument' + '?' + queryString)
+  }
+
+  public async fetchWorkZoneInfo(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/get_list_work_zone_instrument_by_status' + '?' + queryString)
+  }
+}
+
+let api: MetricsService
+
+export default function useMetricsService() {
+  if (!api) api = new MetricsService()
+  return api
+}

package/src/api/services/RepairsService.ts

@@ -40,7 +40,9 @@ class RepairsService extends ApiService {
   }
 
   public finishRepair(id: string) {
-    return this.post<null, void>(`/repairs/${id}/finish`, null)
+    return this.post<any, void>(`/repairs/complete_repair_list`, {
+      repairIdList: [id],
+    })
   }
 
   public finishPreparationProject(id: string) {

package/src/api/settings/ApiService.ts

@@ -1,126 +1,126 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-
-export enum ApiServiceType {
-  SERVICE_AUTH = 'SERVICE_AUTH',
-}
-
-export type ResponseApi<T> = {
-  count: number
-  current_page: number
-  data: T
-  per_page: number
-  total: number
-  total_pages: number
-}
-
-export default class ApiService {
-  private axiosInstance: AxiosInstance
-
-  constructor() {
-    this.axiosInstance = axios.create({
-      baseURL: process.env.VUE_APP_BACKEND,
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-    })
-
-    this.axiosInstance.interceptors.request.use(
-      (config: InternalAxiosRequestConfig) => {
-        const token = this.getToken()
-        if (token && config.headers) {
-          config.headers.Authorization = `Bearer ${token}`
-        }
-        return config
-      },
-      (error: AxiosError) => {
-        return Promise.reject(error)
-      },
-    )
-
-    this.axiosInstance.interceptors.response.use(
-      (response: AxiosResponse) => {
-        return response.data
-      },
-      (error: AxiosError) => {
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          this.logout()
-        }
-        return Promise.reject(error)
-      },
-    )
-  }
-
-  private getToken() {
-    return localStorage.getItem('token')
-  }
-
-  private removeToken() {
-    localStorage.removeItem('token')
-  }
-
-  public logout(): void {
-    this.removeToken()
-    window.location.href = '/sign-in'
-  }
-
-  private handleError(error: AxiosError): void {
-    if (error.response) {
-      console.error('API Error:', error.response.status, error.response.data)
-    } else if (error.request) {
-      console.error('No response received:', error.request)
-    } else {
-      console.error('Error during request setup:', error.message)
-    }
-  }
-
-  protected async get<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
-      return response?.data ?? (response as unknown as T)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      return await this.axiosInstance.delete<T>(url, options)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  // protected patch<T1, T2>(url: string, payload: T1, type: ApiServiceType, options?: AxiosRequestConfig): Promise<T2> {
-  //   return axios
-  //     .patch<T1, AxiosResponse<T2>>(apiServiceUrls[type] + url, payload, options)
-  //     .catch((err: AxiosError) => processError401<T2>(err))
-  //     .then(extractData)
-  // }
-  //
-  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-}
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+
+export enum ApiServiceType {
+  SERVICE_AUTH = 'SERVICE_AUTH',
+}
+
+export type ResponseApi<T> = {
+  count: number
+  current_page: number
+  data: T
+  per_page: number
+  total: number
+  total_pages: number
+}
+
+export default class ApiService {
+  private axiosInstance: AxiosInstance
+
+  constructor() {
+    this.axiosInstance = axios.create({
+      baseURL: process.env.VUE_APP_BACKEND,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+    })
+
+    this.axiosInstance.interceptors.request.use(
+      (config: InternalAxiosRequestConfig) => {
+        const token = this.getToken()
+        if (token && config.headers) {
+          config.headers.Authorization = `Bearer ${token}`
+        }
+        return config
+      },
+      (error: AxiosError) => {
+        return Promise.reject(error)
+      },
+    )
+
+    this.axiosInstance.interceptors.response.use(
+      (response: AxiosResponse) => {
+        return response.data
+      },
+      (error: AxiosError) => {
+        if (error.response?.status === 401 || error.response?.status === 403) {
+          this.logout()
+        }
+        return Promise.reject(error)
+      },
+    )
+  }
+
+  private getToken() {
+    return localStorage.getItem('token')
+  }
+
+  private removeToken() {
+    localStorage.removeItem('token')
+  }
+
+  public logout(): void {
+    this.removeToken()
+    window.location.href = '/sign-in'
+  }
+
+  private handleError(error: AxiosError): void {
+    if (error.response) {
+      console.error('API Error:', error.response.status, error.response.data)
+    } else if (error.request) {
+      console.error('No response received:', error.request)
+    } else {
+      console.error('Error during request setup:', error.message)
+    }
+  }
+
+  protected async get<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
+      return response?.data ?? (response as unknown as T)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      return await this.axiosInstance.delete<T>(url, options)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  // protected patch<T1, T2>(url: string, payload: T1, type: ApiServiceType, options?: AxiosRequestConfig): Promise<T2> {
+  //   return axios
+  //     .patch<T1, AxiosResponse<T2>>(apiServiceUrls[type] + url, payload, options)
+  //     .catch((err: AxiosError) => processError401<T2>(err))
+  //     .then(extractData)
+  // }
+  //
+  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+}

package/src/api/types/Api_Files.ts

@@ -1 +1 @@
-export type Api_Files_Responsible_Dto = unknown
+export type Api_Files_Responsible_Dto = unknown

package/src/api/types/Api_Projects.ts

@@ -1,55 +1,55 @@
-export type Api_Project_Repair = {
-  id: string
-  name: string
-  start_date: null | string
-  end_date: null | string
-}
-
-export type Api_Project_Team = {
-  id: string
-  name: string
-  display_name: string
-  description: string
-  created_at: string
-  updated_at: string
-  pivot: {
-    project_id: string
-    team_id: string
-  }
-}
-
-export type Api_Project_Category = {
-  code: number
-  display_name: string
-  name: string
-}
-
-export type Api_Project_Status = {
-  id: string
-  name: string
-  title: string
-  description: string
-  created_at: string | null
-  updated_at: string | null
-  deleted_at: string | null
-}
-
-export type Api_Project_Dto = {
-  id: string
-  name: string
-  description: null
-  image: null
-  plan_date: string | null
-  deadline: string | null
-  fact_start_date: string | null
-  fact_end_date: string | null
-  planned_start: string | null
-  planned_end: string | null
-  deleted_at: string | null
-  total_tasks: number
-  is_archive: boolean
-  teams: Api_Project_Team[]
-  status: Api_Project_Status
-  category: Api_Project_Category
-  repair: Api_Project_Repair | null
-}
+export type Api_Project_Repair = {
+  id: string
+  name: string
+  start_date: null | string
+  end_date: null | string
+}
+
+export type Api_Project_Team = {
+  id: string
+  name: string
+  display_name: string
+  description: string
+  created_at: string
+  updated_at: string
+  pivot: {
+    project_id: string
+    team_id: string
+  }
+}
+
+export type Api_Project_Category = {
+  code: number
+  display_name: string
+  name: string
+}
+
+export type Api_Project_Status = {
+  id: string
+  name: string
+  title: string
+  description: string
+  created_at: string | null
+  updated_at: string | null
+  deleted_at: string | null
+}
+
+export type Api_Project_Dto = {
+  id: string
+  name: string
+  description: null
+  image: null
+  plan_date: string | null
+  deadline: string | null
+  fact_start_date: string | null
+  fact_end_date: string | null
+  planned_start: string | null
+  planned_end: string | null
+  deleted_at: string | null
+  total_tasks: number
+  is_archive: boolean
+  teams: Api_Project_Team[]
+  status: Api_Project_Status
+  category: Api_Project_Category
+  repair: Api_Project_Repair | null
+}