Skip to content

Commit

Permalink
OP-1339 Fix lots overlooking when they reach zero quantity (#2074)
Browse files Browse the repository at this point in the history 
* Add checkbox to hide empty lots (and improve the code)

* Add bundles and improve code

* Add code check on new lots

* Try to fix build upon "push" events

* Restore previous repo var for pull_request events

* debug current folder

* Fix core repository

* Fix for contributors

* Trying different cases

* Add more debugging

* Fix

* Fix
  • Loading branch information
@mwithi
mwithi authored Oct 30, 2024
1 parent c5edc36 commit 82dfb0a
Show file tree
Hide file tree
Showing 2 changed files with 141 additions and 77 deletions.
4 changes: 4 additions & 0 deletions bundle/language_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -829,10 +829,13 @@ angal.medicalstock.multiplecharging.chargetype
angal.medicalstock.multiplecharging.chooseamedical = Choose a Medical
angal.medicalstock.multiplecharging.cost = Cost
angal.medicalstock.multiplecharging.datecannotbebeforelastmovementdate.msg = Date cannot be before last movement date.
angal.medicalstock.multiplecharging.empty = Empty
angal.medicalstock.multiplecharging.existinglot = Existing Lots
angal.medicalstock.multiplecharging.expired = Expired
angal.medicalstock.multiplecharging.expiringdate = Expiring
angal.medicalstock.multiplecharging.expiringdateinthepastnotallowed = Expiring date in the past not allowed
angal.medicalstock.multiplecharging.expirydatebeforepreparationdate = Expiring date before Preparation date not allowed
angal.medicalstock.multiplecharging.hideemptylots = Hide empty lots
angal.medicalstock.multiplecharging.lotid = Lot id
angal.medicalstock.multiplecharging.lotinformations = Lot Information
angal.medicalstock.multiplecharging.lotnumberabb = Lot No.
Expand All @@ -849,6 +852,7 @@ angal.medicalstock.multiplecharging.selectedlot
angal.medicalstock.multiplecharging.selectedlotwithoutcostpleasespecify = Selected Lot {0} has no cost information, please specify...
angal.medicalstock.multiplecharging.supplier = Supplier
angal.medicalstock.multiplecharging.theinsertedreferencenumberalreadyexists.msg = The inserted reference number already exists.
angal.medicalstock.multiplecharging.theinsertedlotcodealreaedyexists.msg = The inserted lot code already exists.
angal.medicalstock.multiplecharging.totalcost = Total cost
angal.medicalstock.multiplecharging.unitcost = Unit cost
angal.medicalstock.multiplecharging.unitpack = Unit/Pack
Expand Down
214 changes: 137 additions & 77 deletions src/main/java/org/isf/medicalstock/gui/MovStockMultipleCharging.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.swing.DefaultCellEditor;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JFrame;
Expand Down Expand Up @@ -139,6 +141,16 @@ public class MovStockMultipleCharging extends JDialog {
private JComboBox comboBoxUnits = new JComboBox(qtyOption);
private int optionSelected = UNITS;
private List<Lot> updateLots = new ArrayList<Lot>();
private final String[] lotSelectionColumnNames = {
MessageBundle.getMessage("angal.medicalstock.lotid").toUpperCase(),
MessageBundle.getMessage("angal.medicalstock.prepdate.col").toUpperCase(),
MessageBundle.getMessage("angal.medicalstock.duedate").toUpperCase(),
MessageBundle.getMessage("angal.common.quantity.txt").toUpperCase(),
MessageBundle.getMessage("angal.medicalstock.multiplecharging.cost").toUpperCase(),
MessageBundle.getMessage("angal.common.note.txt").toUpperCase()
};
private boolean[] lotSelectionColumnVisible = { true, true, true, true, GeneralData.LOTWITHCOST, true };
private final Class[] lotSelectionColumnClasse = { String.class, String.class, String.class, Integer.class, Double.class, String.class };

private MovStockInsertingManager movStockInsertingManager = Context.getApplicationContext().getBean(MovStockInsertingManager.class);
private MedicalBrowsingManager medicalBrowsingManager = Context.getApplicationContext().getBean(MedicalBrowsingManager.class);
Expand Down Expand Up @@ -594,16 +606,23 @@ protected Lot askLot(Medical med) {

if (ok == JOptionPane.OK_OPTION) {
String lotName = lotNameTextField.getText();

if (expireDateChooser.getDate().isBefore(preparationDateChooser.getDate())) {
MessageDialog.error(this, "angal.medicalstock.multiplecharging.expirydatebeforepreparationdate");
} else if (expireDateChooser.getDate().isBefore(jDateChooser.getLocalDateTime().toLocalDate())) {
MessageDialog.error(this, "angal.medicalstock.multiplecharging.expiringdateinthepastnotallowed");
} else {
expiringDate = expireDateChooser.getDateEndOfDay();
preparationDate = preparationDateChooser.getDateStartOfDay();
lot = new Lot(lotName, preparationDate, expiringDate);
lot.setMedical(med);
try {
if (movStockInsertingManager.lotExists(lotName)) {
MessageDialog.error(this, "angal.medicalstock.multiplecharging.theinsertedlotcodealreaedyexists.msg");
continue;
}
if (expireDateChooser.getDate().isBefore(preparationDateChooser.getDate())) {
MessageDialog.error(this, "angal.medicalstock.multiplecharging.expirydatebeforepreparationdate");
} else if (expireDateChooser.getDate().isBefore(jDateChooser.getLocalDateTime().toLocalDate())) {
MessageDialog.error(this, "angal.medicalstock.multiplecharging.expiringdateinthepastnotallowed");
} else {
expiringDate = expireDateChooser.getDateEndOfDay();
preparationDate = preparationDateChooser.getDateStartOfDay();
lot = new Lot(lotName, preparationDate, expiringDate);
lot.setMedical(med);
}
} catch (OHServiceException e) {
OHServiceExceptionUtil.showMessages(e);
}
} else {
return null;
Expand Down Expand Up @@ -647,47 +666,70 @@ protected Medical chooseMedical(String text) {
protected Lot chooseLot(Medical med) {
List<Lot> lots;
try {
lots = movStockInsertingManager.getLotByMedical(med);
lots = movStockInsertingManager.getLotByMedical(med, false); // get also empty lots
} catch (OHServiceException e) {
lots = new ArrayList<>();
OHServiceExceptionUtil.showMessages(e);
}
Lot lot = null;
if (!lots.isEmpty()) {
JTable lotTable = new JTable(new StockMovModel(lots));
lotTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
JPanel panel = new JPanel(new BorderLayout());
panel.add(new JLabel(MessageBundle.getMessage("angal.medicalstock.multiplecharging.useanexistinglot")), BorderLayout.NORTH); //$NON-NLS-1$
panel.add(new JScrollPane(lotTable), BorderLayout.CENTER);
Object[] options = {
MessageBundle.getMessage("angal.medicalstock.multiplecharging.selectedlot"), //$NON-NLS-1$
MessageBundle.getMessage("angal.medicalstock.multiplecharging.newlot") }; //$NON-NLS-1$

int row;
do {
int ok = JOptionPane.showOptionDialog(this,
panel,
MessageBundle.getMessage("angal.medicalstock.multiplecharging.existinglot"), //$NON-NLS-1$
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE,
null,
options,
options[0]);

if (ok == JOptionPane.YES_OPTION) {
row = lotTable.getSelectedRow();
if (row != -1) {
lot = lots.get(row);
} else {
MessageDialog.error(this, "angal.common.pleaseselectarow.msg");
}
if (lots.isEmpty()) {
return null;
}

StockLotModel lotModel = new StockLotModel(lots);
JTable lotTable = createLotTable(lotModel);
JCheckBox filterZeroQuantityCheckBox = createFilterCheckbox(lotModel);

JPanel panel = new JPanel(new BorderLayout());
panel.add(new JLabel(MessageBundle.getMessage("angal.medicalstock.multiplecharging.useanexistinglot")), BorderLayout.NORTH);
panel.add(new JScrollPane(lotTable), BorderLayout.CENTER);
panel.add(filterZeroQuantityCheckBox, BorderLayout.SOUTH);

Lot selectedLot = null;
Object[] options = {
MessageBundle.getMessage("angal.medicalstock.multiplecharging.selectedlot"),
MessageBundle.getMessage("angal.medicalstock.multiplecharging.newlot")
};

int row;
do {
int ok = JOptionPane.showOptionDialog(this, panel,
MessageBundle.getMessage("angal.medicalstock.multiplecharging.existinglot"),
JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);

if (ok == JOptionPane.YES_OPTION) {
row = lotTable.getSelectedRow();
if (row != -1) {
selectedLot = lots.get(row);
} else {
row = 0;
MessageDialog.error(this, "angal.common.pleaseselectarow.msg");
}
} else {
row = 0;
}
} while (row == -1);

return selectedLot;
}

} while (row == -1);
private JTable createLotTable(StockLotModel lotModel) {
JTable lotTable = new JTable(lotModel);
lotTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
for (int i = 0; i < lotSelectionColumnNames.length; i++) {
if (!lotSelectionColumnVisible[i]) {
TableColumn column = lotTable.getColumnModel().getColumn(i);
column.setMinWidth(0);
column.setMaxWidth(0);
column.setWidth(0);
}
}
return lot;
return lotTable;
}

private JCheckBox createFilterCheckbox(StockLotModel lotModel) {
JCheckBox filterZeroQuantityCheckBox = new JCheckBox(MessageBundle.getMessage("angal.medicalstock.multiplecharging.hideemptylots"));
filterZeroQuantityCheckBox.setSelected(true);
filterZeroQuantityCheckBox.addActionListener(e -> lotModel.setFilterZeroQuantity(filterZeroQuantityCheckBox.isSelected()));
return filterZeroQuantityCheckBox;
}

protected LocalDateTime askExpiringDate() {
Expand Down Expand Up @@ -1002,68 +1044,86 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
}
}

class StockMovModel extends DefaultTableModel {
class StockLotModel extends DefaultTableModel {

private static final String EMPTY = MessageBundle.getMessage("angal.medicalstock.multiplecharging.empty");
private static final String EXPIRED = MessageBundle.getMessage("angal.medicalstock.multiplecharging.expired");
private static final long serialVersionUID = 1L;
private List<Lot> lotList;
private List<Lot> displayedLots;
private boolean filterZeroQuantity = true;

public StockMovModel(List<Lot> lots) {
lotList = lots;
@Override
public Class< ? > getColumnClass(int columnIndex) {
return lotSelectionColumnClasse[columnIndex];
}

public StockLotModel(List<Lot> lots) {
this.lotList = new ArrayList<>(lots);
updateFilteredLots();
}

public void setFilterZeroQuantity(boolean filter) {
this.filterZeroQuantity = filter;
updateFilteredLots();
fireTableDataChanged();
}

private void updateFilteredLots() {
if (filterZeroQuantity) {
// Only include lots with quantity greater than zero
displayedLots = lotList.stream()
.filter(lot -> lot.getMainStoreQuantity() > 0)
.collect(Collectors.toList());
} else {
// Show all lots
displayedLots = new ArrayList<>(lotList);
}
}

@Override
public int getRowCount() {
if (lotList == null) {
if (displayedLots == null) {
return 0;
}
return lotList.size();
return displayedLots.size();
}

@Override
public String getColumnName(int c) {
if (c == 0) {
return MessageBundle.getMessage("angal.medicalstock.lotid").toUpperCase();
}
if (c == 1) {
return MessageBundle.getMessage("angal.medicalstock.prepdate").toUpperCase();
}
if (c == 2) {
return MessageBundle.getMessage("angal.medicalstock.duedate").toUpperCase();
}
if (c == 3) {
return MessageBundle.getMessage("angal.common.quantity.txt").toUpperCase();
}
if (GeneralData.LOTWITHCOST) {
if (c == 4) {
return MessageBundle.getMessage("angal.medicalstock.multiplecharging.cost").toUpperCase();
}
}
return ""; //$NON-NLS-1$
return lotSelectionColumnNames[c];
}

@Override
public int getColumnCount() {
if (GeneralData.LOTWITHCOST) {
return 5;
}
return 4;
return lotSelectionColumnNames.length;
}

@Override
public Object getValueAt(int r, int c) {
Lot lot = lotList.get(r);
if (c == -1) {
Lot lot = displayedLots.get(r);
int i = -1;
if (c == i) {
return lot;
} else if (c == 0) {
} else if (c == ++i) {
return lot.getCode();
} else if (c == 1) {
} else if (c == ++i) {
return TimeTools.formatDateTime(lot.getPreparationDate(), DATE_FORMAT_DD_MM_YYYY);
} else if (c == 2) {
} else if (c == ++i) {
return TimeTools.formatDateTime(lot.getDueDate(), DATE_FORMAT_DD_MM_YYYY);
} else if (c == 3) {
} else if (c == ++i) {
return lot.getMainStoreQuantity();
} else if (c == 4) {
} else if (c == ++i) {
return lot.getCost();
} else if (c == ++i) {
List<String> statuses = new ArrayList<>();
if (lot.getDueDate().isBefore(TimeTools.getDateToday0())) {
statuses.add(EXPIRED);
}
if (lot.getMainStoreQuantity() == 0) {
statuses.add(EMPTY);
}
return String.join(",", statuses);
}
return null;
}
Expand Down

0 comments on commit 82dfb0a

Please sign in to comment.