added 1097 UI to new workspace

PSMRI · Jun 23, 2017 · 62f8c81 · 62f8c81
1 parent e9bc959
commit 62f8c81
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,10 +7,10 @@
         @Email  : [email protected]
     -->
 	<modelVersion>4.0.0</modelVersion>
-    <groupId>com.iemr.common</groupId>
-    <artifactId>demo</artifactId>
-    <version>3.0</version>
-    <name>demo</name>
+    <groupId>com.iemr.helpline1097</groupId>
+    <artifactId>1097-ui</artifactId>
+    <version>1.0</version>
+    <name>1097-ui</name>
     <packaging>war</packaging>
 
     <!-- we could create individual properties similar to variables -->

diff --git a/src/app/closure/closure.component.ts b/src/app/closure/closure.component.ts
@@ -26,8 +26,8 @@ export class ClosureComponent implements OnInit
   ngOnInit ()
   // ngAfterViewInit ()
   {
-    let requestObject = { 'benCallID': this.saved_data.callData.benCallID };
-    this._callServices.getCallSummary( requestObject ).subscribe( response => this.populateCallSummary( response ) );
+    // let requestObject = { 'benCallID': this.saved_data.callData.benCallID };
+    // this._callServices.getCallSummary( requestObject ).subscribe( response => this.populateCallSummary( response ) );
   }
 
   // @Input()
@@ -38,8 +38,10 @@ export class ClosureComponent implements OnInit
   }
   populateCallSummary ( response: any )
   {
+    this.summaryList = [];
     console.log( JSON.stringify( response ) );
     this.summaryList = response;
+    this.showCallSummary = false;
     if ( this.summaryList.length > 0 )
     {
       this.showCallSummary = true;

diff --git a/src/app/innerpage/innerpage.component.html b/src/app/innerpage/innerpage.component.html
@@ -133,19 +133,17 @@
                         <div id="myCarousel" class="carousel slide" data-ride="carousel" data-interval="false" data-wrap="false">
                             <div class="carousel-inner">
                                 <div class="item active">
-                                    <app-beneficiary-registration (onBenRegDataSelect)="getSelectedBenDetails($event); coservice.startCOService(); 
-                                    updatebeneficiary.setBeneficiaryData(); closure.onView();" (StartNewCall)="startCall($event)"
-                                        #registration></app-beneficiary-registration>
+                                    <app-beneficiary-registration (onBenRegDataSelect)="getSelectedBenDetails($event); coservice.startCOService(); updatebeneficiary.PopulateUpdateData(); closure.onView();"
+                                        (StartNewCall)="startCall()" #registration></app-beneficiary-registration>
                                 </div>
                                 <div class="item ">
-                                    <app-co-services (beneficiarySelected)="startCOService($event)" (serviceGiven)="updateServiceProvided($event); closure.onView();"
-                                        #coservice></app-co-services>
+                                    <app-co-services (beneficiarySelected)="startCOService()" (serviceGiven)="updateServiceProvided(); closure.onView();" #coservice></app-co-services>
                                 </div>
                                 <div class="item ">
-                                    <app-updates-from-beneficiary (beneficiarySelected)="setBeneficiaryData($event)" #updatebeneficiary></app-updates-from-beneficiary>
+                                    <app-updates-from-beneficiary (beneficiarySelected)="PopulateUpdateData()" #updatebeneficiary></app-updates-from-beneficiary>
                                 </div>
                                 <div class="item ">
-                                    <app-closure (beneficiarySelected)="onView($event)" (serviceProvided)="onView($event)" (callClosed)="startNewCall($event); registration.startNewCall();"
+                                    <app-closure (beneficiarySelected)="onView()" (serviceProvided)="onView()" (callClosed)="startNewCall(); registration.startNewCall();"
                                         #closure></app-closure>
                                 </div>
                             </div>

diff --git a/src/app/innerpage/innerpage.component.ts b/src/app/innerpage/innerpage.component.ts
@@ -152,9 +152,9 @@ export class InnerpageComponent implements OnInit
 	{
 		console.log( 'data recieved', data, data.beneficiaryRegID );
 		this.beneficiaryNotSelected = false;
-		this.updateClosureData.emit( null );
-		this.serviceProvided.emit( null );
-		this.beneficiarySelected.emit( null );
+		this.updateClosureData.emit();
+		this.serviceProvided.emit();
+		this.beneficiarySelected.emit();
 		this.selectedBenData.id = "BEN" + data.beneficiaryRegID;
 		this.selectedBenData.fname = data.firstName;
 		this.selectedBenData.lname = data.lastName;