Merge pull request #199 from amida-tech/post-demo-fixes

Post demo fixes
amida-tech · Aug 31, 2014 · 24f7035 · 24f7035
2 parents cf46e48 + 204347c
commit 24f7035
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 17 deletions.
diff --git a/client/src/app/matching/reconciliation/review/review.js b/client/src/app/matching/reconciliation/review/review.js
@@ -9,8 +9,25 @@ angular.module('dre.match.review_new', ['directives.matchingObjects'])
     }
 ])
 
-.controller('matchReviewCtrl', ['$scope', '$http', '$routeParams', '$location', 'getNotifications', 'recordFunctions',
-    function ($scope, $http, $routeParams, $location, getNotifications, recordFunctions) {
+.controller('matchReviewCtrl', ['$rootScope', '$scope', '$http', '$routeParams', '$location', 'getNotifications', 'recordFunctions',
+    function ($rootScope, $scope, $http, $routeParams, $location, getNotifications, recordFunctions) {
+
+        $scope.titles = {
+            allergies: "Allergies",
+            encounters: "Encounters",
+            immunizations: "Immunizations",
+            medications: "Medications",
+            problems: "Problem List",
+            procedures: "Procedures",
+            vitals: "Vital Signs",
+            insurance: "Insurance",
+            claims: "Claims",
+            results: "Results",
+            social_history: "Social History"
+        };
+
+
+
 
         //getting parameters from route/url
         $scope.section = $routeParams["section"];
@@ -198,6 +215,12 @@ angular.module('dre.match.review_new', ['directives.matchingObjects'])
             }).
             success(function (data, status, headers, config) {
                 //Note:  Pill count not refreshing.
+
+
+                getNotifications.getUpdate(function(err, notifications) {
+                          $rootScope.notifications = notifications;
+                });
+
                 $location.path("match/reconciliation");
             }).
             error(function (data, status, headers, config) {

diff --git a/client/src/app/matching/reconciliation/review/review.tpl.html b/client/src/app/matching/reconciliation/review/review.tpl.html
@@ -4,7 +4,7 @@
 <div class="col-md-9">
     <div class="col-md-12">
         <br/>
-        <span class="lead"><span style="text-transform:capitalize;">{{match.entry_type}}</span> Match</span>
+        <span class="lead"><span style="text-transform:capitalize;">{{titles[match.entry_type]}}</span> Match</span>
         <span class="pull-right">
             <a href="/#/match/reconciliation"> back
                 <i class="fa fa-undo fa-1x"></i> 

diff --git a/client/src/app/record/components/allergies.tpl.html b/client/src/app/record/components/allergies.tpl.html
@@ -48,7 +48,6 @@ <h4 class="modal-title">Record Sources</h4>
 
             <a data-toggle="collapse" data-parent="#accordian-allergy" data-target="#collapse{{$index}}">
                 <div class="panel-title" style="cursor:pointer;">
-                    <span class="glyphicon glyphicon-exclamation-sign"></span>
                     <span style="text-transform:uppercase;">{{entry.name}}</span>
                     <span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
                 </div>

diff --git a/client/src/app/record/components/claims.tpl.html b/client/src/app/record/components/claims.tpl.html
@@ -49,7 +49,6 @@ <h4 class="modal-title">Record Sources</h4>
 
             <a data-toggle="collapse" data-parent="#accordian-claims" data-target="#claim-{{$index}}">
                 <div class="panel-title" style="cursor:pointer;">
-                    <span class="glyphicon glyphicon-exclamation-sign"></span>
                     <span style="text-transform:uppercase;">{{claim.payer[0]}}</span>
                     <span style="text-transform:uppercase;">- {{claim.number}}</span>
                     <span class="pull-right" style="text-transform:uppercase;">{{claim.date_time.low.displayDate}}</span>

diff --git a/client/src/app/record/components/encounters.tpl.html b/client/src/app/record/components/encounters.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-encounters" data-target="#encounter-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/immunizations.tpl.html b/client/src/app/record/components/immunizations.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-immunizations" data-target="#immunization-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}} - {{entry.status}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/insurance.tpl.html b/client/src/app/record/components/insurance.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-insurance" data-target="#insurance-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{insurance.name}} </span>
 					<span class="pull-right" style="text-transform:uppercase;">{{insurance.date_time.low.displayDate}}</span>
 				</div>

diff --git a/client/src/app/record/components/medications.tpl.html b/client/src/app/record/components/medications.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-medications" data-target="#medication-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/payers.tpl.html b/client/src/app/record/components/payers.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-plans" data-target="#plan-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/plan_of_care.tpl.html b/client/src/app/record/components/plan_of_care.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-plans" data-target="#plan-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/problems.tpl.html b/client/src/app/record/components/problems.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-problems" data-target="#problem-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;" ng-show="entry.negation_indicator">NO </span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span style="text-transform:uppercase;" ng-show="entry.negation_indicator">FOUND</span>

diff --git a/client/src/app/record/components/procedures.tpl.html b/client/src/app/record/components/procedures.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-procedures" data-target="#procedure-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}} - {{entry.status}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/results.tpl.html b/client/src/app/record/components/results.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-results" data-target="#result-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/social_history.tpl.html b/client/src/app/record/components/social_history.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-social_history" data-target="#social_history-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/app/record/components/vitals.tpl.html b/client/src/app/record/components/vitals.tpl.html
@@ -38,7 +38,6 @@ <h4 class="modal-title">Record Sources</h4>
 
 			<a data-toggle="collapse" data-parent="#accordian-vitals" data-target="#vital-{{$index}}">
 				<div class="panel-title" style="cursor:pointer;">
-					<span class="glyphicon glyphicon-exclamation-sign"></span>
 					<span style="text-transform:uppercase;">{{entry.name}}</span>
 					<span class="pull-right" style="text-transform:uppercase;">{{entry.attribute}}</span>
 				</div>

diff --git a/client/src/common/services/recordFunctions.js b/client/src/common/services/recordFunctions.js
@@ -311,7 +311,7 @@ angular.module('services.recordFunctions', [])
                     if (entries[i].observation.date_time) {
                         entries[i].attribute = this.formatDateTime(entries[i].observation.date_time);
                     } else {
-                        entries[i].attribute = "";
+                        entries[i].attribute = "DATE NOT REPORTED";
                     }