@@ -4352,6 +4383,91 @@ $historyFields = [
}
}
+ function resetMedicineFormState() {
+ $('#discharge_med_item_id').val('0');
+ $('#discharge_med_item_source').val('legacy');
+ $('#btn_discharge_med_add').text('+ADD / Update');
+ }
+
+ function medicineActionButtonsHtml(rowId, rowSource) {
+ var id = parseInt(rowId || 0, 10);
+ var source = String(rowSource || 'legacy').trim() || 'legacy';
+ return '
'
+ + ''
+ + ''
+ + ' | ';
+ }
+
+ $(document).on('click', '.btn-edit-discharge-med', function() {
+ var row = $(this).closest('tr');
+ if (!row.length) {
+ return;
+ }
+
+ var rowId = parseInt($(this).data('id') || row.data('row-id') || 0, 10);
+ var rowSource = String($(this).data('source') || row.data('row-source') || 'legacy').trim() || 'legacy';
+
+ var medName = String($(this).data('med-name') || row.find('td:eq(1)').text() || '').trim();
+ var medType = String($(this).data('med-type') || row.find('td:eq(0)').text() || '').trim();
+ var doseId = String($(this).data('dose-id') || '').trim();
+ var whenId = String($(this).data('dose-when-id') || '').trim();
+ var freqId = String($(this).data('dose-freq-id') || '').trim();
+ var doseLabel = String($(this).data('dose-label') || row.find('td:eq(2)').text() || '').trim();
+ var whenLabel = String($(this).data('dose-when-label') || row.find('td:eq(3)').text() || '').trim();
+ var freqLabel = String($(this).data('dose-freq-label') || row.find('td:eq(4)').text() || '').trim();
+ var noOfDays = String($(this).data('days') || row.find('td:eq(5)').text() || '').trim();
+ var qty = String($(this).data('qty') || row.find('td:eq(6)').text() || '').trim();
+ var remark = String($(this).data('remark') || row.find('td:eq(7)').text() || '').trim();
+
+ $('#discharge_med_item_id').val(rowId > 0 ? rowId : 0);
+ $('#discharge_med_item_source').val(rowSource);
+ $('#discharge_med_name').val(medName);
+ $('#discharge_med_type').val(medType);
+
+ if (doseId !== '' && doseId !== '0') {
+ $('#discharge_dosage').val(doseId);
+ } else {
+ ensureDoseOption('#discharge_dosage', doseLabel);
+ $('#discharge_dosage').val(doseLabel);
+ }
+
+ if (whenId !== '' && whenId !== '0') {
+ $('#discharge_dosage_when').val(whenId);
+ } else {
+ ensureDoseOption('#discharge_dosage_when', whenLabel);
+ $('#discharge_dosage_when').val(whenLabel);
+ }
+
+ if (freqId !== '' && freqId !== '0') {
+ $('#discharge_dosage_freq').val(freqId);
+ } else {
+ ensureDoseOption('#discharge_dosage_freq', freqLabel);
+ $('#discharge_dosage_freq').val(freqLabel);
+ }
+
+ $('#discharge_no_of_days').val(noOfDays);
+ $('#discharge_qty').val(qty);
+ $('#discharge_remark').val(remark);
+
+ $('#btn_discharge_med_add').text('Update Medicine');
+ setMedicineStatus('Edit mode: update fields and click Update Medicine.', 'info');
+ $('#discharge_med_name').trigger('focus');
+ });
+
+ $(document).on('click', '.btn-remove-discharge-med', function() {
+ var row = $(this).closest('tr');
+ var tbody = section.querySelector('#discharge_medicine_tbody');
+ if (!row.length || !tbody) {
+ return;
+ }
+
+ row.remove();
+ if (!tbody.querySelector('tr')) {
+ tbody.innerHTML = '
| No medicine added |
';
+ }
+ setMedicineStatus('Medicine removed from current view.', 'info');
+ });
+
// Handle quick buttons
section.querySelectorAll('.discharge-quick-btn').forEach(function(btn) {
btn.addEventListener('click', function() {
@@ -4384,6 +4500,8 @@ $historyFields = [
var qty = $('#discharge_qty').val().trim();
var doseWhere = $('#discharge_dose_where').val();
var remark = $('#discharge_remark').val().trim();
+ var editRowId = parseInt($('#discharge_med_item_id').val() || '0', 10);
+ var editRowSource = String($('#discharge_med_item_source').val() || 'legacy').trim() || 'legacy';
if (medName === '') {
setMedicineStatus('Please enter medicine name.', 'error');
@@ -4439,6 +4557,8 @@ $historyFields = [
var payload = {
action: 'add_drug',
ajax_mode: 'json',
+ drug_edit_id: editRowId,
+ drug_edit_source: editRowSource,
new_drug_name: medName,
new_drug_type: medType,
new_drug_dose: dosage,
@@ -4462,7 +4582,6 @@ $historyFields = [
updateFormCsrf(activeForm, data || {});
if (data && parseInt(data.update || '0', 10) === 1) {
- // Add row to table
var tbody = section.querySelector('#discharge_medicine_tbody');
if (!tbody) {
setMedicineStatus('Medicine table not found.', 'error');
@@ -4475,8 +4594,11 @@ $historyFields = [
emptyRow.closest('tr').remove();
}
- var tr = document.createElement('tr');
- tr.innerHTML = '
' + $(' ').text(medType).html() + ' | ' +
+ var responseRowId = parseInt((data && data.row_id) ? data.row_id : 0, 10);
+ var responseRowSource = String((data && data.row_source) ? data.row_source : (editRowSource || 'legacy')).trim() || 'legacy';
+ var rowIdToUse = responseRowId > 0 ? responseRowId : editRowId;
+
+ var rowHtml = '
' + $(' ').text(medType).html() + ' | ' +
'
' + $(' ').text(medName).html() + ' | ' +
'
' + $(' ').text(doseLabel).html() + ' | ' +
'
' + $(' ').text(whenLabel).html() + ' | ' +
@@ -4484,26 +4606,55 @@ $historyFields = [
'
' + $(' ').text(formattedDuration).html() + ' | ' +
'
' + $(' ').text(qty).html() + ' | ' +
'
' + $(' ').text(remark).html() + ' | ' +
- '
| ';
- tbody.appendChild(tr);
+ medicineActionButtonsHtml(rowIdToUse, responseRowSource);
+
+ if (editRowId > 0) {
+ var existingRow = tbody.querySelector('tr[data-row-id="' + editRowId + '"][data-row-source="' + editRowSource + '"]');
+ if (existingRow) {
+ existingRow.innerHTML = rowHtml;
+ existingRow.setAttribute('data-row-id', String(rowIdToUse));
+ existingRow.setAttribute('data-row-source', responseRowSource);
+ } else {
+ var updatedRow = document.createElement('tr');
+ updatedRow.setAttribute('data-row-id', String(rowIdToUse));
+ updatedRow.setAttribute('data-row-source', responseRowSource);
+ updatedRow.innerHTML = rowHtml;
+ tbody.appendChild(updatedRow);
+ }
+ } else {
+ var tr = document.createElement('tr');
+ tr.setAttribute('data-row-id', String(rowIdToUse));
+ tr.setAttribute('data-row-source', responseRowSource);
+ tr.innerHTML = rowHtml;
+ tbody.appendChild(tr);
+ }
+
+ // Keep fresh values on edit button for repeated edits without reload
+ var targetRow = tbody.querySelector('tr[data-row-id="' + rowIdToUse + '"][data-row-source="' + responseRowSource + '"]');
+ if (targetRow) {
+ var editBtn = targetRow.querySelector('.btn-edit-discharge-med');
+ if (editBtn) {
+ editBtn.setAttribute('data-med-name', medName);
+ editBtn.setAttribute('data-med-type', medType);
+ editBtn.setAttribute('data-dose-id', dosage || '');
+ editBtn.setAttribute('data-dose-when-id', dosageWhen || '');
+ editBtn.setAttribute('data-dose-freq-id', dosageFreq || '');
+ editBtn.setAttribute('data-dose-label', doseLabel || '');
+ editBtn.setAttribute('data-dose-when-label', whenLabel || '');
+ editBtn.setAttribute('data-dose-freq-label', freqLabel || '');
+ editBtn.setAttribute('data-days', noOfDays || '');
+ editBtn.setAttribute('data-qty', qty || '');
+ editBtn.setAttribute('data-remark', remark || '');
+ }
+ }
// Clear form
$('#discharge_med_name, #discharge_med_type, #discharge_no_of_days, #discharge_qty, #discharge_remark').val('');
$('#discharge_dosage, #discharge_dosage_when, #discharge_dosage_freq, #discharge_dose_where').val('');
+ resetMedicineFormState();
$('#discharge_med_name').focus();
- setMedicineStatus('Medicine saved successfully.', 'success');
-
- // Bind remove button (Note: Remove is not yet AJAX - medicines load from DB on page reload)
- tr.querySelector('.btn-remove-discharge-med').addEventListener('click', function() {
- if (confirm('Remove this medicine? This will only remove from the current view. Reload the page to see saved medicines.')) {
- tr.remove();
- if (tbody.children.length === 0) {
- tbody.innerHTML = '
| No medicine added |
';
- }
- setMedicineStatus('Medicine removed from view. Reload to see saved data.', 'info');
- }
- });
+ setMedicineStatus(editRowId > 0 ? 'Medicine updated successfully.' : 'Medicine saved successfully.', 'success');
} else {
var errorMsg = (data && data.error_text) ? data.error_text : 'Unable to save medicine.';
setMedicineStatus(errorMsg, 'error');
@@ -4524,6 +4675,7 @@ $historyFields = [
if (tbody) {
tbody.innerHTML = '
| No medicine added |
';
}
+ resetMedicineFormState();
setMedicineStatus('All medicines removed.', 'info');
}
});