{ path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
{ path: 'run/:reportId', component: RunReportComponent},
{ path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
- { path: 'welcome/welcome', component :WelcomeDashboardComponent}
+ { path: 'welcome', component :WelcomeDashboardComponent}
];
@NgModule({
{ path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent},
{ path: 'run/:reportId', component: RunReportComponent},
{ path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent},
- { path: 'welcome/welcome', component :WelcomeDashboardComponent}
+ { path: 'welcome', component :WelcomeDashboardComponent}
];
@NgModule({
import { PieChartComponent } from './welcome-dashboard/pie-chart/pie-chart.component';
import { NoteComponent } from './welcome-dashboard/note/note.component';
import { GridsterModule } from 'angular-gridster2';
+import { RdpModule } from 'portalsdk-tag-lib';
MatPaginatorModule,
MatSortModule,
MatIconModule,
- GridsterModule
+ GridsterModule,
+ RdpModule
],
entryComponents: [InformationModalComponent, ConfirmationModalComponent, NewRoleComponent, NewRoleFunctionComponent, NewMenuComponent],
providers: []
@Output() focusout = new EventEmitter();
constructor(private el:ElementRef) {
const {webkitSpeechRecognition} : IWindow = <IWindow>window;
- this.recognition = new webkitSpeechRecognition();
- this.recognition.onresult = (event)=> {
- this.el.nativeElement.querySelector(".content").innerText += event.results[0][0].transcript
- console.log(event.results[0][0].transcript)
- document.getElementById('toolbar').focus();
- };
+
+ // Commented below code as it works only for chrome browser.
+
+ // this.recognition = new webkitSpeechRecognition();
+ // this.recognition.onresult = (event)=> {
+ // this.el.nativeElement.querySelector(".content").innerText += event.results[0][0].transcript
+ // console.log(event.results[0][0].transcript)
+ // document.getElementById('toolbar').focus();
+ // };
}
onDismiss(event){
this.initilizeData();
this.notes = JSON.parse(localStorage.getItem('notes')) || [{ id: 0,content:'' }];
-
- const {webkitSpeechRecognition} : IWindow = <IWindow>window;
- this.recognition = new webkitSpeechRecognition();
- this.recognition.onresult = (event)=> {
- console.log(this.el.nativeElement.querySelectorAll(".content")[0]);
- this.el.nativeElement.querySelectorAll(".content")[0].innerText = event.results[0][0].transcript
+
+ // Commented below code as it works only for chrome browser.
+ // const {webkitSpeechRecognition} : IWindow = <IWindow>window;
+ // this.recognition = new webkitSpeechRecognition();
+ // this.recognition.onresult = (event)=> {
+ // console.log(this.el.nativeElement.querySelectorAll(".content")[0]);
+ // this.el.nativeElement.querySelectorAll(".content")[0].innerText = event.results[0][0].transcript
- };
+ // };
}
updateAllNotes() {
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 {}
<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>
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<[]>;
</div>
</div>
<div class="form-row">
- <label for="textinputID-3a">Organization User ID</label> <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>
- <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">
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);
});
public getFunctionalMenuStaticDetailSession(): Observable<User> {
return this.http
- .get(environment.getFunctionalMenuStaticDetail,{ withCredentials: true })
+ .get(environment.getTopMenu,{ withCredentials: true })
.map(response => {
return new User(response);
})
} 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'
})
},
"portalsdk-tag-lib": {
"version": "file:portalsdk-tag-lib-0.0.1.tgz",
- "integrity": "sha512-iqr81BSaZSC+ids5jIxDwvspC/yEKMX2PlTMoFAy0mvI/tcAeKUvSKgsFadqPRHBPbTbtXFDDpn22ZxgTtyc9Q==",
+ "integrity": "sha512-V4X0GIkX63rPFDQjgVbj53GVoyahtyeQX2m3owcJYmYBCvB/e36ncX5/wluFpiR8mp4eD+b+HDSBBVkq7bYqsg==",
"requires": {
"tslib": "^1.9.0"
}
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<!-- </rdp-scroll-container> -->
- <div *ngIf="isPaginationRequired">
+ <div [hidden]="!isPaginationRequired">
<mat-paginator [length]="totalRowsCount" #paginator [pageSizeOptions]="[5, 10, 25, 100]" [pageSize]="pageSize"
- (page)="pageEvent = $event; onPaginationChange($event)"></mat-paginator>
+ ></mat-paginator>
</div>
</div>
\ No newline at end of file
@Input() settings: any;
@ViewChild(MatSort) sort: MatSort;
- @ViewChild(MatPaginator) paginator: MatPaginator;
+ //@ViewChild(MatPaginator) paginator: MatPaginator;
+ private paginator: MatPaginator;
+
+ @ViewChild(MatPaginator) set matPaginator(mp: MatPaginator) {
+ this.paginator = mp;
+ this.setData(this.data);
+ }
+
@ViewChild(MatTable) table: MatTable<T>;
@ViewChild('input') input: ElementRef;
isEditMode: boolean;
isSearchEnabled: boolean;
isServerSidePaginationEnabled: boolean = false;
- showAddButton: boolean = true;
+ showAddButton: boolean = false;
result : any;
totalRowsCount: any;
showSpinner: boolean;
}
ngAfterViewInit() {
- if(this.isServerSidePaginationEnabled){
+ if(this.settings && this.settings.isServerSidePaginationEnabled && this.data){
this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
tap(() => this.loadData(this.paginator.pageIndex, this.paginator.pageSize))
).subscribe();
}
-
- this.dataSource.paginator = this.paginator;
- this.dataSource.sort = this.sort;
+ if(this.data) {
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
+ }
}
ngOnChanges() {
+ if(this.data) {
+ this.setData(this.data);
+ }
if (this.settings) {
console.log("Table setting Objects >>>>", this.settings);
if (this.settings.isReadOnly) {
this.showAddButton = false;
+ }else{
+ this.showAddButton = true;
}
if (this.settings.isTableSearchEnabled) {
}
setData(data) {
- if(this.settings.isServerSidePaginationEnabled){
+ if(this.settings && this.settings.isServerSidePaginationEnabled){
console.log("Server side pagination is enabled");
this.dataSource = new RDPDataSource();
this.dataSource.loadData(this.settings.applicationService,'', this.sort.active, this.sort.direction, 0, this.settings.paginationsSize);
console.log("Server side pagination is not enabled");
if (Array.isArray(data)) {
this.dataSource.data = data;
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
this.totalRowsCount = data.length;
}
}
Code Review / portal / sdk.git / commitdiff