Skip to content

Commit 15ffc32

Browse files
"Sreelekha, Sri Laxmi, Samyuktha | BAH-4105 | Add. Toggle to hide Form name on patient dashboard display control" (#1021)
* "Sreelekha,Sri Laxmi | BAH-4105 | Form name/number to not be displayed on patient dashboard display control" * "Sreelekha,Sri Laxmi | BAH-4105 | Form name/number to not be displayed on patient dashboard display control" * "Sreelekha | BAH-4105 | Update the config variable for hiding form name " * "Sreelekha, Samyuktha | BAH-4105 | Fix. Test cases"
1 parent 5ef2d58 commit 15ffc32

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

ui/app/common/displaycontrols/observation/services/formRecordTreeBuildService.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
'use strict';
22

33
angular.module('bahmni.common.displaycontrol.observation')
4-
.service('formRecordTreeBuildService', ['formService', '$window', function (formService, $window) {
4+
.service('formRecordTreeBuildService', ['formService', '$window', 'appService', function (formService, $window, appService) {
55
var self = this;
66
self.formBuildForms = [];
77
self.build = function (bahmniObservations, hasNoHierarchy) {
88
_.forEach(bahmniObservations, function (obs) {
99
obs.value = self.preProcessMultiSelectObs(obs.value);
1010
});
11-
12-
formService.getAllForms().then(function (response) {
13-
var formBuildForms = response.data;
14-
var obs = self.createObsGroupForForm(bahmniObservations, formBuildForms);
15-
if (!hasNoHierarchy) {
16-
updateObservationsWithFormDefinition(obs, formBuildForms);
17-
}
18-
});
11+
if (!appService.getAppDescriptor().getConfigValue('hideFormName')) {
12+
formService.getAllForms().then(function (response) {
13+
var formBuildForms = response.data;
14+
var obs = self.createObsGroupForForm(bahmniObservations, formBuildForms);
15+
if (!hasNoHierarchy) {
16+
updateObservationsWithFormDefinition(obs, formBuildForms);
17+
}
18+
});
19+
}
1920
};
2021

2122
self.createMultiSelectObservation = function (observations) {

ui/test/unit/common/displaycontrols/observation/services/formRecordTreeBuildService.spec.js

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,29 @@ describe("FormRecordTreeBuildService", function () {
1111
var allFormsDeferred;
1212
var formTranslateDeferred;
1313
var formTranslationsDetails;
14+
var appService = jasmine.createSpyObj('appService', ['getAppDescriptor']);
15+
16+
var mockAppDescriptor = jasmine.createSpyObj('appService', ['getConfigValue']);
17+
mockAppDescriptor.getConfigValue.and.returnValue(undefined);
18+
19+
var mockAppService = jasmine.createSpyObj('appDescriptor', ['getAppDescriptor']);
20+
mockAppService.getAppDescriptor.and.returnValue(mockAppDescriptor);
1421

1522
beforeEach(module("bahmni.common.displaycontrol.observation"));
16-
beforeEach(inject(function (_formRecordTreeBuildService_, _$q_, _$rootScope_, _formService_) {
23+
beforeEach(function () {
24+
appService.getAppDescriptor.and.returnValue({
25+
getConfigValue: function (key) {
26+
if (key === 'hideFormName') {
27+
return false;
28+
}
29+
}
30+
});
31+
32+
module(function ($provide) {
33+
$provide.value('appService', appService);
34+
});
35+
36+
inject(function (_formRecordTreeBuildService_, _$q_, _$rootScope_, _formService_) {
1737
formRecordTreeBuildService = _formRecordTreeBuildService_;
1838
formService = _formService_;
1939
$q = _$q_;
@@ -105,7 +125,8 @@ describe("FormRecordTreeBuildService", function () {
105125
formDetailDeferred = $q.defer();
106126
allFormsDeferred = $q.defer();
107127
formTranslateDeferred = $q.defer();
108-
}));
128+
});
129+
});
109130

110131
it("should construct obs group for single observation from form", function () {
111132
var obsOne = {

0 commit comments

Comments
 (0)