diff --git a/angular/projects/admin-nrpti/src/app/app-routing.module.ts b/angular/projects/admin-nrpti/src/app/app-routing.module.ts
index fe0f2e9e0..555368b7c 100644
--- a/angular/projects/admin-nrpti/src/app/app-routing.module.ts
+++ b/angular/projects/admin-nrpti/src/app/app-routing.module.ts
@@ -8,6 +8,7 @@ import { NewsResolver } from './news/news-resolver';
import { NewsListComponent } from './news/news-list.component';
import { CommunicationsComponent } from './communications/communications.component';
import { CommunicationsResolver } from './communications/communications.resolver';
+import { LngMapInfoResolver } from './communications/lng-map-info/lng-map-info-resolver';
const routes: Routes = [
{
@@ -55,9 +56,10 @@ const routes: Routes = [
},
component: CommunicationsComponent,
resolve: {
- communicationsPackage: CommunicationsResolver
+ communicationsPackage: CommunicationsResolver,
+ lngMapData: LngMapInfoResolver
}
- },
+ }
]
},
{
diff --git a/angular/projects/admin-nrpti/src/app/communications/communications.component.html b/angular/projects/admin-nrpti/src/app/communications/communications.component.html
index 8a1821f61..7e80a0926 100644
--- a/angular/projects/admin-nrpti/src/app/communications/communications.component.html
+++ b/angular/projects/admin-nrpti/src/app/communications/communications.component.html
@@ -68,14 +68,19 @@
Application Communication Popup
+
+
+
+
-
-
-
-
+
+
+
diff --git a/angular/projects/admin-nrpti/src/app/communications/communications.component.ts b/angular/projects/admin-nrpti/src/app/communications/communications.component.ts
index a3ad6fab4..5635cfc29 100644
--- a/angular/projects/admin-nrpti/src/app/communications/communications.component.ts
+++ b/angular/projects/admin-nrpti/src/app/communications/communications.component.ts
@@ -1,9 +1,11 @@
+import { LngMapInfoComponent } from './lng-map-info/lng-map-info.component';
import { Component, OnInit, OnDestroy, ViewChild, EventEmitter } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs/Subject';
import { FormGroup, FormControl } from '@angular/forms';
import { CommunicationsPackage } from '../../../../common/src/app/models/master/common-models/communications-package';
+import { MapInfo } from './../../../../common/src/app/models/master/common-models/map-info';
import { FactoryService } from '../services/factory.service';
import { DatePickerComponent, LoadingScreenService, Utils } from 'nrpti-angular-components';
@@ -14,13 +16,16 @@ import { DatePickerComponent, LoadingScreenService, Utils } from 'nrpti-angular-
})
export class CommunicationsComponent implements OnInit, OnDestroy {
@ViewChild(DatePickerComponent) DatePicker: DatePickerComponent;
+ @ViewChild(LngMapInfoComponent) LngMapInfoComponent: LngMapInfoComponent;
private ngUnsubscribe: Subject = new Subject();
public resetDates: EventEmitter = new EventEmitter();
+ public selectedApp: EventEmitter = new EventEmitter();
public myForm: FormGroup;
public commPackage: CommunicationsPackage;
+ public lngMapInfo: MapInfo;
public selectedApplication: string;
public tinyMceSettings = {
@@ -47,7 +52,6 @@ export class CommunicationsComponent implements OnInit, OnDestroy {
this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => {
this.commPackage = res.communicationsPackage.COMMUNICATIONS;
this.selectedApplication = this.route.snapshot.params.application.toUpperCase();
-
this.buildForm();
});
}
diff --git a/angular/projects/admin-nrpti/src/app/communications/communications.module.ts b/angular/projects/admin-nrpti/src/app/communications/communications.module.ts
index 852e5c337..debed55f3 100644
--- a/angular/projects/admin-nrpti/src/app/communications/communications.module.ts
+++ b/angular/projects/admin-nrpti/src/app/communications/communications.module.ts
@@ -1,3 +1,4 @@
+import { LngMapInfoComponent } from './lng-map-info/lng-map-info.component';
// modules
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
@@ -6,31 +7,32 @@ import { CommonModule } from '@angular/common';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { BrowserModule } from '@angular/platform-browser';
import { EditorModule } from '@tinymce/tinymce-angular';
-
import { GlobalModule } from 'nrpti-angular-components';
-import { CommonModule as NrptiCommonModule } from '../../../../common/src/app/common.module';
+import { CommonModule as NrptiCommonModule } from '../../../../common/src/app/common.module';
import { CommunicationsComponent } from './communications.component';
+import { LngMapInfoResolver } from './lng-map-info/lng-map-info-resolver';
@NgModule({
imports: [
BrowserModule,
+ EditorModule,
FormsModule,
ReactiveFormsModule,
- FormsModule,
CommonModule,
GlobalModule,
- ReactiveFormsModule,
NrptiCommonModule,
RouterModule,
NgbModule,
- EditorModule,
],
declarations: [
- CommunicationsComponent
+ CommunicationsComponent,
+ LngMapInfoComponent
+ ],
+ providers: [
+ LngMapInfoResolver
],
- providers: [],
entryComponents: [
CommunicationsComponent
],
diff --git a/angular/projects/admin-nrpti/src/app/communications/lng-map-info/lng-map-info-resolver.ts b/angular/projects/admin-nrpti/src/app/communications/lng-map-info/lng-map-info-resolver.ts
new file mode 100644
index 000000000..413e9b86c
--- /dev/null
+++ b/angular/projects/admin-nrpti/src/app/communications/lng-map-info/lng-map-info-resolver.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import { Resolve } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
+import { FactoryService } from '../../services/factory.service';
+
+@Injectable()
+export class LngMapInfoResolver implements Resolve> {
+ constructor(private factoryService: FactoryService) {}
+
+ resolve(): Observable