-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
✨ Fix merge conflict for @larslemos.
- Loading branch information
Showing
13 changed files
with
360 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,134 @@ | ||
| 'use strict'; | ||
|
|
||
| angular.module('clinic') | ||
| .controller('DashboardController', ["$rootScope", "$scope", "$location", "$stateParams", "patientService", "openmrsPatientMapper", "alertService", function ($rootScope, $scope, $location, $stateParams, patientService, patientMapper, alertService) { | ||
| .controller('DashboardController', ["$rootScope", "$scope", "$location", "$stateParams", "$filter", "patientService", "openmrsPatientMapper", | ||
| "alertService", "encounterService", "observationsService", "commonService", | ||
| function ($rootScope, $scope, $location, $stateParams, $filter, patientService, patientMapper, alertService, encounterService, observationsService, commonService) { | ||
| var patientUuid; | ||
|
|
||
|
|
||
| var patientPrescriptions = []; | ||
|
|
||
| init(); | ||
|
|
||
| function init() { | ||
| patientUuid = $stateParams.patientUuid; | ||
|
|
||
| patientService.get(patientUuid).success(function (data) { | ||
| $rootScope.patient = patientMapper.map(data); | ||
| }); | ||
| } | ||
| $scope.linkSearch = function() { | ||
|
|
||
| $scope.linkSearch = function() { | ||
| $location.url("/search"); // path not hash | ||
| }; | ||
| $scope.linkPatientDetail = function() { | ||
|
|
||
| $scope.linkPatientDetail = function() { | ||
| $location.url("/patient/detail/" + patientUuid + "/demographic"); // path not hash | ||
| }; | ||
| $scope.getAlerts = function () { | ||
|
|
||
| $scope.getAlerts = function () { | ||
| alertService.get(patientUuid).success(function (data) { | ||
| $scope.flags = data.flags; | ||
| }); | ||
| }; | ||
| }]); | ||
| }; | ||
|
|
||
| //TODO: Add patientState Tests, fix followup refresh scope issue | ||
| $scope.initPatientState = function () { | ||
| var labEncounterUuid = "e2790f68-1d5f-11e0-b929-000c29ad1d07"; | ||
| var conceptsLabs = ["e1e68f26-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1d6247e-1d5f-11e0-b929-000c29ad1d07"]; | ||
|
|
||
| var seriesLabs = [$filter('translate')('CLINIC_PATIENT_CD4_COUNT'), | ||
| $filter('translate')('CLINIC_PATIENT_HIV_VIRAL_LOAD')]; | ||
| var name = "labResults"; | ||
|
|
||
| encounterService.getEncountersForEncounterType(patientUuid, labEncounterUuid) | ||
| .success(function (data) { | ||
| var filteredLabs = filterObs(data, conceptsLabs, seriesLabs, name); | ||
| $scope.patientStates = createStateData(filteredLabs, conceptsLabs, seriesLabs, name); | ||
| }); | ||
|
|
||
| //TODO: Fix concept translation reference and synonyms, answers | ||
| var conceptsTreatment = ["e1d9f7a2-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1d9ee10-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1d9ead2-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1de8862-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1d85906-1d5f-11e0-b929-000c29ad1d07", | ||
| "e2404d72-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1d9ef28-1d5f-11e0-b929-000c29ad1d07", | ||
| "e1d83e4e-1d5f-11e0-b929-000c29ad1d07"]; | ||
|
|
||
| var seriesFollowUp = [$filter('translate')('TUBERCULOSIS_PROPHYLAXIS_STARTED'), | ||
| $filter('translate')('ANTIRETROVIRAL PLAN'), | ||
| $filter('translate')('HISTORICAL_DRUG_START_DATE'), | ||
| $filter('translate')('TUBERCULOSIS_DRUG_TREATMENT_START_DATE'), | ||
| $filter('translate')('TUBERCULOSIS_DRUG_TREATMENT_START_DATE'), | ||
| $filter('translate')('ANTIRETROVIRAL_PLAN'), | ||
| $filter('translate')('REGIMEN')]; | ||
|
|
||
| var adultFollowupEncounterUuid = "e278f956-1d5f-11e0-b929-000c29ad1d07";//TODO: create in configuration file | ||
| var childFollowupEncounterUuid = "e278fce4-1d5f-11e0-b929-000c29ad1d07";//TODO: create in configuration file | ||
|
|
||
| var patient = commonService.deferPatient($rootScope.patient); | ||
| var patientPrescriptions = []; | ||
|
|
||
| encounterService.getEncountersForEncounterType(patient.uuid, | ||
| (patient.age.years >= 15) ? adultFollowupEncounterUuid : childFollowupEncounterUuid) | ||
| .success(function (data) { | ||
| patientPrescriptions = commonService.filterGroupReverseFollowupObs("e1d9ef28-1d5f-11e0-b929-000c29ad1d07", data.results); | ||
|
|
||
| var filteredFollowup = filterObs(data, conceptsTreatment, seriesFollowUp, "followUp"); | ||
| var encounterType = ((patient.age.years >= 15) ? adultFollowupEncounterUuid : childFollowupEncounterUuid); | ||
| $scope.patientFollowups = createStateData(filteredFollowup, conceptsTreatment, seriesFollowUp, "followUp"); | ||
|
|
||
|
|
||
| $scope.patientPrescriptions = patientPrescriptions[0]; | ||
| }); | ||
| }; | ||
|
|
||
| var filterObs = function (data, concepts) { | ||
|
|
||
| var nonRetired = encounterService.filterRetiredEncoounters(data.results); | ||
|
|
||
| var sliced = _.slice(nonRetired, 0, 9); | ||
|
|
||
| _.forEach(sliced, function (encounter) { | ||
| encounter.obs = observationsService.filterByList(encounter.obs, concepts); | ||
| }); | ||
| var filtered = _.filter(sliced, function (encounter) { | ||
| return !_.isEmpty(encounter.obs); | ||
| }); | ||
|
|
||
| return filtered; | ||
| }; | ||
|
|
||
| var createStateData = function (encounters, concepts, seriesLabs, state) { | ||
| var patientStates = []; | ||
| $scope[state + "dates"] = []; | ||
| $scope[state + "seriesLabs"] = seriesLabs; | ||
| var data = []; | ||
|
|
||
| _.forEach(encounters, function (encounter) { | ||
| $scope[state + "dates"].push($filter('date')(encounter.encounterDatetime, "MMM d, y")); | ||
| _.forEach(concepts, function (concept, key) { | ||
| var found = _.find(encounter.obs, function (obs) { | ||
| return obs.concept.uuid === concept; | ||
| }); | ||
| if (typeof data[key] === 'undefined') data[key] = []; | ||
| data[key].push((found) ? found.value : null); | ||
| }); | ||
| }); | ||
| var lastDate = $scope[state + "dates"].length - 1; | ||
| $scope.labDate = $scope[state + "dates"][lastDate]; | ||
| $scope[state + "Data"] = data; | ||
| var lastObs = data.length - 1; | ||
|
|
||
| angular.forEach(seriesLabs, function (value, key) { | ||
| var exam = value; | ||
| var result = data[key][lastObs]; | ||
| var state = {"exam": exam, "result": result}; | ||
| patientStates.push(state); | ||
| }); | ||
|
|
||
| return patientStates; | ||
| } | ||
| }]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| <div class="row bg-info-border content-border border-rouded"><!--patient header --> | ||
| <div class="col-md-4 well well-sm panel-marginless-bottom"> | ||
| <p>CD4: <span class="label label-danger">300</span> desde: 2016-5-14</p> | ||
| <p>Carga Viral: <span class="label label-primary">200</span> desde: 2016-5-14</p> | ||
| <p>Estadio OMS: <span class="label label-primary">II</span> desde: 2016-5-14</p> | ||
| </div> | ||
|
|
||
| <div class="col-md-4 well well-sm panel-marginless-bottom" ng-repeat="patientState in patientStates"> | ||
| <p ng-class="capitalize"> {{patientState.exam}} : | ||
| <span class="label label-danger">{{patientState.result}}</span> desde: {{labDate}}</p> | ||
| </div> | ||
| <!-- TODO: Filter correct observations --> | ||
| <div class="col-md-8 well well-sm panel-marginless-bottom"> | ||
| <p>Em TARV: <span class="label label-primary">SIM</span> desde: 2016-5-14</p> | ||
|
|
||
| <p>Estadio OMS: <span class="label label-primary">II</span> desde: 2016-5-14</p> | ||
|
|
||
| <p>Em TARV: <span class="label label-primary">SIM</span> desde: 2016-5-14</p> | ||
| <p>Em tratamento TB: <span class="label label-primary">NÃO</span></p> | ||
| <p>Regime: <span class="label label-primary">ZIDOVUDINE + LAMIVUDINE + NEVIRAPINE</span> desde: 2016-5-14</p> | ||
| </div> | ||
| </div><!--patient header --> | ||
| </div><!--patient header --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.