Skip to content
This repository has been archived by the owner on Jun 7, 2018. It is now read-only.

Commit

Permalink
Merge branch '#61-Formatting' into #27-DiagnosesOriginal
Browse files Browse the repository at this point in the history
  • Loading branch information
@hardikk08
hardikk08 committed Dec 25, 2017
2 parents 64a4fdd + bb4411e commit ef33442
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
21 changes: 12 additions & 9 deletions omod/src/main/webapp/fragments/overview/complaint.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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) {
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -101,4 +104,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
});
</script>
<script>
</script>
</script>
13 changes: 6 additions & 7 deletions omod/src/main/webapp/fragments/overview/exam.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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) {
Expand Down Expand Up @@ -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 = [];
Expand Down Expand Up @@ -97,4 +96,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
});
</script>
<script>
</script>
</script>
11 changes: 5 additions & 6 deletions omod/src/main/webapp/fragments/overview/famhist.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)
Expand All @@ -100,4 +99,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
});
</script>
<script>
</script>
</script>
9 changes: 4 additions & 5 deletions omod/src/main/webapp/fragments/overview/history.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -97,4 +96,4 @@ recentVisitFactory.fetchVisitEncounterObs(visitId).then(function(data) {
});
</script>
<script>
</script>
</script>

0 comments on commit ef33442

Please sign in to comment.