feedback updates
This commit is contained in:
parent
a5eb513d8a
commit
4833406406
@ -7,7 +7,7 @@
|
||||
</div>
|
||||
|
||||
<div class="copyright">
|
||||
© {{ currentYear }} alpha Omega Infosys. All rights reserved.
|
||||
© {{ currentYear }} Alpha Omega Infosys. All rights reserved.
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
@ -38,8 +38,8 @@ export class BasicFeeService {
|
||||
createBasicFee(spid: number, fee: BasicFee): Observable<any> {
|
||||
const payload = {
|
||||
P_SPID: spid,
|
||||
P_STARTCARNETVALUE: fee.startCarnetValue,
|
||||
P_ENDCARNETVALUE: fee.endCarnetValue,
|
||||
P_STARTNUMBER: fee.startCarnetValue,
|
||||
P_ENDNUMBER: fee.endCarnetValue,
|
||||
P_FEES: fee.fees,
|
||||
P_EFFDATE: this.commonService.formatUSDate(fee.effectiveDate),
|
||||
P_USERID: this.userService.getUser()
|
||||
@ -50,8 +50,6 @@ export class BasicFeeService {
|
||||
updateBasicFee(feeId: number, fee: BasicFee): Observable<any> {
|
||||
const payload = {
|
||||
P_BASICFEESETUPID: feeId,
|
||||
P_STARTCARNETVALUE: fee.startCarnetValue,
|
||||
P_ENDCARNETVALUE: fee.endCarnetValue,
|
||||
P_FEES: fee.fees,
|
||||
P_EFFDATE: this.commonService.formatUSDate(fee.effectiveDate),
|
||||
P_USERID: this.userService.getUser()
|
||||
|
||||
@ -51,7 +51,7 @@ export class ContactService {
|
||||
p_defcontactflag: data.defaultContact ? 'Y' : 'N',
|
||||
p_firstname: data.firstName,
|
||||
p_lastname: data.lastName,
|
||||
P_MIDDLEINITIAL: data.middleInitial,
|
||||
P_MIDDLEINITIAL: data.middleInitial ?? '',
|
||||
p_title: data.title,
|
||||
p_phoneno: data.phone,
|
||||
p_mobileno: data.mobile,
|
||||
@ -69,7 +69,7 @@ export class ContactService {
|
||||
p_spcontactid: spContactId,
|
||||
p_firstname: data.firstName,
|
||||
p_lastname: data.lastName,
|
||||
P_MIDDLEINITIAL: data.middleInitial,
|
||||
P_MIDDLEINITIAL: data.middleInitial ?? '',
|
||||
p_title: data.title,
|
||||
p_phoneno: data.phone,
|
||||
p_mobileno: data.mobile,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<div class="service-provider-container">
|
||||
<mat-stepper orientation="vertical" [linear]="true" (selectionChange)="onStepChange($event)"
|
||||
<mat-stepper orientation="vertical" [linear]="isLinear" (selectionChange)="onStepChange($event)"
|
||||
[selectedIndex]="currentStep">
|
||||
|
||||
<!-- Basic Details Step -->
|
||||
@ -20,7 +20,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Carnet Sequence Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && contactsCompleted" [completed]="carnetSequenceCompleted">
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="carnetSequenceCompleted">
|
||||
<ng-template matStepLabel>Carnet Sequence</ng-template>
|
||||
|
||||
<app-carnet-sequence *ngIf="serviceProviderId" [spid]="serviceProviderId"
|
||||
@ -29,7 +29,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Fees & Commission Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && carnetSequenceCompleted"
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted"
|
||||
[completed]="feeCommissionCompleted && carnetSequenceCompleted">
|
||||
<ng-template matStepLabel>Carnet Fee & Commission Setup</ng-template>
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Basic Fee Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && feeCommissionCompleted"
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted"
|
||||
[completed]="basicFeeCompleted && feeCommissionCompleted">
|
||||
<ng-template matStepLabel>Basic Fee Setup</ng-template>
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Counterfoil Fee Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && basicFeeCompleted" [completed]="counterfoilFeeCompleted">
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="counterfoilFeeCompleted">
|
||||
<ng-template matStepLabel>Counterfoil Setup</ng-template>
|
||||
|
||||
<app-counterfoil-fee *ngIf="serviceProviderId" [spid]="serviceProviderId"
|
||||
@ -56,7 +56,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Continuation Sheet Fee Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && counterfoilFeeCompleted"
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted"
|
||||
[completed]="continuationSheetFeeCompleted">
|
||||
<ng-template matStepLabel>Continuation Sheet Fee Setup</ng-template>
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Expedited Fee Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && continuationSheetFeeCompleted" [completed]="expeditedFeeCompleted">
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="expeditedFeeCompleted">
|
||||
<ng-template matStepLabel>Expedited Fee Setup</ng-template>
|
||||
|
||||
<app-expedited-fee *ngIf="serviceProviderId" [spid]="serviceProviderId"
|
||||
@ -75,7 +75,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Security Deposit Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && expeditedFeeCompleted" [completed]="securityDepositCompleted">
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="securityDepositCompleted">
|
||||
<ng-template matStepLabel>Security Deposit</ng-template>
|
||||
|
||||
<app-security-deposit *ngIf="serviceProviderId" [spid]="serviceProviderId"
|
||||
@ -84,7 +84,7 @@
|
||||
</mat-step>
|
||||
|
||||
<!-- Cargo Rate Step -->
|
||||
<mat-step [editable]="!!serviceProviderId && securityDepositCompleted" [completed]="cargoRateCompleted">
|
||||
<mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="cargoRateCompleted">
|
||||
<ng-template matStepLabel>Cargo Rate Setup</ng-template>
|
||||
|
||||
<app-cargo-rate *ngIf="serviceProviderId" [spid]="serviceProviderId"
|
||||
|
||||
@ -24,6 +24,7 @@ import { CargoRateComponent } from '../cargo-rate/cargo-rate.component';
|
||||
})
|
||||
export class AddServiceProviderComponent {
|
||||
isEditMode = false;
|
||||
isLinear = true;
|
||||
serviceProviderId: number | null = null;
|
||||
currentStep: number = 0;
|
||||
isLoading: boolean = false;
|
||||
@ -47,6 +48,7 @@ export class AddServiceProviderComponent {
|
||||
onBasicDetailsSaved(event: string): void {
|
||||
this.serviceProviderId = +event;
|
||||
this.basicDetailsCompleted = true;
|
||||
this.isLinear = false; // Disable linear mode after basic detail is created
|
||||
}
|
||||
|
||||
onContactsSaved(event: boolean): void {
|
||||
|
||||
@ -139,38 +139,29 @@
|
||||
<div class="form-row">
|
||||
<mat-form-field appearance="outline" class="cargo-surety">
|
||||
<mat-label>Cargo Surety</mat-label>
|
||||
<mat-select formControlName="cargoSurety" required>
|
||||
<mat-select formControlName="cargoSurety">
|
||||
<mat-option *ngFor="let cargoSurety of cargoSuretys" [value]="cargoSurety.value">
|
||||
{{ cargoSurety.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['cargoSurety'].errors?.['required']">
|
||||
Cargo Surety is required
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field appearance="outline" class="cargo-policy">
|
||||
<mat-label>Cargo Policy</mat-label>
|
||||
<mat-select formControlName="cargoPolicyNo" required>
|
||||
<mat-select formControlName="cargoPolicyNo">
|
||||
<mat-option *ngFor="let cargoPolicy of cargoPolicies" [value]="cargoPolicy.value">
|
||||
{{ cargoPolicy.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['cargoPolicyNo'].errors?.['required']">
|
||||
Cargo Policy is required
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field appearance="outline" class="bond-surety">
|
||||
<mat-label>Bond Surety</mat-label>
|
||||
<mat-select formControlName="bondSurety" required>
|
||||
<mat-select formControlName="bondSurety">
|
||||
<mat-option *ngFor="let bondSurety of bondSuretys" [value]="bondSurety.value">
|
||||
{{ bondSurety.name }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="f['bondSurety'].errors?.['required']">
|
||||
Bond Surety is required
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
@ -111,7 +111,7 @@ export class BasicFeeComponent {
|
||||
{ basicFeeId: 0, startCarnetValue: 50000, endCarnetValue: 149999, fees: 365, effectiveDate: new Date() },
|
||||
{ basicFeeId: 0, startCarnetValue: 150000, endCarnetValue: 399999, fees: 425, effectiveDate: new Date() },
|
||||
{ basicFeeId: 0, startCarnetValue: 400000, endCarnetValue: 999999, fees: 480, effectiveDate: new Date() },
|
||||
{ basicFeeId: 0, startCarnetValue: 1000000, endCarnetValue: null, fees: 545, effectiveDate: new Date() }
|
||||
{ basicFeeId: 0, startCarnetValue: 1000000, endCarnetValue: 99999999, fees: 545, effectiveDate: new Date() }
|
||||
];
|
||||
|
||||
// Create an array of observables for each fee creation
|
||||
@ -130,8 +130,6 @@ export class BasicFeeComponent {
|
||||
},
|
||||
error: (error) => {
|
||||
console.error('Error initializing default fees:', error);
|
||||
// Even if some failed, try to load what was created
|
||||
this.loadBasicFees();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
export const environment = {
|
||||
production: false,
|
||||
apiUrl: 'https://dev.alphaomegainfosys.com/test-api',
|
||||
apiDb: '1',
|
||||
appType: 'policy'
|
||||
apiUrl: 'https://dev.alphaomegainfosys.com/test-api-2',
|
||||
apiDb: '2',
|
||||
appType: 'policy',
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user