chore: Align with develop

src/components/accessories/admin/operations/operationForm/OperationForm.tsx

@@ -1,5 +1,5 @@
 import { useFormik } from "formik";
-import { OperationDTOOpeForEnum } from "generated";
+import { OperationDTOOpeForEnum } from "generated/models/OperationDTO";
 import { useAppDispatch, useAppSelector } from "libraries/hooks/redux";
 import { get, has } from "lodash";
 import React, {

src/components/accessories/admin/users/newUser/NewUser.tsx

@@ -15,10 +15,11 @@ import Button from "../../../button/Button";
 import ConfirmationDialog from "../../../confirmationDialog/ConfirmationDialog";
 import TextField from "../../../textField/TextField";
 
-import { UserDTO, UserGroupDTO } from "../../../../../generated";
 import { IState } from "../../../../../types";
 
 import CheckboxField from "components/accessories/checkboxField/CheckboxField";
+import { UserDTO } from "generated/models/UserDTO";
+import { UserGroupDTO } from "generated/models/UserGroupDTO";
 import { PATHS } from "../../../../../consts";
 import { getUserGroups } from "../../../../../state/usergroups";
 import { createUser, createUserReset } from "../../../../../state/users";

src/components/accessories/admin/wards/wardTable/WardTable.tsx

@@ -1,16 +1,16 @@
 import { CheckOutlined, CloseOutlined } from "@mui/icons-material";
 import { CircularProgress } from "@mui/material";
+import { WardDTO } from "generated/models/WardDTO";
 import { useAppDispatch, useAppSelector } from "libraries/hooks/redux";
 import React, { FunctionComponent, ReactNode, useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import checkIcon from "../../../../../assets/check-icon.png";
-import { WardDTO } from "../../../../../generated";
 import { scrollToElement } from "../../../../../libraries/uiUtils/scrollToElement";
 import { deleteWardReset, getWards } from "../../../../../state/ward";
 import ConfirmationDialog from "../../../confirmationDialog/ConfirmationDialog";
 import InfoBox from "../../../infoBox/InfoBox";
-import { TFilterField } from "../../../table/filter/types";
 import Table from "../../../table/Table";
+import { TFilterField } from "../../../table/filter/types";
 import classes from "./WardTable.module.scss";
 
 interface IOwnProps {

src/components/accessories/patientNewBill/itemPicker/BillItemPicker.tsx

@@ -1,8 +1,8 @@
 import { FormControlLabel, Radio, RadioGroup } from "@mui/material";
 
+import { PriceDTO } from "generated/models/PriceDTO";
 import React, { FC, useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { PriceDTO } from "../../../../generated/models/PriceDTO";
 import { formatAllFieldValues } from "../../../../libraries/formDataHandling/functions";
 import AutocompleteField from "../../autocompleteField/AutocompleteField";
 import SmallButton from "../../smallButton/SmallButton";

src/components/activities/billingActivity/types.ts

@@ -1,6 +1,7 @@
+import { BillItemsDTO } from "generated/models/BillItemsDTO";
+import { FullBillDTO } from "generated/models/FullBillDTO";
+import { PriceDTO } from "generated/models/PriceDTO";
 import { Dispatch, SetStateAction } from "react";
-import { BillItemsDTO, FullBillDTO } from "../../../generated";
-import { PriceDTO } from "../../../generated/models/PriceDTO";
 import { TUserCredentials } from "../../../state/main/types";
 
 interface IOwnProps {

src/generated/.openapi-generator/FILES

@@ -87,36 +87,18 @@ models\PageLabWithRowsDTO.ts
 models\PageOpdDTO.ts
 models\PagePatientDTO.ts
 models\PagePatientExaminationDTO.ts
-models\Patient.ts
-models\PatientConsensus.ts
 models\PatientConsensusDTO.ts
 models\PatientDTO.ts
 models\PatientExaminationDTO.ts
-models\PatientProfilePhoto.ts
-models\PatientProfilePhotoPhotoAsImage.ts
-models\PatientProfilePhotoPhotoAsImageGraphics.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsClip.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsClipBounds.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsClipBoundsBounds2D.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsClipBoundsLocation.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsClipBoundsSize.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsColor.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsColorColorSpace.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsFont.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsFontMetrics.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsFontMetricsFontRenderContext.ts
-models\PatientProfilePhotoPhotoAsImageGraphicsFontTransform.ts
 models\PatientVaccineDTO.ts
 models\PermissionDTO.ts
 models\PregnantTreatmentTypeDTO.ts
 models\PriceDTO.ts
-models\PriceList.ts
 models\PriceListDTO.ts
 models\PricesOthersDTO.ts
 models\SmsDTO.ts
 models\SupplierDTO.ts
 models\TherapyDTO.ts
-models\TherapyRow.ts
 models\TherapyRowDTO.ts
 models\TokenRefreshRequest.ts
 models\UserDTO.ts

src/generated/apis/AdmissionsApi.ts

@@ -55,7 +55,7 @@ export interface GetDischargesRequest {
     size?: number;
 }
 
-export interface GetNextYProgRequest {
+export interface GetNextYearProgressiveIdRequest {
     wardcode: string;
 }
 
@@ -240,10 +240,10 @@ export class AdmissionsApi extends BaseAPI {
 
     /**
      */
-    getNextYProg({ wardcode }: GetNextYProgRequest): Observable<number>
-    getNextYProg({ wardcode }: GetNextYProgRequest, opts?: OperationOpts): Observable<RawAjaxResponse<number>>
-    getNextYProg({ wardcode }: GetNextYProgRequest, opts?: OperationOpts): Observable<number | RawAjaxResponse<number>> {
-        throwIfNullOrUndefined(wardcode, 'wardcode', 'getNextYProg');
+    getNextYearProgressiveId({ wardcode }: GetNextYearProgressiveIdRequest): Observable<number>
+    getNextYearProgressiveId({ wardcode }: GetNextYearProgressiveIdRequest, opts?: OperationOpts): Observable<RawAjaxResponse<number>>
+    getNextYearProgressiveId({ wardcode }: GetNextYearProgressiveIdRequest, opts?: OperationOpts): Observable<number | RawAjaxResponse<number>> {
+        throwIfNullOrUndefined(wardcode, 'wardcode', 'getNextYearProgressiveId');
 
         const headers: HttpHeaders = {
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),

src/generated/apis/DischargeTypeApi.ts

@@ -25,7 +25,7 @@ export interface NewDischargeTypeRequest {
     dischargeTypeDTO: DischargeTypeDTO;
 }
 
-export interface UpdateDischargeTypetRequest {
+export interface UpdateDischargeTypeRequest {
     dischargeTypeDTO: DischargeTypeDTO;
 }
 
@@ -90,10 +90,10 @@ export class DischargeTypeApi extends BaseAPI {
 
     /**
      */
-    updateDischargeTypet({ dischargeTypeDTO }: UpdateDischargeTypetRequest): Observable<DischargeTypeDTO>
-    updateDischargeTypet({ dischargeTypeDTO }: UpdateDischargeTypetRequest, opts?: OperationOpts): Observable<RawAjaxResponse<DischargeTypeDTO>>
-    updateDischargeTypet({ dischargeTypeDTO }: UpdateDischargeTypetRequest, opts?: OperationOpts): Observable<DischargeTypeDTO | RawAjaxResponse<DischargeTypeDTO>> {
-        throwIfNullOrUndefined(dischargeTypeDTO, 'dischargeTypeDTO', 'updateDischargeTypet');
+    updateDischargeType({ dischargeTypeDTO }: UpdateDischargeTypeRequest): Observable<DischargeTypeDTO>
+    updateDischargeType({ dischargeTypeDTO }: UpdateDischargeTypeRequest, opts?: OperationOpts): Observable<RawAjaxResponse<DischargeTypeDTO>>
+    updateDischargeType({ dischargeTypeDTO }: UpdateDischargeTypeRequest, opts?: OperationOpts): Observable<DischargeTypeDTO | RawAjaxResponse<DischargeTypeDTO>> {
+        throwIfNullOrUndefined(dischargeTypeDTO, 'dischargeTypeDTO', 'updateDischargeType');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',

src/generated/apis/DiseaseTypesApi.ts

@@ -36,16 +36,16 @@ export class DiseaseTypesApi extends BaseAPI {
 
     /**
      */
-    deleteDiseaseType({ code }: DeleteDiseaseTypeRequest): Observable<{ [key: string]: boolean; }>
-    deleteDiseaseType({ code }: DeleteDiseaseTypeRequest, opts?: OperationOpts): Observable<RawAjaxResponse<{ [key: string]: boolean; }>>
-    deleteDiseaseType({ code }: DeleteDiseaseTypeRequest, opts?: OperationOpts): Observable<{ [key: string]: boolean; } | RawAjaxResponse<{ [key: string]: boolean; }>> {
+    deleteDiseaseType({ code }: DeleteDiseaseTypeRequest): Observable<boolean>
+    deleteDiseaseType({ code }: DeleteDiseaseTypeRequest, opts?: OperationOpts): Observable<RawAjaxResponse<boolean>>
+    deleteDiseaseType({ code }: DeleteDiseaseTypeRequest, opts?: OperationOpts): Observable<boolean | RawAjaxResponse<boolean>> {
         throwIfNullOrUndefined(code, 'code', 'deleteDiseaseType');
 
         const headers: HttpHeaders = {
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
         };
 
-        return this.request<{ [key: string]: boolean; }>({
+        return this.request<boolean>({
             url: '/diseasetypes/{code}'.replace('{code}', encodeURI(code)),
             method: 'DELETE',
             headers,

src/generated/apis/DiseasesApi.ts

@@ -56,16 +56,16 @@ export class DiseasesApi extends BaseAPI {
 
     /**
      */
-    deleteDisease({ code }: DeleteDiseaseRequest): Observable<{ [key: string]: boolean; }>
-    deleteDisease({ code }: DeleteDiseaseRequest, opts?: OperationOpts): Observable<RawAjaxResponse<{ [key: string]: boolean; }>>
-    deleteDisease({ code }: DeleteDiseaseRequest, opts?: OperationOpts): Observable<{ [key: string]: boolean; } | RawAjaxResponse<{ [key: string]: boolean; }>> {
+    deleteDisease({ code }: DeleteDiseaseRequest): Observable<boolean>
+    deleteDisease({ code }: DeleteDiseaseRequest, opts?: OperationOpts): Observable<RawAjaxResponse<boolean>>
+    deleteDisease({ code }: DeleteDiseaseRequest, opts?: OperationOpts): Observable<boolean | RawAjaxResponse<boolean>> {
         throwIfNullOrUndefined(code, 'code', 'deleteDisease');
 
         const headers: HttpHeaders = {
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
         };
 
-        return this.request<{ [key: string]: boolean; }>({
+        return this.request<boolean>({
             url: '/diseases/{code}'.replace('{code}', encodeURI(code)),
             method: 'DELETE',
             headers,

src/generated/apis/ExaminationsApi.ts

@@ -179,17 +179,17 @@ export class ExaminationsApi extends BaseAPI {
 
     /**
      */
-    newPatientExamination({ patientExaminationDTO }: NewPatientExaminationRequest): Observable<boolean>
-    newPatientExamination({ patientExaminationDTO }: NewPatientExaminationRequest, opts?: OperationOpts): Observable<RawAjaxResponse<boolean>>
-    newPatientExamination({ patientExaminationDTO }: NewPatientExaminationRequest, opts?: OperationOpts): Observable<boolean | RawAjaxResponse<boolean>> {
+    newPatientExamination({ patientExaminationDTO }: NewPatientExaminationRequest): Observable<PatientExaminationDTO>
+    newPatientExamination({ patientExaminationDTO }: NewPatientExaminationRequest, opts?: OperationOpts): Observable<RawAjaxResponse<PatientExaminationDTO>>
+    newPatientExamination({ patientExaminationDTO }: NewPatientExaminationRequest, opts?: OperationOpts): Observable<PatientExaminationDTO | RawAjaxResponse<PatientExaminationDTO>> {
         throwIfNullOrUndefined(patientExaminationDTO, 'patientExaminationDTO', 'newPatientExamination');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
         };
 
-        return this.request<boolean>({
+        return this.request<PatientExaminationDTO>({
             url: '/examinations',
             method: 'POST',
             headers,
@@ -199,9 +199,9 @@ export class ExaminationsApi extends BaseAPI {
 
     /**
      */
-    updateExamination({ id, patientExaminationDTO }: UpdateExaminationRequest): Observable<boolean>
-    updateExamination({ id, patientExaminationDTO }: UpdateExaminationRequest, opts?: OperationOpts): Observable<RawAjaxResponse<boolean>>
-    updateExamination({ id, patientExaminationDTO }: UpdateExaminationRequest, opts?: OperationOpts): Observable<boolean | RawAjaxResponse<boolean>> {
+    updateExamination({ id, patientExaminationDTO }: UpdateExaminationRequest): Observable<PatientExaminationDTO>
+    updateExamination({ id, patientExaminationDTO }: UpdateExaminationRequest, opts?: OperationOpts): Observable<RawAjaxResponse<PatientExaminationDTO>>
+    updateExamination({ id, patientExaminationDTO }: UpdateExaminationRequest, opts?: OperationOpts): Observable<PatientExaminationDTO | RawAjaxResponse<PatientExaminationDTO>> {
         throwIfNullOrUndefined(id, 'id', 'updateExamination');
         throwIfNullOrUndefined(patientExaminationDTO, 'patientExaminationDTO', 'updateExamination');
 
@@ -210,7 +210,7 @@ export class ExaminationsApi extends BaseAPI {
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
         };
 
-        return this.request<boolean>({
+        return this.request<PatientExaminationDTO>({
             url: '/examinations/{id}'.replace('{id}', encodeURI(id)),
             method: 'PUT',
             headers,

src/generated/apis/OpdsApi.ts

@@ -51,7 +51,7 @@ export interface GetOpdToDayOrWeekRequest {
     oneWeek?: boolean;
 }
 
-export interface GetProgYear1Request {
+export interface GetProgressiveYearRequest {
     year: number;
 }
 
@@ -198,10 +198,10 @@ export class OpdsApi extends BaseAPI {
 
     /**
      */
-    getProgYear1({ year }: GetProgYear1Request): Observable<number>
-    getProgYear1({ year }: GetProgYear1Request, opts?: OperationOpts): Observable<RawAjaxResponse<number>>
-    getProgYear1({ year }: GetProgYear1Request, opts?: OperationOpts): Observable<number | RawAjaxResponse<number>> {
-        throwIfNullOrUndefined(year, 'year', 'getProgYear1');
+    getProgressiveYear({ year }: GetProgressiveYearRequest): Observable<number>
+    getProgressiveYear({ year }: GetProgressiveYearRequest, opts?: OperationOpts): Observable<RawAjaxResponse<number>>
+    getProgressiveYear({ year }: GetProgressiveYearRequest, opts?: OperationOpts): Observable<number | RawAjaxResponse<number>> {
+        throwIfNullOrUndefined(year, 'year', 'getProgressiveYear');
 
         const headers: HttpHeaders = {
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),

src/generated/apis/TherapiesApi.ts

@@ -16,7 +16,6 @@ import { BaseAPI, HttpHeaders, throwIfNullOrUndefined, encodeURI, OperationOpts,
 import {
     MedicalDTO,
     TherapyDTO,
-    TherapyRow,
     TherapyRowDTO,
 } from '../models';
 
@@ -171,17 +170,17 @@ export class TherapiesApi extends BaseAPI {
 
     /**
      */
-    replaceTherapies({ therapyRowDTO }: ReplaceTherapiesRequest): Observable<TherapyRow>
-    replaceTherapies({ therapyRowDTO }: ReplaceTherapiesRequest, opts?: OperationOpts): Observable<RawAjaxResponse<TherapyRow>>
-    replaceTherapies({ therapyRowDTO }: ReplaceTherapiesRequest, opts?: OperationOpts): Observable<TherapyRow | RawAjaxResponse<TherapyRow>> {
+    replaceTherapies({ therapyRowDTO }: ReplaceTherapiesRequest): Observable<TherapyRowDTO>
+    replaceTherapies({ therapyRowDTO }: ReplaceTherapiesRequest, opts?: OperationOpts): Observable<RawAjaxResponse<TherapyRowDTO>>
+    replaceTherapies({ therapyRowDTO }: ReplaceTherapiesRequest, opts?: OperationOpts): Observable<TherapyRowDTO | RawAjaxResponse<TherapyRowDTO>> {
         throwIfNullOrUndefined(therapyRowDTO, 'therapyRowDTO', 'replaceTherapies');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
             ...(this.configuration.username != null && this.configuration.password != null ? { Authorization: `Basic ${btoa(this.configuration.username + ':' + this.configuration.password)}` } : undefined),
         };
 
-        return this.request<TherapyRow>({
+        return this.request<TherapyRowDTO>({
             url: '/therapies/replace',
             method: 'POST',
             headers,