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

Upstream Repo sync #51

Merged
merged 42 commits into from
Dec 11, 2023
Merged

Upstream Repo sync #51

merged 42 commits into from
Dec 11, 2023

Conversation

shreypatidar-beehyv
Copy link
Collaborator

Merged the latest code from PSMRI repo.

Anjana2310 and others added 30 commits July 7, 2023 17:58
* API cleanup

* API clean up

* Renaming controller classes

* removing unwanted file
* Update and rename sast-and-package-prod.yml to package-prod.yml

* Update package-prod.yml

* Update package-prod.yml

* Update and rename sast-and-package.yml to test-package.yml

* Update test-package.yml

* Update and rename test-package.yml to package-test.yml

* Update package-test.yml

* Update package-prod.yml

* Update package-test.yml

* Create codeql.yml

* Update codeql.yml

* Update codeql.yml

* Update codeql.yml

* Update codeql.yml

* Update and rename package-test.yml to package.yml

* Update codeql.yml

* Update package.yml

* Update package-prod.yml

* Update package-prod.yml

* Rename codeql.yml to sast.yml

---------

Co-authored-by: Anjana KJ <[email protected]>
* Update sast.yml

* Delete .github/workflows directory

* Create sast.yml

* Add files via upload
Added Pull Request template, added placeholders in properties file
New Serviceline API modified, UPTSU API changes
devikasuresh20 and others added 12 commits October 20, 2023 15:52
Co-authored-by: KA40094929 <[email protected]>
)

* Multiple Benificiary visit-api modified for all visit category

* Multiple Ben Visit Api code Modified

* TestNcdCareController error resolved

* WASA point- Swagger documentation disclosure

---------

Co-authored-by: IN40068837 <[email protected]>
# Conflicts:
#	src/main/environment/common_dev.properties
#	src/main/environment/common_local.properties
#	src/main/environment/common_test.properties
#	src/main/environment/common_uat.properties
#	src/main/java/com/iemr/hwc/controller/location/LocationController.java
#	src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java
#	src/main/java/com/iemr/hwc/repo/location/V_getVanLocDetailsRepo.java
#	src/main/java/com/iemr/hwc/repo/nurse/BenVisitDetailRepo.java
#	src/main/java/com/iemr/hwc/service/location/LocationServiceImpl.java
@roopesh-beehyv roopesh-beehyv merged commit 264da81 into develop Dec 11, 2023
1 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.