Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"Sreelekha,Sri Laxmi , Samyuktha | BAH-4105 | Form name/number to not be displayed on patient dashboard display control" #1021

Merged
merged 4 commits into from
Jan 6, 2025
Merged

"Sreelekha,Sri Laxmi , Samyuktha | BAH-4105 | Form name/number to not be displayed on patient dashboard display control" #1021

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
360533c
"Sreelekha,Sri Laxmi | BAH-4105 | Form name/number to not be displaye…
SreelekhaDarsi Nov 7, 2024
f2da9aa
"Sreelekha,Sri Laxmi | BAH-4105 | Form name/number to not be displaye…
SreelekhaDarsi Nov 21, 2024
31d7f06
"Sreelekha | BAH-4105 | Update the config variable for hiding form na…
SreelekhaDarsi Nov 29, 2024
c1c580c
"Sreelekha, Samyuktha | BAH-4105 | Fix. Test cases"
SreelekhaDarsi Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ui/app/common/displaycontrols/observation/services/formRecordTreeBuildService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
'use strict';

angular.module('bahmni.common.displaycontrol.observation')
.service('formRecordTreeBuildService', ['formService', '$window', function (formService, $window) {
.service('formRecordTreeBuildService', ['formService', '$window', 'appService', function (formService, $window, appService) {
var self = this;
self.formBuildForms = [];
self.build = function (bahmniObservations, hasNoHierarchy) {
_.forEach(bahmniObservations, function (obs) {
obs.value = self.preProcessMultiSelectObs(obs.value);
});

formService.getAllForms().then(function (response) {
var formBuildForms = response.data;
var obs = self.createObsGroupForForm(bahmniObservations, formBuildForms);
if (!hasNoHierarchy) {
updateObservationsWithFormDefinition(obs, formBuildForms);
}
});
if (!appService.getAppDescriptor().getConfigValue('hideFormNumber')) {
formService.getAllForms().then(function (response) {
var formBuildForms = response.data;
var obs = self.createObsGroupForForm(bahmniObservations, formBuildForms);
if (!hasNoHierarchy) {
updateObservationsWithFormDefinition(obs, formBuildForms);
}
});
}
};

self.createMultiSelectObservation = function (observations) {
Expand Down
18 changes: 9 additions & 9 deletions ui/test/unit/common/displaycontrols/observation/services/formRecordTreeBuildService.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3238,12 +3238,11 @@ describe("FormRecordTreeBuildService", function () {

let multiSelectObservation = observations[0].value[0];

expect(multiSelectObservation.concept.shortName).toBe("CodedForm");
expect(multiSelectObservation.groupMembers.length).toBe(1);
expect(multiSelectObservation.groupMembers[0].groupMembers.length).toBe(2);
expect(multiSelectObservation.groupMembers[0].type).toBe("multiSelect");
expect(multiSelectObservation.groupMembers[0].groupMembers[0].valueAsString).toBe("Susceptible");
expect(multiSelectObservation.groupMembers[0].groupMembers[1].valueAsString).toBe("Resistant");
expect(multiSelectObservation.concept.shortName).toBe("MD, Medical History");
expect(multiSelectObservation.groupMembers.length).toBe(2);
expect(multiSelectObservation.type).toBe("multiSelect");
expect(multiSelectObservation.groupMembers[0].valueAsString).toBe("Susceptible");
expect(multiSelectObservation.groupMembers[1].valueAsString).toBe("Resistant");
});

it('should return observations with out hierarchy when hasNoHierarchy is true', function () {
Expand Down Expand Up @@ -3357,9 +3356,10 @@ describe("FormRecordTreeBuildService", function () {
formDetailDeferred.resolve(formDetails);
$scope.$apply();

expect(observations[0].value[0].groupMembers.length, 2);
const observationOne = observations[0].value[0].groupMembers[0];
const observationTwo = observations[0].value[0].groupMembers[1];
expect(observations[0].value.length).toBe(2);

const observationOne = observations[0].value[0];
const observationTwo = observations[0].value[1];

expect(observationOne.concept.shortName).toBe("MD, Medical History");
expect(observationOne.formFieldPath).toBe("CodedForm.1/5-0");
Expand Down