From eb784753ce918cdc13ffbe7e05646f4a5ff7dc7a Mon Sep 17 00:00:00 2001
From: abf <abf@globeteam.com>
Date: Mon, 23 Jan 2023 12:17:41 +0100
Subject: [PATCH] DDT-1496: fix voyageNumber  on TC creation

---
 src/app/model/jit/transport-call.ts           | 17 +++++++---------
 .../transport-call-creator.component.ts       | 20 +++----------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/app/model/jit/transport-call.ts b/src/app/model/jit/transport-call.ts
index 473762a3..0c48dd99 100644
--- a/src/app/model/jit/transport-call.ts
+++ b/src/app/model/jit/transport-call.ts
@@ -1,4 +1,3 @@
-import { PortCallServiceTypeCode } from "../enums/portCallServiceTypeCode";
 import { FacilityTypeCode } from "../enums/facilityTypeCodeOPR";
 import { FacilityCodeListProvider } from "../enums/facilityCodeListProvider";
 import { Vessel } from "../portCall/vessel";
@@ -12,14 +11,14 @@ export interface TransportCall {
   carrierExportVoyageNumber?: string;
   carrierImportVoyageNumber?: string;
   portOfCall?: Port;
-  transportCallReference: string;
+  transportCallReference?: string;
   modeOfTransport: string;
   UNLocationCode: string;
   transportCallSequenceNumber: number;
   facilityTypeCode: FacilityTypeCode;
-  facilityCodeListProvider: FacilityCodeListProvider;
-  facilityCode: string;
-  otherFacility: string;
+  facilityCodeListProvider?: FacilityCodeListProvider;
+  facilityCode?: string;
+  otherFacility?: string;
   sequenceColor?: string;
   vessel?: Vessel;
   location: EventLocation;
@@ -27,15 +26,13 @@ export interface TransportCall {
   atdBerthDateTime?: Date;
   omitCreatedDateTime?: Date;
   latestEventCreatedDateTime?: Date;
-  transportCallID: string | null;
-    /**
+  transportCallID?: string | null;
+  /**
 * @deprecated
-Although deprecated, the UI JIT 1.1 combo - newer fields are converted to this
 */
   exportVoyageNumber?: string;
-    /**
+  /**
 * @deprecated
-Although deprecated, the UI uses JIT 1.1 combo  - newer fields are convereted to this
 */
   importVoyageNumber?: string;
 }
diff --git a/src/app/view/transport-call-creator/transport-call-creator.component.ts b/src/app/view/transport-call-creator/transport-call-creator.component.ts
index 5c8a3116..a0138576 100644
--- a/src/app/view/transport-call-creator/transport-call-creator.component.ts
+++ b/src/app/view/transport-call-creator/transport-call-creator.component.ts
@@ -1,6 +1,5 @@
 import {Component, OnInit} from '@angular/core';
 import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
-import {Globals} from '../../model/portCall/globals';
 import {MessageService} from 'primeng/api';
 import {TranslateService} from '@ngx-translate/core';
 import {Port} from '../../model/portCall/port';
@@ -10,15 +9,11 @@ import {TransportCallService} from '../../controller/services/jit/transport-call
 import {DialogService, DynamicDialogRef} from 'primeng/dynamicdialog';
 import {VesselService} from '../../controller/services/base/vessel.service';
 import {Vessel} from '../../model/portCall/vessel';
-import {DelayCodeService} from '../../controller/services/base/delay-code.service';
-import {TimestampMappingService} from '../../controller/services/mapping/timestamp-mapping.service';
 import {EventLocation} from '../../model/eventLocation';
 import {PortService} from 'src/app/controller/services/base/port.service';
-import {TimestampDefinitionService} from '../../controller/services/base/timestamp-definition.service';
 import {ErrorHandler} from 'src/app/controller/services/util/errorHandler';
 import {Observable, take} from 'rxjs';
 import {tap} from 'rxjs/operators';
-import {PublisherRoleService} from '../../controller/services/base/publisher-role.service';
 import {TimestampEditorComponent} from '../timestamp-editor/timestamp-editor.component';
 import {TimestampResponseStatus} from '../../model/enums/timestamp-response-status';
 
@@ -38,16 +33,11 @@ export class TransportCallCreatorComponent implements OnInit {
 
   constructor(private formBuilder: FormBuilder,
               private translate: TranslateService,
-              private globals: Globals,
               private dialogService: DialogService,
               public ref: DynamicDialogRef,
               private messageService: MessageService,
-              private delayCodeService: DelayCodeService,
               private transportCallService: TransportCallService,
               private vesselService: VesselService,
-              private timestampDefinitionService: TimestampDefinitionService,
-              private timestampMappingService: TimestampMappingService,
-              private publisherRoleService: PublisherRoleService,
               private portService: PortService,
               ) {
   }
@@ -107,21 +97,17 @@ export class TransportCallCreatorComponent implements OnInit {
       facilityCodeListProvider: null
     };
     const transportCall: TransportCall = {
-      transportCallReference: null,
       UNLocationCode: port.UNLocationCode,
       carrierServiceCode: carrierServiceCode,
-      carrierVoyageNumber: exportVoyageNumber,
       exportVoyageNumber: exportVoyageNumber,
       importVoyageNumber: importVoyageNumber ?? exportVoyageNumber,
-      facilityCode: null,
+      carrierExportVoyageNumber: exportVoyageNumber,
+      carrierImportVoyageNumber: importVoyageNumber ?? exportVoyageNumber,
       facilityTypeCode: FacilityTypeCode.POTE,
-      otherFacility: null,
-      transportCallID: null,
       transportCallSequenceNumber: 1,
       modeOfTransport: 'VESSEL',
-      facilityCodeListProvider: null,
       location: location,
-      vessel: vessel,
+      vessel: vessel
     };
 
     if (this.createTimestampChecked) {