Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HLM-4496, HLM-4207 attendance module #616

Merged
merged 84 commits into from
Feb 28, 2024
Merged

HLM-4496, HLM-4207 attendance module #616

merged 84 commits into from
Feb 28, 2024

Commits on Dec 13, 2023

  1. HLM-4496: Added attendance module in HCM

    @kanishq-egov
    kanishq-egov committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    23a0cda View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. HLM-4496: updated attendance directory, removed target folder and imi… 

    … file
    @kanishq-egov
    kanishq-egov committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b9a4b83 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. buil config added for hlm-4496 in feature branch

    @kanishq-egov
    kanishq-egov committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    bf2b8b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. HLM-4207: offline enablement in attendance log

    @kanishq-egov
    kanishq-egov committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d4f9423 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. HLM-4207: added db migration script

    @kanishq-egov
    kanishq-egov committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a634c20 View commit details
    Browse the repository at this point in the history

  2. HLM-4207: updated db migration script

    @kanishq-egov
    kanishq-egov committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1768276 View commit details
    Browse the repository at this point in the history

  3. HLM-4207: updated incorrect statements

    @kanishq-egov
    kanishq-egov committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    5cd9c7e View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. HLM-4207: bulk api support, without redis cache

    @kanishq-egov
    kanishq-egov committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    d94fd4b View commit details
    Browse the repository at this point in the history

  2. HLM-4207: updated Attendancelog consumer for bulk api

    @kanishq-egov
    kanishq-egov committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    e9d4177 View commit details
    Browse the repository at this point in the history

  3. HLM-4207: consumer fix

    @kanishq-egov
    kanishq-egov committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    3bde7c4 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. HLM-4207: cache support added for attendance log create and update

    @kanishq-egov
    kanishq-egov committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    8ca4e88 View commit details
    Browse the repository at this point in the history

  2. HLM-4207: added health-individual endpoint

    @kanishq-egov
    kanishq-egov committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    996c791 View commit details
    Browse the repository at this point in the history

  3. HLM-4207: added radis host

    @kanishq-egov
    kanishq-egov committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    0413424 View commit details
    Browse the repository at this point in the history

  4. HLM-4207: updated qualified for objectmapper in attendance module

    @kanishq-egov
    kanishq-egov committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    47f8ee5 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. HLM-4496,HLM-4207: updated application.properties for redis config

    @kanishq-egov
    kanishq-egov committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    a1dc8d8 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. HLM-4207: updated kafka listener topics

    @kanishq-egov
    kanishq-egov committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    362e619 View commit details
    Browse the repository at this point in the history

  2. HLM-4207: changed kafka config

    @kanishq-egov
    kanishq-egov committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    d581383 View commit details
    Browse the repository at this point in the history

  3. HLM-4894 adding hrms related flag to Individual object, adding anothe… 

    …r ApiOperation
    @Priyanka-eGov
    Priyanka-eGov committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    e890e85 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. HLM-4894 adding hrms related flag to Individual object, adding anothe… 

    …r ApiOperation
    @Priyanka-eGov
    Priyanka-eGov committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    20149b2 View commit details
    Browse the repository at this point in the history

  2. HLM-4207, HLM-4986, HLM-4987 : bug fix

    @kanishq-egov
    kanishq-egov committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    a475ba7 View commit details
    Browse the repository at this point in the history

  3. HLM-4894 adding changes related to linking of HRMS Employee with Indi… 

    …vidual
    @Priyanka-eGov
    Priyanka-eGov committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    217c2ef View commit details
    Browse the repository at this point in the history

  4. HLM-4894 adding changes related to linking of HRMS Employee with Indi… 

    …vidual
    @Priyanka-eGov
    Priyanka-eGov committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    5398a0d View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. HLM-4207: added clientreferenceid search, null check for document id

    @kanishq-egov
    kanishq-egov committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    490b801 View commit details
    Browse the repository at this point in the history

  2. HLM-4894 reverting changes related to linking of HRMS Employee with I… 

    …ndividual
    @Priyanka-eGov
    Priyanka-eGov committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    70beffa View commit details
    Browse the repository at this point in the history

  3. HLM-4894 reverting changes related to linking of HRMS Employee with I… 

    …ndividual from libraries, common-models
    @Priyanka-eGov
    Priyanka-eGov committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    484acf8 View commit details
    Browse the repository at this point in the history

  4. HLM-4207: code re-format

    @kanishq-egov
    kanishq-egov committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    7c5dc56 View commit details
    Browse the repository at this point in the history

  5. HLM-4894 adding changes for managing attendees while enrollment

    @Priyanka-eGov
    Priyanka-eGov committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    1e5a3bc View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. HLM-4207: updated attendance search, register id or clientreference i… 

    …d are mandatory
    @kanishq-egov
    kanishq-egov committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    b4d01a5 View commit details
    Browse the repository at this point in the history

  2. hlm-5009 staffId in ProjectStaffSearch changed to list from string

    @syed-egov
    syed-egov committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    fc0c0c3 View commit details
    Browse the repository at this point in the history

  3. HLM-4894 updating build config

    @Priyanka-eGov
    Priyanka-eGov committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    0323475 View commit details
    Browse the repository at this point in the history

  4. HLM-4207: clientReferenceIds is changed to clientReferenceId for Atte… 

    …ndance Log search criteria
    @kanishq-egov
    kanishq-egov committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    6f468b3 View commit details
    Browse the repository at this point in the history

  5. HLM-4207: removed staff validation for search without register id

    @kanishq-egov
    kanishq-egov committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    f240d9e View commit details
    Browse the repository at this point in the history

  6. HLM-4894 adding changes for project staff validation

    @Priyanka-eGov
    Priyanka-eGov committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    17d2591 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Merge pull request #632 from egovernments/HLM-5009-be-make-staff-fiel… 

    …ds-as-array-in-project-staff-search

hlm-5009 staffId in ProjectStaffSearch changed to list from string
    @kanishq-egov
    kanishq-egov authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a0fcee4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'hlm-4496-attendance-module' of https://github.com/egove… 

    …rnments/health-campaign-services into HLM-4894
    @Priyanka-eGov
    Priyanka-eGov committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    e09485e View commit details
    Browse the repository at this point in the history

  3. HLM-4894 adding @qualifier annotation for object mapper

    @Priyanka-eGov
    Priyanka-eGov committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3d5eddd View commit details
    Browse the repository at this point in the history

  4. HLM-4894 fixing hrms url

    @Priyanka-eGov
    Priyanka-eGov committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    659085c View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. HLM-4771: added changes for updating the registers on project date up… 

    …date
    @kanishq-egov
    kanishq-egov committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    1fdb023 View commit details
    Browse the repository at this point in the history

  2. HLM-4771: project update changes

    @kanishq-egov
    kanishq-egov committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c6ad1e7 View commit details
    Browse the repository at this point in the history

  3. HLM-4771: updated the project start date update validation, can not u… 

    …pdate start date if it is already started
    @kanishq-egov
    kanishq-egov committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    5165568 View commit details
    Browse the repository at this point in the history

  4. HLM-4771: updated attendance register consumer and service with comments

    @kanishq-egov
    kanishq-egov committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    c9b7a7d View commit details
    Browse the repository at this point in the history

  5. HLM-4771: updated the tenant id

    @kanishq-egov
    kanishq-egov committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    9d24274 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merge branch 'hlm-4496-attendance-module' of https://github.com/egove… 

    …rnments/health-campaign-services into HLM-4894
    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    66e66f4 View commit details
    Browse the repository at this point in the history

  2. HLM-4894 updating environment variables.

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    3dcdc20 View commit details
    Browse the repository at this point in the history

  3. HLM-4894 updating code changes

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    5e23b8f View commit details
    Browse the repository at this point in the history

  4. HLM-4894 adding code changes

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    4457086 View commit details
    Browse the repository at this point in the history

  5. HLM-4894 adding code changes

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    51cb04c View commit details
    Browse the repository at this point in the history

  6. HLM-4894 adding code changes

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    eb14bf1 View commit details
    Browse the repository at this point in the history

  7. HLM-4771: updated the project validators, validation for start and en… 

    …d date of project
    @kanishq-egov
    kanishq-egov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    dabbef2 View commit details
    Browse the repository at this point in the history

  8. HLM-4894 adding useruuid as search param in individual search

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    48606bc View commit details
    Browse the repository at this point in the history

  9. HLM-4894 adding useruuid as search param in individual search

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    9d6afb5 View commit details
    Browse the repository at this point in the history

  10. HLM-4894 adding useruuid as search param in individual search

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    af0b1be View commit details
    Browse the repository at this point in the history

  11. HLM-4894 adding changes for registry creation when supervisor enrolls

    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    ad05191 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'hlm-4496-attendance-module' of https://github.com/egove… 

    …rnments/health-campaign-services into HLM-4894
    @Priyanka-eGov
    Priyanka-eGov committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    c38976d View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. HLM-4496, HLM-4894: first staff enrollment on attendance register cre… 

    …ation is optional
    @kanishq-egov
    kanishq-egov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    31c1c8e View commit details
    Browse the repository at this point in the history

  2. HLM-4894 adding changes attendee enrollment

    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    45bad0a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'hlm-4496-attendance-module' of https://github.com/egove… 

    …rnments/health-campaign-services into HLM-4894

# Conflicts:
#	health-services/attendance/src/main/java/org/egov/config/AttendanceServiceConfiguration.java
    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    f972556 View commit details
    Browse the repository at this point in the history

  4. HLM-4894 adding changes for making staffId as list of staffId in Proj… 

    …ectStaffSearch
    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    db5417a View commit details
    Browse the repository at this point in the history

  5. HLM-4894 adding changes for making staffId as list of staffId in Proj… 

    …ectStaffSearch
    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    5e570a2 View commit details
    Browse the repository at this point in the history

  6. HLM-4894 adding changes for making staffId as list of staffId in Proj… 

    …ectStaffSearch
    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    e1b3b87 View commit details
    Browse the repository at this point in the history

  7. HLM-4894 removing staff-bulk-create-topic

    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    e2e307e View commit details
    Browse the repository at this point in the history

  8. HLM-4894 removing staff-bulk-create-topic

    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    cbed04f View commit details
    Browse the repository at this point in the history

  9. HLM-4894 removing staff-bulk-create-topic

    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    39afd9b View commit details
    Browse the repository at this point in the history

  10. HLM-4894 removing staff-bulk-create-topic

    @Priyanka-eGov
    Priyanka-eGov committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    070ed3a View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. HLM-4894 changing health-attendance consumer group-id

    @Priyanka-eGov
    Priyanka-eGov committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    fb8b1da View commit details
    Browse the repository at this point in the history

  2. HLM-4894 adding changes for projectstaff consumer

    @Priyanka-eGov
    Priyanka-eGov committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7fed5e8 View commit details
    Browse the repository at this point in the history

  3. HLM-4894 adding changes for projectstaff consumer

    @Priyanka-eGov
    Priyanka-eGov committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    c9060fb View commit details
    Browse the repository at this point in the history

  4. HLM-4894 adding changes for projectstaff consumer

    @Priyanka-eGov
    Priyanka-eGov committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    6a80066 View commit details
    Browse the repository at this point in the history

  5. HLM-4894 adding changes for projectstaff consumer

    @Priyanka-eGov
    Priyanka-eGov committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    8772b71 View commit details
    Browse the repository at this point in the history

  6. HLM-4894 adding changes for projectstaff consumer

    @Priyanka-eGov
    Priyanka-eGov committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7f1e892 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. HLM-5045: added changes, project start date and end date difference s… 

    …hould at least be 1 day.
    @kanishq-egov
    kanishq-egov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    989c42d View commit details
    Browse the repository at this point in the history

  2. HLM-4894 adding comments

    @Priyanka-eGov
    Priyanka-eGov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    0ee5698 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. HLM-4894 adding additional Details during attendance register creation

    @Priyanka-eGov
    Priyanka-eGov committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    aaf9df9 View commit details
    Browse the repository at this point in the history

  2. HLM-4894 adding additional Details during attendance register creation

    @Priyanka-eGov
    Priyanka-eGov committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    fda2b2b View commit details
    Browse the repository at this point in the history

  3. hlm-4496 : bug fix on adding staff on updation of register

    @kanishq-egov
    kanishq-egov committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    4318536 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Merge branch 'hlm-4496-attendance-module' of https://github.com/egove… 

    …rnments/health-campaign-services into HLM-4894
    @Priyanka-eGov
    Priyanka-eGov committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    e8d303e View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. HLM-4894 increasing limit to 1000

    @Priyanka-eGov
    Priyanka-eGov committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    494ba0f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #627 from egovernments/HLM-4894 

    HLM-4894 Changes for managing staff in attendance module
    @kanishq-egov
    kanishq-egov authored Feb 21, 2024
    Configuration menu
    Copy the full SHA
    dc51427 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Added changelog for individual, health-services-models, project, stock

    @kanishq-egov
    kanishq-egov committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    f7a9d21 View commit details
    Browse the repository at this point in the history

  2. HLM-4496 : remove attendance module as it is moved to DIGIT-Works rep… 

    …ository.
    @kanishq-egov
    kanishq-egov committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    77b6159 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. HLM-5076: added changes related to project module

    @kanishq-egov
    kanishq-egov committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    daa9866 View commit details
    Browse the repository at this point in the history

  2. updated individual user uuid search field for hlm-4496, hlm-4207

    @kanishq-egov
    kanishq-egov committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    d3e39f2 View commit details
    Browse the repository at this point in the history

  3. changed common models build to 1.0.19-SNAPSHOT

    @kanishq-egov
    kanishq-egov committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    1328912 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge branch 'dev' into hlm-4496-attendance-module

    @kavi-egov
    kavi-egov authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    a788ee2 View commit details
    Browse the repository at this point in the history