').text(remark).html();
+ var safeAttr = function(val) {
+ return String(val || '')
+ .replace(/&/g, '&')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''')
+ .replace(//g, '>');
+ };
+
+ var trClass = (currentEditId > 0 && currentEditId === id) ? ' class="table-warning"' : '';
+
+ html += '
'
+ + '' + safeName + ' '
+ + ''
+ + ''
+ + ''
+ + 'Edit '
+ + 'Remove '
+ + '
'
+ + ' '
+ ' ';
});
$tbody.html(html);
}
+ $(document).on('click', '.btn-edit-final-diagnosis-row', function() {
+ var $btn = $(this);
+ var id = parseInt($btn.data('id') || '0', 10);
+ if (id <= 0) return;
+
+ var name = String($btn.attr('data-name') || $btn.data('name') || '').trim();
+ var remark = String($btn.attr('data-remark') || $btn.data('remark') || '').trim();
+ var code = parseInt($btn.attr('data-code') || $btn.data('code') || '0', 10);
+ var snomedId = String($btn.attr('data-snomed-id') || $btn.data('snomed-id') || '').trim();
+ var snomedTerm = String($btn.attr('data-snomed-term') || $btn.data('snomed-term') || '').trim();
+
+ if (!name) {
+ var $tr = $btn.closest('tr');
+ name = $tr.find('.diag-report-text').text().trim();
+ remark = $tr.find('.diag-remark-text').text().trim();
+ }
+
+ $('#diagnosis_edit_id').val(id);
+ $('#new_diagnosis_name').val(name);
+ $('#new_diagnosis_remark').val(remark);
+ $('#new_diagnosis_master_code').val(code);
+ $('#new_diagnosis_snomed_concept_id').val(snomedId);
+ $('#new_diagnosis_snomed_term').val(snomedTerm);
+
+ $('#discharge_final_diagnosis_tbody tr').removeClass('table-warning');
+ $('#diag_row_' + id).addClass('table-warning');
+
+ $('#btn_add_final_diagnosis_row')
+ .html('
Update')
+ .removeClass('btn-primary')
+ .addClass('btn-warning fw-bold');
+ $('#btn_cancel_final_diagnosis_edit').show();
+
+ setSectionStatus('discharge_diagnosis_status', 'Editing diagnosis: update details and click Update.', 'info');
+ $('#new_diagnosis_name').trigger('focus');
+ });
+
+ $(document).on('click', '#btn_cancel_final_diagnosis_edit', function() {
+ resetFinalDiagnosisEditMode();
+ setSectionStatus('discharge_diagnosis_status', 'Edit cancelled.', 'info');
+ });
+
$(document).on('click', '#btn_add_final_diagnosis_row', function() {
+ if (isDiagnosisSubmitting) {
+ return false;
+ }
+
var form = getDischargeForm();
var name = ($('#new_diagnosis_name').val() || '').toString().trim();
if (!name) {
setSectionStatus('discharge_diagnosis_status', 'Enter diagnosis before adding.', 'error');
- return;
+ $('#new_diagnosis_name').trigger('focus');
+ return false;
}
+
+ var editId = parseInt($('#diagnosis_edit_id').val() || '0', 10);
+ var isEdit = (editId > 0);
+
+ // Client-side duplicate check to prevent duplicates on slow network
+ var normalizedName = name.toLowerCase();
+ var isDuplicate = false;
+ $('#discharge_final_diagnosis_tbody tr').each(function() {
+ var rowId = parseInt($(this).find('.btn-edit-final-diagnosis-row').data('id') || $(this).find('.btn-remove-final-diagnosis-row').data('id') || 0, 10);
+ if (isEdit && rowId === editId) {
+ return; // Skip self when updating
+ }
+ var existingName = $(this).find('.diag-report-text').text().trim().toLowerCase();
+ if (existingName && existingName === normalizedName) {
+ isDuplicate = true;
+ return false;
+ }
+ });
+
+ if (isDuplicate) {
+ var dupMsg = isEdit
+ ? 'Another row with this diagnosis name already exists.'
+ : 'Diagnosis "' + name + '" is already in the list.';
+ setSectionStatus('discharge_diagnosis_status', dupMsg, 'warning');
+ return false;
+ }
+
var remark = ($('#new_diagnosis_remark').val() || '').toString().trim();
var masterCode = parseInt($('#new_diagnosis_master_code').val() || '0', 10);
var snomedConceptId = ($('#new_diagnosis_snomed_concept_id').val() || '').toString().trim();
@@ -4731,7 +4870,9 @@ $historyFields = [
var csrf = getCsrfPair(form);
var payload = {
- action: 'add_diagnosis',
+ action: isEdit ? 'update_diagnosis' : 'add_diagnosis',
+ diagnosis_row_id: editId,
+ diagnosis_edit_id: editId,
new_diagnosis_name: name,
new_diagnosis_remark: remark,
new_diagnosis_master_code: masterCode,
@@ -4741,26 +4882,48 @@ $historyFields = [
};
payload[csrf.name] = csrf.value;
+ // Lock UI against slow network multiple submissions
+ isDiagnosisSubmitting = true;
+ var $btn = $('#btn_add_final_diagnosis_row');
+ var originalHtml = isEdit ? '
Update' : '+ADD';
+ $btn.prop('disabled', true).html('
' + (isEdit ? 'Updating...' : 'Adding...'));
+ $('#btn_cancel_final_diagnosis_edit').prop('disabled', true);
+ $('#new_diagnosis_name, #new_diagnosis_remark').prop('readonly', true);
+
$.post($(form).attr('action') || window.location.href, payload, function(data) {
updateFormCsrf(form, data);
if (data && data.diagnosisRows) {
renderFinalDiagnosisRows(data.diagnosisRows);
}
- $('#new_diagnosis_name').val('');
- $('#new_diagnosis_remark').val('');
- $('#new_diagnosis_master_code').val('0');
- $('#new_diagnosis_snomed_concept_id').val('');
- $('#new_diagnosis_snomed_term').val('');
- setSectionStatus('discharge_diagnosis_status', (data && data.notice) ? data.notice : 'Diagnosis row added.', 'success');
+ resetFinalDiagnosisEditMode();
+ var notice = (data && data.notice) ? data.notice : (isEdit ? 'Diagnosis row updated.' : 'Diagnosis row added.');
+ var noticeType = (data && data.noticeType) ? data.noticeType : (data && data.update ? 'success' : 'warning');
+ setSectionStatus('discharge_diagnosis_status', notice, noticeType);
+ $('#new_diagnosis_name').trigger('focus');
}, 'json').fail(function() {
- setSectionStatus('discharge_diagnosis_status', 'Unable to add diagnosis row.', 'error');
+ setSectionStatus('discharge_diagnosis_status', isEdit ? 'Unable to update diagnosis row.' : 'Unable to add diagnosis row.', 'error');
+ }).always(function() {
+ isDiagnosisSubmitting = false;
+ $btn.prop('disabled', false).html(originalHtml);
+ $('#btn_cancel_final_diagnosis_edit').prop('disabled', false);
+ $('#new_diagnosis_name, #new_diagnosis_remark').prop('readonly', false);
+ if ($('#diagnosis_edit_id').val() === '0') {
+ $btn.html('+ADD').removeClass('btn-warning fw-bold').addClass('btn-primary');
+ }
});
});
$(document).on('click', '.btn-remove-final-diagnosis-row', function() {
+ var $btn = $(this);
+ if ($btn.prop('disabled')) return;
var form = getDischargeForm();
- var id = parseInt($(this).data('id') || '0', 10);
+ var id = parseInt($btn.data('id') || '0', 10);
if (id <= 0) return;
+
+ if (parseInt($('#diagnosis_edit_id').val() || '0', 10) === id) {
+ resetFinalDiagnosisEditMode();
+ }
+
var diagnosisRemarkText = ($('#diagnosis_remark').val() || '').toString().trim();
var csrf = getCsrfPair(form);
var payload = {
@@ -4770,13 +4933,27 @@ $historyFields = [
};
payload[csrf.name] = csrf.value;
+ $btn.prop('disabled', true).text('Removing...');
+
$.post($(form).attr('action') || window.location.href, payload, function(data) {
updateFormCsrf(form, data);
if (data && data.diagnosisRows) {
renderFinalDiagnosisRows(data.diagnosisRows);
}
- setSectionStatus('discharge_diagnosis_status', (data && data.notice) ? data.notice : 'Diagnosis row removed.', 'success');
- }, 'json');
+ var notice = (data && data.notice) ? data.notice : 'Diagnosis row removed.';
+ var noticeType = (data && data.noticeType) ? data.noticeType : 'success';
+ setSectionStatus('discharge_diagnosis_status', notice, noticeType);
+ }, 'json').fail(function() {
+ $btn.prop('disabled', false).text('Remove');
+ setSectionStatus('discharge_diagnosis_status', 'Unable to remove diagnosis row.', 'error');
+ });
+ });
+
+ $(document).on('keydown', '#new_diagnosis_remark', function(e) {
+ if (e.key === 'Enter') {
+ e.preventDefault();
+ $('#btn_add_final_diagnosis_row').trigger('click');
+ }
});
function bindDiagnosisIcdLookup(form) {
@@ -4875,6 +5052,11 @@ $historyFields = [
if ($dd.is(':visible') && ddIdx >= 0 && ddIdx < $items.length) {
e.preventDefault();
$items.eq(ddIdx).trigger('click');
+ setTimeout(function() { $('#new_diagnosis_remark').trigger('focus'); }, 50);
+ } else {
+ e.preventDefault();
+ closeDd();
+ $('#new_diagnosis_remark').trigger('focus');
}
} else if (e.key === 'Escape') {
closeDd();