diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 010986a..da5b616 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -7,6 +7,7 @@ import { registerLocaleData } from '@angular/common'; import fr from '@angular/common/locales/fr'; import { provideAnimationsAsync } from '@angular/platform-browser/animations/async'; import { provideHttpClient } from '@angular/common/http'; +import {NzModalService} from 'ng-zorro-antd/modal'; registerLocaleData(fr); @@ -14,6 +15,7 @@ export const appConfig: ApplicationConfig = { providers: [ provideBrowserGlobalErrorListeners(), provideZoneChangeDetection({ eventCoalescing: true }), - provideRouter(routes), provideNzI18n(fr_FR), provideAnimationsAsync(), provideHttpClient() + provideRouter(routes), provideNzI18n(fr_FR), provideAnimationsAsync(), provideHttpClient(), + NzModalService ] }; diff --git a/src/app/pages/contact/contact-card/contact-card.ts b/src/app/pages/contact/contact-card/contact-card.ts index e22c666..c8ef92d 100644 --- a/src/app/pages/contact/contact-card/contact-card.ts +++ b/src/app/pages/contact/contact-card/contact-card.ts @@ -53,7 +53,7 @@ export class ContactCard { } try { - const contact = await firstValueFrom(this.contactsService.updateContactRequest(this.contact().id,contactValue)); + const contact = await firstValueFrom(this.contactsService.updateContactEndpoint(this.contact().id,contactValue)); this.contactEdit.set(contact); console.log(contact); this.contactForm.reset(); diff --git a/src/app/pages/contact/contact.ts b/src/app/pages/contact/contact.ts index cc43b0b..796710b 100644 --- a/src/app/pages/contact/contact.ts +++ b/src/app/pages/contact/contact.ts @@ -35,7 +35,7 @@ export class Contact { async fetchCustomers() { this.contactsLoading.set(true); try { - const contacts = await firstValueFrom(this.contactsService.getAllContactxuest()) + const contacts = await firstValueFrom(this.contactsService.getAllContactEndpoint()) this.contacts.set(contacts) } catch (e) { this.notificationService.error('Erreur', 'Erreur de communication avec l\'API'); diff --git a/src/app/pages/customers/create-customers-modal/customers-card-form.ts b/src/app/pages/customers/create-customers-modal/customers-card-form.ts index b5ec8cd..a20b2fc 100644 --- a/src/app/pages/customers/create-customers-modal/customers-card-form.ts +++ b/src/app/pages/customers/create-customers-modal/customers-card-form.ts @@ -2,7 +2,6 @@ import {Component, output} from '@angular/core'; import {NzMessageService} from "ng-zorro-antd/message"; import {NzButtonModule} from "ng-zorro-antd/button"; import {NzModalModule} from "ng-zorro-antd/modal"; -import {ProvidersAddForm} from "../../providers/providers-add-form/providers-add-form"; import {CustomersAddForm} from "../customers-add-form/customers-add-form"; @Component({ diff --git a/src/app/pages/providers/create-providers-modal/create-providers-modal.ts b/src/app/pages/providers/create-providers-modal/create-providers-modal.ts index 9f431de..551cc7e 100644 --- a/src/app/pages/providers/create-providers-modal/create-providers-modal.ts +++ b/src/app/pages/providers/create-providers-modal/create-providers-modal.ts @@ -17,7 +17,7 @@ import {ProvidersAddForm} from "../providers-add-form/providers-add-form"; [nzContent]="modalContent" [nzFooter]="modalFooter" (nzOnCancel)="handleCancel()"> - Création de clients + Création de prestataires diff --git a/src/app/pages/providers/providers-add-form/providers-add-form.html b/src/app/pages/providers/providers-add-form/providers-add-form.html index 3a69e44..69dfa7a 100644 --- a/src/app/pages/providers/providers-add-form/providers-add-form.html +++ b/src/app/pages/providers/providers-add-form/providers-add-form.html @@ -1,8 +1,8 @@
- Note + Prix - + diff --git a/src/app/pages/providers/providers-add-form/providers-add-form.ts b/src/app/pages/providers/providers-add-form/providers-add-form.ts index c8e7cbf..d0a2a59 100644 --- a/src/app/pages/providers/providers-add-form/providers-add-form.ts +++ b/src/app/pages/providers/providers-add-form/providers-add-form.ts @@ -6,48 +6,29 @@ import {NzFlexDirective} from "ng-zorro-antd/flex"; import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; import {NzInputDirective} from "ng-zorro-antd/input"; import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; -import { - CreateCustomerDto, - CustomersService, - CustomertypesService, - GetCustomerTypeDto, - ProvidersService, ProvidertypesService -} from "../../../services/api"; +import {CreateProviderDto, GetProviderTypeDto, ProvidertypesService, ServiceprovidersService} from "../../../services/api"; import {NzNotificationService} from "ng-zorro-antd/notification"; import {firstValueFrom} from "rxjs"; @Component({ selector: 'app-providers-add-form', - imports: [ - FormsModule, - NzButtonComponent, - NzColDirective, - NzFlexDirective, - NzFormControlComponent, - NzFormDirective, - NzFormItemComponent, - NzFormLabelComponent, - NzInputDirective, - NzOptionComponent, - NzRowDirective, - NzSelectComponent, - ReactiveFormsModule + imports: [FormsModule, NzButtonComponent, NzColDirective, NzFlexDirective, NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent, NzInputDirective, NzOptionComponent, NzRowDirective, NzSelectComponent, ReactiveFormsModule ], templateUrl: './providers-add-form.html', styleUrl: './providers-add-form.css', }) export class ProvidersAddForm { - private providersService = inject(ProvidersService); - private providertypesService = inject(ProvidertypesService); + private providersService = inject(ServiceprovidersService); + private serviceprovidertypesService = inject(ProvidertypesService); private notificationService = inject(NzNotificationService) providerForm = new FormGroup({ - Price: new FormControl(null, [Validators.required]), + Price: new FormControl(null, [Validators.required]), providerTypeId: new FormControl(null, [Validators.required]), }) - providerPost = signal(this.providerForm.value); + providerPost = signal(this.providerForm.value); providersLoading = signal(false); async submitForm() { @@ -58,16 +39,16 @@ export class ProvidersAddForm { console.log(this.providerForm.getRawValue()) this.providerPost.set(this.providerForm.getRawValue()) - await this.createCustomers(this.providerPost().note, this.providerPost().customerTypeId) + await this.createProviders(this.providerPost().price, this.providerPost().providerTypeId) // Pour vider le formulaire this.providerForm.reset() } - async createCustomers(note: string, customerTypeId: number) { + async createProviders(price: number, customerTypeId: number) { this.providersLoading.set(true); const providerValue = { - note: note, + price: price, customerTypeId: customerTypeId } @@ -85,21 +66,21 @@ export class ProvidersAddForm { this.providersLoading.set(false); } - customerTypes = signal([]) + providerTypes = signal([]) async ngOnInit() { await this.fetchCustomerTypes() } async fetchCustomerTypes() { - this.customersLoading.set(true); + this.providersLoading.set(true); try { - const customerType = await firstValueFrom(this.customertypesService.getAllCustomerTypeEndpoint()) - this.customerTypes.set(customerType) + const providerType = await firstValueFrom(this.serviceprovidertypesService.getAllProviderTypesEndpoint()) + this.providerTypes.set(providerType) } catch (e) { this.notificationService.error('Erreur', 'Erreur de communication avec l\'API'); } - this.customersLoading.set(false); + this.providersLoading.set(false); } } diff --git a/src/app/pages/providers/providers-card/providers-card.html b/src/app/pages/providers/providers-card/providers-card.html index 2a291ad..e9ec0c8 100644 --- a/src/app/pages/providers/providers-card/providers-card.html +++ b/src/app/pages/providers/providers-card/providers-card.html @@ -1 +1,29 @@ -

providers-card works!

+@if (edit() == false) { + +

Prestataire n°{{ provider().id }}

+

Prix : {{ provider().price }}

+
+ + + + + + +} @else { + + + + Prix + + + + + + + + + + + + +} diff --git a/src/app/pages/providers/providers-card/providers-card.ts b/src/app/pages/providers/providers-card/providers-card.ts index 596c6fd..71c7265 100644 --- a/src/app/pages/providers/providers-card/providers-card.ts +++ b/src/app/pages/providers/providers-card/providers-card.ts @@ -1,11 +1,96 @@ -import { Component } from '@angular/core'; +import {Component, inject, input, output, signal} from '@angular/core'; +import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; +import {NzCardComponent} from "ng-zorro-antd/card"; +import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; +import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; +import {NzIconDirective} from "ng-zorro-antd/icon"; +import {NzInputDirective} from "ng-zorro-antd/input"; +import { + CustomersService, + GetCustomerDto, GetProviderDto, + ServiceprovidersService, + UpdateCustomerDto, + UpdateProviderDto +} from "../../../services/api"; +import {NzNotificationService} from "ng-zorro-antd/notification"; +import {firstValueFrom} from "rxjs"; @Component({ selector: 'app-providers-card', - imports: [], + imports: [FormsModule, NzCardComponent, NzColDirective, NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent, NzIconDirective, NzInputDirective, NzRowDirective, ReactiveFormsModule], templateUrl: './providers-card.html', styleUrl: './providers-card.css', }) export class ProvidersCard { + private providersService = inject(ServiceprovidersService); + private notificationService = inject(NzNotificationService) + providerEdit = signal(null); + providersLoading = signal(false); + + providerForm = new FormGroup({ + id: new FormControl(null, [Validators.required]), + price: new FormControl(null, [Validators.required]), + }) + + async submitForm() { + this.providersLoading.set(true); + + const providerValue = { + price: this.providerForm.value.price, + } + + try { + const provider = await firstValueFrom(this.providersService.updateProviderEndpoint(this.provider().id,providerValue)); + this.providerEdit.set(provider); + console.log(provider); + this.providerForm.reset(); + this.edit.set(false); + + this.triggerEdited.emit(); + + } catch (e) + { + this.notificationService.error('Erreur', ' (ou Erreur de communication avec l\'API)'); + } + + this.providersLoading.set(false); + + } + + + provider = input(null); + + edit = signal(false) + + triggerEdited = output(); + + protected Edit() { + this.edit.set(true) + } + + protected Back() { + this.edit.set(false) + this.providerForm.reset(); + } + + async Delete() { + this.providersLoading.set(true); + + try { + const provider = await firstValueFrom(this.providersService.deleteProviderEndpoint(this.provider().id)); + this.providerEdit.set(provider); + + this.providerForm.reset(); + this.triggerEdited.emit(); + + } catch (e) + { + this.notificationService.error('Erreur de recherche', "L\'auteur n\'existe pas !"); + + this.notificationService.error('Erreur', ' (ou Erreur de communication avec l\'API)'); + } + + this.providersLoading.set(false); + } } diff --git a/src/app/pages/providers/providers.ts b/src/app/pages/providers/providers.ts index 1511818..b1b0557 100644 --- a/src/app/pages/providers/providers.ts +++ b/src/app/pages/providers/providers.ts @@ -1,6 +1,6 @@ import {Component, inject, signal} from '@angular/core'; import {NzRowDirective} from "ng-zorro-antd/grid"; -import {GetProviderDto, ProvidersService} from "../../services/api"; +import {GetProviderDto, ServiceprovidersService} from "../../services/api"; import {NzNotificationService} from "ng-zorro-antd/notification"; import {Router} from "@angular/router"; import {firstValueFrom} from "rxjs"; @@ -14,7 +14,7 @@ import {CreateProvidersModal} from "./create-providers-modal/create-providers-mo styleUrl: './providers.css', }) export class Providers { - private providersService = inject(ProvidersService); + private providersService = inject(ServiceprovidersService); private notificationService = inject(NzNotificationService) router = inject(Router); diff --git a/src/app/pages/staff/staff-add-form/staff-add-form.css b/src/app/pages/staff/staff-add-form/staff-add-form.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/pages/staff/staff-add-form/staff-add-form.html b/src/app/pages/staff/staff-add-form/staff-add-form.html deleted file mode 100644 index 5ef2c2f..0000000 --- a/src/app/pages/staff/staff-add-form/staff-add-form.html +++ /dev/null @@ -1,61 +0,0 @@ -
- - Nom - - - - - - - Prénom - - - - - - - Téléphone - - - - - - - Email - - - - - - - Adresse - - - - - - - Rôle - - - - - - - - - Numéro F4T2 - - - - - - - Date d'expiration du F4T2 - - - - - - -
diff --git a/src/app/pages/staff/staff-add-form/staff-add-form.ts b/src/app/pages/staff/staff-add-form/staff-add-form.ts deleted file mode 100644 index 3e341b1..0000000 --- a/src/app/pages/staff/staff-add-form/staff-add-form.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Component } from '@angular/core'; -import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; -import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; -import { - NzFormControlComponent, - NzFormDirective, - NzFormItemComponent, - NzFormLabelComponent, - NzFormModule -} from "ng-zorro-antd/form"; -import {NzInputDirective} from "ng-zorro-antd/input"; -import {NzLayoutComponent} from "ng-zorro-antd/layout"; - -@Component({ - selector: 'app-staff-add-form', - imports: [ReactiveFormsModule, NzFormModule, NzInputDirective, NzLayoutComponent], - templateUrl: './staff-add-form.html', - styleUrl: './staff-add-form.css', -}) -export class StaffAddForm { - staffForm = new FormGroup({ - lastName: new FormControl(null, [Validators.required]), - firstName: new FormControl(null, [Validators.required]), - phoneNumber: new FormControl(null, [Validators.required]), - email: new FormControl(null, [Validators.required]), - address: new FormControl(null, [Validators.required]), - role: new FormControl(null, [Validators.required]), - price: new FormControl(null, [Validators.required]), - F4T2NumberApproval: new FormControl(null, [Validators.required]), - F4T2ExpirationDate: new FormControl(null, [Validators.required]), - - }) - submitForm() { - // Pour annuler si le formulaire est invalide - if (this.staffForm.invalid) return; - - // Pour obtenir la valeur du formulaire - console.log(this.staffForm.getRawValue()) - - // Pour vider le formulaire - this.staffForm.reset() - } -} diff --git a/src/app/pages/staff/staff-card-form/staff-card-form.css b/src/app/pages/staff/staff-card-form/staff-card-form.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/pages/staff/staff-card-form/staff-card-form.html b/src/app/pages/staff/staff-card-form/staff-card-form.html deleted file mode 100644 index 00c833f..0000000 --- a/src/app/pages/staff/staff-card-form/staff-card-form.html +++ /dev/null @@ -1 +0,0 @@ -

staff-card-form works!

diff --git a/src/app/pages/staff/staff-card-form/staff-card-form.ts b/src/app/pages/staff/staff-card-form/staff-card-form.ts deleted file mode 100644 index 90e9a07..0000000 --- a/src/app/pages/staff/staff-card-form/staff-card-form.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { Component } from '@angular/core'; -import {NzMessageService} from "ng-zorro-antd/message"; -import {StaffAddForm} from "../staff-add-form/staff-add-form"; -import {NzButtonModule} from "ng-zorro-antd/button"; -import {NzModalModule} from "ng-zorro-antd/modal"; -import {ProvidersAddForm} from "../../providers/providers-add-form/providers-add-form"; - -@Component({ - selector: 'app-staff-card-form', - imports: [NzButtonModule, NzModalModule, StaffAddForm], - template: ` - - - Création de artificiers - - - - - - - - - - - `, - styleUrl: './staff-card-form.css', -}) -export class StaffCardForm { - constructor(private message: NzMessageService) {} - isVisible = false; - isConfirmLoading = false; - - showModal(): void { - this.isVisible = true; - } - - handleOk(): void { - this.isConfirmLoading = true; - this.message.success('Prestataire créé !'); - setTimeout(() => { - this.isVisible = false; - this.isConfirmLoading = false; - }, 1000); - } - - handleCancel(): void { - this.isVisible = false; - } -} \ No newline at end of file diff --git a/src/app/pages/staff/staff-get-all/staff-get-all.css b/src/app/pages/staff/staff-get-all/staff-get-all.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/pages/staff/staff-get-all/staff-get-all.html b/src/app/pages/staff/staff-get-all/staff-get-all.html deleted file mode 100644 index 00bc9ae..0000000 --- a/src/app/pages/staff/staff-get-all/staff-get-all.html +++ /dev/null @@ -1 +0,0 @@ -

staff-get-all works!

diff --git a/src/app/pages/staff/staff-get-all/staff-get-all.ts b/src/app/pages/staff/staff-get-all/staff-get-all.ts deleted file mode 100644 index 27702c8..0000000 --- a/src/app/pages/staff/staff-get-all/staff-get-all.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-staff-get-all', - imports: [], - templateUrl: './staff-get-all.html', - styleUrl: './staff-get-all.css', -}) -export class StaffGetAll { - -} diff --git a/src/app/pages/staff/staff.html b/src/app/pages/staff/staff.html index 614ec0e..d0db3ca 100644 --- a/src/app/pages/staff/staff.html +++ b/src/app/pages/staff/staff.html @@ -1,3 +1 @@ - - - +

staff

diff --git a/src/app/services/api/.openapi-generator/FILES b/src/app/services/api/.openapi-generator/FILES index f314012..e7d025e 100644 --- a/src/app/services/api/.openapi-generator/FILES +++ b/src/app/services/api/.openapi-generator/FILES @@ -11,9 +11,8 @@ api/customers.service.ts api/customertypes.service.ts api/experiencelevels.service.ts api/historyofapprovals.service.ts -api/providers.service.ts -api/providertype.service.ts api/providertypes.service.ts +api/serviceproviders.service.ts api/staffs.service.ts configuration.ts encoder.ts diff --git a/src/app/services/api/api/api.ts b/src/app/services/api/api/api.ts index 2934582..bba0b75 100644 --- a/src/app/services/api/api/api.ts +++ b/src/app/services/api/api/api.ts @@ -12,12 +12,10 @@ export * from './experiencelevels.service'; import { ExperiencelevelsService } from './experiencelevels.service'; export * from './historyofapprovals.service'; import { HistoryofapprovalsService } from './historyofapprovals.service'; -export * from './providers.service'; -import { ProvidersService } from './providers.service'; -export * from './providertype.service'; -import { ProvidertypeService } from './providertype.service'; export * from './providertypes.service'; import { ProvidertypesService } from './providertypes.service'; +export * from './serviceproviders.service'; +import { ServiceprovidersService } from './serviceproviders.service'; export * from './staffs.service'; import { StaffsService } from './staffs.service'; -export const APIS = [AvailabilitiesService, CommunicationsService, ContactsService, CustomersService, CustomertypesService, ExperiencelevelsService, HistoryofapprovalsService, ProvidersService, ProvidertypeService, ProvidertypesService, StaffsService]; +export const APIS = [AvailabilitiesService, CommunicationsService, ContactsService, CustomersService, CustomertypesService, ExperiencelevelsService, HistoryofapprovalsService, ProvidertypesService, ServiceprovidersService, StaffsService]; diff --git a/src/app/services/api/api/contacts.service.ts b/src/app/services/api/api/contacts.service.ts index de283ff..d8a5e13 100644 --- a/src/app/services/api/api/contacts.service.ts +++ b/src/app/services/api/api/contacts.service.ts @@ -162,10 +162,10 @@ export class ContactsService extends BaseService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public getAllContactxuest(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getAllContactxuest(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllContactxuest(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllContactxuest(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + public getAllContactEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public getAllContactEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllContactEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllContactEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { let localVarHeaders = this.defaultHeaders; @@ -268,15 +268,15 @@ export class ContactsService extends BaseService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public updateContactRequest(id: number, updateContactDto: UpdateContactDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; - public updateContactRequest(id: number, updateContactDto: UpdateContactDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public updateContactRequest(id: number, updateContactDto: UpdateContactDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public updateContactRequest(id: number, updateContactDto: UpdateContactDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + public updateContactEndpoint(id: number, updateContactDto: UpdateContactDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable; + public updateContactEndpoint(id: number, updateContactDto: UpdateContactDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public updateContactEndpoint(id: number, updateContactDto: UpdateContactDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public updateContactEndpoint(id: number, updateContactDto: UpdateContactDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { if (id === null || id === undefined) { - throw new Error('Required parameter id was null or undefined when calling updateContactRequest.'); + throw new Error('Required parameter id was null or undefined when calling updateContactEndpoint.'); } if (updateContactDto === null || updateContactDto === undefined) { - throw new Error('Required parameter updateContactDto was null or undefined when calling updateContactRequest.'); + throw new Error('Required parameter updateContactDto was null or undefined when calling updateContactEndpoint.'); } let localVarHeaders = this.defaultHeaders; diff --git a/src/app/services/api/api/providertype.service.ts b/src/app/services/api/api/providertype.service.ts deleted file mode 100644 index 9f7c7d6..0000000 --- a/src/app/services/api/api/providertype.service.ts +++ /dev/null @@ -1,88 +0,0 @@ -/** - * PyroFetes - * - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/* tslint:disable:no-unused-variable member-ordering */ - -import { Inject, Injectable, Optional } from '@angular/core'; -import { HttpClient, HttpHeaders, HttpParams, - HttpResponse, HttpEvent, HttpParameterCodec, HttpContext - } from '@angular/common/http'; -import { CustomHttpParameterCodec } from '../encoder'; -import { Observable } from 'rxjs'; - -// @ts-ignore -import { GetProviderTypeDto } from '../model/get-provider-type-dto'; - -// @ts-ignore -import { BASE_PATH, COLLECTION_FORMATS } from '../variables'; -import { Configuration } from '../configuration'; -import { BaseService } from '../api.base.service'; - - - -@Injectable({ - providedIn: 'root' -}) -export class ProvidertypeService extends BaseService { - - constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) { - super(basePath, configuration); - } - - /** - * @endpoint get /API/providertype - * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. - * @param reportProgress flag to report request and response progress. - */ - public getAllProviderTypesEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; - public getAllProviderTypesEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllProviderTypesEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; - public getAllProviderTypesEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { - - let localVarHeaders = this.defaultHeaders; - - const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ - 'application/json' - ]); - if (localVarHttpHeaderAcceptSelected !== undefined) { - localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); - } - - const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); - - const localVarTransferCache: boolean = options?.transferCache ?? true; - - - let responseType_: 'text' | 'json' | 'blob' = 'json'; - if (localVarHttpHeaderAcceptSelected) { - if (localVarHttpHeaderAcceptSelected.startsWith('text')) { - responseType_ = 'text'; - } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { - responseType_ = 'json'; - } else { - responseType_ = 'blob'; - } - } - - let localVarPath = `/API/providertype`; - const { basePath, withCredentials } = this.configuration; - return this.httpClient.request>('get', `${basePath}${localVarPath}`, - { - context: localVarHttpContext, - responseType: responseType_, - ...(withCredentials ? { withCredentials } : {}), - headers: localVarHeaders, - observe: observe, - ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), - reportProgress: reportProgress - } - ); - } - -} diff --git a/src/app/services/api/api/providertypes.service.ts b/src/app/services/api/api/providertypes.service.ts index bcbfc2a..81fdd00 100644 --- a/src/app/services/api/api/providertypes.service.ts +++ b/src/app/services/api/api/providertypes.service.ts @@ -157,6 +157,56 @@ export class ProvidertypesService extends BaseService { ); } + /** + * @endpoint get /API/providertypes + * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. + * @param reportProgress flag to report request and response progress. + */ + public getAllProviderTypesEndpoint(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>; + public getAllProviderTypesEndpoint(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllProviderTypesEndpoint(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable>>; + public getAllProviderTypesEndpoint(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable { + + let localVarHeaders = this.defaultHeaders; + + const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([ + 'application/json' + ]); + if (localVarHttpHeaderAcceptSelected !== undefined) { + localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected); + } + + const localVarHttpContext: HttpContext = options?.context ?? new HttpContext(); + + const localVarTransferCache: boolean = options?.transferCache ?? true; + + + let responseType_: 'text' | 'json' | 'blob' = 'json'; + if (localVarHttpHeaderAcceptSelected) { + if (localVarHttpHeaderAcceptSelected.startsWith('text')) { + responseType_ = 'text'; + } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) { + responseType_ = 'json'; + } else { + responseType_ = 'blob'; + } + } + + let localVarPath = `/API/providertypes`; + const { basePath, withCredentials } = this.configuration; + return this.httpClient.request>('get', `${basePath}${localVarPath}`, + { + context: localVarHttpContext, + responseType: responseType_, + ...(withCredentials ? { withCredentials } : {}), + headers: localVarHeaders, + observe: observe, + ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}), + reportProgress: reportProgress + } + ); + } + /** * @endpoint get /API/providertypes/{id} * @param id diff --git a/src/app/services/api/api/providers.service.ts b/src/app/services/api/api/serviceproviders.service.ts similarity index 94% rename from src/app/services/api/api/providers.service.ts rename to src/app/services/api/api/serviceproviders.service.ts index 1275be0..377f44f 100644 --- a/src/app/services/api/api/providers.service.ts +++ b/src/app/services/api/api/serviceproviders.service.ts @@ -33,14 +33,14 @@ import { BaseService } from '../api.base.service'; @Injectable({ providedIn: 'root' }) -export class ProvidersService extends BaseService { +export class ServiceprovidersService extends BaseService { constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) { super(basePath, configuration); } /** - * @endpoint post /API/providers + * @endpoint post /API/serviceproviders * @param createProviderDto * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -87,7 +87,7 @@ export class ProvidersService extends BaseService { } } - let localVarPath = `/API/providers`; + let localVarPath = `/API/serviceproviders`; const { basePath, withCredentials } = this.configuration; return this.httpClient.request('post', `${basePath}${localVarPath}`, { @@ -104,7 +104,7 @@ export class ProvidersService extends BaseService { } /** - * @endpoint delete /API/providers/{id} + * @endpoint delete /API/serviceproviders/{id} * @param id * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -142,7 +142,7 @@ export class ProvidersService extends BaseService { } } - let localVarPath = `/API/providers/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; + let localVarPath = `/API/serviceproviders/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; const { basePath, withCredentials } = this.configuration; return this.httpClient.request('delete', `${basePath}${localVarPath}`, { @@ -158,7 +158,7 @@ export class ProvidersService extends BaseService { } /** - * @endpoint get /API/providers + * @endpoint get /API/serviceproviders * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ @@ -192,7 +192,7 @@ export class ProvidersService extends BaseService { } } - let localVarPath = `/API/providers`; + let localVarPath = `/API/serviceproviders`; const { basePath, withCredentials } = this.configuration; return this.httpClient.request>('get', `${basePath}${localVarPath}`, { @@ -208,7 +208,7 @@ export class ProvidersService extends BaseService { } /** - * @endpoint get /API/providers/{id} + * @endpoint get /API/serviceproviders/{id} * @param id * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. @@ -246,7 +246,7 @@ export class ProvidersService extends BaseService { } } - let localVarPath = `/API/providers/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; + let localVarPath = `/API/serviceproviders/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; const { basePath, withCredentials } = this.configuration; return this.httpClient.request('get', `${basePath}${localVarPath}`, { @@ -262,7 +262,7 @@ export class ProvidersService extends BaseService { } /** - * @endpoint put /API/providers/{id} + * @endpoint put /API/serviceproviders/{id} * @param id * @param updateProviderDto * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. @@ -313,7 +313,7 @@ export class ProvidersService extends BaseService { } } - let localVarPath = `/API/providers/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; + let localVarPath = `/API/serviceproviders/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`; const { basePath, withCredentials } = this.configuration; return this.httpClient.request('put', `${basePath}${localVarPath}`, { diff --git a/src/app/services/api/model/create-provider-dto.ts b/src/app/services/api/model/create-provider-dto.ts index 5b88833..a939b6a 100644 --- a/src/app/services/api/model/create-provider-dto.ts +++ b/src/app/services/api/model/create-provider-dto.ts @@ -11,5 +11,6 @@ export interface CreateProviderDto { price?: number; + providerTypeId?: number; } diff --git a/src/app/services/api/model/create-staff-dto.ts b/src/app/services/api/model/create-staff-dto.ts index 062ecb6..2e1ac8e 100644 --- a/src/app/services/api/model/create-staff-dto.ts +++ b/src/app/services/api/model/create-staff-dto.ts @@ -10,6 +10,10 @@ export interface CreateStaffDto { + firstName?: string | null; + lastName?: string | null; + profession?: string | null; + email?: string | null; f4T2NumberApproval?: string | null; f4T2ExpirationDate?: string; } diff --git a/src/app/services/api/model/get-provider-dto.ts b/src/app/services/api/model/get-provider-dto.ts index cab49cd..ebeb7d5 100644 --- a/src/app/services/api/model/get-provider-dto.ts +++ b/src/app/services/api/model/get-provider-dto.ts @@ -12,5 +12,6 @@ export interface GetProviderDto { id?: number; price?: number; + providerTypeId?: number; } diff --git a/src/app/services/api/model/get-staff-dto.ts b/src/app/services/api/model/get-staff-dto.ts index 3dbc21d..f9610b6 100644 --- a/src/app/services/api/model/get-staff-dto.ts +++ b/src/app/services/api/model/get-staff-dto.ts @@ -11,6 +11,10 @@ export interface GetStaffDto { id?: number; + firstName?: string | null; + lastName?: string | null; + profession?: string | null; + email?: string | null; f4T2NumberApproval?: string | null; f4T2ExpirationDate?: string; } diff --git a/src/app/services/api/model/method-impl-attributes.ts b/src/app/services/api/model/method-impl-attributes.ts index c9250ed..3e0ac0e 100644 --- a/src/app/services/api/model/method-impl-attributes.ts +++ b/src/app/services/api/model/method-impl-attributes.ts @@ -18,6 +18,7 @@ export const MethodImplAttributes = { NUMBER_1: 1, NUMBER_2: 2, NUMBER_3: 3, + NUMBER_32: 3, NUMBER_4: 4, NUMBER_42: 4, NUMBER_8: 8,