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

OP-1193 | OP-1194 | OP-1197 | OP-1198 | Update, Delete and validate Ward inventory #2085

Open
wants to merge 11 commits into
base: OP-1200-Wards-Inventory
Choose a base branch
from
Open

OP-1193 | OP-1194 | OP-1197 | OP-1198 | Update, Delete and validate Ward inventory #2085

wants to merge 11 commits into from

Conversation

JantBogard
Copy link

@JantBogard JantBogard commented Nov 12, 2024 •
edited by jira bot
Loading

See OP-1193
See OP-1194
See OP-1197
See OP-1198

@mwithi
Copy link
Member

mwithi commented Nov 12, 2024

Please @JantBogard resolve conflicts with the update base branch

mwithi
mwithi reviewed Nov 18, 2024
View reviewed changes
src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation of new parts looks wrong

mwithi
mwithi reviewed Nov 18, 2024
View reviewed changes
src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java Outdated
Comment on lines 333 to 337
private JButton getUpdateButton() {
updateButton = new JButton(MessageBundle.getMessage("angal.common.update.btn"));
updateButton.setMnemonic(MessageBundle.getMnemonic("angal.common.update.btn.key"));
updateButton.setEnabled(false);
updateButton.addActionListener(actionEvent -> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please change everything "update" to more application standard "edit"

mwithi
mwithi reviewed Nov 18, 2024
View reviewed changes
src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java
MessageDialog.error(null, "angal.inventory.inventorymustsavebeforevalidation.msg");
return;
}
int reset = MessageDialog.yesNo(null, "angal.inventory.doyoureallywanttovalidatethisinventory.msg");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing bundle (coming along with OP-1199?)

mwithi
mwithi reviewed Nov 18, 2024
View reviewed changes
src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated
// validate inventory
int inventoryRowsSize = inventoryRowSearchList.size();
try {
medicalInventoryManager.validateMedicalInventoryRow(inventory, inventoryRowSearchList);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ward inventory cannot use the same validation method for main inventory... it makes no sense...

mwithi
mwithi reviewed Nov 18, 2024
View reviewed changes
src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated
Comment on lines 634 to 646
MovementType charge = (MovementType) chargeComboBox.getSelectedItem();
inventory.setChargeType(charge != null ? charge.getCode() : null);

MovementType discharge = (MovementType) dischargeComboBox.getSelectedItem();
inventory.setDischargeType(discharge != null ? discharge.getCode() : null);

Supplier supplier1 = (Supplier) supplierComboBox.getSelectedItem();
inventory.setSupplier(supplier1 != null ? supplier1.getSupId() : null);

Ward destination = (Ward) destinationComboBox.getSelectedItem();
inventory.setDestination(destination != null ? destination.getCode() : null);

inventory = medicalInventoryManager.updateMedicalInventory(inventory);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In ward inventory we don't have charge type, discharge type and supplier, so it doesn't make sense ask them to the user

mwithi
mwithi requested changes Nov 18, 2024
View reviewed changes
Copy link
Member

@mwithi mwithi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The whole feature must be tailored for wards, cannot be same as main inventory

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwithi mwithi mwithi requested changes

@dbmalkovsky dbmalkovsky Awaiting requested review from dbmalkovsky

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JantBogard @mwithi @dbmalkovsky