diff --git a/src/app/components/deliverery-note-form/deliverery-note-form.ts b/src/app/components/deliverery-note-form/deliverery-note-form.ts index 0b69c02..67e5e35 100644 --- a/src/app/components/deliverery-note-form/deliverery-note-form.ts +++ b/src/app/components/deliverery-note-form/deliverery-note-form.ts @@ -1,11 +1,11 @@ -import {Component, inject, signal} from '@angular/core'; +import {Component, effect, inject, input, OnInit, signal} from '@angular/core'; import {FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms"; import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; import {NzColDirective} from "ng-zorro-antd/grid"; import {NzFlexDirective} from "ng-zorro-antd/flex"; import {NzDatePickerComponent} from "ng-zorro-antd/date-picker"; import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; -import {DeliverersService, GetDelivererDto} from "../../services/api"; +import {DeliverersService, GetDelivererDto, GetDeliveryNoteDto} from "../../services/api"; import {NzNotificationService} from "ng-zorro-antd/notification"; import {firstValueFrom} from "rxjs"; @@ -21,13 +21,14 @@ import {firstValueFrom} from "rxjs"; ReactiveFormsModule, NzDatePickerComponent, NzSelectComponent, - NzOptionComponent + NzOptionComponent, ], templateUrl: './deliverery-note-form.html', styleUrl: './deliverery-note-form.css', }) -export class DelivereryNoteForm { +export class DelivereryNoteForm implements OnInit { deliveryNoteForm: FormGroup = new FormGroup({ + trackingNumber: new FormControl("TRK-" + Date.now), deliverer: new FormControl(null,[Validators.required]), expeditionDate: new FormControl(null,[Validators.required]), estimatedDate: new FormControl(null), diff --git a/src/app/components/deliverery-note-table/deliverery-note-table.html b/src/app/components/deliverery-note-table/deliverery-note-table.html index 801f261..1c164ca 100644 --- a/src/app/components/deliverery-note-table/deliverery-note-table.html +++ b/src/app/components/deliverery-note-table/deliverery-note-table.html @@ -48,24 +48,15 @@
-
- -
+ - - - + -
- -
- -
- -
+
} + diff --git a/src/app/components/deliverery-note-table/deliverery-note-table.ts b/src/app/components/deliverery-note-table/deliverery-note-table.ts index 15f9380..d5b093d 100644 --- a/src/app/components/deliverery-note-table/deliverery-note-table.ts +++ b/src/app/components/deliverery-note-table/deliverery-note-table.ts @@ -1,4 +1,4 @@ -import {Component, inject, OnInit, signal} from '@angular/core'; +import {Component, inject, OnInit, signal, viewChild} from '@angular/core'; import {DatePipe} from "@angular/common"; import {ModalButton} from "../modal-button/modal-button"; import {ModalNav} from "../modal-nav/modal-nav"; @@ -32,6 +32,7 @@ export class DelivereryNoteTable implements OnInit { private fileService = inject(FileService); deliveryNotes = signal([]); deliveryNotesLoading = signal(false); + modal = viewChild.required('modalNav'); async ngOnInit() { await this.fetchDeliveryNotes();