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 | Update ward Inventory #1980

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

OP-1193 | Update ward Inventory #1980

wants to merge 85 commits into from

Conversation

JantBogard
Copy link

@JantBogard JantBogard commented Apr 11, 2024 •
edited by jira bot
Loading

See OP-1193

@dependabot
Chore(deps): Bump org.slf4j:slf4j-reload4j from 2.0.12 to 2.0.13
ab166a6 
Bumps org.slf4j:slf4j-reload4j from 2.0.12 to 2.0.13.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-reload4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-jar-plugin
eda28ae 
Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.3.0...maven-jar-plugin-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Chore(deps): Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13
28a93da 
Bumps org.slf4j:slf4j-api from 2.0.12 to 2.0.13.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@mwithi mwithi changed the base branch from develop to OP-1200-Wards-Inventory April 15, 2024 20:36
transifex-integration bot and others added 26 commits May 31, 2024 08:47
@transifex-integration
Update translations for project OpenHospital (informatici#2012)
e9965e8 
* Translate bundle/language_en.properties in sq

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'sq'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in sq

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'sq'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in sq

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'sq'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in sq

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'sq'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in sq

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'sq'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in sq

100% translated source file: 'bundle/language_en.properties'
on 'sq'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
@transifex-integration
Update translations for project OpenHospital (informatici#2014)
42b5054 
* Translate bundle/language_en.properties in de

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'de'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in de

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'de'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in de

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'de'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in de

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'de'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in de

99% of minimum 95% translated source file: 'bundle/language_en.properties'
on 'de'.

Sync of partially translated files: 
untranslated content is included with an empty translation 
or source language content depending on file format

* Translate bundle/language_en.properties in de

100% translated source file: 'bundle/language_en.properties'
on 'de'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
@mwithi @dbmalkovsky
OP-1217 Add Medical Stock Feature (informatici#2013)
3aff278 
* First commit

* Add new AMC_ver2 report

* Add Movement Type category field 'production' or 'inventory'

* Improve report clarity

* Add MedicalType category

* Fix javadoc

* Restore original report name

* Add hidden column for stock movement Excel export

* Refactor category admitted values

* Apply suggestions from code review

---------

Co-authored-by: David B Malkovsky <[email protected]>
@mwithi
Update Eclipse settings (informatici#2018)
cb84808
@dbmalkovsky
OP-1278 resource bundle addition (informatici#2015)
41d00f8
@dbmalkovsky
Chore: update Intellij settings to match Eclipse (informatici#2019)
d0f2e01
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin
c62a846 
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Hibernate renamed org.hibernate.type to org.hibernate.orm.jdbc.bind (i…
b8b66ff 
…nformatici#2021)
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-jar-plugin
14fefeb 
Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.4.1...maven-jar-plugin-3.4.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2022 from informatici/dependabot/maven…
894460a 
…/org.apache.maven.plugins-maven-jar-plugin-3.4.2

Chore(deps): Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2
@dbmalkovsky
Merge pull request informatici#2020 from informatici/dependabot/maven…
730ca0c 
…/org.apache.maven.plugins-maven-surefire-plugin-3.3.0

Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0
@dependabot
Chore(deps-dev): Bump org.junit.jupiter:junit-jupiter-engine
802e5c2 
Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.2 to 5.10.3.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.10.2...r5.10.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2024 from informatici/dependabot/maven…
49302c4 
…/org.junit.jupiter-junit-jupiter-engine-5.10.3

Chore(deps-dev): Bump org.junit.jupiter:junit-jupiter-engine from 5.10.2 to 5.10.3
@dependabot
Chore(deps-dev): Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
04cad6c 
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.0.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](assertj/assertj@assertj-build-3.25.3...assertj-build-3.26.0)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin
77b3d83 
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.1 to 3.7.1.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2011 from informatici/dependabot/maven…
f7ee54e 
…/org.assertj-assertj-core-3.26.0

Chore(deps-dev): Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
@dbmalkovsky
Merge pull request informatici#2023 from informatici/dependabot/maven…
bb20adf 
…/org.apache.maven.plugins-maven-dependency-plugin-3.7.1

Chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.1 to 3.7.1
@dependabot
Chore(deps-dev): Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
f153d0e 
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.26.0 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](assertj/assertj@assertj-build-3.26.0...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2025 from informatici/dependabot/maven…
e32e243 
…/org.assertj-assertj-core-3.26.3

Chore(deps-dev): Bump org.assertj:assertj-core from 3.26.0 to 3.26.3
@dependabot
Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin
2b49478 
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.3.0...surefire-3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dbmalkovsky
Merge pull request informatici#2026 from informatici/dependabot/maven…
53f306a 
…/org.apache.maven.plugins-maven-surefire-plugin-3.3.1

Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.0 to 3.3.1
@mwithi @dbmalkovsky
OP-1301-fix-units-packets-management-in-main-store (informatici#2027)
37499d7 
* Improve quantity check for single lot

* Add exception for AUTOMATICLOT_OUT case

* Apply project standards

* Deprecate initialQty

* Apply suggestions from code review

---------

Co-authored-by: David B Malkovsky <[email protected]>
@JantBogard
work on update inventory new specification
14da650
@JantBogard
work on update inventory new specification
b821c2a
@JantBogard
Merge commit '37499d719fa70875fc06209d57f38f3c35871377' into OP-1193
f7bd40e
@JantBogard
Apply new specification in ward inventory
e461670
@JantBogard JantBogard requested a review from mwithi August 13, 2024 14:18
@dbmalkovsky
Copy link
Collaborator

I can't tell what code you really changed; there is so much code that has been committed for weeks/months included in this PR.
Please start with a new branch that matches the current code base and then apply your changes. That is the only way I can reasonably review what you are trying to accomplish. Thanks

@JantBogard
Copy link
Author

I can't tell what code you really changed; there is so much code that has been committed for weeks/months included in this PR. Please start with a new branch that matches the current code base and then apply your changes. That is the only way I can reasonably review what you are trying to accomplish. Thanks

Ok

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

@dbmalkovsky dbmalkovsky Awaiting requested review from dbmalkovsky

@mwithi mwithi Awaiting requested review from mwithi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@JantBogard @dbmalkovsky @mwithi