edfe #698
Open
edfe #698
+72,991
−119,801
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
restricting data points from date before the campaign start date
…ll_targets Handling table charts overall targets
Disabling sms send feature if the role is org_admin
…wing custom exception
…xception-in-library Pfm 4215 removed throwing exception in library
Added CHANGELOG.md
…wing custom exception
* Updated few loggers (#759) * updated few loggers flow * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/genericUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Updated the user Password generation logic #761 * Merge branch 'campaign' into campaign-merged --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: ashish-egov <[email protected]>
#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Revert "HLM updated flyway migration docker version" This reverts commit 1f1167e. * Updated code comments on EmployeeService update method * Update EmployeeService.java * Updated code comments on EmployeeService, added changes for NPE handling --------- Co-authored-by: kavi_elrey@1993 <[email protected]>
* HLM-6185: Added null check for the project task resources list * HLM-6185: updated transformer logic for project task with beneficiary task and status population
* microplan-ui * adding HLM-6172 changes * hiding unique identifier column * Update build-config.yml * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * adding digti frontend pr 934 changes * Update build-config.yml * removing pl tl and template files * removed unnecessary code * Delete frontend/microplan-ui/Jenkinsfile * updating operation to match api changes * updating operation to match api changes * Update README.md * Update README.md * microplan-ui adding uploadguidelines and removing unnecessary files --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: SriPadma8997-egov <[email protected]>
…ng, delivery type integarted (#790) * Update campaignValidators.ts (#655) * fixes-> cyclenumber issue, hover issue, dropdown height issue, * css * fixes-> cyclenumber issue, hover issue, dropdown height issue, (#656) * fixes-> cyclenumber issue, hover issue, dropdown height issue, * css --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update campaignUtils.ts * fixed HLM-5970 * Feat : added boundary validation at data level * fixes * local add * Added boundary validation * Refactor * fixed HLM-5935 and HLM-5749 * Refactor * Feat : updated table * change campaignid in payload * Feat : added campaignId * Update campaignApis.ts * Update campaignValidators.ts * refactored * Refactor * assigned campaignId * Refactor * updated createRequest Schema * Feat : invalid Status Persist * status fix * version-fix * Update CODEOWNERS * core version updated and css fix for language dropdown * refactor (#676) * Uat signoff (#678) * change in filter recursive * lowest level * added validation related to target sheet headers * HLM-5916 * download button fixes in summary (#682) Co-authored-by: nabeelmd-eGov <[email protected]> * Hlm 5927 (#687) * change in filter recursive * lowest level * added validation for boundary codes to be invalid other than that selected from UI in target upload * Added Delivery and cycle config for LLIN and SMC both (#688) * no of cycle and deivery drafted changes * fixes * add localisation code for boundaries * fixes * fixes * Value localise in summary screen, api error change * fixes * genarate api call fix * font size change for summary * login css change * HLM-5718: SMC delivery config enhancement * config update * added config for in between * fix config for llin * added mdms integration --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Fixed HLM-5988_warning message (#689) Co-authored-by: nabeelmd-eGov <[email protected]> * download filename fixes (#693) * download button fixes in summary * download filename with custom name changes added --------- Co-authored-by: nabeelmd-eGov <[email protected]> * download filename fixes (#694) * download button fixes in summary * download filename with custom name changes added * config fix for llin --------- Co-authored-by: nabeelmd-eGov <[email protected]> * successful toast message is fixed (#695) * successful toast message is fixed * Update UploadData.js * HLM-5991: Alert Pop UP CR (#696) Co-authored-by: nabeelmd-eGov <[email protected]> * HLM-5718 changes (#703) Co-authored-by: nabeelmd-eGov <[email protected]> * Localization cache (#706) * change in filter recursive * lowest level * refactored localization cache logic * Update README.md (#707) * Update README.md * Update README.md * Update utilities/project-factory/README.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update README.md --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM-5985_made lowest level changes (#708) * HLM-5985_made lowest level changes * resolved codeRabbit comments * Create LOCALSETUP.md (#709) * Create LOCALSETUP.md * Refactored config * Update LOCALSETUP.md * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update LOCALSETUP.md --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated the localisation module config * Refactor config (#713) * Refactor config * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update postman_collection.json (#714) * Update postman_collection.json * Update postman_collection.json * Delete utilities/project-factory/project_factory_swagger.yml (#715) * Feat : removed campaignId validation for boundary upload (#718) * updated the delay for boundary relationship * added logger for request TODO TEST will be reverted * Revert "added logger for request TODO TEST" This reverts commit d5c2bf5. * Schema validation (#719) * Feat : removed campaignId validation for boundary upload * Feat : added schema validation * Fixed mdms host * updated the logger messages * updated the loggers * delivery new changes, toast fix, error fix (#716) * delivery new changes, toast fix, error fix * new fixes * fixes * change text component to field component * added hierarchy * fix * fix * fix * fix * passing hierarchy from props --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Schema validation2 (#721) * Feat : removed campaignId validation for boundary upload * Feat : added schema validation * Fixed mdms host * Feat : added boundary validation * Feat : optimized product search * Fix : project mapping fixed (#722) * Fixed project search (#723) * smc fixes (#724) Co-authored-by: nabeelmd-eGov <[email protected]> * Feat : added boundary confirmation (#727) * Fix: fixed processing boundary * Refactor * fixed HLM-6109 (#729) * gate fixes validation, ui ux (#731) Co-authored-by: nabeelmd-eGov <[email protected]> * integrated panelcard component (#732) * integrated panelcard component * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/Response.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#733) * updated the folder structure * Create CHANGELOG.md (#717) * updated the versions * Update .gitignore * Update request.ts (#735) * fixed generate api issue (#734) Co-authored-by: Jagankumar <[email protected]> * Create CHANGELOG.md * gate fixes (#736) * gate fixes validation, ui ux * gate fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * added loader in the selecting boundaries (#737) * Update createAndSearch.ts (#738) * fix (#739) * fix * fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Patch 3 (#740) * change in filter recursive * lowest level * trimmed underscore and empty spaces * boundary fix (#742) Co-authored-by: nabeelmd-eGov <[email protected]> * Update genericUtils.ts (#746) * fixed the delivery products issue * Fixed delivery conditions issue * Update campaignApis.ts (#747) * fixed warning toast (#748) * fixed warning toast * Update UploadData.js * fix (#749) * fix * fx * fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * core -update (#751) Co-authored-by: nabeelmd-eGov <[email protected]> * fixed stepper issue (#752) * fixed stepper issue * Update index.html * Feat : added user validation via individual (#753) * fixes (#754) Co-authored-by: nabeelmd-eGov <[email protected]> * code fix nabeel (#756) * fixes * fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Updated few loggers (#759) * updated few loggers flow * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/genericUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Updated the user Password generation logic #761 * Update Listener.ts (#730) * Update Listener.ts * added try catch logic in producer * Feat : added parallel batch execution (#767) * Feat : added parallel batch execution * Refactor * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed the stepper (#765) * changes config (#769) * Project type config and added loggers for process of campaign (#772) * Feat : added themes in generate template (#773) * fixed the ajv package version for build issue * Feat : removed xlsx (#776) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (#778) Co-authored-by: nabeelmd-eGov <[email protected]> * css update (#780) Co-authored-by: nabeelmd-eGov <[email protected]> * HLM-6179 and HLM-6180 (#777) * HLM-6179 and HLM-6180 * campaign name changes --------- Co-authored-by: Jagankumar <[email protected]> * Feat : fixed target generation (#781) * fixed tenantId issue (#784) * fix: resolved AJV-related Jenkins build issue reference #783 #786 (#787) * module ui fix * updated all the package version for build fixes * fixed kafka-error at target generation (#789) * updated core version (#791) * updated core version * updated css also * Update campaignValidators.ts (#794) * Updated the excel generation logic and files * added changes for configurable column in target sheet (#779) * change in filter recursive * lowest level * made target headers genearte through mdms schema * changed config index.ts * changed config index.ts * changes for now * added configurable column logic from schema HLM-6169 * updated validate of target columns through schema * added masterForColumnSchema in index.ts * formatted dataManageService * refactored lock TargetFields func * removed console.log * User creation performance improved (#800) * Feat : Improved user creation performance * Change status color * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#801) * Hlm 6170 (#802) * change in filter recursive * lowest level * HLM -6170 added logic for only village level data in target sheet and some refactoring * updated css (#804) * fixed button issue (#805) * HLM 6177: Error card implementation in summary screen (#806) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT * Added Error Cards in summary screen and redirection --------- Co-authored-by: nabeelmd-eGov <[email protected]> * added error button styles (#807) Co-authored-by: nabeelmd-eGov <[email protected]> * updated popUp css (#808) * HLM 6178: Implementing New Pop up screen in boundaries (#809) * added error button styles * Implementing New Pop up screen in boundaries --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Facility changes (#812) * Feat : changed facility Template * Feat : locked target templates * fixed colour issue (#813) * Updated the project type conversion logic for the "deliveryType" dont1 and n config * Unique field added (#814) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Target schema update (#815) * change in filter recursive * lowest level * updated shcema of target columns to be configurable * removed empty spaces from config index.ts * Active mapping (#817) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Feat : added mapping via active field * changes in the schema validation (#816) * Updated the workbench and css module version * Feat : added active inactive boundary check (#818) * Update campaignValidators.ts (#819) * added active inactive validation (#820) * changed api call time (#826) * Feat : added target sum mapping (#825) * added campaign type as filter (#827) * Update genericApis.ts (#828) * Update excelUtils.ts (#829) * UI issue fixes, icon fix in summary error (#831) Co-authored-by: nabeelmd-eGov <[email protected]> * Target columns (#830) * change in filter recursive * lowest level * commit * Feat : target flow fixed for LLIN-mz * uat to dev --------- Co-authored-by: admin1 <[email protected]> * Feat : freezed target columns (#833) * Target mr dn (#834) * change in filter recursive * lowest level * Feat : skipped validation temporarily * changes in the target validation (#835) * fixed error info (#837) * Added roboto font (#840) * Feat : added roboto font * Fixed config * target validation based on diff campaign types (#843) * change in filter recursive * lowest level * updated validation of target based on campaign type * fixed validation issue (#844) * Updated the workbench package version * fixed validation logic (#846) * fixed validation logic * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Error messages improved (#848) * Feat : imporved error messages and initilised utils for tracking process * Fix ; unused variables fixed * Feat : improved error messages * Fix : download error fix (#850) * Update campaignUtils.ts (#851) * Update campaignUtils.ts * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#853) * HLM 6210: Toast, error focus fix and project type reset delivery data fix (#854) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * HLM-6225_added time out according to data (#855) * Update campaignValidators.ts (#859) * HLM 6210 (#858) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Remove validation (#852) * change in filter recursive * lowest level * removed unnecessary validation for target * spacing refactor * Update campaignValidators.ts (#863) * Header validation (#861) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * space refactor * Update campaignUtils.ts (#864) * fixed ui error (#865) * Read me (#867) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * fixed portugese language error * space refactoring * Update Dockerfile * Update Dockerfile * Update migrate.sh * Update Dockerfile * Update campaignValidators.ts (#868) * HLM 6210:campaign type change reset fix (#869) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes * campaign type change reset fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update excelUtils.ts for sheetHeaders wraping (#870) * Update package.json * updated error messages (#871) * feat : added jaeger-client tracing (#872) * updated the table config * Update campaignApis.ts (#875) * removed the schema and updated the db name * fixing generate API call, file auto delete, date error (#877) Co-authored-by: nabeelmd-eGov <[email protected]> * Trim resource (#878) * Feat : trimmed resource persist message * Refactor * Removed reject error in produce message * fixed min time, draft logic (#879) * Update index.ts (#880) * added min ui error and facility usage (#883) * added min ui error and facility usage * changes * Update campaignUtils.ts (#884) * HLM 6007 (#885) * fixing generate API call, file auto delete, date error * generate api fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update Dockerfile * Feat : docker config update (#886) * Update Dockerfile (#887) * Create buildWorkbenchUI.yml * Update README.md (#917) * Update buildWorkbenchUI.yml * Update README.md * Updated the DB Schema issue of Project-factory * fixed hierarchy order (#919) * User flag hcm (#920) * Feat : docker config update * Feat : added user create flag * Refactored * Update campaignUtils.ts * Update campaignMappingUtils.ts (#922) * Ashish egov patch 2 (#921) * Update index.ts * Update campaignApis.ts * Fixed the project type conversion and product duplicate issue * Update campaignApis.ts (#924) * Update campaignMappingUtils.ts (#925) * Update campaignMappingUtils.ts * Refactored * Update publishProjectFactory.yml * Update buildWorkbenchUI.yml * Update campaignMappingUtils.ts (#926) * Update request.ts (#928) * Update request.ts * Feat : updated httprequest * Feat : warning response added * Refactor * added start and enddate in cycles * Update campaignApis.ts (#930) * Update request.ts (#932) * fixed generate issue (#933) * Fixed project-type resources duplication * updated target error messages (#936) * fixed stepper from draft (#937) * Update Listener.ts * delivery type disable fix, product sku name change (#939) Co-authored-by: nabeelmd-eGov <[email protected]> * fixed error message issue (#941) * Redis integration (#940) * Feat : added redis * Feat : added redis retry * updated migration * fixed * updated migration * Delete .vscode/launch.json * Delete .vscode/settings.json --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: Bhavya-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: Bhavya-egov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Swathi-eGov <[email protected]> Co-authored-by: admin1 <[email protected]>
* flyway base image updated * reverted product changes and removed duplicate attendance code (#768) * flyway version update * updated psql version for core services and facility * flyway update * HLM throwing custom exception when boundary service call throw an error (#775) * HLM-6196: Search failing, updated GenericQueryBuilder.java, added changes to get all … (#769) * HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Revert "HLM updated flyway migration docker version" This reverts commit 1f1167e. * Updated code comments on EmployeeService update method * Update EmployeeService.java * Updated code comments on EmployeeService, added changes for NPE handling --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * HLM-6196: updated GenericQueryBuilder.java, added changes to get all the fields except Object class * hlm-6196: update common library reference for dev testing" * HLM-6196: updated health-service-common version to 1.0.17-SNAPSHOT and added default for included deleted * HLM-6196: updated genericrepository * HLM-6196: fixed testcases * HLM-6196: fixed individual search query error * taskresource additional fields column added * HLM-6196: updated health services models TaskResource, added AdditionalField * HLM-6196: hfreferral, referral, sideeffect - edge case fix * HLM-6196: removed todo from urlparams --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: Vishal <[email protected]> * Hlm 6196 hrms employee search by names fix (#785) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104. * HLM-6196: added comments as per code review * Update IndividualSearch.java --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * HLM-6196: updated @component in validators for client reference id va… (#781) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104. * Revert "Revert "HLM-6196: updated @component in validators for client reference id validation"" This reverts commit 2218ad3. * Revert "Revert "HLM-6196: fixed testcases for stock and individual"" This reverts commit 083c516. * HLM-6196: replaced RuntimeException with CustomException * HLM-6196: updated to get only message from exception * HLM-6196: updated individual search as it was with exclude annotation * Update core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated changelog for HCM v1.4 release * updated changelog for HCM v1.4 release * Update health-services/product/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM added error stack strace whenever custom exception is thrown while validation duplicate entry --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Vishal <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* Adding plan-service folder for master merge * code review comment. --------- Co-authored-by: devdatta-egov <[email protected]>
* microplan-ui * adding HLM-6172 changes * hiding unique identifier column * Update build-config.yml * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * adding digti frontend pr 934 changes * Update build-config.yml * removing pl tl and template files * removed unnecessary code * Delete frontend/microplan-ui/Jenkinsfile * updating operation to match api changes * updating operation to match api changes * Update README.md * Update README.md * microplan-ui adding uploadguidelines and removing unnecessary files * adding microplan to micro-ui * adding microplan folder in microui/web * Update setupProxy.js * review changes * adding review changes * review changes * Update Mapping.js * Update Upload.js * Update geojsonValidations.js * Update CreateMicroplan.js * Update MicroplanPreview.js * Update MicroplanPreview.js * Update CreateMicroplan.js * adding review comments, updage campaign service, removed hardcoded tenent and removed logout util * removing microplan-ui folder * Update index.js * adding review changes, reducing functional complexcity * updaing microplan css pkg version * Update jsonToExcelBlob.js * Update MicroplanCreatedScreen.js * Update UICustomizations.js * Update uploadUtils.js * Update build-config.yml --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: SriPadma8997-egov <[email protected]>
* Adding resource-estimation-service folder for master merge * change names to camel case. * Code review comment * code review comments * removed lines that are not required * removed space * updated files. * change and code review comment * code review * code review * code comment * code review * removed finally --------- Co-authored-by: devdatta-egov <[email protected]> Co-authored-by: Nilesh Shinolikar <[email protected]>
* commit changelog,localsetup,readme * Code review comment * Order by caluse in search * checking empty in differnt way
* Read me changes from master branch * change properties file * Code review comment
…h underscores being present in boundary codes (#809) * fixed target upload flow in french locale * added comments for changes in each line of codes
* Resource estimation service - regex fix * Resource estimation service - empty row check
…n it will show previous filestore id (#811) * updated generate different tab logic * added comments
* HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Hlm 4062 count api (#547) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter * Project beneficiary tag cherrypick (#539) * added downsync dummy api * added downsync dummy api with res * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Dev (#537) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * rebased project-persister.yml from configs * updated pom.xml: update common model version to 1.0.10 * updated db script, added unique constraint to tag column * updated referral-management.yml * updated db script * project beneficiary voucher tag uniqueness validator and search support * updated PbVoucherTagUniqueValidator.java * Added and updated for unique field voucher tag create and update scenario * project beneficiary bug fix * removed unused import * project beneficiary : voucherTag renamed to tag * Hlm 4062 count api (#547) (#548) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter Co-authored-by: kanishq-egov <[email protected]> * referral management project beneficiary validation fix * deleted persister and indexer file from project module resource folder --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Vishal <[email protected]> * HH member clientrefid (#551) * adding clientRefId, Models version change, migration file * adding clientRefId for HouseholdMemberSearch as List * updated migration * adding Notnull for clientrefId --------- Co-authored-by: Vishal <[email protected]> * Downsync smc referral module (#556) * added downsync dummy api * added downsync dummy api with res * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Dev (#537) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * Hlm 4062 count api (#547) (#548) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter Co-authored-by: kanishq-egov <[email protected]> * Project beneficiary tag cherrypick (#549) * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * rebased project-persister.yml from configs * updated pom.xml: update common model version to 1.0.10 * updated db script, added unique constraint to tag column * updated referral-management.yml * updated db script * project beneficiary voucher tag uniqueness validator and search support * updated PbVoucherTagUniqueValidator.java * Added and updated for unique field voucher tag create and update scenario * project beneficiary bug fix * removed unused import * project beneficiary : voucherTag renamed to tag * referral management project beneficiary validation fix --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Vishal <[email protected]> * dummy api with same pagination response * dummy api with same pagination response * dummy api with same pagination response * downsync data test * data integrated till beneficiary * Update CHANGELOG.md * Delete health-services/project/src/main/resources/project-persistor.yml * skip on empty result added * skip on empty result added * beneficary searhc based on individual clientref id added * sideeffetc, ref, task fetch added * tasks earch fix * referral search fix --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Vishal <[email protected]> * Dev downsync fix smc (#561) * household model reverse * Update CHANGELOG.md * Added changes for includeDeleted for downsync * not null added --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Dev master conflict fix (#562) * HLM-3069: updated build.config.yml * HLM-3069: updated build-config.yml renamed adrm to referralmanagement * HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and project version from 1.1.0 to 1.1.1-beta * referralmanagement version 1.0.0-beta, added changelog, localsetup * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * HLM-3069: null project beneficiary validation error fix * HLM-3069: added comments and splitted validation condition * Dev to master (#550) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Hlm 4062 count api (#547) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter --------- Co-authored-by: kavi_elrey@1993 <[email protected]> --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Dev downsync fix smc (#563) * household model reverse * Update CHANGELOG.md * Added changes for includeDeleted for downsync * not null added --------- Co-authored-by: kanishq-egov <[email protected]> * Dev master conflict fix (#565) * HLM-3069: updated build.config.yml * HLM-3069: updated build-config.yml renamed adrm to referralmanagement * HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and project version from 1.1.0 to 1.1.1-beta * referralmanagement version 1.0.0-beta, added changelog, localsetup * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * HLM-3069: null project beneficiary validation error fix * HLM-3069: added comments and splitted validation condition * Dev to master (#550) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Hlm 4062 count api (#547) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter --------- Co-authored-by: kavi_elrey@1993 <[email protected]> --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Dev downsync fix smc (#566) * household model reverse * Update CHANGELOG.md * Added changes for includeDeleted for downsync * not null added --------- Co-authored-by: kanishq-egov <[email protected]> * Added fix for testcases for householdmember (#570) Co-authored-by: kanishq-egov <[email protected]> * updated the version, and added the changelog (#571) * updated the version, and added the changelog * updated ReferralManagement CHANGELOG * Update CHANGELOG.md --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * HLM-4062: removed pagination from fields excluding household api call * HLM-4062: missed in implementation (#574) * HLM-4062: missed in implementation * HLM-4062: default max is set to 1000 for not null limit value and 0 for offset value * project beneficiary tag update failed fix HLM-4444 * HLM-4444: added code review comments * sownsync bug fix for limit --------- Co-authored-by: kavi_elrey <[email protected]> * HLM-4444: project beneficiary update fix (#575) * Update CHANGELOG.md * updated changelog with dates (#577) * updated stock module changelog (#578) * HLM-4481: Added changes for task resource quantity validation and data type to double, db migration script added * HLM-4481: updated rowmapper for taskresource * HLM-4481: updated TaskTestBuilder.java * HLM-4481: added user create and update properties in application.properties * HLM-4481: fixed the regex required * Hlm 4501 smc referral flow (#602) * HLM-4501: Added changes for HFReferral flow * updated comments for common models * updated comments for common models removed ini file This reverts commit c1e226f961042f1162bb9ece8d2e1c01b62d220c. * HLM-4501: updated topics and hfreferal constants * HLM-4501: updated HFReferralService.java * HLM-4501: Added changes in project id validator * HLM-4501: updated HFReferralService.java * HLM-4501: fixed hfreferral changes * HLM-4501: added project facility id validator for hf_referral * HLM-4501: missing link for validator added * HLM-4501: updated HfrProjectFacilityIdValidator for NPE * HLM-4501 : updated hf referral symtoms character length to 256 * HLM-4501: updated additionalFields field value size from 2 to 1 * Implementation of row version validator for referral and side effect Implemented the row version validator for side effect under validator/sideeffect and similarly for referral under validator. The implemented validators were added to their respective service classes. * Revert "Implementation of row version validator for referral and side effect" This reverts commit 7a1a291110e4b5079fd177612c76df2d27681a6d. * hlm-4989 Implementation of row version validtor for side effect and referral * hlm-4989 Ordered and cleaned up imports * hlm-4989 Added code review comments for the Side effect and Referral Version Validator * hlm-4988 Regex pattern added for bednet quantities to be positive whole numbers * hlm-4988 Added config for health-project to build-config file * hlm-4988 Newly added regex pattern for bednet quantities commented-out * hlm-4988 mesage for Task resource quantity added in application.properties * hlm-4988 message added for invalid quantity error * Hlm 3372 enhance inventory flow backend fixes (#623) * HLM-3372: added changes required to fix quantity, Sender Receiver enum * HLM-3372: Sender and Receiver id validator * HLM-3372: updated all reference for SenderType and Receiver Type enum * HLM-3372: stock model updated, removed size annotations from referenceidtype enum field * HLM-3372: Min validation added for integer type of quantity * HLM-3372: test cases updated * HLM-5004 Added max value and decimal condition for quantity in stock, added component and order annotation for SSenderIdReceiverIdEqualsValidator * HLM-5004 Custom JsonDeserializer validator IntegerValidator added in health-services-models * hlm-5004 added custom exception and a custom exception handler to handle the integer validator exception * hlm-5004 optimized imports and added code comments * hlm-5004 CustomIntegerSerializer added and unnecessary validators removed * hlm-5004 Registered the CustomIntegerDeserializer with objectMapper for Integer class * hlm-5004 Removed line of code that was removing all the invalid entities from the list in SSenderIdReceiverIdEqualsValidator * hlm-5004 changes in test configurations and optimized imports * hlm-5004 added row version validator for stock delete * hlm-5004 dateOfEntry field was handled in StockRowMapper to return null if no value is present and description was added to stock contact for transactionReason * updated pom.xml for health campaign models * Revert "updated pom.xml for health campaign models" This reverts commit 035c78720c610916000c8de76fa87e7904774b59. --------- Co-authored-by: syed-egov <[email protected]> * Hlm 4501 smc referral flow code comments (#636) * Dev to master : beneficiary tag bug fix, downsync pagination fix (#576) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Hlm 4062 count api (#547) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter * Project beneficiary tag cherrypick (#539) * added downsync dummy api * added downsync dummy api with res * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Dev (#537) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * rebased project-persister.yml from configs * updated pom.xml: update common model version to 1.0.10 * updated db script, added unique constraint to tag column * updated referral-management.yml * updated db script * project beneficiary voucher tag uniqueness validator and search support * updated PbVoucherTagUniqueValidator.java * Added and updated for unique field voucher tag create and update scenario * project beneficiary bug fix * removed unused import * project beneficiary : voucherTag renamed to tag * Hlm 4062 count api (#547) (#548) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter Co-authored-by: kanishq-egov <[email protected]> * referral management project beneficiary validation fix * deleted persister and indexer file from project module resource folder --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Vishal <[email protected]> * HH member clientrefid (#551) * adding clientRefId, Models version change, migration file * adding clientRefId for HouseholdMemberSearch as List * updated migration * adding Notnull for clientrefId --------- Co-authored-by: Vishal <[email protected]> * Downsync smc referral module (#556) * added downsync dummy api * added downsync dummy api with res * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Dev (#537) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * Hlm 4062 count api (#547) (#548) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter Co-authored-by: kanishq-egov <[email protected]> * Project beneficiary tag cherrypick (#549) * Added project beneficiary tag field * renamed project beneficiary tag to voucher tag * rebased project-persister.yml from configs * updated pom.xml: update common model version to 1.0.10 * updated db script, added unique constraint to tag column * updated referral-management.yml * updated db script * project beneficiary voucher tag uniqueness validator and search support * updated PbVoucherTagUniqueValidator.java * Added and updated for unique field voucher tag create and update scenario * project beneficiary bug fix * removed unused import * project beneficiary : voucherTag renamed to tag * referral management project beneficiary validation fix --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Vishal <[email protected]> * dummy api with same pagination response * dummy api with same pagination response * dummy api with same pagination response * downsync data test * data integrated till beneficiary * Update CHANGELOG.md * Delete health-services/project/src/main/resources/project-persistor.yml * skip on empty result added * skip on empty result added * beneficary searhc based on individual clientref id added * sideeffetc, ref, task fetch added * tasks earch fix * referral search fix --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Vishal <[email protected]> * Dev downsync fix smc (#561) * household model reverse * Update CHANGELOG.md * Added changes for includeDeleted for downsync * not null added --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Dev master conflict fix (#562) * HLM-3069: updated build.config.yml * HLM-3069: updated build-config.yml renamed adrm to referralmanagement * HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and project version from 1.1.0 to 1.1.1-beta * referralmanagement version 1.0.0-beta, added changelog, localsetup * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * HLM-3069: null project beneficiary validation error fix * HLM-3069: added comments and splitted validation condition * Dev to master (#550) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Hlm 4062 count api (#547) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter --------- Co-authored-by: kavi_elrey@1993 <[email protected]> --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Dev downsync fix smc (#563) * household model reverse * Update CHANGELOG.md * Added changes for includeDeleted for downsync * not null added --------- Co-authored-by: kanishq-egov <[email protected]> * Dev master conflict fix (#565) * HLM-3069: updated build.config.yml * HLM-3069: updated build-config.yml renamed adrm to referralmanagement * HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and project version from 1.1.0 to 1.1.1-beta * referralmanagement version 1.0.0-beta, added changelog, localsetup * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * HLM-3069: null project beneficiary validation error fix * HLM-3069: added comments and splitted validation condition * Dev to master (#550) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-4062: added count api changes for household * HLM-4062: Updated findbyid references * HLM-4062: Updated pom.xml of household * Hlm 3376 reviewcomments (#524) * HLM-3376: review comments commit * HLM-3069: side effect code comments, code refactor * HLM-3376: code review comments and code refactoring * updated the common-models version to 1.0.10, and updated in dependent service * HLM-3376 : Added additional field in side effect, referral. * HLM-3376: missing column fix * HLM-3372: constants type changed * HLM-3376: removed not used validators * code refactor and code comments * hlm-3376: added test cases * hlm-3376: referralmanagement context in test cases * hlm-3376: changed parameters for find by id * HLM-3372: typo fix * hlm-3376: persister changes, removed invalid parameters * hlm-3372: added changes as per code review, removed unused properties * hlm-3376: recipient validator for faciliy not working fix * HLM-3376: throwing exception on invalid recipient type * HLM-3376: added comments as per review comments * HLM-3376 : added changes as per code review comments, each column's name included in query * HLM-3376: query column names * Hlm 4062 count api (#547) * hlm-4062: updated household * HLM-4062: added count api support using cte for household * HLM-4062: updated HouseholdRepository.java * updated householdrowmapper.java * HLM-4062:code refactor, removed useCTE parameter --------- Co-authored-by: kavi_elrey@1993 <[email protected]> --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> * Dev downsync fix smc (#566) * household model reverse * Update CHANGELOG.md * Added changes for includeDeleted for downsync * not null added --------- Co-authored-by: kanishq-egov <[email protected]> * Added fix for testcases for householdmember (#570) Co-authored-by: kanishq-egov <[email protected]> * updated the version, and added the changelog (#571) * updated the version, and added the changelog * updated ReferralManagement CHANGELOG * Update CHANGELOG.md --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * HLM-4062: removed pagination from fields excluding household api call * HLM-4062: missed in implementation (#574) * HLM-4062: missed in implementation * HLM-4062: default max is set to 1000 for not null limit value and 0 for offset value * project beneficiary tag update failed fix HLM-4444 * HLM-4444: added code review comments * sownsync bug fix for limit --------- Co-authored-by: kavi_elrey <[email protected]> * HLM-4444: project beneficiary update fix (#575) * Update CHANGELOG.md * updated changelog with dates (#577) * updated stock module changelog (#578) --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: Vishal <[email protected]> Co-authored-by: bhanu prakash <[email protected]> Co-authored-by: Naveen J <[email protected]> Co-authored-by: talele08 <[email protected]> * Referral and Side effect sequence diagram * HLM-4501: Added changes for HFReferral flow * updated comments for common models * updated comments for common models removed ini file This reverts commit c1e226f961042f1162bb9ece8d2e1c01b62d220c. * HLM-4501: updated topics and hfreferal constants * HLM-4501: updated HFReferralService.java * HLM-4501: Added changes in project id validator * HLM-4501: updated HFReferralService.java * HLM-4501: fixed hfreferral changes * HLM-4501: added project facility id validator for hf_referral * HLM-4501: missing link for validator added * HLM-4501: updated HfrProjectFacilityIdValidator for NPE * HLM-4501 : updated hf referral symtoms character length to 256 * HLM-4501: updated additionalFields field value size from 2 to 1 * HLM-4501: added code comments for all hf referral related classes * HLM-4501: hf-referral sequence diagram --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: Vishal <[email protected]> Co-authored-by: bhanu prakash <[email protected]> Co-authored-by: Naveen J <[email protected]> Co-authored-by: talele08 <[email protected]> * HLM-4496, HLM-4207 attendance module (#616) * HLM-4496: Added attendance module in HCM * HLM-4496: updated attendance directory, removed target folder and imi file * buil config added for hlm-4496 in feature branch * HLM-4207: offline enablement in attendance log * HLM-4207: added db migration script * HLM-4207: updated db migration script * HLM-4207: updated incorrect statements * HLM-4207: bulk api support, without redis cache * HLM-4207: updated Attendancelog consumer for bulk api * HLM-4207: consumer fix * HLM-4207: cache support added for attendance log create and update * HLM-4207: added health-individual endpoint * HLM-4207: added radis host * HLM-4207: updated qualified for objectmapper in attendance module * HLM-4496,HLM-4207: updated application.properties for redis config * HLM-4207: updated kafka listener topics * HLM-4207: changed kafka config * HLM-4894 adding hrms related flag to Individual object, adding another ApiOperation * HLM-4894 adding hrms related flag to Individual object, adding another ApiOperation * HLM-4207, HLM-4986, HLM-4987 : bug fix * HLM-4894 adding changes related to linking of HRMS Employee with Individual * HLM-4894 adding changes related to linking of HRMS Employee with Individual * HLM-4207: added clientreferenceid search, null check for document id * HLM-4894 reverting changes related to linking of HRMS Employee with Individual * HLM-4894 reverting changes related to linking of HRMS Employee with Individual from libraries, common-models * HLM-4207: code re-format * HLM-4894 adding changes for managing attendees while enrollment * HLM-4207: updated attendance search, register id or clientreference id are mandatory * hlm-5009 staffId in ProjectStaffSearch changed to list from string * HLM-4894 updating build config * HLM-4207: clientReferenceIds is changed to clientReferenceId for Attendance Log search criteria * HLM-4207: removed staff validation for search without register id * HLM-4894 adding changes for project staff validation * HLM-4894 adding @Qualifier annotation for object mapper * HLM-4894 fixing hrms url * HLM-4771: added changes for updating the registers on project date update * HLM-4771: project update changes * HLM-4771: updated the project start date update validation, can not update start date if it is already started * HLM-4771: updated attendance register consumer and service with comments * HLM-4771: updated the tenant id * HLM-4894 updating environment variables. * HLM-4894 updating code changes * HLM-4894 adding code changes * HLM-4894 adding code changes * HLM-4894 adding code changes * HLM-4771: updated the project validators, validation for start and end date of project * HLM-4894 adding useruuid as search param in individual search * HLM-4894 adding useruuid as search param in individual search * HLM-4894 adding useruuid as search param in individual search * HLM-4894 adding changes for registry creation when supervisor enrolls * HLM-4496, HLM-4894: first staff enrollment on attendance register creation is optional * HLM-4894 adding changes attendee enrollment * HLM-4894 adding changes for making staffId as list of staffId in ProjectStaffSearch * HLM-4894 adding changes for making staffId as list of staffId in ProjectStaffSearch * HLM-4894 adding changes for making staffId as list of staffId in ProjectStaffSearch * HLM-4894 removing staff-bulk-create-topic * HLM-4894 removing staff-bulk-create-topic * HLM-4894 removing staff-bulk-create-topic * HLM-4894 removing staff-bulk-create-topic * HLM-4894 changing health-attendance consumer group-id * HLM-4894 adding changes for projectstaff consumer * HLM-4894 adding changes for projectstaff consumer * HLM-4894 adding changes for projectstaff consumer * HLM-4894 adding changes for projectstaff consumer * HLM-4894 adding changes for projectstaff consumer * HLM-5045: added changes, project start date and end date difference should at least be 1 day. * HLM-4894 adding comments * HLM-4894 adding additional Details during attendance register creation * HLM-4894 adding additional Details during attendance register creation * hlm-4496 : bug fix on adding staff on updation of register * HLM-4894 increasing limit to 1000 * Added changelog for individual, health-services-models, project, stock * HLM-4496 : remove attendance module as it is moved to DIGIT-Works repository. * HLM-5076: added changes related to project module * updated individual user uuid search field for hlm-4496, hlm-4207 * changed common models build to 1.0.19-SNAPSHOT --------- Co-authored-by: Priyanka-eGov <[email protected]> Co-authored-by: syed-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> * Hlm 4496 individual UUID search (#656) * HLM-4496: updated changedlog for individual, health-services-models, project, referralmanagement * HLM-4496: Added size annotations on individual search userUuid field * hlm-4496: Revert of application.properties changes * updated pom.xml version for individual, project, referralmanagement, stock (#657) * Health hrms (#660) * updated pom.xml version for individual, project, referralmanagement, stock * Added health-hrms * Hlm health hrms changes (#650) * HLM-4496: Added attendance module in HCM * HLM-4496: updated attendance directory, removed target folder and imi file * buil config added for hlm-4496 in feature branch * HLM-4207: offline enablement in attendance log * HLM-4207: added db migration script * HLM-4207: updated db migration script * HLM-4207: updated incorrect statements * HLM-4207: bulk api support, without redis cache * HLM-4207: updated Attendancelog consumer for bulk api * HLM-4207: consumer fix * HLM-4207: cache support added for attendance log create and update * HLM-4207: added health-individual endpoint * HLM-4207: added radis host * HLM-4207: updated qualified for objectmapper in attendance module * HLM-4496,HLM-4207: updated application.properties for redis config * HLM-4207: updated kafka listener topics * HLM-4207: changed kafka config * HLM-4207, HLM-4986, HLM-4987 : bug fix * HLM-4207: added clientreferenceid search, null check for document id * HLM-4894 moving hrms code from DIGIT-Dev branc health-moz-dev * HLM-4894 moving hrms code from DIGIT-Dev branc health-moz-dev * HLM-4894 updating build config for health-hrms * HLM-4894 adding clientreferenceID while creating individuals * HLM-4894 adding clientreferenceID while creating individuals * HLM-4894 adding clientreferenceID while creating individuals * HLM-4894 adding clientAuditDetails while creating individuals * Adding mdmsLegacyHost * Adding mdmsLegacyHost --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> * Revert "Hlm health hrms changes (#650)" (#663) This reverts commit db786acf5fd949084ad544aa6f9f31e5d9a37f6e. * index creation migrations (#668) * hlm-5051 added method to validate task resource quantity based on product variant id which will be used to fetch the regex and error message from mdms * hlm-5051 changed the versionn for health-services-models * hlm-5051 added mdms task module config * hlm-5051 changed the module name for mdms data for task validation * hlm-5051 removed the regex patterns and error messages from appliction.properties and al removed the properties from cofigurations * flyway base image updated * reverted product changes and removed duplicate attendance code (#768) * flyway version update * updated psql version for core services and facility * flyway update * HLM throwing custom exception when boundary service call throw an error (#775) * HLM-6196: Search failing, updated GenericQueryBuilder.java, added changes to get all … (#769) * HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Revert "HLM updated flyway migration docker version" This reverts commit 1f1167ea0fc5ee5ed259f85cbdf9777e31eb868f. * Updated code comments on EmployeeService update method * Update EmployeeService.java * Updated code comments on EmployeeService, added changes for NPE handling --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * HLM-6196: updated GenericQueryBuilder.java, added changes to get all the fields except Object class * hlm-6196: update common library reference for dev testing" * HLM-6196: updated health-service-common version to 1.0.17-SNAPSHOT and added default for included deleted * HLM-6196: updated genericrepository * HLM-6196: fixed testcases * HLM-6196: fixed individual search query error * taskresource additional fields column added * HLM-6196: updated health services models TaskResource, added AdditionalField * HLM-6196: hfreferral, referral, sideeffect - edge case fix * HLM-6196: removed todo from urlparams --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: Vishal <[email protected]> * Hlm 6196 hrms employee search by names fix (#785) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0c58c07d3495bf736069c30003ac0ba65e. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104fbe75fd01bf6e812e8cbe4b91569c1f2f. * HLM-6196: added comments as per code review * Update IndividualSearch.java --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * HLM-6196: updated @component in validators for client reference id va… (#781) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0c58c07d3495bf736069c30003ac0ba65e. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104fbe75fd01bf6e812e8cbe4b91569c1f2f. * Revert "Revert "HLM-6196: updated @component in validators for client reference id validation"" This reverts commit 2218ad3b3916587f2b0e6ac67d06ded5152ce366. * Revert "Revert "HLM-6196: fixed testcases for stock and individual"" This reverts commit 083c516b18c02096ab1cfeb70e32b68c2c1c6c0d. * HLM-6196: replaced RuntimeException with CustomException * HLM-6196: updated to get only message from exception * HLM-6196: updated individual search as it was with exclude annotation * Update core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated changelog for HCM v1.4 release * updated changelog for HCM v1.4 release * Update health-services/product/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM added error stack strace whenever custom exception is thrown while validation duplicate entry * HLM-6303: fixed search for zero search object parameters case (#799) * merging master to master-flyway-imageupdate (#800) * HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Re…
* Hlm 6385 irs changes (#841) * HLM-6385: added changes for IRS activity track and closed household concepts * HLM-6385: added changes for IRS activity track and closed household concepts, added db migration script, validations for closed household * HLM-6385: added changes for location tracking * HLM-6385: added changes for location points * HLM-6385: added clientReferenceId and tenantId in LocationPoint, updated Location_capture model * HLM-6385, HCMPRE-46: Updated changes as per design review * HLM-6385, HCMPRE-46: Added Location capture changes * HLM-6385, HCMPRE-46: Added UserAction changes * HLM-6385, HCMPRE-46: updated common models, replaced digit models with service-common * Revert "HLM-6385, HCMPRE-46: updated common models, replaced digit models with service-common" This reverts commit 6abdea4. * HLM-6385, HCMPRE-46: updated table informations and columns for migration scripts * reverting BoundaryUtil change * reverting BoundaryUtil changes * HLM-6385, HCMPRE-46: updated validators and IRSConsumer * HLM-6385, HCMPRE-46: updated validators * HLM-6385, HCMPRE-46: updated project configuration * HLM-6385, HCMPRE-49: updated models to have isDeleted as it is required in common utils enrichment code * HLM-6385, HCMPRE-46: updated the projectid field, added notnull annotation * HLM-6385, HCMPRE-46: updated all the changes related to enrichment * HLM-6385, HCMPRE-46: made action field notnull * HLM-6385, HCMPRE-46: updated locationCapture and userAction with mandatory latitude, longitude, locationAccuracy fields * HLM-6385, HCMPRE-46: updated locationCapture and userAction with mandatory latitude, longitude, locationAccuracy fields, HCMPRE-116, HCMPRE-117 * HLM-6385, HCMPRE-46: updated locationCapture and userAction with mandatory latitude, longitude, locationAccuracy fields, HCMPRE-116, HCMPRE-117, added in services * HLM-6385, HCMPRE-46: removed outdated changes from Task.java * removed all user location models * Refactored from LocationCapture model to UserAction and packges from irs to useraction * HLM-6385 - lat/long irs name changes * HLM Downsync Incremental product changes pull from impel (#831) * HLM Downsync Incremental product changes pull from impel * HLM removed impel specific changes * renamed Project type filter code constant * HLM updated beneficiary based search * HLM updated downsync search, cycles is required only when it is smc based campaign * HCM - removed project task resource quantity validator * HLM updated downsync logic as per review comments * HCMPRE-216 : Added Administration failed status for validation when task resource is empty or when status is ADMINISTRATION_FAILED * HCMPRE-216: updated task status * HCMPRE-216: changed to ADMINISTRATION_FAILED * HLM-6385: updated with code review comments * HLM-6385: added changes as per review comments, and added correct logs wherever required. * HLM-6385: code review comments addressed. * HLM-6385: review comment added for error handling on LocationCaptureRepository * HLM-6385: another batch of coderabbitai code review comments addressed. * HLM-6385: added more logs in repository for useraction and location capture * HLM-6385: updated the code as per code review comments from @kavi-egov --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Holash Chand <[email protected]> * Hcmpre 240 (#846) * HLM closed household status * HCMPRE-240: validate no resource task status scenario with configurable statuses * HCMPRE-240: fixed issues related to string trimming * HLM fixed rowversion referral bug, mis placement of rowversion validator * HCMPRE-240: code review changes * HCMPRE-242: updated for null resources and address check * HCMPRE-242: added for proper null check * HCMPRE-242: added checks for task resource where ever applicable * HCMPRE-242: updated taskstatus to enum from string * HCMPRE-242, HCMPRE-240: renamed task's status field to taskStatus field, as there is contradiction with EgovModel status field * HCMPRE-242: fixed dupcalite entity cache issue for existing entity validation during bulk create * HCMPRE-242: updated project test case for taskStatus field contraints changes : not null * HCMPRE-242: fix generic repository code * HCMPRE-242: added taskstatus migration script * HCMPRE-240: updated PtIsResourceEmptyValidator, for task status * HLM-242: added changes as per code review * Revert "HCMPRE-242: added taskstatus migration script", and removed status field from EgovModel, and rename TaskStatus to status This reverts commit 7caf0c4. * HCMPRE-240: FIXED all task status reference --------- Co-authored-by: sivajiganesh-dev <[email protected]> * HLM rowmapper issue in household, referral fixed (#848) * HLM rowmapper issue in household, referral fixed * HCMPRE-255: updated the changes for household * reverted local changes commit by mistake * added logic for cascading project date updates (#834) * added logic for cascading project date updates * updated application.properties * refactored logic for using ProjectRequest pojo to send message to kafka instead of Ancestor and Descendant Projects pojo * added comments and enhanced search project logic * made public back to private * made more concise the method in project service separated create project map logic * separated concerns of update based on action whether null or updateProjectDates * updated action logic for just test purpose * updated version of health-service-models library * update logic * updated final logic for cascading update project dates based on flag in project request * reverted config * reverted config 2 * added multiple line comments * udpated error messages * HLM fixed issues in useraction existent entity validator (#850) * HLM fixed issues in useraction existent entity validator * updated after code review comments * updated version for hcm v1.5 release (#852) * updated version for hcm v1.5 release * HLM updated the code as per code review from code rabbit * HCMPRE-209: updated code review comments and code documentation --------- Co-authored-by: kavi_elrey <[email protected]> Co-authored-by: Holash Chand <[email protected]> Co-authored-by: sivajiganesh-dev <[email protected]> Co-authored-by: nitish-egov <[email protected]>
* Updated the user Password generation logic #761 * Update Listener.ts (#730) * Update Listener.ts * added try catch logic in producer * Feat : added parallel batch execution (#767) * Feat : added parallel batch execution * Refactor * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed the stepper (#765) * changes config (#769) * Project type config and added loggers for process of campaign (#772) * Feat : added themes in generate template (#773) * fixed the ajv package version for build issue * Feat : removed xlsx (#776) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (#778) Co-authored-by: nabeelmd-eGov <[email protected]> * css update (#780) Co-authored-by: nabeelmd-eGov <[email protected]> * HLM-6179 and HLM-6180 (#777) * HLM-6179 and HLM-6180 * campaign name changes --------- Co-authored-by: Jagankumar <[email protected]> * Feat : fixed target generation (#781) * fixed tenantId issue (#784) * fix: resolved AJV-related Jenkins build issue reference #783 #786 (#787) * module ui fix * updated all the package version for build fixes * fixed kafka-error at target generation (#789) * updated core version (#791) * updated core version * updated css also * Update campaignValidators.ts (#794) * Updated the excel generation logic and files * added changes for configurable column in target sheet (#779) * change in filter recursive * lowest level * made target headers genearte through mdms schema * changed config index.ts * changed config index.ts * changes for now * added configurable column logic from schema HLM-6169 * updated validate of target columns through schema * added masterForColumnSchema in index.ts * formatted dataManageService * refactored lock TargetFields func * removed console.log * User creation performance improved (#800) * Feat : Improved user creation performance * Change status color * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#801) * Hlm 6170 (#802) * change in filter recursive * lowest level * HLM -6170 added logic for only village level data in target sheet and some refactoring * updated css (#804) * fixed button issue (#805) * HLM 6177: Error card implementation in summary screen (#806) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT * Added Error Cards in summary screen and redirection --------- Co-authored-by: nabeelmd-eGov <[email protected]> * added error button styles (#807) Co-authored-by: nabeelmd-eGov <[email protected]> * updated popUp css (#808) * HLM 6178: Implementing New Pop up screen in boundaries (#809) * added error button styles * Implementing New Pop up screen in boundaries --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Facility changes (#812) * Feat : changed facility Template * Feat : locked target templates * fixed colour issue (#813) * Updated the project type conversion logic for the "deliveryType" dont1 and n config * Unique field added (#814) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Target schema update (#815) * change in filter recursive * lowest level * updated shcema of target columns to be configurable * removed empty spaces from config index.ts * Active mapping (#817) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Feat : added mapping via active field * changes in the schema validation (#816) * Updated the workbench and css module version * Feat : added active inactive boundary check (#818) * Update campaignValidators.ts (#819) * added active inactive validation (#820) * changed api call time (#826) * Feat : added target sum mapping (#825) * added campaign type as filter (#827) * Update genericApis.ts (#828) * Update excelUtils.ts (#829) * UI issue fixes, icon fix in summary error (#831) Co-authored-by: nabeelmd-eGov <[email protected]> * Target columns (#830) * change in filter recursive * lowest level * commit * Feat : target flow fixed for LLIN-mz * uat to dev --------- Co-authored-by: admin1 <[email protected]> * Feat : freezed target columns (#833) * Target mr dn (#834) * change in filter recursive * lowest level * Feat : skipped validation temporarily * changes in the target validation (#835) * fixed error info (#837) * Added roboto font (#840) * Feat : added roboto font * Fixed config * target validation based on diff campaign types (#843) * change in filter recursive * lowest level * updated validation of target based on campaign type * fixed validation issue (#844) * Updated the workbench package version * fixed validation logic (#846) * fixed validation logic * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Error messages improved (#848) * Feat : imporved error messages and initilised utils for tracking process * Fix ; unused variables fixed * Feat : improved error messages * Fix : download error fix (#850) * Update campaignUtils.ts (#851) * Update campaignUtils.ts * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#853) * HLM 6210: Toast, error focus fix and project type reset delivery data fix (#854) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * HLM-6225_added time out according to data (#855) * Update campaignValidators.ts (#859) * HLM 6210 (#858) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Remove validation (#852) * change in filter recursive * lowest level * removed unnecessary validation for target * spacing refactor * Update campaignValidators.ts (#863) * Header validation (#861) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * space refactor * Update campaignUtils.ts (#864) * fixed ui error (#865) * Read me (#867) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * fixed portugese language error * space refactoring * Update Dockerfile * Update Dockerfile * Update migrate.sh * Update Dockerfile * Update campaignValidators.ts (#868) * HLM 6210:campaign type change reset fix (#869) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes * campaign type change reset fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update excelUtils.ts for sheetHeaders wraping (#870) * Update package.json * updated error messages (#871) * feat : added jaeger-client tracing (#872) * updated the table config * Update campaignApis.ts (#875) * removed the schema and updated the db name * fixing generate API call, file auto delete, date error (#877) Co-authored-by: nabeelmd-eGov <[email protected]> * Trim resource (#878) * Feat : trimmed resource persist message * Refactor * Removed reject error in produce message * fixed min time, draft logic (#879) * Update index.ts (#880) * added min ui error and facility usage (#883) * added min ui error and facility usage * changes * Update campaignUtils.ts (#884) * HLM 6007 (#885) * fixing generate API call, file auto delete, date error * generate api fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update Dockerfile * Feat : docker config update (#886) * Update Dockerfile (#887) * Create buildWorkbenchUI.yml * Update README.md (#917) * Update buildWorkbenchUI.yml * Update README.md * Updated the DB Schema issue of Project-factory * fixed hierarchy order (#919) * User flag hcm (#920) * Feat : docker config update * Feat : added user create flag * Refactored * Update campaignUtils.ts * Update campaignMappingUtils.ts (#922) * Ashish egov patch 2 (#921) * Update index.ts * Update campaignApis.ts * Fixed the project type conversion and product duplicate issue * Update campaignApis.ts (#924) * Update campaignMappingUtils.ts (#925) * Update campaignMappingUtils.ts * Refactored * Update publishProjectFactory.yml * Update buildWorkbenchUI.yml * Update campaignMappingUtils.ts (#926) * Update request.ts (#928) * Update request.ts * Feat : updated httprequest * Feat : warning response added * Refactor * added start and enddate in cycles * Update campaignApis.ts (#930) * Update request.ts (#932) * fixed generate issue (#933) * Fixed project-type resources duplication * updated target error messages (#936) * fixed stepper from draft (#937) * Update Listener.ts * delivery type disable fix, product sku name change (#939) Co-authored-by: nabeelmd-eGov <[email protected]> * fixed error message issue (#941) * Redis integration (#940) * Feat : added redis * Feat : added redis retry * updated migration * Feat : changed download logic (#942) * Update README.md (#943) * fixed target validate for different tabs not present (#945) * Enriching already exsisting user (#946) * Feat : adding dropdowns (#952) * HLM-6270: Date logic changes, added localisation code (#953) Co-authored-by: nabeelmd-eGov <[email protected]> * changed maximum target message (#954) * changed maximum target message * Update UploadData.js * Call generate (#951) * updated target error messages * generate call while campaign update changes boundaries * some update on call-generate * call-generate * updated call-gnerate logic * added column campaign id in generated resource table * updated config index.ts * removed console.logs * Update utilities/project-factory/src/server/utils/generateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/generateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * added some additional conditions --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * changed facility info message (#955) * HLM 6270 (#957) * refactor * added title text --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update genericUtils.ts (#958) * fixed boundary draft logic (#959) * Boundary code generated has now configurable hierarchy type and boundary name at last based on config (#963) * fixed target validate for different tabs not present * made hierarchytype and bondary name configurable in auto generation of boundary code * added toString() on elment for safety * HLM-6270: Elimated Generate API & enhance download API, Date logic fixes (#966) * refactor * added title text * HLM-6270: Elimated Generate API & enhance download API, Date logic fixes --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Ashish table create (#972) * saving * Feat : adding table * Feat : table creating * updated configs * Feat : added table * Feat : table added * Feat : integrated processtracks * Fix : name format (#973) * Update campaignUtils.ts (#974) * configure app static screen and skeleton (#980) * configure app static screen and skeleton * comments resolved * Migration repair (#981) * migration repair * migration repair * migration repair * Updated CampaignCard to add NATIONAL_SUPERVISOR dashboard link * made isActive change (#986) * boundaries on which we split to be fetched from mdms (#982) * fixed target validate for different tabs not present * split boundaries fetch from mdms * updated logic to fetch split on from mdms based on campaign type * fromatting * Update campaignUtils.ts (#988) * Update processTrackUtils.ts (#989) * fixs (#990) * fixs * Update SelectingBoundaries.js * Update processTrackUtils.ts (#991) * Summary screen api loop fix (#992) Co-authored-by: nabeelmd-eGov <[email protected]> * Resource activity (#993) * fixed target validate for different tabs not present * resource activity persisting in db * Update processTrackUtils.ts (#994) * added timeout of 2 sec for boundary entity to persist (#996) * fixed target validate for different tabs not present * resource activity persisting in db * added timeout of 2 sec for boundary entity to persist * css version fix (#997) Co-authored-by: nabeelmd-eGov <[email protected]> * Process tracking update (#998) * Feat : changed logic of process track * Feat : improved process tracks * improved process tracking * Update campaignUtils.ts (#999) * Update campaignUtils.ts (#1000) * Update campaignUtils.ts * Update Listener.ts * Feat : imporved process track (#1001) * Update campaignManageService.ts (#1003) * Update campaignManageService.ts * Update campaignUtils.ts * Update processTrackUtils.ts * Feat : added user mapping for multiple boundaries with common parent (#1005) * new template will be generated if source is microplan accordingly from mdms (#1004) * fixed target validate for different tabs not present * resource activity persisting in db * added timeout of 2 sec for boundary entity to persist * new template generate if source is microplan * updated logic for generating templates if source of campaign is from microplan * made separate function for checking source is microplan * added separate func for checking source is microplan * refactor * chnaged the checkIFSourceMicoplan func * refactored checkifsourceismicroplan * Fix : fix array fetch from cell (#1006) * Feat : fixed array issue in target (#1007) * Feat : fixed array issue in target * Update index.ts * Some fixes and refactor (#1008) * Feat : fixed array issue in target * Update index.ts * Refactor * Fixed status row * commented harcoded check && added new dashboard icon (#1011) Co-authored-by: nabeelmd-eGov <[email protected]> * Fixed sheetrows issues (#1012) * Sheet row fixed (#1013) * Fixed sheetrows issues * Shut down if kafka error * Feat : formated sheet (#1015) * integrated admin schema with mdms_v2 (#1018) * Fix process timeline (#1029) * Feat : formated sheet * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Feat : imporved processTracking and fixed migration script * Feat : fixed error persistence * Fix * Un wrap other rows (#1034) * Feat : formated sheet * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Feat : imporved processTracking and fixed migration script * Feat : fixed error persistence * Unwraped lower rows * Update publishProjectFactory.yml * updated package versions (#1042) * HLM-6325/HLM-6277: Update date with & without boundary screen integration and actionable column added (#1045) * HLM-6007 * css version fix * update date screen added * change add * css fixes and API Integration for search project * Implemented Action component in My Campaign screen * Implemented Date Update with and without boundary with API integration * Boundary change --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Facility dynamic generate for source microplan (#1046) * fixed target validate for different tabs not present * resource activity persisting in db * added timeout of 2 sec for boundary entity to persist * added code for generating facility template if source is microplan * updated name * updated version (#1047) * updated core version to fix login forget password issues(#1051) * Fixed update topic (#1056) * updated version (#1061) * Hidden sheet impel (#1077) * Feat : formated sheet * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Feat : imporved processTracking and fixed migration script * Feat : fixed error persistence * Unwraped lower rows * Update campaignUtils.ts * Update publishProjectFactory.yml * Update genericUtils.ts (#1078) * target template download based on delivery conditions if present (#1080) * fixed target validate for different tabs not present * resource activity persisting in db * added timeout of 2 sec for boundary entity to persist * logic for dynamic target generate template based on delivery conditions * fixed stepper color issue from draft (#1083) * fixed reordering of tab issue (#1092) * Hlm 6350 (#1094) * timeline wip * added timeline from summary * removed log * integarte with mdms (#1095) Co-authored-by: nabeelmd-eGov <[email protected]> * Update genericUtils.ts (#1097) * Update targetUtils.ts (#1098) * Hlm 6350 (#1100) * timeline wip * added timeline from summary * removed log * integrated timeline with popup * updated version * updated css version * HCMPRE-32: Resolve date update demo points (#1104) * integarte with mdms * HCMPRE-32: Resolve date update demo points * comment resolve --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Dynamic target upload and download both with target columns as per delivery conditions when campaign is updated with cahnegs in delivery conditions (#1109) * fixed target validate for different tabs not present * resource activity persisting in db * added timeout of 2 sec for boundary entity to persist * target upload based on dynamic column in reference to deliveryRules * logic for calling generate target tempalte when campaign delivery conditions change * removed console * updated css version (#1102) * added chip for dropdown (#1111) * version fix to resolve issue (#1112) Co-authored-by: nabeelmd-eGov <[email protected]> * Ashish patch1 (#1118) * Feat : formated sheet * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Feat : imporved processTracking and fixed migration script * Feat : fixed error persistence * Unwraped lower rows * Update campaignUtils.ts * Update genericValidator.ts * Update publishProjectFactory.yml * Update targetUtils.ts * edit product with prefilled value and count (#1115) * Boundary upload to have not generate boundary code if code is already filled to support migration (#1121) * fixed target validate for different tabs not present * resource activity persisting in db * added timeout of 2 sec for boundary entity to persist * Boundary upload to have not generate boundary code if code is already filled to support migration * Update index.ts * Update constants.ts (#1122) * Update constants.ts * Update utilities/project-factory/src/server/config/constants.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignUtils.ts * Update campaignUtils.ts * Update campaignMappingUtils.ts --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * template downlod for source microplan (#1123) * Different tabs onlevel to fetch from mdms rather than from config in target upload flow (#1124) * template downlod for source microplan * updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow * Sequence order change in action button (#1125) Co-authored-by: nabeelmd-eGov <[email protected]> * reverted the function validateAllDistrictTabsPresentOrNot (#1126) * template downlod for source microplan * updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow * restored the func validateAllDistrictTabsPresentOrNot to default * Update index.ts (#1129) * Update index.ts * Update Listener.ts * Update Producer.ts * Update generateUtils.ts (#1130) * some changes related to generate boundary template (#1133) * updated logic for target columns acc to delivery conditions only for smc (#1137) * some changes related to generate boundary template * updated logic for making configurable target acc to delivery only for smc * refactored code for including dynamic target columns for specific types according to configs array * updated version and boundary fix (#1141) * updated readmeconfig for sheet (#1142) * HCMPRE-140: Action column fixes, date editable logic change (#1143) * Action column fixes, date editable logic change * added roles for dss --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Update constants.ts (#1145) * Update constants.ts * Update processTrackUtils.ts * Update Listener.ts (#1147) * HCMPRE 140 (#1149) * Action column fixes, date editable logic change * added roles for dss * update dates fixes --------- Co-authored-by: nabeelmd-eGov <[email protected]> * updated core version (#1150) * Ashish patch2 (#1152) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Update publishProjectFactory.yml * Redis cache for generating target when delivery conditions change (#1156) * updated readmeconfig for sheet * added cache for generating target template when only delivery conditions change * added cache time in config * refactored caching code in generate flow for boundary sheet * refactored callGenerate function * Ashish egov patch 2 (#1166) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Removing foreign key constraint * Update publishProjectFactory.yml * HCMPRE-154: Update Dates bug fixes, Toast added for error. (#1158) * Action column fixes, date editable logic change * added roles for dss * update dates fixes * HCMPRE-154 update dates bug fixes, Added toast for error * code clean * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Adding date bug * date fix * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Jagankumar <[email protected]> * version update (#1168) Co-authored-by: nabeelmd-eGov <[email protected]> * HCMPRE-6407 download template changes (#1128) * HLM-6407 adding changes for facility template * HLM-6407 adding changes for facility template * HLM-6407 adding changes for facility template * HLM-6407 codde review comment * HCMPRE-91 code review comments * HLM-6407 using same mdms schema for microplan * HLM-6407 adding changes for facility template * HLM-6407 adding changes for facility template * HLM-6407 adding changes for facility template * HLM-6407 codde review comment * HCMPRE-91 code review comments * HLM-6407 using same mdms schema for microplan * HLM-6407 code review comments * HLM-6407 code review comments * Core ui version fix (#1176) Co-authored-by: nabeelmd-eGov <[email protected]> * Ashish egov patch 2 (#1178) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Removing foreign key constraint * Producer update * Update publishProjectFactory.yml * Update Producer.ts (#1182) * fixed timeline issues (#1185) * HCMPRE 154 (#1186) * date validation fix * Update date logic * FIX --------- Co-authored-by: nabeelmd-eGov <[email protected]> * changes in timeline (#1187) * CSS version add (#1188) * date validation fix * Update date logic * FIX * css add --------- Co-authored-by: nabeelmd-eGov <[email protected]> * HCMPRE 154 (#1189) * date validation fix * Update date logic * FIX * css add * non editable fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * limited the number of columns of target for upto only 18 in number (#1190) * updated readmeconfig for sheet * added cache for generating target template when only delivery conditions change * added logic for having only 18 target columns if exceed i will create one column with header OTHER_TARGETS * HCMPRE 154 (#1191) * date validation fix * Update date logic * FIX * css add * non editable fix * date start from tomorrow * css fix for language screen --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Produceasync (#1192) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Producer update * Feat : updated producemodified message * Update publishProjectFactory.yml * Update publishProjectFactory.yml * HCMPRE 154 (#1193) * date validation fix * Update date logic * FIX * css add * non editable fix * date start from tomorrow * css fix for language screen * disable today date --------- Co-authored-by: nabeelmd-eGov <[email protected]> * config updates according to devops (#1197) * updated readmeconfig for sheet * added cache for generating target template when only delivery conditions change * added logic for having only 18 target columns if exceed i will create one column with header OTHER_TARGETS * updated config to fetch from devops accordingly * Update index.ts * All changes (#1201) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Removing foreign key constraint * Producer update * Update Producer.ts * Update Producer.ts * Feat : updated producemodified message * Feat : removed waiting * adding constraint * Update V20240731162600__add_uniqiue_constraint_process_track.sql * Update constants.ts * Update publishProjectFactory.yml * HCMPRE 154 (#1202) * date validation fix * Update date logic * FIX * css add * non editable fix * date start from tomorrow * css fix for language screen * disable today date * date and cycle fix --------- Co-authored-by: nabeelmd-eGov <[email protected]> * Revert "HCMPRE 154 (#1191)" (#1203) This reverts commit 59ec953. Co-authored-by: nabeelmd-eGov <[email protected]> * updated versions (#1205) * Update date change screen date logic fix, info added, hard reload issue fix (#1206) Co-authored-by: nabeelmd-eGov <[email protected]> * Config update for project-factory (#1207) * updated readmeconfig for sheet * added cache for generating target template when only delivery conditions change * added logic for having only 18 target columns if exceed i will create one column with header OTHER_TARGETS * updated config to fetch from devops accordingly * updated config for project -factory * Timeline (#1210) * updated versions * fixed user credential button * Kafka fix (#1212) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Removing foreign key constraint * Producer update * Revert "Ashish egov patch 2 (#1178)" This reverts commit e86a4dc. * Update Producer.ts * Update Producer.ts * Feat : updated producemodified message * Feat : removed waiting * adding constraint * Update V20240731162600__add_uniqiue_constraint_process_track.sql * Update constants.ts * Feat : improved kafka * Fix kafka restart issue * fixed the pop up button issue (#1215) * Kafka restart (#1217) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Removing foreign key constraint * Producer update * Revert "Ashish egov patch 2 (#1178)" This reverts commit e86a4dc. * Update Producer.ts * Update Producer.ts * Feat : updated producemodified message * Feat : removed waiting * adding constraint * Update V20240731162600__add_uniqiue_constraint_process_track.sql * Update constants.ts * Feat : improved kafka * Update Producer.ts * Update Producer.ts * Update publishProjectFactory.yml * updated core versions for privacy component (#1223) * Ashish egov patch 1 (#1228) * Update Listener.ts * added new branch * Update Listener.ts * fixed mapping kafka error * mapping kafka fixed * fix kafka * fix kafka * Removing foreign key constraint * Producer update * Revert "Ashish egov patch 2 (#1178)" This reverts commit e86a4dc. * Update Producer.ts * Update Producer.ts * Feat : updated producemodified message * Feat : removed waiting * adding constraint * Update V20240731162600__add_uniqiue_constraint_process_track.sql * Update constants.ts * Feat : improved kafka * Update Producer.ts * Update Producer.ts * Update campaignUtils.ts * feat : solved localization passing through kafka * Update publishProjectFactory.yml * removed frontend * Update package.json * Squashed commit of the following: commit 3cd21c2 Merge: 12061ca 80f6307 Author: Jagankumar <[email protected]> Date: Thu Aug 8 15:13:48 2024 +0530 Merge branch 'campaign' into campaign-merged commit 80f6307 Author: nitish-egov <[email protected]> Date: Wed Aug 7 18:08:15 2024 +0530 Updated changelog (#1242) * default enableDynamicTemplateForWillBe empty string in config * updated changelog and postman collection commit f897dba Author: Jagankumar <[email protected]> Date: Wed Aug 7 17:25:39 2024 +0530 Update package.json commit dd691e6 Author: Bhavya-egov <[email protected]> Date: Tue Aug 6 13:34:40 2024 +0530 updated workbench version (#1236) commit 3a30736 Author: Bhavya-egov <[email protected]> Date: Tue Aug 6 11:00:14 2024 +0530 updated micro ui core version (#1233) commit a1f7329 Author: nitish-egov <[email protected]> Date: Mon Aug 5 18:29:40 2024 +0530 default enableDynamicTemplateForWillBe empty string in config (#1231) commit d3c3e95 Author: nabeelmd-eGov <[email protected]> Date: Mon Aug 5 18:11:23 2024 +0530 build issue fix for optional chanining issue (#1230) Co-authored-by: nabeelmd-eGov <[email protected]> commit 236b843 Author: nabeelmd-eGov <[email protected]> Date: Mon Aug 5 17:17:20 2024 +0530 fix (#1229) Co-authored-by: nabeelmd-eGov <[email protected]> * sending only activity object to kafka in place of request body (#851) --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Bhavya-egov <[email protected]> Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: nabeelmd-eGov <[email protected]> Co-authored-by: Priyanka-eGov <[email protected]>
* Added changelog and upgraded the versions for household, individual and service request * Update core-services/service-request/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/individual/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM fixed merge issues * HLM fixed merge issues * HCMPRE-413: updated the changelog as per code review comments * Update health-services/project/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
HCMPRE-424: fixed hrms call from pgr-service
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
Remark-lint (reported by Codacy) found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
| @@ -0,0 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note
| @@ -0,0 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note test
| @@ -1,3 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note
| @@ -1,3 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note
| @@ -1,3 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note
| @@ -1,3 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note
| @@ -1,3 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true migrate | |||
Check notice
Code scanning / Shellcheck (reported by Codacy)
Double quote to prevent globbing and word splitting. Note
There was a problem hiding this comment.
Tsqllint (reported by Codacy) found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
* Create branch-name-validator * Update branch-name-validator * Update .github/workflows/branch-name-validator Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update .github/workflows/branch-name-validator Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
…gfix Update branch-name-validator
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.
No description provided.