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

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

Open
wants to merge 51 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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
de0e912
Merge branch 'develop' of into OP-1193_OP-1194_OP-1197
JantBogard Nov 6, 2024
ed30bc1
Update, Delete and validate inventory ward
JantBogard Nov 12, 2024
6d22666
Merge branch 'develop' into OP-1193_OP-1194_OP-1197
JantBogard Nov 12, 2024
c571371
Merge branch 'OP-1200-Wards-Inventory' into OP-1193_OP-1194_OP-1197
JantBogard Nov 13, 2024
adc7d6a
Applying suggestion for change
JantBogard Nov 14, 2024
612365d
Applying suggestion to change
JantBogard Nov 15, 2024
c29b77e
Applying suggestion to change
JantBogard Nov 15, 2024
8a01036
Applying suggestion to change
JantBogard Nov 15, 2024
8179fd7
Merge branch 'OP-1200-Wards-Inventory' into OP-1193_OP-1194_OP-1197
mwithi Nov 18, 2024
7f0556b
OP-1360 add missing message bundle (#2087)
ArnaudFofou Nov 19, 2024
a5a8a9e
Applying suggestion to change
JantBogard Nov 19, 2024
2463316
Merge branch 'OP-1193_OP-1194_OP-1197' of https://github.com/JantBoga…
JantBogard Nov 19, 2024
c1c94fa
Add new message bundle
JantBogard Nov 20, 2024
8df6b0a
Merge branch 'develop' into OP-1193_OP-1194_OP-1197
JantBogard Nov 20, 2024
dff24b2
Fix indentations issue
JantBogard Nov 20, 2024
f5eda62
OP-1363 | Fix NullPointerException on PatientBillEdit (#2089)
ArnaudFofou Nov 21, 2024
5a1b7e8
Fix bug occur when i update CORE
JantBogard Nov 21, 2024
d9500e9
Merge branch 'OP-1193_OP-1194_OP-1197' of https://github.com/JantBoga…
JantBogard Nov 21, 2024
1920be9
OP-1361 | Fix getMedicalsWard method (#2088)
ArnaudFofou Nov 21, 2024
cb7f20f
Fix for merges (#2090)
mwithi Nov 22, 2024
f23a4fb
Fix typo
mwithi Nov 22, 2024
c1db1d6
Merge pull request #2095 from informatici/mwithi_fix_worfklow_for_merges
dbmalkovsky Nov 22, 2024
59c64c6
Applying suggestion for change
JantBogard Nov 22, 2024
0ca0998
Applying suggestion for change
JantBogard Nov 22, 2024
00e3fa3
Applying suggestion for change
JantBogard Nov 22, 2024
825d342
Applying suggestion for change
JantBogard Nov 25, 2024
99b20f8
Applying suggestion for change
JantBogard Nov 25, 2024
1390895
Revert "Applying suggestion for change"
JantBogard Nov 25, 2024
65d64e8
Fix format issues
JantBogard Nov 25, 2024
2febb59
Applying suggestion to change
JantBogard Nov 25, 2024
959de16
formating
JantBogard Nov 25, 2024
4f43182
formating
JantBogard Nov 25, 2024
106ec23
formating
JantBogard Nov 25, 2024
c34717a
formating
JantBogard Nov 25, 2024
4343b0c
formating
JantBogard Nov 25, 2024
454edcc
formatting
JantBogard Nov 25, 2024
b84bc5b
Fix format issues
JantBogard Nov 26, 2024
1e22eae
Merge branch 'develop' into OP-1193_OP-1194_OP-1197
JantBogard Nov 26, 2024
146f929
Fix format issues
JantBogard Nov 26, 2024
fed3d55
OP-1043 | Remove deleted group from user edit group jcombo box (#2096)
SteveGT96 Nov 26, 2024
d246186
OP-1341 Enable Medical Type for Soft Deletion (#2092)
mohit10696 Nov 26, 2024
a4f6d71
Chore: add missing @Override annotation (#2097)
dbmalkovsky Nov 27, 2024
29293c1
Fix format issues
JantBogard Nov 27, 2024
30166b2
Remove all necessary field
JantBogard Nov 27, 2024
c7fc541
Merge branch 'develop' into OP-1193_OP-1194_OP-1197
JantBogard Nov 28, 2024
7240e01
Add possibility to actualize inventory row when we validate inventory…
JantBogard Nov 28, 2024
a94c574
Applying a few change
JantBogard Dec 4, 2024
64bcc22
Add possibility to get all medical in chooese medical and add manage lot
JantBogard Dec 11, 2024
9e2323d
Fixed bugs
JantBogard Dec 20, 2024
8dbfeb7
Fixed bugs
JantBogard Dec 23, 2024
82c9db0
Fixed bugs
JantBogard Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,27 @@ jobs:
run: |
# Set default FORK_REPO and BRANCH_NAME values.
BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
FORK_REPO="${GITHUB_HEAD_REPOSITORY:-${GITHUB_ACTOR}/openhospital-core}"
CHECK_BRANCH_URL="https://github.com/${GITHUB_ACTOR}/openhospital-core/tree/$BRANCH_NAME"
echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"

# Determine FORK_REPO with fallback logic
if [[ -n "${GITHUB_HEAD_REPOSITORY}" ]]; then
echo "Using ${GITHUB_HEAD_REPOSITORY}."
FORK_REPO=${GITHUB_HEAD_REPOSITORY}
elif curl -s -o /dev/null -w "%{http_code}" $CHECK_BRANCH_URL | grep -q "200"; then
echo "Using ${GITHUB_ACTOR}/openhospital-core"
FORK_REPO=${GITHUB_ACTOR}/openhospital-core
else
echo "Using informatici/openhospital-core."
if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REPOSITORY" == "informatici/openhospital-gui" ]]; then
# For pushes to the main repository, default to the main core repo
FORK_REPO="informatici/openhospital-core"
else
# For pull requests or other pushes, use the contributor fork if applicable
if [[ -n "$GITHUB_HEAD_REPOSITORY" ]]; then
FORK_REPO="$GITHUB_HEAD_REPOSITORY"
else
# Check if the actor's repo exists with the branch
FORK_REPO="${GITHUB_ACTOR}/openhospital-core"
CHECK_BRANCH_URL="https://github.com/$FORK_REPO/tree/$BRANCH_NAME"
echo "Checking branch existence with: curl -s -o /dev/null -w \"%{http_code}\" $CHECK_BRANCH_URL"

if curl -s -o /dev/null -w "%{http_code}" "$CHECK_BRANCH_URL" | grep -q "200"; then
echo "Branch $BRANCH_NAME exists in $FORK_REPO."
else
# Fallback to the main repository if the branch doesn’t exist in the fork
FORK_REPO="informatici/openhospital-core"
fi
fi
fi

# Export FORK_REPO and BRANCH_NAME to GITHUB_ENV for the next step
Expand Down
78 changes: 65 additions & 13 deletions bundle/language_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,43 +670,94 @@ angal.hospital.visitduration.txt
angal.hospital.visitendhour.txt = Visit end hour
angal.hospital.visitstarthour.txt = Visit start hour
angal.lab.allnegative.txt = All negative.
angal.inventory.allproduct.radio = All products
angal.invetory.allmedicaladdedsuccessfully.msg = All medicals are added successfully.
angal.inventory.allproduct.btn = All products
angal.inventory.canceled = Canceled
JantBogard marked this conversation as resolved.
Show resolved Hide resolved
angal.inventory.cancelednoteditable.msg = A canceled inventory can not be modified.
angal.inventory.cannotcreateanotherinventorywithotherinprogressinthisward.msg = Cannot create another inventory with other in progress in this ward.
angal.inventory.cannotsaveinventorywithoutproducts.msg = Cannot save inventory without products.
angal.inventory.chargetype.label = Charge Type:
angal.inventory.choosedestinationbeforevalidation.msg = Please choose the destination and save the inventory before validation.
angal.inventory.clean.btn = Clean Table
angal.inventory.clean.btn.key = T
angal.inventory.date.label = Inventory's date
angal.inventory.edit.title = Edit an inventory
JantBogard marked this conversation as resolved.
Show resolved Hide resolved
angal.inventory.deletion.confirm.msg = Do you really want to delete this inventory?
angal.inventory.deletion.success.msg = The inventory has been successfully marked as deleted.
angal.inventory.deletion.error.msg = Deletion is only allowed for inventories with 'draft' or 'validated' status.
angal.inventory.dischargetype.label = Discharge Type:
angal.inventory.done = Done
JantBogard marked this conversation as resolved.
Show resolved Hide resolved
angal.inventory.doyoureallywanttocleanthistable.msg = Do you really want to clean this table?
angal.inventory.doyoureallywanttodeletethisinventoryrow.msg = Do you really want to delete this inventory row?
angal.inventory.doyouwanttoactualizetheinventory.msg = Do you want to actualize this inventory?
angal.inventory.doyouwanttoaddallnotyetlistedproducts.msg = Do you want to add all not yet listed products?
angal.inventory.doyouwanttocontinueediting.msg = Do you want to continue editing?
angal.inventory.doyouwanttosavethechanges.msg = Do you want to save the changes?
angal.inventory.doyouwanttoupdatethisinventory.msg = Do you want to update this inventory?
angal.inventory.doyoureallywanttovalidatethisinventory.msg = Do you really want to validate this inventory?
angal.inventory.draft = Draft
JantBogard marked this conversation as resolved.
Show resolved Hide resolved
angal.inventory.edit.title = Edit Inventory
angal.inventory.error.msg = Error during some products's recording
angal.inventory.id.col = Id
angal.inventory.invalidquantity.msg = Invalid quantity.
angal.inventory.inventoryisalreadysaved.msg = This inventory is already saved. Please enter at least one inventory row before continuing.
angal.inventory.inventorymustsavebeforevalidation.msg = Inventory must be saved before validation.
angal.inventory.lot.btn = Lot
angal.inventory.lot.btn.key = L
angal.inventory.lotcode.col = Lot's code
angal.inventory.managementward.title = Manage Ward Inventory
angal.inventory.medical.col = Medical
angal.inventory.mustenterareference.msg = You must enter a reference.
angal.inventory.nextarrow.btn = >
angal.inventory.new.title = New inventory
angal.inventory.newlot.col = New lot
angal.inventory.newlotshavebeenaddedforsomemedicalward.fmt.msg = New lot(s) have been found by new movement(s) in ward store for: {0}
angal.inventory.newlotshavebeenaddedforsomemedical.detail.fmt.msg = {0} lot: {1} qty: {2}
angal.inventory.newmedicalshavebeenfoundward.fmt.msg = New medical(s) have been found by new movement(s) in ward store for: {0}
angal.inventory.newmedicalshavebeenfound.detail.fmt.msg = {0} lot: {1} qty: {2}
angal.inventory.noproduct.msg = Product is not found.
angal.inventory.noproductfound.msg = No medical found
angal.inventory.notdateinfuture.msg = A date in the future is not allowed.
angal.inventory.page.text = Page
angal.inventory.pages.text = Pages
angal.inventory.pleasesaveinventorybeforevalidateit.msg = Please save the inventory before validating it.
angal.inventory.pleaseselectatleastoneinventoryrow.msg = Please select at least one inventory row.
angal.inventory.pleaseselectonlyoneinventory.msg = Please select only one inventory.
angal.inventory.pleaseselectinventory.msg = Please select inventory.
angal.inventory.previousarrow.btn = <
angal.inventory.productalreadyexist.msg = {0} already exist in the list. do you still like to add it?
angal.inventory.productcode.text = Product's code
angal.inventory.realqty.col = Real quantity
angal.inventory.reference.label = Inventory's reference
angal.inventory.referencealreadyused.msg = Reference is already used.
angal.inventory.referenceshow.col = Reference
angal.inventory.savesucces.msg = Inventory saved.
angal.inventory.savesuccess.msg = Inventory saved.
angal.inventory.searchproduct.txt = Search a product
angal.inventory.selectward.label = Select ward
angal.inventory.specificproduct.radio = Specific product
angal.inventory.state.col = State
angal.inventory.state.label = State
angal.inventory.state.canceled.txt = Canceled
angal.inventory.state.inprogress.txt = In progress
angal.inventory.state.validate.txt = Validate
angal.inventory.specificproduct.btn = Specific product
angal.inventory.status.col = Status
angal.inventory.status.label = Status
angal.inventory.status.canceled.txt = Canceled
angal.inventory.status.inprogress.txt = In progress
angal.inventory.status.validate.txt = Validate
angal.inventory.supplier.label = Supplier:
angal.inventory.theorticalqty.col = Theoretical
angal.inventory.theoreticalqtyhavebeenupdatedforsomemedicalward.fmt.msg = Theoretical(s) quantity(ies) have been updated by new movement(s) in ward store for: {0}
angal.inventory.theoreticalqtyhavebeenupdatedforsomemedical.detail.fmt.msg = {0} lot: {1} qty: {2} -> {3} ({4})
angal.inventory.totalprice.col = Total price quantity
angal.inventory.unitprice.col = Unit price
angal.inventory.update.error.msg = Inventory not updated.
angal.inventory.update.success.msg = Inventory updated.
angal.inventory.updaterowerror.msg = Error during some products's update.
angal.inventory.user.col = User
angal.inventory.validate.btn = Validate
angal.inventory.validate.btn.key = V
angal.inventory.view.btn = View inventory
angal.inventory.validate.success.msg = The inventory has been successfully validated.
angal.inventory.validated = Validated
angal.inventory.view.btn = View
angal.inventory.view.btn.key = V
angal.inventoryrow.cannotchangethepriceofproductwithoutlot.msg = You cannot update the unit price of a product without a lot.
angal.inventoryrow.doyoureallywanttodeletethisinventoryrow.msg = Do you really want to delete this inventory row?
angal.inventoryrow.pleaseselectonlyoneinventoryrow.msg = Please select only one inventory row.
angal.inventory.view.title = View Inventory
angal.inventory.youcannotvalidatethisinventory.msg = You cannot validate the inventory with a medicine without a lot.
angal.inventory.youhavealreadyaddedallproduct.msg = You have already added all the products.
angal.lab.blood.txt = Blood
angal.lab.cfs.txt = CFS
angal.lab.datapatient = Patient's Data
Expand Down Expand Up @@ -1849,6 +1900,7 @@ angal.ward.newward.title
angal.ward.nurses.col = Nurses
angal.ward.nursesedit = Number of nurses *
angal.ward.opd.txt = OPD
angal.ward.opdwardmusthaveopdservicechecked.msg = OPD ward must have OPD service checked.
angal.ward.pleasecheckinadmissionpatients.msg = Please check in admission / patients.
angal.ward.requiredfields = * Required fields
angal.ward.theemailmustbevalid.msg = The email must be valid.
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/isf/accounting/gui/PatientBillEdit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,11 +845,13 @@ private JButton getJButtonTrashPatient() {
jButtonTrashPatient.setPreferredSize(new Dimension(25, 25));
jButtonTrashPatient.setIcon(new ImageIcon("rsc/icons/remove_patient_button.png"));
jButtonTrashPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.removethepatientassociatedwiththisbill.tooltip"));
if (thisBill.getBillPatient() == null) {
jButtonTrashPatient.setEnabled(false);
}
jButtonTrashPatient.addActionListener(actionEvent -> {
// BILL
thisBill.setBillPatient(null);
thisBill.setIsPatient(false);
thisBill.getBillPatient().setCode(0);
thisBill.setPatName(""); //$NON-NLS-1$
thisBill.setAdmission(null);
// INTERFACE
Expand Down Expand Up @@ -895,6 +897,9 @@ private void setJButtonPickPatient() {
jButtonPickPatient.setText(MessageBundle.getMessage("angal.newbill.changepatient.btn"));
jButtonPickPatient.setMnemonic(MessageBundle.getMnemonic("angal.newbill.changepatient.btn.key"));
jButtonPickPatient.setToolTipText(MessageBundle.getMessage("angal.newbill.changethepatientassociatedwiththisbill.tooltip"));
if (jButtonTrashPatient != null) {
jButtonTrashPatient.setEnabled(true);
}
}
}

Expand Down
Loading
Loading