cyril/service-provider-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:31:15 -04:00
parent 8163b02f34
commit 4c77415c14
17 changed files with 146 additions and 65 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;
specialCountry: string;
rate: number;
rateInPercentage: number;
rateType: string;
effectiveDate: Date;
spid: number;
dateCreated?: Date | null;

1
src/app/core/models/preparer/basic-detail.ts
View File

@ -3,6 +3,7 @@ export interface BasicDetail {
spid: number;
name: string;
lookupCode: string;
address?: string;
address1: string;
address2?: string | null;
city: string;

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

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

9
src/app/core/services/preparer/client.service.ts
View File

@ -27,6 +27,7 @@ export class ClientService {
spid: basicDetails.SPID,
name: basicDetails.PREPARERNAME,
lookupCode: basicDetails.LOOKUPCODE,
address: this.getAddressLabel(basicDetails.ADDRESS1, basicDetails.ADDRESS2),
address1: basicDetails.ADDRESS1,
address2: basicDetails.ADDRESS2,
city: basicDetails.CITY,
@ -44,4 +45,12 @@ export class ClientService {
// inactivatedDate: basicDetails.INACTIVEDATE || null
}));
}
private getAddressLabel(address1: string, address2?: string): string {
let addressLabel = address1;
if (address2) {
addressLabel += `, ${address2}`;
}
return addressLabel;
}
}

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);
}
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 -->
<ng-container matColumnDef="rate">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rate</th>
<td mat-cell *matCellDef="let deposit">{{ deposit.rate | currency }}</td>
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rate/Value</th>
<td mat-cell *matCellDef="let deposit">{{ deposit.rate }}</td>
</ng-container>
<!-- Rate In Percentage Column -->
<ng-container matColumnDef="rateInPercentage">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rate In Percentage</th>
<td mat-cell *matCellDef="let deposit">{{ deposit.rateInPercentage/100 | percent }}</td>
<!-- Rate Type Column -->
<ng-container matColumnDef="rateType">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Rate In % or $</th>
<td mat-cell *matCellDef="let deposit">{{ deposit.rateType }}</td>
</ng-container>
<!-- Effective Date Column -->
@ -142,9 +142,9 @@
<div class="form-row">
<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">
<span class="dollar-prefix" matPrefix>$&nbsp;</span>
<!-- <span class="dollar-prefix" matPrefix>$&nbsp;</span> -->
<mat-error *ngIf="depositForm.get('rate')?.errors?.['required']">
Rate is required
</mat-error>
@ -154,14 +154,10 @@
</mat-form-field>
<mat-form-field appearance="outline">
<mat-label>Rate %</mat-label>
<input matInput type="number" formControlName="rateInPercentage" required min="0" step="1">
<span class="percent-suffix" matSuffix>%&nbsp;</span>
<mat-error *ngIf="depositForm.get('rateInPercentage')?.errors?.['required']">
Rate % is required
</mat-error>
<mat-error *ngIf="depositForm.get('rateInPercentage')?.errors?.['min']">
Rate % must be positive
<mat-label>Rate in % or $</mat-label>
<input matInput formControlName="rateType" required>
<mat-error *ngIf="depositForm.get('rateType')?.errors?.['required']">
Rate in % or $ is required
</mat-error>
</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) {
this.dataSource.paginator = value;
}
@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>();
depositForm: FormGroup;
isEditing = false;
@ -73,7 +73,7 @@ export class SecurityDepositComponent implements OnInit {
specialCommodity: [''],
specialCountry: [''],
rate: [0, [Validators.required, Validators.min(0)]],
rateInPercentage: [0, [Validators.required, Validators.min(0)]],
rateType: ['', [Validators.required]],
effectiveDate: ['', Validators.required]
});
}
@ -159,7 +159,7 @@ export class SecurityDepositComponent implements OnInit {
uscibMember: 'N',
specialCountry: '',
});
this.depositForm.patchValue({ rate: 0, rateInPercentage: 0 });
this.depositForm.patchValue({ rate: 0 });
this.depositForm.get('holderType')?.enable();
this.depositForm.get('uscibMember')?.enable();
@ -177,7 +177,7 @@ export class SecurityDepositComponent implements OnInit {
specialCommodity: deposit.specialCommodity,
specialCountry: deposit.specialCountry,
rate: deposit.rate,
rateInPercentage: deposit.rateInPercentage,
rateType: deposit.rateType,
effectiveDate: deposit.effectiveDate
});

2
src/app/preparer/basic-details/basic-details.component.html
View File

@ -139,7 +139,7 @@
<mat-form-field appearance="outline" class="revenue-location">
<mat-label>Revenue Location</mat-label>
<mat-select formControlName="revenueLocation" required>
<mat-option *ngFor="let state of states" [value]="state.value">
<mat-option *ngFor="let state of usStates" [value]="state.value">
{{ state.name }}
</mat-option>
</mat-select>

19
src/app/preparer/basic-details/basic-details.component.ts
View File

@ -34,6 +34,7 @@ export class BasicDetailsComponent implements OnInit, OnDestroy {
countries: Country[] = [];
regions: Region[] = [];
states: State[] = [];
usStates: State[] = [];
industryTypes: IndustryType[] = [];
isLoading = true;
@ -114,6 +115,7 @@ export class BasicDetailsComponent implements OnInit, OnDestroy {
this.loadRegions();
this.loadIndustryTypes();
this.loadUSStates();
}
loadRegions(): void {
@ -152,7 +154,21 @@ export class BasicDetailsComponent implements OnInit, OnDestroy {
next: (states) => {
this.states = states;
this.updateStateControl('state', country);
this.updateStateControl('revenueLocation', country);
},
error: (error) => {
console.error('Failed to load states', error);
}
});
}
loadUSStates(): void {
this.isLoading = true;
this.commonService.getStates('US')
.pipe(takeUntil(this.destroy$),
finalize(() => this.isLoading = false))
.subscribe({
next: (states) => {
this.usStates = states;
},
error: (error) => {
console.error('Failed to load states', error);
@ -197,7 +213,6 @@ export class BasicDetailsComponent implements OnInit, OnDestroy {
onCountryChange(country: string): void {
this.basicDetailsForm.get('state')?.reset();
this.basicDetailsForm.get('revenueLocation')?.reset();
if (country) {
this.loadStates(country);

14
src/app/preparer/contacts/contacts.component.html
View File

@ -21,6 +21,12 @@
<td mat-cell *matCellDef="let contact">{{ contact.firstName }}</td>
</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 -->
<ng-container matColumnDef="lastName">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Last Name</th>
@ -45,6 +51,12 @@
<td mat-cell *matCellDef="let contact">{{ contact.mobile | phone }}</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 -->
<ng-container matColumnDef="email">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th>
@ -117,7 +129,7 @@
<mat-label>Location</mat-label>
<mat-select formControlName="locationid" required>
<mat-option *ngFor="let location of locations" [value]="location.locationid">
{{ location.name }}
{{ getLocationLabel(location) }}
</mat-option>
</mat-select>
<mat-error *ngIf="contactForm.get('locationid')?.errors?.['required']">

22
src/app/preparer/contacts/contacts.component.ts
View File

@ -34,7 +34,7 @@ export class ContactsComponent {
@ViewChild(MatSort) sort!: MatSort;
displayedColumns: string[] = ['firstName', 'lastName', 'title', 'phone', 'mobile', 'email', 'defaultContact', 'actions'];
displayedColumns: string[] = ['firstName', 'middleInitial', 'lastName', 'title', 'phone', 'mobile', 'fax', 'email', 'defaultContact', 'actions'];
dataSource = new MatTableDataSource<any>();
contactForm: FormGroup;
// contactLoginForm: FormGroup;
@ -334,4 +334,24 @@ export class ContactsComponent {
}
});
}
getLocationLabel(location: Location): string {
let locationLabel = location.name;
if (location.address1) {
locationLabel += `, ${location.address1}`;
}
if (location.address2) {
locationLabel += `, ${location.address2}`;
}
if (location.city) {
locationLabel += `, ${location.city}`;
}
if (location.state) {
locationLabel += `, ${location.state}`;
}
if (location.zip) {
locationLabel += `, ${location.zip}`;
}
return locationLabel;
}
}

8
src/app/preparer/location/location.component.html
View File

@ -20,7 +20,7 @@
<!-- Address1 Column -->
<ng-container matColumnDef="address">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Address</th>
<td mat-cell *matCellDef="let location">{{ getAddressLabel(location.address1, location.address2) }}</td>
<td mat-cell *matCellDef="let location">{{ location.address }}</td>
</ng-container>
<!-- City Column -->
@ -41,6 +41,12 @@
<td mat-cell *matCellDef="let location">{{ getCountryLabel(location.country) }}</td>
</ng-container>
<!-- Zip Column -->
<ng-container matColumnDef="zip">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Zip Code</th>
<td mat-cell *matCellDef="let location">{{ location.zip }}</td>
</ng-container>
<!-- Actions Column -->
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef>Actions</th>

10
src/app/preparer/location/location.component.ts
View File

@ -32,7 +32,7 @@ export class LocationComponent {
@ViewChild(MatSort) sort!: MatSort;
displayedColumns: string[] = ['name', 'address', 'city', 'state', 'country', 'actions'];
displayedColumns: string[] = ['name', 'address', 'city', 'state', 'country', 'zip', 'actions'];
dataSource = new MatTableDataSource<any>();
locationForm: FormGroup;
isEditing = false;
@ -254,14 +254,6 @@ export class LocationComponent {
// });
// }
getAddressLabel(address1: string, address2?: string): string {
let addressLabel = address1;
if (address2) {
addressLabel += `, ${address2}`;
}
return addressLabel;
}
getCountryLabel(value: string): string {
const country = this.countries.find(c => c.value === value);
return country ? country.name : value;

2
src/app/preparer/manage/manage-preparer.component.html
View File

@ -72,7 +72,7 @@
<!-- Address Column -->
<ng-container matColumnDef="address">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Address</th>
<td mat-cell *matCellDef="let client">{{ getAddressLabel(client.address1, client.address2)}}
<td mat-cell *matCellDef="let client">{{ client.address}}
</td>
</ng-container>

8
src/app/preparer/manage/manage-preparer.component.ts
View File

@ -124,12 +124,4 @@ export class ManagePreparerComponent implements OnInit, OnDestroy, AfterViewInit
onEdit(clientid: number): void {
this.navigationService.navigate(['preparer', clientid]);
}
getAddressLabel(address1: string, address2?: string): string {
let addressLabel = address1;
if (address2) {
addressLabel += `, ${address2}`;
}
return addressLabel;
}
}

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

@ -25,6 +25,12 @@
<td mat-cell *matCellDef="let contact">{{ contact.firstName }}</td>
</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 -->
<ng-container matColumnDef="lastName">
<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>
</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 -->
<ng-container matColumnDef="email">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th>
@ -76,10 +94,11 @@
matTooltip="Delete">
<mat-icon>delete</mat-icon>
</button>
<!-- <button mat-icon-button (click)="setDefaultContact(contact.contactId)"
[color]="contact.defaultContact ? 'primary' : ''" matTooltip="Set as default">
<button mat-icon-button (click)="setDefaultContact(contact.spContactId)"
*ngIf="!contact.defaultContact || !contact.isInactive"
[hidden]="contact.defaultContact || contact.isInactive" matTooltip="Set as default contact">
<mat-icon>star</mat-icon>
</button> -->
</button>
</td>
</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;
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>();
contactForm: FormGroup;
isEditing = false;
@ -253,16 +253,32 @@ export class ContactsComponent implements OnInit {
});
}
// setDefaultContact(contactId: string): void {
// this.contactService.setDefaultServiceProviderContact(this.spid, contactId).subscribe({
// next: () => {
// this.notificationService.showSuccess('Default contact updated successfully');
// this.loadContacts();
// },
// error: (error) => {
// this.notificationService.showError('Failed to set default contact');
// console.error('Error setting default contact:', error);
// }
// });
// }
setDefaultContact(contactId: string): void {
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
width: '450px',
data: {
title: 'Confirm Default Contact',
message: 'Are you sure you want to set this contact as default contact?',
confirmText: 'Yes',
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);
}
});
}
});
}
}