OE-13322- Fixed issue that user cannot remove an unsaved block when a…

…ll the meds are administered (#8319)
AppertaFoundation · Aug 19, 2022 · 0629a62 · 0629a62
1 parent ca18390
commit 0629a62
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/protected/modules/OphCiExamination/widgets/js/DrugAdministration.js b/protected/modules/OphCiExamination/widgets/js/DrugAdministration.js
@@ -165,7 +165,13 @@ OpenEyes.OphCiExamination = OpenEyes.OphCiExamination || {};
         }
         if(!add_meds_btn_disabled && !add_preset_btn_disabled){
             $(parent_selector).each(function(i, section){
-                if(controller.isAllMedicationAdministered($(this))) {
+                // if the assignment_id has value, that means it is a saved record
+                const has_assignment_id_value = $(section).find('input[name$="[assignment_id]"]').val() ? true : false;
+
+                const is_all_meds_administered = controller.isAllMedicationAdministered($(this));
+
+                // hide the after confirm elements only when it is a saved record and its medications are administered
+                if(has_assignment_id_value && is_all_meds_administered) {
                     $(this).find('.js-after-confirm').hide();
                 } else {
                     $(this).find('.js-after-confirm').show();
@@ -178,6 +184,7 @@ OpenEyes.OphCiExamination = OpenEyes.OphCiExamination || {};
         $(add_meds_btn_ctn_selector).find('button#js-add-preset-order').prop('disabled', add_preset_btn_disabled);
         $(add_meds_btn_ctn_selector).find('button#js-add-medications').prop('disabled', add_meds_btn_disabled);
     }
+
     DrugAdministrationController.prototype.isAllMedicationAdministered = function($parent_block) {
         const administer_btn_selector = `.${this.options.administerBtnClass}`;
         return $parent_block.find('tbody tr').length === $parent_block.find(`tbody tr ${administer_btn_selector}:checked`).length