From eb4b5a44aad6aee87931bae80856622c359a19d4 Mon Sep 17 00:00:00 2001 From: Sudarshan Kumar Date: Fri, 6 Mar 2020 15:30:05 +0530 Subject: Fixed Rdp-data-table data loading issue Fixed rdp-data-table data loading issue and also fixed firefox issue for welcome page.inculuded missing imports and providers Issue-ID: PORTAL-836 Change-Id: I0ca770536a1fb9e7056bc4dc890ad677bcd8d4e9 Signed-off-by: Sudarshan Kumar --- .../ngapp/src/app/pages/pages-routing.module.ts | 2 +- .../ngappsrc/portalsdk-tag-lib-0.0.1.tgz | Bin 316596 -> 346392 bytes .../ngappsrc/src/app/pages/pages-routing.module.ts | 2 +- .../ngappsrc/src/app/pages/pages.module.ts | 4 +++- .../pages/welcome-dashboard/note/note.component.ts | 15 +++++++++------ .../welcome-dashboard.component.ts | 15 ++++++++------- 6 files changed, 22 insertions(+), 16 deletions(-) (limited to 'ecomp-sdk/epsdk-app-os') diff --git a/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts index eff5a3d0..3439f8c9 100644 --- a/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts @@ -29,7 +29,7 @@ const routes: Routes = [ { 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({ diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz b/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz index dccad51f..3b1c200f 100644 Binary files a/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz and b/ecomp-sdk/epsdk-app-os/ngappsrc/portalsdk-tag-lib-0.0.1.tgz differ diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts index eff5a3d0..3439f8c9 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts @@ -29,7 +29,7 @@ const routes: Routes = [ { 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({ diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts index 47b86c24..041988ab 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts @@ -61,6 +61,7 @@ import { BarChartComponent } from './welcome-dashboard/bar-chart/bar-chart.compo 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'; @@ -138,7 +139,8 @@ import { GridsterModule } from 'angular-gridster2'; MatPaginatorModule, MatSortModule, MatIconModule, - GridsterModule + GridsterModule, + RdpModule ], entryComponents: [InformationModalComponent, ConfirmationModalComponent, NewRoleComponent, NewRoleFunctionComponent, NewMenuComponent], providers: [] diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/note/note.component.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/note/note.component.ts index 9b35bb0d..d8935f7c 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/note/note.component.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/note/note.component.ts @@ -53,12 +53,15 @@ export class NoteComponent { @Output() focusout = new EventEmitter(); constructor(private el:ElementRef) { const {webkitSpeechRecognition} : 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){ diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts index 99118e3a..47e83e90 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/welcome-dashboard/welcome-dashboard.component.ts @@ -250,14 +250,15 @@ export class WelcomeDashboardComponent { this.initilizeData(); this.notes = JSON.parse(localStorage.getItem('notes')) || [{ id: 0,content:'' }]; - - const {webkitSpeechRecognition} : 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 = 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() { -- cgit 1.2.3-korg