summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-overlay/src/main/webapp
diff options
context:
space:
mode:
authorSunder Tattavarada <statta@research.att.com>2020-03-09 20:27:22 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-09 20:27:22 +0000
commit1dc25cca722492de0d28487ddf24936e2bf875a5 (patch)
treee12534035d478cdebf87fa9b4f0add1d092171f3 /ecomp-sdk/epsdk-app-overlay/src/main/webapp
parent291bc599dd9fbbb7b26dae3f24bcaf132d40a8f7 (diff)
parenteb4b5a44aad6aee87931bae80856622c359a19d4 (diff)
Merge "Fixed Rdp-data-table data loading issue"
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp')
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts8
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html4
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.html7
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/user/user.service.ts6
5 files changed, 13 insertions, 14 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts
index 4f136074..a6bc03f0 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/layout/layout.module.ts
@@ -44,14 +44,18 @@ import { LayoutRoutingModule } from './layout-routing.module';
import { LayoutComponent } from './layout.component';
import { SidebarComponent } from './components/sidebar/sidebar.component';
import { HeaderComponent } from './components/header/header.component';
+import { MatDialogModule } from '@angular/material/dialog';
+import { CookieService } from 'ngx-cookie-service';
@NgModule({
imports: [
CommonModule,
LayoutRoutingModule,
TranslateModule,
- NgbDropdownModule
+ NgbDropdownModule,
+ MatDialogModule
],
- declarations: [LayoutComponent, SidebarComponent, HeaderComponent]
+ declarations: [LayoutComponent, SidebarComponent, HeaderComponent],
+ providers:[CookieService]
})
export class LayoutModule {}
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html
index 1b3b37be..1629ac24 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.html
@@ -63,12 +63,12 @@
<td mat-cell *matCellDef="let rowData" > {{rowData.email}} </td>
</ng-container>
- <ng-container matColumnDef="OrgUserId">
+ <ng-container matColumnDef="orgUserId">
<th mat-header-cell *matHeaderCellDef id="heading4"> {{userHeaders[4]}} </th>
<td mat-cell *matCellDef="let rowData" > {{rowData.orgUserId}} </td>
</ng-container>
- <ng-container matColumnDef="Manager OrgUserId">
+ <ng-container matColumnDef="orgManagerUserId">
<th mat-header-cell *matHeaderCellDef id="heading4"> {{userHeaders[5]}} </th>
<td mat-cell *matCellDef="let rowData" > {{rowData.orgManagerUserId}} </td>
</ng-container>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts
index 7bebd04c..a02158b6 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/search/search.component.ts
@@ -56,7 +56,7 @@ export class SearchComponent implements OnInit {
response: any;
result: any;
profileList:any;
- userHeaders = ["User ID","Last Name","First Name","Email","ORG ID","Manager ORG ID","Edit","Active?"];
+ userHeaders = ["User ID","Last Name","First Name","Email","orgUserId","orgManagerUserId","Edit","Active?"];
constructor(public profileservice:ProfileService, public ngbModal: NgbModal) { }
dataSource: MatTableDataSource<[]>;
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.html
index 846dae52..ff319de4 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/ext/profile/self/self.component.html
@@ -59,17 +59,12 @@
</div>
</div>
<div class="form-row">
- <label for="textinputID-3a">Organization User ID</label>&nbsp;<a style="cursor: hand;" target="_new"
- href="http://webphone.att.com/cgi-bin/webphones.pl?id={{profile.orgUserId}}">wephone</a>
-
+ <label for="textinputID-3a">Organization User ID</label>
<input [(ngModel)]="profile.orgUserId" type="text" name="orgUserId" class="form-control" id="orgUserId"
style="width: 100%;" disabled="true">
</div>
<div class="form-row">
<label for="textinputID-3a">Organization Manager ID</label>
- &nbsp;<a style="cursor: hand;" target="_new"
- href="http://webphone.att.com/cgi-bin/webphones.pl?id={{profile.orgManagerUserId}}">wephone</a>
-
<input [(ngModel)]="profile.orgManagerUserId" type="text" name="orgManagerUserId" class="form-control"
id="orgManagerUserId" style="
width: 59%;" disabled="true">
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/user/user.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/user/user.service.ts
index 4c4a01c3..44d9e5ef 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/user/user.service.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/shared/services/user/user.service.ts
@@ -20,7 +20,7 @@ data;
observable;
getFunctionalMenuStaticDetailSession2(){
- return this.http.get(environment.getFunctionalMenuStaticDetail,{ withCredentials: true })
+ return this.http.get(environment.getTopMenu,{ withCredentials: true })
.subscribe((results: Object) => {
this.user = new User(results);
});
@@ -30,7 +30,7 @@ getFunctionalMenuStaticDetailSession2(){
public getFunctionalMenuStaticDetailSession(): Observable<User> {
return this.http
- .get(environment.getFunctionalMenuStaticDetail,{ withCredentials: true })
+ .get(environment.getTopMenu,{ withCredentials: true })
.map(response => {
return new User(response);
})
@@ -43,7 +43,7 @@ getFunctionalMenuStaticDetailSession1() {
} else if (this.observable) {
return this.observable;
} else {
- this.observable = this.http.get(environment.getFunctionalMenuStaticDetail, {
+ this.observable = this.http.get(environment.getTopMenu, {
withCredentials: true,
observe: 'response'
})