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

Jump to bottom

RA-1628:Condition List:Voiding/Deleting condition should delete entire history #276

Merged
merged 1 commit into from Jan 31, 2020
Merged

RA-1628:Condition List:Voiding/Deleting condition should delete entire history #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion omod/src/main/webapp/pages/conditionlist/manageConditions.gsp
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ ${ui.includeFragment("coreapps", "patientHeader", [patient: patient])}
<i class="icon-pencil edit-action" title="${ui.message("coreapps.conditionui.editCondition","")}"
ng-click="redirectToEditCondition('${ ui.pageLink("coreapps/conditionlist", "editCondition", [patientId: patient.uuid, returnUrl: returnUrl]) }',condition) " ng-if="condition.voided===false"></i>
<i class="icon-remove delete-action" title="${ui.message("coreapps.delete")}"
ng-click="conditionConfirmation(condition)" ng-if="condition.voided===false"></i>
ng-click="conditionConfirmation(conditionHistory.conditions)" ng-if="condition.voided===false"></i>
<button style="background-color: #cccccc;border: none; color: black; padding: 5px;font-size: 10px; margin: 2px 2px; border-radius: 4px;"
ng-click="activateCondition(condition)" ng-if="condition.status==='INACTIVE' && condition.voided===false">Set Active</button>
<button style="background-color: #cccccc;border: none; color: black; padding: 5px;font-size: 10px; margin: 2px 2px; border-radius: 4px;"
Expand Down
21 changes: 12 additions & 9 deletions ...rc/main/webapp/resources/scripts/conditionlist/controllers/manageconditions.controller.js
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ ManageConditionsController.$inject = ['$scope', 'RestfulService', 'CommonFunctio
function ManageConditionsController($scope, RestfulService, CommonFunctions) {
var self = this;
$scope.conditions = [];
$scope.conditionToBeRemoved =null;
$scope.conditionListToBeRemoved =null;
$scope.tabs = ["ACTIVE", "INACTIVE"];

// this is required inorder to initialize the Restangular service
Expand Down Expand Up @@ -40,23 +40,26 @@ function ManageConditionsController($scope, RestfulService, CommonFunctions) {
}

self.removeCondition = self.removeCondition || function () {
$scope.conditionToBeRemoved.voided = true;
$scope.conditionToBeRemoved.endDate = new Date();
self.saveCondition($scope.conditionToBeRemoved);
var dialog = document.getElementById("remove-condition-dialog");
dialog.style.display = "none";
var conditions = $scope.conditionListToBeRemoved;
for(i=0;i<conditions.length;i++){
conditions[i].voided = true;
conditions[i].endDate = new Date();
self.saveCondition(conditions[i]);
var dialog = document.getElementById("remove-condition-dialog");
dialog.style.display = "none";
}
}

self.redirectToEditCondition = self.redirectToEditCondition || function(baselink,condition) {
window.location= baselink+'conditionUuid=' + JSON.stringify(condition.uuid)+'&';
}

self.conditionConfirmation = self.conditionConfirmation || function(condition) {
self.conditionConfirmation = self.conditionConfirmation || function(conditionList) {
var dialog = document.getElementById("remove-condition-dialog");
dialog.style.display = "block";
$scope.conditionToBeRemoved = condition;
$scope.conditionListToBeRemoved = conditionList;
var setText = document.getElementById("removeConditionMessage");
setText.innerHTML = "Are you sure you want to remove condition: <b>"+$scope.conditionToBeRemoved.concept.name+"</b> for this patient";
setText.innerHTML = "Are you sure you want to remove condition: <b>"+$scope.conditionListToBeRemoved.concept.name+"</b> for this patient";
}

self.cancelDeletion = self.cancelDeletion || function(){
Expand Down