Mater and develop merge #86
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Cleanup in POM and unused OpenKM features in HWC Change 1 = Instead of Jasypt, we are using javax.crypto package features. Change is in DBConfig.java Change 2 = Removed the Openkm, sdk4j dependency from the code base. Also removed all files that had references in OpenKM. HWC does not use OpenKM. Hence this change. Change 3 = Removed duplicate dependencies mentioned in pom.xml (jackson-databind, jacksond-joda-data, json) * Logs folder added into gitignore * Update Maven Build and CodeQL.yml
Renamed all classes related to Swymed to VideoConsultation in order to make it generic. This will help us integrate any such video consultation tool to HWC.
* Cleanup in POM and unused OpenKM features in HWC Change 1 = Instead of Jasypt, we are using javax.crypto package features. Change is in DBConfig.java Change 2 = Removed the Openkm, sdk4j dependency from the code base. Also removed all files that had references in OpenKM. HWC does not use OpenKM. Hence this change. Change 3 = Removed duplicate dependencies mentioned in pom.xml (jackson-databind, jacksond-joda-data, json) * Logs folder added into gitignore * Update Maven Build and CodeQL.yml * Github actions workflow change
* Cleanup in POM and unused OpenKM features in HWC Change 1 = Instead of Jasypt, we are using javax.crypto package features. Change is in DBConfig.java Change 2 = Removed the Openkm, sdk4j dependency from the code base. Also removed all files that had references in OpenKM. HWC does not use OpenKM. Hence this change. Change 3 = Removed duplicate dependencies mentioned in pom.xml (jackson-databind, jacksond-joda-data, json) * Logs folder added into gitignore * Update Maven Build and CodeQL.yml * Github actions workflow change * Crypto code moved to a utility class and added padding 1. Encryption logic modified to have a padding to have 16byte blocks
Co-authored-by: Anjana K J <[email protected]>
Removed encryption logic,modified properties file,swagger changes
password encryption changes modified
* Create sast-and-package-prod.yml * Update sast-and-package-prod.yml * Update sast-and-package-prod.yml
doc save, doc update, fetch case record, casesheet changes for ncd care
* Adding environment and modified placeholder * Adding environment and modified placeholder
* API cleanup * Adding .springBeans to gitignore * Remove .springBeans from version control * Removing .springBeans file
* API cleanup * Adding .springBeans to gitignore * Remove .springBeans from version control * Removing .springBeans file * API cleanup
Co-authored-by: Anjana KJ <[email protected]>
* Update sast-and-package-prod.yml * Update sast-and-package.yml
* API optimize * changes
* API cleanup * Adding .springBeans to gitignore * Remove .springBeans from version control * Removing .springBeans file * API cleanup * Clean up
Added Pull Request template, added placeholders in properties file
New Serviceline API modified, UPTSU API changes
location mapping changes
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]>
http insecure changes
casesheet print data issue fixed
new serviceline changes
Co-authored-by: KA40094929 <[email protected]>
* Develop branch merge to master (#6) * HWC POM cleanup and password encryption using crypto package (#1) * Cleanup in POM and unused OpenKM features in HWC Change 1 = Instead of Jasypt, we are using javax.crypto package features. Change is in DBConfig.java Change 2 = Removed the Openkm, sdk4j dependency from the code base. Also removed all files that had references in OpenKM. HWC does not use OpenKM. Hence this change. Change 3 = Removed duplicate dependencies mentioned in pom.xml (jackson-databind, jacksond-joda-data, json) * Logs folder added into gitignore * Update Maven Build and CodeQL.yml * Swymed decoupling from HWC-API (#2) Renamed all classes related to Swymed to VideoConsultation in order to make it generic. This will help us integrate any such video consultation tool to HWC. * Github actions workflow change (#3) * Cleanup in POM and unused OpenKM features in HWC Change 1 = Instead of Jasypt, we are using javax.crypto package features. Change is in DBConfig.java Change 2 = Removed the Openkm, sdk4j dependency from the code base. Also removed all files that had references in OpenKM. HWC does not use OpenKM. Hence this change. Change 3 = Removed duplicate dependencies mentioned in pom.xml (jackson-databind, jacksond-joda-data, json) * Logs folder added into gitignore * Update Maven Build and CodeQL.yml * Github actions workflow change * Create README.md * Update README.md * Crypto utility modified to have padding for 16 byte block size (#4) * Cleanup in POM and unused OpenKM features in HWC Change 1 = Instead of Jasypt, we are using javax.crypto package features. Change is in DBConfig.java Change 2 = Removed the Openkm, sdk4j dependency from the code base. Also removed all files that had references in OpenKM. HWC does not use OpenKM. Hence this change. Change 3 = Removed duplicate dependencies mentioned in pom.xml (jackson-databind, jacksond-joda-data, json) * Logs folder added into gitignore * Update Maven Build and CodeQL.yml * Github actions workflow change * Crypto code moved to a utility class and added padding 1. Encryption logic modified to have a padding to have 16byte blocks * Create CODE_OF_CONDUCT.md * Create License File * Create CONTRIBUTING.md * modified .gitignore file (#5) --------- Co-authored-by: Sweta Prakash <[email protected]> Co-authored-by: Vidyadevi Salunkhe <[email protected]> * empty change --------- Co-authored-by: Harimohan Rajamohanan <[email protected]> Co-authored-by: Sweta Prakash <[email protected]> Co-authored-by: Vidyadevi Salunkhe <[email protected]> Co-authored-by: KA40094929 <[email protected]> Co-authored-by: Karyamsetty Helen Grace <[email protected]> Co-authored-by: ravishanigarapu <[email protected]>
* Fixed the NoSuchMethodException encountered while deployment. Needed to add a no-arg constructor as the class instance was getting created using reflection by jboss. * Removed the extra FhirRestfulServer constructor. * Corrected the indentation. * Corrected the indentation. * Implement update geolocation for a village (#24) * Implement update geolocation for a village * Update geolocation API infos * get geolocations data when retrieving village * Create a new constructor when retrieving village --------- Co-authored-by: Babacar Ndiaye <[email protected]> * Beneficiary sync (#26) * 1) Created wrapper API to sync beneficiaries from CHO app to AMRIT server that returns both beneficiaryID and beneficiaryRegID. 2) Handled exceptions. Instead of returning custom error codes & 200 as HTTP status code , now sending appropriate HTTP status codes with message in response body. * 1. Created API to down-sync beneficiaries (new and updated both) from AMRIT server to CHO App. 2. Handled exceptions as well. 3. Changed searchSyncLocation url for Identity service. 4. Created a new request object with villageID and lastSyncDate. * Beneficiary flow status records sync (#27) * 1. Created API to down-sync beneficiaries flow status records (new and updated both) from AMRIT server to CHO App. 2. Handled exceptions as well. * Implement save fingerprints for a user (#25) * Implement save fingerprints for a user * HTTP Request method changed to POST from GET (#28) * Changed request method for down-sync APIs to POST from GET. Swagger doesn't read request body for GET calls. * Modified API to sync beneficiaries and flow records based on villageId list instead of a single villageId. * Modified App-server syncing APIs . Sending response object 'Output response' while sync ben to server. Serialising nulls as well while down syncing. * Add one other field address (#31) * Update geolocation API infos * Changed serviceID and visitCategoryId to 9 as suggested. Referred commit 'f98d6361' done by 'KA40094929' for the same. * 1) Removed Authorization from response header. 2) Used existing method to create gson with null serialisation instead of new gson builder instance creation. * 1) Created entity to save user activity logs. 2) Created API to save/sync logs from App to server. 3) Handled exceptions. * Add APIs to get and set the master villageID without auth (#33) Add APIs to get and set the master villageID without auth Refactor DDL * Created API to get beneficiary nurse form data (visit details , chief complaints , vitals , history and examination) based on benRegID and visitCode to sync to App. * 1) Removed benAdherence from response while down syncing nurse data. 2) Created entity outreach master. 3) API to get outreaches in a state. * Added wrapper API to return visitId also in response while saving nurse data on server . Used Existing API to save nurse data , modified the response in this new API. * Made changes to fix getLocDetails API. * Added field to save user image (in case of outreach login) in user activity logs entity.Corresponding changes in service logic as well. * Modified and refactored APIs to set, get master village of a user. Added field 'loginDistance' to master district branch mapping entity. * Changed response while setting location coordinates for a village. * Changes suggested by Ravi(Wipro).Added userID field in view getVanLocDetails.Corresponding changes in getLocDetailsBasedOnSpIDAndPsmIDNew API. * 1) Added entity to save prescription templates. 2) APIs to upload and fetch templates. * Added field 'isOutOfReach' in user activity logs table. It will act as a flag when user logs in outside the HWC range. * API to delete prescription templates.Removed unique constraint in template entity. * Corrected ben visit detail repo call to get graph data for generalOPD doctor data. * Added APis to get count of beneficiaries and ben flow records to be synced from Server to App. To be used to show progress bar in the app. * Corrected the URl for APi to get beneficiary count. * Created daily outreach activity entity,repo and APIs related to it. * Added Identity-API url to get count of beneficiaries in all the properties files. * Removed duplicate columns of userID from V_getVanLocDetails. * CHOAppSyncController - Request header vulnerability fix. * -Added Copyright headers to new files. -Removed commented code. -Changes envs in common_ci.properties as suggested by Dr. Mithun. --------- Co-authored-by: roopesh-beehyv <[email protected]> Co-authored-by: babstar93 <[email protected]> Co-authored-by: Babacar Ndiaye <[email protected]>
Co-authored-by: Devika <[email protected]>
* Corrected patientFetosenseId variable name * Modified Van & Loc Details --------- Co-authored-by: Devika <[email protected]>
|
save doctor data-prescription save modified
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Type of change
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
Checklist: