feedback updates
This commit is contained in:
parent
b2b921e040
commit
7f79cc6d57
@ -7,7 +7,7 @@
|
||||
</div>
|
||||
|
||||
<div class="copyright">
|
||||
© {{ currentYear }} {{currentServiceProviderName}}. All rights reserved.
|
||||
© {{ currentYear }} alpha Omega Infosys. All rights reserved.
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
@ -1,8 +1,6 @@
|
||||
import { Component, effect, inject, Input } from '@angular/core';
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { AngularMaterialModule } from '../../shared/module/angular-material.module';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { User } from '../../core/models/user';
|
||||
import { UserService } from '../../core/services/common/user.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-footer',
|
||||
@ -12,20 +10,5 @@ import { UserService } from '../../core/services/common/user.service';
|
||||
})
|
||||
export class FooterComponent {
|
||||
currentYear = new Date().getFullYear();
|
||||
currentServiceProviderName: string = 'USCIB Carnet Portal';
|
||||
userDetails: User | null = {};
|
||||
|
||||
@Input() isUserLoggedIn = false;
|
||||
|
||||
private userService = inject(UserService);
|
||||
|
||||
constructor(
|
||||
) {
|
||||
effect(() => {
|
||||
this.userDetails = this.userService.userDetailsSignal();
|
||||
if (this.userDetails?.userDetails && this.userDetails.userDetails.serviceProviderName) {
|
||||
this.currentServiceProviderName = this.userDetails.userDetails.serviceProviderName || 'USCIB Carnet Portal';
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -13,6 +13,7 @@ import { ApiErrorHandlerService } from './api-error-handler.service';
|
||||
})
|
||||
export class AuthService {
|
||||
private apiUrl = environment.apiUrl;
|
||||
private applicationName = environment.appType;
|
||||
|
||||
private http = inject(HttpClient);
|
||||
private userService = inject(UserService);
|
||||
@ -22,7 +23,7 @@ export class AuthService {
|
||||
private errorHandler = inject(ApiErrorHandlerService);
|
||||
|
||||
login(username: string, password: string): Observable<any> {
|
||||
return this.http.post(`${this.apiUrl}/login`, { p_emailaddr: username, p_password: password });
|
||||
return this.http.post(`${this.apiUrl}/login`, { p_emailaddr: username, p_password: password, P_APPLICATIONNAME: this.applicationName });
|
||||
}
|
||||
|
||||
refreshToken(): Observable<any> {
|
||||
|
||||
@ -54,7 +54,7 @@ export class CommonService {
|
||||
}
|
||||
|
||||
getRegions(): Observable<Region[]> {
|
||||
return this.http.get<any[]>(`${this.apiUrl}/${this.apiDb}/GetRegions`).pipe(
|
||||
return this.http.get<any[]>(`${this.apiUrl}/${this.apiDb}/GetRegions/${this.userService.getUserSpid()}`).pipe(
|
||||
map((response) =>
|
||||
response.map((item) => ({
|
||||
id: item.REGIONID,
|
||||
|
||||
@ -85,8 +85,9 @@
|
||||
<mat-icon>chevron_right</mat-icon>
|
||||
</button>
|
||||
|
||||
<button mat-icon-button color="primary" *ngIf="isParamRecord" (click)="onEditParam(client)"
|
||||
[matTooltip]="'edit'">
|
||||
<button mat-icon-button color="primary" *ngIf="isParamRecord
|
||||
&& allowEdit"
|
||||
(click)="onEditParam(client)" [matTooltip]="'edit'">
|
||||
<mat-icon>edit</mat-icon>
|
||||
</button>
|
||||
|
||||
|
||||
@ -38,6 +38,7 @@ export class ParamTableComponent {
|
||||
paramData: any = [];
|
||||
showInactiveData: boolean = false;
|
||||
isEditing: boolean = false;
|
||||
allowEdit: boolean = true;
|
||||
showForm: boolean = false;
|
||||
currentParamid: number | null = null;
|
||||
|
||||
@ -116,6 +117,7 @@ export class ParamTableComponent {
|
||||
|
||||
ngOnInit(): void {
|
||||
this.paramType = this.route.snapshot.paramMap.get('id');
|
||||
this.allowEdit = this.paramType !== '014';
|
||||
this.getParameters();
|
||||
}
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ export class SecurityDepositComponent implements OnInit {
|
||||
holderType: ['CORP', Validators.required],
|
||||
uscibMember: ['Y', Validators.required],
|
||||
specialCommodity: [''],
|
||||
specialCountry: ['US'],
|
||||
specialCountry: [''],
|
||||
rate: [0, [Validators.required, Validators.min(0)]],
|
||||
effectiveDate: ['', Validators.required]
|
||||
});
|
||||
@ -145,7 +145,7 @@ export class SecurityDepositComponent implements OnInit {
|
||||
this.depositForm.reset({
|
||||
holderType: 'CORP',
|
||||
uscibMember: 'N',
|
||||
specialCountry: 'US',
|
||||
specialCountry: '',
|
||||
});
|
||||
this.depositForm.patchValue({ rate: 0 });
|
||||
|
||||
@ -245,7 +245,7 @@ export class SecurityDepositComponent implements OnInit {
|
||||
this.depositForm.reset({
|
||||
holderType: 'CORP',
|
||||
uscibMember: 'N',
|
||||
specialCountry: 'US',
|
||||
specialCountry: '',
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
export const environment = {
|
||||
production: false,
|
||||
apiUrl: 'https://dev.alphaomegainfosys.com/test-api',
|
||||
apiDb: 'oracle'
|
||||
apiDb: 'oracle',
|
||||
appType: 'policy'
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
export const environment = {
|
||||
production: true,
|
||||
apiUrl: 'https://dev.alphaomegainfosys.com/test-api',
|
||||
apiDb: 'oracle'
|
||||
apiDb: 'oracle',
|
||||
appType: 'policy'
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user