From bb4411ed945994e7a13678d910ddb370c4a92d63 Mon Sep 17 00:00:00 2001
From: hardikk08 <hardiknagda12@gmail.com>
Date: Thu, 14 Dec 2017 16:43:27 +0530
Subject: [PATCH] Formatting for 4 frags

Complaints, Examination, Family History and Medical History now have html rendering. Any html tag from android side will be rendered on OpenMRS.
---
 .../webapp/fragments/overview/complaint.gsp   | 21 +++++++++++--------
 .../main/webapp/fragments/overview/exam.gsp   | 13 ++++++------
 .../webapp/fragments/overview/famhist.gsp     | 11 +++++-----
 .../webapp/fragments/overview/history.gsp     |  9 ++++----
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/omod/src/main/webapp/fragments/overview/complaint.gsp b/omod/src/main/webapp/fragments/overview/complaint.gsp
index 08758d3..6c3149b 100644
--- a/omod/src/main/webapp/fragments/overview/complaint.gsp
+++ b/omod/src/main/webapp/fragments/overview/complaint.gsp
@@ -8,9 +8,10 @@
 	<table>
 		<tr ng-repeat="item in visitEncounters | orderBy:'-encounterDatetime' | filter : 'ADULTINITIAL'">
 			<td width="100px" style="border: none">{{item.display | dateFormat | date: 'dd.MMM.yyyy'}}</td>
-	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'CURRENT COMPLAINT' | orderBy:'-display'">
-                	    {{ob.display | limitTo : ob.display.length : '19' }}
+	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'CURRENT COMPLAINT' | orderBy:'-display'" ng-bind-html = "ob.display | limitTo : ob.display.length : '19'">
+
                 	</td>
+
 		</tr>
 	</table>
 	</div>
@@ -23,7 +24,7 @@
 </div>
 
 <script>
-var app = angular.module('complaintSummary', ['recentVisit']);
+var app = angular.module('complaintSummary', ['recentVisit', 'ngSanitize']);
 
 app.filter('dateFormat', function() {
  return function(text) {
@@ -47,25 +48,26 @@ return function(text) {
     };
 });
 
-app.controller('ComplaintSummaryController', function(\$scope, \$http, recentVisitFactory) {
+app.controller('ComplaintSummaryController',  function(\$scope, \$http, recentVisitFactory, \$sce) {
+\$scope.text = "Hey <h1> This is HTML</h1>";
 var path = window.location.search;
 var i = path.indexOf("visitId=");
 var visitId = path.substr(i + 8, path.length);
 \$scope.visitEncounters = [];
-\$scope.visitObs = []; 
+\$scope.visitObs = [];
 \$scope.vitalsData = [];
 \$scope.vitalsPresent = true;
 recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 						\$scope.visitDetails = data.data;
-						\$scope.visitEncounters = data.data.encounters; 
+						\$scope.visitEncounters = data.data.encounters;
 						if(\$scope.visitEncounters.length !== 0) {
 						\$scope.vitalsPresent = true;
 					}
 					}, function(error) {
 						console.log(error);
 					});
-					
-					
+
+
     var patient = "${ patient.uuid }";
     \$scope.objects = [];
     var url = "/" + OPENMRS_CONTEXT_PATH + "/ws/rest/v1/encounter";
@@ -89,6 +91,7 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 			\$http.get(item)
 			      .then(function(response) {
 		  		   \$scope.objects.push(response.data);
+						 //\$scope.trustedHtml = \$sce.trustAsHtml(item);
 			      }, function(response) {
 	       			   \$scope.error = "Get Encounter Observations Went Wrong";
 	       		           \$scope.statuscode = response.status;
@@ -101,4 +104,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 });
 </script>
 <script>
-</script>  
+</script>
diff --git a/omod/src/main/webapp/fragments/overview/exam.gsp b/omod/src/main/webapp/fragments/overview/exam.gsp
index d9f85fe..f9d50f5 100644
--- a/omod/src/main/webapp/fragments/overview/exam.gsp
+++ b/omod/src/main/webapp/fragments/overview/exam.gsp
@@ -8,8 +8,7 @@
 	<table>
 		<tr ng-repeat="item in visitEncounters | orderBy:'-encounterDatetime' | filter : 'ADULTINITIAL'">
 			<td width="100px" style="border: none">{{item.display | dateFormat | date: 'dd.MMM.yyyy'}}</td>
-	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'PHYSICAL EXAMINATION' | orderBy:'-display'">
-                	    {{ob.display | limitTo : ob.display.length : '22' }}
+	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'PHYSICAL EXAMINATION' | orderBy:'-display'" ng-bind-html = "ob.display | limitTo : ob.display.length : '22'">
                 	</td>
 		</tr>
 	</table>
@@ -20,7 +19,7 @@
 </div>
 
 <script>
-var app = angular.module('examSummary', ['recentVisit']);
+var app = angular.module('examSummary', ['recentVisit', 'ngSanitize']);
 
 app.filter('dateFormat', function() {
 return function(text) {
@@ -48,19 +47,19 @@ var path = window.location.search;
 var i = path.indexOf("visitId=");
 var visitId = path.substr(i + 8, path.length);
 \$scope.visitEncounters = [];
-\$scope.visitObs = []; 
+\$scope.visitObs = [];
 \$scope.vitalsData = [];
 \$scope.vitalsPresent = true;
 recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 						\$scope.visitDetails = data.data;
-						\$scope.visitEncounters = data.data.encounters; 
+						\$scope.visitEncounters = data.data.encounters;
 						if(\$scope.visitEncounters.length !== 0) {
 						\$scope.vitalsPresent = true;
 					}
 					}, function(error) {
 						console.log(error);
 					});
-					
+
 
     var patient = "${ patient.uuid }";
 	\$scope.objects = [];
@@ -97,4 +96,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 });
 </script>
 <script>
-</script>  
+</script>
diff --git a/omod/src/main/webapp/fragments/overview/famhist.gsp b/omod/src/main/webapp/fragments/overview/famhist.gsp
index be66203..63a8c1f 100644
--- a/omod/src/main/webapp/fragments/overview/famhist.gsp
+++ b/omod/src/main/webapp/fragments/overview/famhist.gsp
@@ -8,8 +8,7 @@
 	<table>
 		<tr ng-repeat="item in visitEncounters | orderBy:'-encounterDatetime' | filter : 'ADULTINITIAL'">
 			<td width="100px" style="border: none">{{item.display | dateFormat | date: 'dd.MMM.yyyy'}}</td>
-	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'FAMILY HISTORY'">
-                	    {{ ob.display | limitTo : ob.display.length : '16' }}
+	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'FAMILY HISTORY'" ng-bind-html = "ob.display | limitTo : ob.display.length : '16'">
                 	</td>
 		</tr>
 	</table>
@@ -48,12 +47,12 @@ var path = window.location.search;
 var i = path.indexOf("visitId=");
 var visitId = path.substr(i + 8, path.length);
 \$scope.visitEncounters = [];
-\$scope.visitObs = []; 
+\$scope.visitObs = [];
 \$scope.vitalsData = [];
 \$scope.vitalsPresent = true;
 recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 						\$scope.visitDetails = data.data;
-						\$scope.visitEncounters = data.data.encounters; 
+						\$scope.visitEncounters = data.data.encounters;
 						if(\$scope.visitEncounters.length !== 0) {
 						\$scope.vitalsPresent = true;
 					}
@@ -82,7 +81,7 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 	        	    url2 += value;
                 	\$scope.url2.push(url2);
 		});
-                
+
 		\$scope.obs = \$scope.url2.length;
 		angular.forEach(\$scope.url2, function(item){
 			\$http.get(item)
@@ -100,4 +99,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 });
 </script>
 <script>
-</script>  
+</script>
diff --git a/omod/src/main/webapp/fragments/overview/history.gsp b/omod/src/main/webapp/fragments/overview/history.gsp
index 3ce6b4e..4a5c261 100644
--- a/omod/src/main/webapp/fragments/overview/history.gsp
+++ b/omod/src/main/webapp/fragments/overview/history.gsp
@@ -8,8 +8,7 @@
 	<table>
 		<tr ng-repeat="item in visitEncounters | orderBy:'-encounterDatetime' | filter : 'ADULTINITIAL'">
 			<td width="100px" style="border: none">{{item.display | dateFormat | date: 'dd.MMM.yyyy'}}</td>
-	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'MEDICAL HISTORY' | orderBy:'-display'">
-                	    {{ob.display | limitTo : ob.display.length : '17' }}
+	                <td style="border:none" ng-repeat="ob in item.obs | filter : 'MEDICAL HISTORY' | orderBy:'-display'" ng-bind-html = "ob.display | limitTo : ob.display.length : '17'">
                 	</td>
 		</tr>
 	</table>
@@ -48,12 +47,12 @@ var path = window.location.search;
 var i = path.indexOf("visitId=");
 var visitId = path.substr(i + 8, path.length);
 \$scope.visitEncounters = [];
-\$scope.visitObs = []; 
+\$scope.visitObs = [];
 \$scope.vitalsData = [];
 \$scope.vitalsPresent = true;
 recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 						\$scope.visitDetails = data.data;
-						\$scope.visitEncounters = data.data.encounters; 
+						\$scope.visitEncounters = data.data.encounters;
 						if(\$scope.visitEncounters.length !== 0) {
 						\$scope.vitalsPresent = true;
 					}
@@ -97,4 +96,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
 });
 </script>
 <script>
-</script>  
+</script>