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.

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

Merged
merged 108 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from 96 commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
46d6847
Create a window to manage ward Inventory
JantBogard Feb 26, 2024
c75c27d
fix reviewed change
JantBogard Feb 27, 2024
e1dd299
fix reviewed change
JantBogard Feb 27, 2024
9e3d42b
add the standard license header comment block
JantBogard Feb 27, 2024
904ee1f
Fix order import
JantBogard Feb 27, 2024
b2c1e5f
Fix all reviewed change
JantBogard Feb 27, 2024
95c389a
Change hardcode mnemonic to bundle message
JantBogard Feb 28, 2024
74fcc4a
remove unused methode
JantBogard Feb 28, 2024
34a1c44
Uppercase all column headings
JantBogard Feb 28, 2024
fa10582
Apply review suggestion
JantBogard Mar 15, 2024
9201be5
Merge pull request #1968 from JantBogard/OP-1190
mwithi Mar 15, 2024
1f960c0
Create window to Add new ward Inventory
JantBogard Mar 19, 2024
32da113
Apply review change
JantBogard Mar 20, 2024
19fcdc7
Apply review change
JantBogard Mar 20, 2024
c2a0c1d
Merge pull request #1973 from JantBogard/OP-1191
mwithi Mar 25, 2024
152ec20
Add new inventory for all Medicals or for specific Medical
JantBogard Apr 2, 2024
3ae95a2
apply review suggestion
JantBogard Apr 2, 2024
69e093b
Applying the suggested changes
JantBogard Apr 3, 2024
710ef9b
Apply review suggestion
JantBogard Apr 8, 2024
3659c4f
Apply suggestions from code review
JantBogard Apr 9, 2024
f6070bd
Merge pull request #1978 from JantBogard/OP-1192
mwithi Apr 11, 2024
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
c2416c7
Merge pull request #2086 from informatici/develop
mwithi 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
573658a
Merge branch 'develop' into OP-1200-Wards-Inventory
mwithi Nov 18, 2024
7548b13
Fix
mwithi Nov 18, 2024
8179fd7
Merge branch 'OP-1200-Wards-Inventory' into OP-1193_OP-1194_OP-1197
mwithi Nov 18, 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
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
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
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
ed52130
Merge branch 'develop' into OP-1200-Wards-Inventory
mwithi Dec 7, 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
5c4896d
Fixed null pointer exception when you not exit code in specific produ…
JantBogard Jan 9, 2025
f2eb624
bloc the possibility to validate inventory with new lot having real q…
JantBogard Jan 9, 2025
ba30d23
Merge pull request #2116 from informatici/develop
mwithi Jan 9, 2025
22d9da6
Fix unpredicted inventoryEdit close behavior
JantBogard Jan 10, 2025
42a9054
Remove "do you want to continue editing" message when you save an inv…
JantBogard Jan 13, 2025
4c3ecdd
Merge pull request #2085 from JantBogard/OP-1193_OP-1194_OP-1197
mwithi Jan 14, 2025
5de182c
Fix total cost calculation as it is BigDecimal now
mwithi Jan 15, 2025
8102462
add button confirm and implement the logic of that button
Jan 15, 2025
30e3702
update message bundle and the logic for confirmButton
Jan 15, 2025
7d74329
Update bundle/language_en.properties
ArnaudFofou Jan 15, 2025
9cffb14
Update bundle/language_en.properties
ArnaudFofou Jan 15, 2025
9d03407
Update bundle/language_en.properties
ArnaudFofou Jan 15, 2025
ddb94f5
update bundle/language_en.properties
Jan 15, 2025
9a0af93
Merge branch 'OP-1376' of https://github.com/ArnaudFofou/openhospital…
Jan 15, 2025
4740b0b
update the licence date
Jan 15, 2025
8de1b12
Merge pull request #2120 from informatici/develop
mwithi Jan 15, 2025
a38556b
OP-1195 | Print ward Inventory (#2119)
JantBogard Jan 15, 2025
f7aa936
add possibility to choose lot during inventory
Jan 18, 2025
da1efc0
Merge branch 'develop' into OP-1376
Jan 20, 2025
091968f
check the status of existing war inventory before give possibility to…
Jan 20, 2025
26e436b
Merge remote-tracking branch 'upstream/OP-1200-Wards-Inventory' into …
Jan 20, 2025
a989ba4
Merge branch 'OP-1200-Wards-Inventory' into OP-1376
ArnaudFofou Jan 20, 2025
5b40140
Merge branch 'OP-1376' of https://github.com/ArnaudFofou/openhospital…
Jan 21, 2025
840d943
fix buggs
Jan 22, 2025
d56b51c
fix null pointer exception
Jan 22, 2025
676fef3
change lot.getMainStoreQuantity() to lot.getWardsTotalQuantity()
Jan 22, 2025
ec83902
fix bug
Jan 22, 2025
3fb4bbf
remove column qty and not on the lot table
Jan 23, 2025
19e3c77
Merge pull request #2118 from ArnaudFofou/OP-1376
mwithi Jan 23, 2025
bbd970e
Fix old fashion code
mwithi Jan 24, 2025
1f10596
Add @Override annotation
mwithi Jan 24, 2025
e75b11a
Use interface constant
mwithi Jan 24, 2025
65e839a
Use lambda
mwithi Jan 24, 2025
af1ae2c
Remove redundant 'null', 'public' and 'return'
mwithi Jan 24, 2025
2d1ae32
Add @Override
mwithi Jan 24, 2025
4ec0802
Remove unnecessary casting
mwithi Jan 24, 2025
f59cccf
Apply code review suggestions
mwithi Jan 24, 2025
b0b9b17
Add @Override
mwithi Jan 24, 2025
1717400
Apply suggestions from code review
mwithi Jan 28, 2025
2f2fd7f
Apply suggestions from code review
mwithi Jan 28, 2025
38f2adf
Merge branch 'OP-1332_OP-1199_OP-1200' into OP-1200-Wards-Inventory
mwithi Jan 28, 2025
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
108 changes: 108 additions & 0 deletions bundle/language_en.properties

Large diffs are not rendered by default.

Binary file added rpt_base/InventoryWard.jasper
Binary file not shown.
404 changes: 404 additions & 0 deletions rpt_base/InventoryWard.jrxml

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions rpt_base/InventoryWard.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#Generated by Eclipse Messages Editor (Eclipse Babel)

Inventory = Inventory

Code = Code

Status = Status

Reference = Reference

InventoryDate = Inventory Date

WardInventoryID = Ward INVENTORY ID

Designation = Designation

LotCode= Lot Code

DueDate = Due Date

TheoreticQuantity = Theoretic Quantity

RealQuantity = Real Quantity


25 changes: 25 additions & 0 deletions rpt_base/InventoryWard_en.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#Generated by Eclipse Messages Editor (Eclipse Babel)

Inventory = Inventory

Code = Code

Status = Status

Reference = Reference

InventoryDate = Inventory Date

WardInventoryID = WARD INVENTORY ID

Designation = Designation

LotCode= Lot Code

DueDate = Due Date

TheoreticQuantity = Theoretic Quantity

RealQuantity = Real Quantity


Loading
Loading