cyril/carnet-portal-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feedback updates

Browse Source
This commit is contained in:
Cyril Joseph 2025-11-11 23:32:42 -04:00
parent 251b9f8644
commit 76d78c5869
7 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/models/fees/security-deposit.ts
View File

@ -5,7 +5,7 @@ export interface SecurityDeposit {
specialCommodity: string; specialCommodity: string;
specialCountry: string; specialCountry: string;
rate: number; rate: number;
rateInPercentage: number; rateType: string;
effectiveDate: Date; effectiveDate: Date;
spid: number; spid: number;
dateCreated?: Date | null; dateCreated?: Date | null;

6
src/app/core/services/fees/security-deposit.service.ts
View File

@ -30,7 +30,7 @@ export class SecurityDepositService {
specialCommodity: item.SPCLCOMMODITY, specialCommodity: item.SPCLCOMMODITY,
specialCountry: item.SPCLCOUNTRY, specialCountry: item.SPCLCOUNTRY,
rate: item.RATE, rate: item.RATE,
rateInPercentage: item.RATE_PCT, rateType: item.RATE_PCT,
effectiveDate: item.EFFDATE, effectiveDate: item.EFFDATE,
spid: item.SPID, spid: item.SPID,
createdBy: item.CREATEDBY || null, createdBy: item.CREATEDBY || null,
@ -49,7 +49,7 @@ export class SecurityDepositService {
P_SPCLCOMMODITY: data.specialCommodity, P_SPCLCOMMODITY: data.specialCommodity,
P_SPCLCOUNTRY: data.specialCountry, P_SPCLCOUNTRY: data.specialCountry,
P_RATE: data.rate, P_RATE: data.rate,
P_PCT_VALUE: data.rateInPercentage.toString(), P_PCT_VALUE: data.rateType,
P_USERID: this.userService.getUser() P_USERID: this.userService.getUser()
} }
@ -62,7 +62,7 @@ export class SecurityDepositService {
P_BONDRATESETUPID: id, P_BONDRATESETUPID: id,
P_EFFDATE: this.commonService.formatUSDate(data.effectiveDate), P_EFFDATE: this.commonService.formatUSDate(data.effectiveDate),
P_RATE: data.rate, P_RATE: data.rate,
P_PCT_VALUE: data.rateInPercentage.toString(), P_PCT_VALUE: data.rateType,
P_USERID: this.userService.getUser() P_USERID: this.userService.getUser()
} }

3
src/app/core/services/service-provider/contact.service.ts
View File

@ -98,4 +98,7 @@ export class ContactService {
return this.http.post(`${this.apiUrl}/${this.apiDb}/CreateSPLogins`, contact); return this.http.post(`${this.apiUrl}/${this.apiDb}/CreateSPLogins`, contact);
} }
setDefaultContact(spContactId: string): Observable<any> {
return this.http.patch(`${this.apiUrl}/${this.apiDb}/SetSPDefaultContact/${spContactId}`, null);
}
} }

28
src/app/fees/security-deposit/security-deposit.component.html
View File

@ -44,14 +44,14 @@
<!-- Rate Column --> <!-- Rate Column -->
<ng-container matColumnDef="rate"> <ng-container matColumnDef="rate">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rate</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Rate/Value</th>
<td mat-cell *matCellDef="let deposit">{{ deposit.rate | currency }}</td> <td mat-cell *matCellDef="let deposit">{{ deposit.rate }}</td>
</ng-container> </ng-container>
<!-- Rate In Percentage Column --> <!-- Rate Type Column -->
<ng-container matColumnDef="rateInPercentage"> <ng-container matColumnDef="rateType">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rate In Percentage</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Rate In % or $</th>
<td mat-cell *matCellDef="let deposit">{{ deposit.rateInPercentage/100 | percent }}</td> <td mat-cell *matCellDef="let deposit">{{ deposit.rateType }}</td>
</ng-container> </ng-container>
<!-- Effective Date Column --> <!-- Effective Date Column -->
@ -142,9 +142,9 @@
<div class="form-row"> <div class="form-row">
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Rate</mat-label> <mat-label>Rate / Value</mat-label>
<input matInput type="number" formControlName="rate" required min="0" step="1"> <input matInput type="number" formControlName="rate" required min="0" step="1">
<span class="dollar-prefix" matPrefix>$&nbsp;</span> <!-- <span class="dollar-prefix" matPrefix>$&nbsp;</span> -->
<mat-error *ngIf="depositForm.get('rate')?.errors?.['required']"> <mat-error *ngIf="depositForm.get('rate')?.errors?.['required']">
Rate is required Rate is required
</mat-error> </mat-error>
@ -154,14 +154,10 @@
</mat-form-field> </mat-form-field>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label>Rate %</mat-label> <mat-label>Rate in % or $</mat-label>
<input matInput type="number" formControlName="rateInPercentage" required min="0" step="1"> <input matInput formControlName="rateType" required>
<span class="percent-suffix" matSuffix>%&nbsp;</span> <mat-error *ngIf="depositForm.get('rateType')?.errors?.['required']">
<mat-error *ngIf="depositForm.get('rateInPercentage')?.errors?.['required']"> Rate in % or $ is required
Rate % is required
</mat-error>
<mat-error *ngIf="depositForm.get('rateInPercentage')?.errors?.['min']">
Rate % must be positive
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>

10
src/app/fees/security-deposit/security-deposit.component.ts
View File

@ -28,10 +28,10 @@ export class SecurityDepositComponent implements OnInit {
set paginator(value: MatPaginator) { set paginator(value: MatPaginator) {
this.dataSource.paginator = value; this.dataSource.paginator = value;
} }
@ViewChild(MatSort) sort!: MatSort; @ViewChild(MatSort) sort!: MatSort;
displayedColumns: string[] = ['holderType', 'uscibMember', 'specialCommodity', 'specialCountry', 'rate', 'rateInPercentage', 'effectiveDate', 'actions']; displayedColumns: string[] = ['holderType', 'uscibMember', 'specialCommodity', 'specialCountry', 'rate', 'rateType', 'effectiveDate', 'actions'];
dataSource = new MatTableDataSource<any>(); dataSource = new MatTableDataSource<any>();
depositForm: FormGroup; depositForm: FormGroup;
isEditing = false; isEditing = false;
@ -73,7 +73,7 @@ export class SecurityDepositComponent implements OnInit {
specialCommodity: [''], specialCommodity: [''],
specialCountry: [''], specialCountry: [''],
rate: [0, [Validators.required, Validators.min(0)]], rate: [0, [Validators.required, Validators.min(0)]],
rateInPercentage: [0, [Validators.required, Validators.min(0)]], rateType: ['', [Validators.required]],
effectiveDate: ['', Validators.required] effectiveDate: ['', Validators.required]
}); });
} }
@ -159,7 +159,7 @@ export class SecurityDepositComponent implements OnInit {
uscibMember: 'N', uscibMember: 'N',
specialCountry: '', specialCountry: '',
}); });
this.depositForm.patchValue({ rate: 0, rateInPercentage: 0 }); this.depositForm.patchValue({ rate: 0 });
this.depositForm.get('holderType')?.enable(); this.depositForm.get('holderType')?.enable();
this.depositForm.get('uscibMember')?.enable(); this.depositForm.get('uscibMember')?.enable();
@ -177,7 +177,7 @@ export class SecurityDepositComponent implements OnInit {
specialCommodity: deposit.specialCommodity, specialCommodity: deposit.specialCommodity,
specialCountry: deposit.specialCountry, specialCountry: deposit.specialCountry,
rate: deposit.rate, rate: deposit.rate,
rateInPercentage: deposit.rateInPercentage, rateType: deposit.rateType,
effectiveDate: deposit.effectiveDate effectiveDate: deposit.effectiveDate
}); });

25
src/app/service-provider/contacts/contacts.component.html
View File

@ -25,6 +25,12 @@
<td mat-cell *matCellDef="let contact">{{ contact.firstName }}</td> <td mat-cell *matCellDef="let contact">{{ contact.firstName }}</td>
</ng-container> </ng-container>
<!-- Middle Initial Column -->
<ng-container matColumnDef="middleInitial">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Middle Initial</th>
<td mat-cell *matCellDef="let contact">{{ contact.middleInitial }}</td>
</ng-container>
<!-- Last Name Column --> <!-- Last Name Column -->
<ng-container matColumnDef="lastName"> <ng-container matColumnDef="lastName">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Last Name</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Name</th>
@ -43,6 +49,18 @@
<td mat-cell *matCellDef="let contact">{{ contact.phone | phone }}</td> <td mat-cell *matCellDef="let contact">{{ contact.phone | phone }}</td>
</ng-container> </ng-container>
<!-- Mobile Column -->
<ng-container matColumnDef="mobile">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Mobile</th>
<td mat-cell *matCellDef="let contact">{{ contact.mobile }}</td>
</ng-container>
<!-- Fax Column -->
<ng-container matColumnDef="fax">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Fax</th>
<td mat-cell *matCellDef="let contact">{{ contact.fax }}</td>
</ng-container>
<!-- Email Column --> <!-- Email Column -->
<ng-container matColumnDef="email"> <ng-container matColumnDef="email">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th> <th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th>
@ -76,10 +94,11 @@
matTooltip="Delete"> matTooltip="Delete">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
</button> </button>
<!-- <button mat-icon-button (click)="setDefaultContact(contact.contactId)" <button mat-icon-button (click)="setDefaultContact(contact.spContactId)"
[color]="contact.defaultContact ? 'primary' : ''" matTooltip="Set as default"> *ngIf="!contact.defaultContact || !contact.isInactive"
[hidden]="contact.defaultContact || contact.isInactive" matTooltip="Set as default contact">
<mat-icon>star</mat-icon> <mat-icon>star</mat-icon>
</button> --> </button>
</td> </td>
</ng-container> </ng-container>

42
src/app/service-provider/contacts/contacts.component.ts
View File

@ -32,7 +32,7 @@ export class ContactsComponent implements OnInit {
@ViewChild(MatSort) sort!: MatSort; @ViewChild(MatSort) sort!: MatSort;
displayedColumns: string[] = ['firstName', 'lastName', 'title', 'phone', 'email', 'defaultContact', 'actions']; displayedColumns: string[] = ['firstName', 'middleInitial', 'lastName', 'title', 'phone', 'mobile', 'fax', 'email', 'defaultContact', 'actions'];
dataSource = new MatTableDataSource<any>(); dataSource = new MatTableDataSource<any>();
contactForm: FormGroup; contactForm: FormGroup;
isEditing = false; isEditing = false;
@ -253,16 +253,32 @@ export class ContactsComponent implements OnInit {
}); });
} }
// setDefaultContact(contactId: string): void { setDefaultContact(contactId: string): void {
// this.contactService.setDefaultServiceProviderContact(this.spid, contactId).subscribe({
// next: () => { const dialogRef = this.dialog.open(ConfirmDialogComponent, {
// this.notificationService.showSuccess('Default contact updated successfully'); width: '450px',
// this.loadContacts(); data: {
// }, title: 'Confirm Default Contact',
// error: (error) => { message: 'Are you sure you want to set this contact as default contact?',
// this.notificationService.showError('Failed to set default contact'); confirmText: 'Yes',
// console.error('Error setting default contact:', error); cancelText: 'Cancel'
// } }
// }); });
// }
dialogRef.afterClosed().subscribe(result => {
if (result) {
this.contactService.setDefaultContact(contactId).subscribe({
next: () => {
this.notificationService.showSuccess('Default contact updated successfully');
this.loadContacts();
},
error: (error) => {
let errorMessage = this.errorHandler.handleApiError(error, 'Failed to set default contact');
this.notificationService.showError(errorMessage);
console.error('Error setting default contact:', error);
}
});
}
});
}
} }