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-1200 wards inventory #2126

Open

mwithi wants to merge 105 commits into develop from OP-1200-Wards-Inventory

Member

mwithi commented Jan 23, 2025

See OP-1200.
Changes in core should be fine.

JantBogard and others added 30 commits

February 26, 2024 17:52


          Create a window to manage ward Inventory

46d6847


          fix reviewed change

c75c27d


          fix reviewed change

e1dd299


          add the standard license header comment block

9e3d42b


          Fix order import

904ee1f


          Fix all reviewed change

b2c1e5f


          Change hardcode mnemonic to bundle message

95c389a


          remove unused methode

74fcc4a


          Uppercase all column headings

34a1c44


          Apply review suggestion

fa10582


          Merge pull request #1968 from JantBogard/OP-1190

9201be5

OP-1190 | Create a window to manage ward Inventory


          Create window to Add new ward Inventory

1f960c0


          Apply review change

32da113


          Apply review change

19fcdc7


          Merge pull request #1973 from JantBogard/OP-1191

c2a0c1d

OP-1191 | Create window to Add new ward Inventory


          Add new inventory for all Medicals or for specific Medical

152ec20


          apply review suggestion

3ae95a2


          Applying the suggested changes

69e093b


          Apply review suggestion

710ef9b


          Apply suggestions from code review

3659c4f


          Merge pull request #1978 from JantBogard/OP-1192

f6070bd

OP-1192 | Add new inventory for all Medicals or for specific Medical


          Merge branch 'develop' of into OP-1193_OP-1194_OP-1197

de0e912


          Update, Delete and validate inventory ward

ed30bc1


          Merge branch 'develop' into OP-1193_OP-1194_OP-1197

6d22666


          Merge pull request #2086 from informatici/develop

c2416c7

Merge with develop


          Merge branch 'OP-1200-Wards-Inventory' into OP-1193_OP-1194_OP-1197

c571371


          Applying suggestion for change

adc7d6a


          Applying suggestion to change

612365d


          Applying suggestion to change

c29b77e


          Applying suggestion to change

8a01036

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java

+              			pagesCombo.addItem(j + 1);
+              			under.setText("/" + (total_rows / PAGE_SIZE + 1 + " " + MessageBundle.getMessage("angal.inventory.pages.text")));
+              		} else {
+              			under.setText("/" + total_rows / PAGE_SIZE + " " + MessageBundle.getMessage("angal.inventory.pages.text"));

Collaborator

dbmalkovsky Jan 24, 2025 •

edited

Loading

isn't there a formatted msg in the bundle that can by used instead of concatenation?

in addition I'm not sure how the PAGE_SIZE + 1 will come out; does addition have a higher precedence than concatenation?

Member Author

mwithi Jan 24, 2025

not in this PR, but in #2125. We can add it in both and then resolve conflicts, or first merge the latter...

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/MedicalPicker.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/MedicalPicker.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/MedicalPicker.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/MedicalPicker.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/StockMedModel.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/StockMedModel.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/StockMedModel.java Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/StockMedModel.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/StockMedModel.java Outdated Show resolved Hide resolved

dbmalkovsky reviewed

View reviewed changes

src/main/java/org/isf/medicalinventory/gui/StockMedModel.java Outdated Show resolved Hide resolved

mwithi added 9 commits

January 24, 2025 21:11


          Fix old fashion code

bbd970e


          Add @OverRide annotation

1f10596


          Use interface constant

e75b11a


          Use lambda

65e839a


          Remove redundant 'null', 'public' and 'return'

af1ae2c


          Add @OverRide

2d1ae32


          Remove unnecessary casting

4ec0802


          Apply code review suggestions

f59cccf


          Add @OverRide

b0b9b17

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

Labels

None yet