Skip to content

Commit

Permalink
Develop (#297)
Browse files Browse the repository at this point in the history
* Hlm 2650 resource card multiround proximity (#283)

* [hlm-2825]: Fix project selection error (#162)

* Hlm 2742 and HLM 931 (#163)

* [hlm-2742]: Beneficiary progress bar

* [hlm-2742]: Report selection

* [hlm-2742]: Fix overflows

* [hlm-2742]: Intermittent

* [hlm-2742]: Update transaction search model

* [hlm-2742]: Intermittent

* [hlm-2742]: Intermittent

* [hlm-2742]: Fix report

* [hlm-2742]: Fix recon additional details

* [hlm-2742]: Fix localization

* [hlm-2742]: [Revert this commit]

* [hlm-2742]: Intermittent

* [hlm-2742]: Fix

* [hlm-2742]: Update report_details.dart

* Revert "[hlm-2742]: [Revert this commit]"

This reverts commit 8fd72d0b351630334eb59dae20a64f00a0d7b698.

* [hlm-2742]: Fix report selection i18n

* [hlm-2742]: Fix dependencies

* [hlm-2742]: Update report_details.dart (#164)

* Hlm 2742 fix localization (#165)

* [hlm-2742]: Update report_details.dart

* [hlm-2742]: Fix translation for tile

* [hlm-2054]: Decrease debounce duration (#169)

Co-authored-by: roopeshegov <[email protected]>

* Hlm 2765 fix project sync dialog (#168)

* [hlm-2765]: Update SDK constraints

* [hlm-2765]: Fix

* [hlm-2765]: Fix sync error type

* [hlm-2765]: Fix localization

* [hlm-2765]: Fix error after coming back online

* [hlm-2765]: Update pods

* Hlm 2547 locality fixes (#167)

* added help icon

* added call support

* added checklist plugin

* added help icon fixes

* removed images

* removed un-used code

* modified json

* added localization keys

* [hlm-2547]: Fix address locality model

* [hlm-2547]: Add locality for delivery intervention

* added applogo

* bug fixe
s

* added enum for beneficiary

* added individual delivery

* resolved

* resolved commits

* help icon and progress bar fixes

* added id check

* added lcoality for updates

* added address id

* fixed navigation issue

* added stock min and max validation

* updated validation

* fixed address id issue

* Hlm 2742 fix localization (#165)

* [hlm-2742]: Update report_details.dart

* [hlm-2742]: Fix translation for tile

* [hlm-2054]: Decrease debounce duration (#169)

Co-authored-by: roopeshegov <[email protected]>

* Hlm 2765 fix project sync dialog (#168)

* [hlm-2765]: Update SDK constraints

* [hlm-2765]: Fix

* [hlm-2765]: Fix sync error type

* [hlm-2765]: Fix localization

* [hlm-2765]: Fix error after coming back online

* [hlm-2765]: Update pods

* [hlm-2547]: Lints + fix build

* [hlm-2547]: Fix

* [hlm-2547]: Fix beneficiary type

* [hlm-2547]: Pluralize tasks

* [hlm-2547]: Pluralize beneficiaries

* [hlm-2547]: Update search_households.dart

* [hlm-2547]: Fix locality model

* [hlm-2547]: Typo

* [hlm-2547]: Fix target

* [hlm-2547]: Fix target count

* [hlm-2547]: Fix values

* [hlm-2547]: Add launcher icons

* [hlm-2547]: Fix manifest

---------

Co-authored-by: Ajil Oommen <[email protected]>
Co-authored-by: ajilo-eGov <[email protected]>
Co-authored-by: roopeshegov <[email protected]>

* [hlm-2478]: Fix is deleted (#170)

[hlm-2478]: Update models

* [hlm-000]: Add generated files (#173)

* [hlm-931]: Fix progress bar for non-distributor (#174)

* Hlm 2861 fix offline downsync (#172)

* [hlm-2765]: Update SDK constraints

* [hlm-2765]: Fix

* [hlm-2765]: Fix sync error type

* [hlm-2765]: Fix localization

* [hlm-2765]: Fix error after coming back online

* [hlm-2765]: Update pods

* [hlm-2861]: Fix double enum import in tables

* [hlm-2861]: Fixed scripts

* [hlm-2861]: Fix down sync problem

* [hlm-2861]: Fix no facility dialog on stock recon

* [hlm-2861]: Fix lints

* [hlm-000]: Build fix

* added delete check (#177)

* Hlm 2878 handle downsync failure (#175)

* [hlm-2878]: Handle down sync error

* [hlm-2878]: Fix build

* [hlm-2878]: Minor optimization

* [hlm-2878]: Update network_manager.dart

* Hlm 2879 firebase crashlytics (#178)

* [hlm-2879]: Add package base

* [hlm-2879]: Add ios bundle identifier

* [hlm-2879]: Fix auth

* [hlm-2879]: Update back_navigation_help_header.dart

* [hlm-2879]: Check for context

* [hlm-2879]: Intermittent

* [hlm-2879]: Add firebase config

* [hlm-2879]: Add crash enforcer

* [hlm-2879]: Fix config

* [hlm-2879]: Fix config

* [hlm-000]: Update README.md (#179)

* [hlm-000]: Update README.md


* [hlm-000]: Update sync docs

* Hlm 2977 profile update (#181)

* added profile page

* added user

* added bloc

* added update profile api integration

* added loader

* added localization codes

* added error fallback

* removed logs

* bug fixes

* added filters (#183)

* HLM-3161:: Split Age into years and Months across the application (#184)

* HLM-3161:: Split Age into years and Months across the application

* Updated Date Conversion functions

* Code commenting and minor UI fixes (#185)

* Code commenting and minor UI fixes

* HLM-3161:: Age Split in Table and css fixes for member card

* Update app_initialization.dart

* Update app_initialization.dart

* Digit Text Form Field suffix icon constraints css fixes

* Update auth.dart

* HLM-1361:: Date Conversion from months to date fixes

* Added trailing commas

* Error message changes for DOB field

* Error message changes for DOB field

* HLM-3161:: Updated age calculator logic and added Date utils to digit components  (#186)

* Digit Date Utils added, and handled years and age end cases

* Remove commented lines

* Added code commenting for Date Utils and DOB Picker

* Hlm 2876 auto sync (#176)

* [hlm-2878]: Handle down sync error

* [hlm-2878]: Fix build

* added auto sync

* fixed melos build issue

* added tost message

* [hlm-2878]: Minor optimization

* [hlm-2878]: Update network_manager.dart

* removed logs

* added filter bandwidth logic

* added background service logic

* intermetent commit

* auto sync fixed

* added isdeleted default value

* added error handling

* age issue fixed

* added error handling

* removed un-used code

* resloved conflicts

* removed duplicate

* handled bad state

* added retry count and row-version

* added code comments

* fixed typo and file renamed

* removed un-used code

* removed hard-coded credentials

* typo fixes

* added debouncing + filter checklist entity for sync-down

* Updated Age logic in DateExtensions

---------

Co-authored-by: Ajil Oommen <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>

* added filter for stock recon (#188)

* added filter for stock recon

* removed un-used code

* Updated Ade and months validations for DOB Picker (#189)

* HLM-3161:: Added Generic error message for the DOB Picker and handled negative years and months validation (#191)

* HLM-3161:: Negative months and years use cases validations added

* HLM-3161:: Added Generic error message for the DOB Picker

* HLM-3161:: Years and months conversion in Delivery intervention page

* HLM-3161:: input formatter added for text field

* bug fix for filter (#193)

* bug fix for filter

* removed un-used code

* [fix] added dropdown value population (#194)

* Hlm 2981 row version (#195)

* resolved conflicts

* resolved conflicts

* added row-version schema

* remove duplicate isar open

* removed un-used file

* added app version (#197)

* added app version

* added version

* HLM-3161:: Age and Date of Birth Fixes (#199)

* HLM-3161:: Age and Date of Birth Fixes

* HLM-3161:: Age and Date of Birth Fixes

* added client-audit-time

* HLM-2850:: Gender value Others not retaining on Edit Fixes

* HLM-2650: Added static screen for resource benificiary & added localisation

* HLM-2650: Updated dart.yaml (#204)

* HLM-2650: Updated dart.yaml (#204)

* added roles actions

* HLM-2650:Added Stepper for Doses

* removed commented code

* HLM-2650: Updated card for Resource

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* HLM-2650: Static screen in progress

* HLM-2650: Added Cycle table

* added client audit details

* Past delivery changes

* HLM-2650: Updated key for localisation

* added null check

* added null check

* HLM-2850:: Gender value Others not retaining on Edit Fixes (#202)

Co-authored-by: Naveen <[email protected]>

* added missing routers

* HLM-2650: Added project type model

* HLM-2650,HLM-3117: Added Bloc, Schema,Model

* added projectype mapping in beneficary Details page

* added fix for task client audit details

* added past delivery

* added table color schema

* added dynmaic resource card

* added minor validation

* removed print and un-used code

* added active cycle

* HLM-3117: Added localisation & fixed integer taking 0 value

* HLM-3117: Added popup data and updated stpper to dynamic

* HLM-3117: Added popup data and updated stpper to dynamic

* code seperation

* resolved conflicts

* HLM-3117: rebasing

* HLM-3117: future deliveries WIP

* fixed the dialog height and past deliverytable

* HLM-3117: Added futures deliveries

* HLM-3117: Addde localisation

* added past resources and active cycle and dose

* HLM-3950:: Digit Components changes pull out from CBO App (#210)

* HLM-4067: Added API integration for future delivery (#216)

* HLM-4067: Added API integration for future deliveires

* HLM-4067: clean up

* HLM-3560::Black Screen fixes on App launch (#211)

* HLM-3560::Black Screen fixes on App launch

* HLM-3560::Black Screen and Offline data fetch on App launch

* HLM-3560:: added Code commenting for Blank screen fixes

* Blank screen localizations changed to English

* HLM-4067: Added task resource api (#217)

* HLM-3117: Added Static screen for past record (#215)

* HLM-3117: Added static screen for past record

* HLM-3117: Added static screen for past record

* HLM-4067: Updated naming convention, handled dose administered, localisation (#218)

* HLM-4067: Updated naming convetion, handled dose

* HLM-4067: Added deliverystrategy in additionals fields & updated localisation for table

* Hlm 3068 adv events merge to multi round (#213)

* HLM-3068:: Adverse Events Static screen and Bloc, Models

* HLM-3068:: Adverse events static screen routing changes

* HLM-3068::Adverse Events API integration

* HLM-3068::Adverse Events, Localization changes for reattempts field

* HLM-3068::Adverse Events:: Search Response Fix

* Print statements removed

* Restrict Tracking of adverse events while updating Delivery, PendingSync Count fixes

* HLM-3068:: Adverse event fixes

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068:: Adverse events merging to Multi round campaign

* HLM-3068:: Adverse events changes added to multi round

* TODO comments added

* Adverse events fixes merged to multi round and UI fixes

* Comments and print statements removed

* Age Eligibility check added, Beneficiary Refused status updated.

* Beneficiary Refused check, Adverse events recorded check and Update Delivery removed

* Current and future cycle and Doses Fixes

* TODO comments added

* HLM-4065::Search Households clear event on Open Pressed (#219)

* added project type

* added resources

* added status

* HLM-4065::Fetch-Active and past cycle for Beneficiary Table data (#221)

* HLM-4065::Render Current and Past Cycles, Future delivery Bug fixes (#222)

* HLM-4064: Record Past Delivery Details  (#220)

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM-4064: Added dynamic form controlfor record past delivery, updated bloc to handled futureTask

* HLM-4064: Merge conflic fixes from /HLM-2650-resource-card-multiround

* HLM-4064: Added adverse event popup, updated localisation,updated bloc for futuretask (#223)

* HLM-4064: Added adevrse event popup, updated localisation,updated bloc for futuretask

* HLM-4064: Added enum for hardcoded values

* HLM-4064: Added null check for advrese event, Removed all hardcoded values

* Hlm 2982 added seperate server client time (#209)

* added client-audit-time

* added roles actions

* removed commented code

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* added client audit details

* added null check

* added null check

* added missing routers

* added fix for task client audit details

* added time stamp and removed the print statements

* HLM-4064,HLM-3565: Updated future Task back button, updated localisation for future task (#225)

* HLM-3565: Added code comment (#224)

* HLM-3565: Added code comment

* HLM-3565: Added localisation,removed help button,

* HLM-3565:Removed unwanted code

* HLM-4065:: Beneficiary Details fixes (#226)

* HLM-4065:: Beneficiary Details fixes

* Merge conflicts fixes

* Merge conflicts fixes

* HLM-3565: Added min age and max age& removed hardcoded values (#227)

* HLM-1890:: If Default identifier is ID, "ID Number" field should be hidden from the UI. (#208)

* added status reset

* HLM-3565: Added patches back to search not owrking, added null check for task data (#229)

* HLM-4065::Date validation fixes, and null check added (#230)

* HLM-4065::Date validation fixes, and null check added

* HLM-4065::Past Cycles in reverse order

* HLM-3565: Added dash on table (#232)

* HLM-3565: Added dash on table

* HLM-3565:Fixed conflict issue

* HLM-3565:: Reverted PR, and UI fixes (#233)

* Revert "HLM-3565: Added dash on table (#232)"

This reverts commit 7796aed9bb8f00f5932645eb13b03d331e1dd814.

* HLM-3565:: Reverted PR, and UI fixes

* HLM-3074:: Multi Round fixes (#234)

* HLM-3565: Added fixes for backward compatibility (#235)

* Hlm 3091 proximity based search (#190)

* added filter for stock recon

* removed un-used code

* added fallback code

* added query

* enabled proximity bases search

* modified the query

* modfied the query

* added clearing the  search bar when proximity search is triggered

* added filters

* Update dart.yml (#200)

* Update dart.yml

* Update dart.yml

* Update dart.yml

* Update dart.yml

* HLM-3379: Fixed proximity based search

* Revert "HLM-3379: Fixed proximity based search"

This reverts commit a22ef1cddcdb14ae132da2e9689b96c01803f0bc.

* HLM-3379: Fixed proximity based search (#205)

* HLM-3379: Fixed proximity based search

* HLM-3379: Code updated

* HLM-3379: Updated code

* Proximity Based search Code review changes

* HLM-3379:Updated distance display info inside brackets

---------

Co-authored-by: Ramkrishna-egov <[email protected]>

* HLM-3950:: Digit Components changes pull out from CBO App (#210)

* HLM-3560::Black Screen fixes on App launch (#211)

* HLM-3560::Black Screen fixes on App launch

* HLM-3560::Black Screen and Offline data fetch on App launch

* HLM-3560:: added Code commenting for Blank screen fixes

* Blank screen localizations changed to English

* Hlm 2982 added seperate server client time (#209)

* added client-audit-time

* added roles actions

* removed commented code

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* added client audit details

* added null check

* added null check

* added missing routers

* added fix for task client audit details

* added time stamp and removed the print statements

* removed TODO as it's been completed

* Update auth_model.dart

---------

Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>

* HLM-3565: Fixed back button for splash (#236)

* HLM-3565: Added validation for record past& fixed asterisk (#237)

* HLM-3565: Added patches for future task shwoing for all other child card (#238)

* HLM-3074:: Multi Round UI/UX Fixes and Validation fixes on Cycle reset (#239)

* HLM-3565: Hide back and help button for doseadminstered screen & prevented  physical back button click (#241)

* HLM-3565: Hide back and help button for doseadminstered screen & prevnt physical back button click

* HLM-3565: Removed print and added rethrow

* HLM-3565: Fixed back button navigating to household instead of search (#242)

* HLM-3565: Added default value as per the figma for future dose (#243)

* added button color

* added toggle button to view records

* removed the shadow

* HLM-3565: Fixed resource card delete option et to last element & fixed multiple card showing same value (#244)

* added padding

* HLM-3565:Added missing code for project bloc, fixed future task taking multiple data (#246)

* HLM-3565: Fixed back to search not redirecting to search for member card after delete (#247)

* HLM-3565: Added localisation , added static screen for vie whouseholkd (#250)

* HLM-3565: Fixed yes no button for dialog (#253)

* HLM-3565: Commented code for household button (#254)

* HLM-3565: Added validation, Fixed button shrink issue on record dose, fixed reload issue (#255)

* HLM-3565: Validtion in progress

* HLM-3565:Added validation, Foxed button shrink issue, fixed reload issue

* HLM-3565: Removed hardcoded start & end date value

* HLM-3565: Removed print statement

* HLM-3074:: Button validation fixes on completion of cycle and current… (#245) (#256)

* HLM-3074:: Button validation fixes on completion of cycle and current cycle moved to context utility

* HLM-3074:: Table height fix

* HLM-3074:: Dose Criteria configuration for each delivery added (#257)

* HLM-3565: Fixed modal issue, added reload event (#258)

* HLM-3565: Added view household, fixed popup paddign issue

* HLM-3565: Fixed dialog issue, updated reload event

* HLM-3565

* HLM-3565: Fixed view to household not reloading future task

* HLM-3074:: Age Validation Fixes (#259)

* HLM-3074:: Age Validation Fixes

* Removed print statements

* Adverse events load on proximity search (#260)

* Multi round fixes :: task reload, Location null check , deliveries config changes

* Code commenting

* Proximity fixes for individual search for INDIVIDUAL based campaign (#263)

* Proximity fixes for individual search for INDIVIDUAL based campaign

* Proximity Toggle Fixes and UI?UX Audit fixes

* Demo fixes

* Beneficiary Details mapping fixes,Task Local Repository Search Fixes, UI/UX Bug Fixes,

* HLM-4320:: Status Updates

* Build pipeline fixes (#267)

* Nested Checklist Code Changes (#269)

* Hlm 2650 UI fixes (#268)

* HLM-2650:Added ui fixes for table height and left column issue

* UI/UX Audit Fixes

* Beneficary Details updated based on Beneficiary Type

* Nested Checklist Code Changes (#269)

* UI/UX Fixes

* Reverted script

* Dialog padding fixes

* resolved the sync issue

* removed the un-necessary bloc call

* Proximity fixes for Household Based

---------

Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Naveen <[email protected]>

* added sync fixes

* Adverse event entity name changed to Side Effect Entity (#271)

* Adverse event entity name changed to Side Effect Entity

* print logs removed

* Symptoms values mapping

* Side effect local and remote repository added to sync

* Task Oplog creation when resources are null (#273)

* Task Oplog creation when resources are null

* Code Reformatting

* Handle Pop of dialog on back button pressed

* Handle Pop of dialog on back button pressed

* Resolved review comments

* Resolved review comments

* Resolved review comments

* Resolved review comments

* Hlm 2650 resource card multiround proximity (#275)

* added client-audit-time

* HLM-2850:: Gender value Others not retaining on Edit Fixes

* HLM-2650: Added static screen for resource benificiary & added localisation

* HLM-2650: Updated dart.yaml (#204)

* added roles actions

* HLM-2650:Added Stepper for Doses

* removed commented code

* HLM-2650: Updated card for Resource

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* HLM-2650: Static screen in progress

* HLM-2650: Added Cycle table

* added client audit details

* Past delivery changes

* HLM-2650: Updated key for localisation

* added null check

* added null check

* added missing routers

* HLM-2650: Added project type model

* HLM-2650,HLM-3117: Added Bloc, Schema,Model

* added projectype mapping in beneficary Details page

* added fix for task client audit details

* added past delivery

* added table color schema

* added dynmaic resource card

* added minor validation

* removed print and un-used code

* added active cycle

* HLM-3117: Added localisation & fixed integer taking 0 value

* HLM-3117: Added popup data and updated stpper to dynamic

* HLM-3117: Added popup data and updated stpper to dynamic

* code seperation

* resolved conflicts

* HLM-3117: rebasing

* HLM-3117: future deliveries WIP

* fixed the dialog height and past deliverytable

* HLM-3117: Added futures deliveries

* HLM-3117: Addde localisation

* added past resources and active cycle and dose

* HLM-4067: Added API integration for future delivery (#216)

* HLM-4067: Added API integration for future deliveires

* HLM-4067: clean up

* HLM-4067: Added task resource api (#217)

* HLM-3117: Added Static screen for past record (#215)

* HLM-3117: Added static screen for past record

* HLM-3117: Added static screen for past record

* HLM-4067: Updated naming convention, handled dose administered, localisation (#218)

* HLM-4067: Updated naming convetion, handled dose

* HLM-4067: Added deliverystrategy in additionals fields & updated localisation for table

* Hlm 3068 adv events merge to multi round (#213)

* HLM-3068:: Adverse Events Static screen and Bloc, Models

* HLM-3068:: Adverse events static screen routing changes

* HLM-3068::Adverse Events API integration

* HLM-3068::Adverse Events, Localization changes for reattempts field

* HLM-3068::Adverse Events:: Search Response Fix

* Print statements removed

* Restrict Tracking of adverse events while updating Delivery, PendingSync Count fixes

* HLM-3068:: Adverse event fixes

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068:: Adverse events merging to Multi round campaign

* HLM-3068:: Adverse events changes added to multi round

* TODO comments added

* Adverse events fixes merged to multi round and UI fixes

* Comments and print statements removed

* Age Eligibility check added, Beneficiary Refused status updated.

* Beneficiary Refused check, Adverse events recorded check and Update Delivery removed

* Current and future cycle and Doses Fixes

* TODO comments added

* HLM-4065::Search Households clear event on Open Pressed (#219)

* added project type

* added resources

* added status

* HLM-4065::Fetch-Active and past cycle for Beneficiary Table data (#221)

* HLM-4065::Render Current and Past Cycles, Future delivery Bug fixes (#222)

* HLM-4064: Record Past Delivery Details  (#220)

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM-4064: Added dynamic form controlfor record past delivery, updated bloc to handled futureTask

* HLM-4064: Merge conflic fixes from /HLM-2650-resource-card-multiround

* HLM-4064: Added adverse event popup, updated localisation,updated bloc for futuretask (#223)

* HLM-4064: Added adevrse event popup, updated localisation,updated bloc for futuretask

* HLM-4064: Added enum for hardcoded values

* HLM-4064: Added null check for advrese event, Removed all hardcoded values

* HLM-4064,HLM-3565: Updated future Task back button, updated localisation for future task (#225)

* HLM-3565: Added code comment (#224)

* HLM-3565: Added code comment

* HLM-3565: Added localisation,removed help button,

* HLM-3565:Removed unwanted code

* HLM-4065:: Beneficiary Details fixes (#226)

* HLM-4065:: Beneficiary Details fixes

* Merge conflicts fixes

* Merge conflicts fixes

* HLM-3565: Added min age and max age& removed hardcoded values (#227)

* added status reset

* HLM-3565: Added patches back to search not owrking, added null check for task data (#229)

* HLM-4065::Date validation fixes, and null check added (#230)

* HLM-4065::Date validation fixes, and null check added

* HLM-4065::Past Cycles in reverse order

* HLM-3565: Added dash on table (#232)

* HLM-3565: Added dash on table

* HLM-3565:Fixed conflict issue

* HLM-3565:: Reverted PR, and UI fixes (#233)

* Revert "HLM-3565: Added dash on table (#232)"

This reverts commit 7796aed9bb8f00f5932645eb13b03d331e1dd814.

* HLM-3565:: Reverted PR, and UI fixes

* HLM-3074:: Multi Round fixes (#234)

* HLM-3565: Added fixes for backward compatibility (#235)

* HLM-3565: Fixed back button for splash (#236)

* HLM-3565: Added validation for record past& fixed asterisk (#237)

* HLM-3565: Added patches for future task shwoing for all other child card (#238)

* HLM-3074:: Multi Round UI/UX Fixes and Validation fixes on Cycle reset (#239)

* HLM-3565: Hide back and help button for doseadminstered screen & prevented  physical back button click (#241)

* HLM-3565: Hide back and help button for doseadminstered screen & prevnt physical back button click

* HLM-3565: Removed print and added rethrow

* HLM-3565: Fixed back button navigating to household instead of search (#242)

* HLM-3565: Added default value as per the figma for future dose (#243)

* added button color

* added toggle button to view records

* removed the shadow

* HLM-3565: Fixed resource card delete option et to last element & fixed multiple card showing same value (#244)

* added padding

* HLM-3565:Added missing code for project bloc, fixed future task taking multiple data (#246)

* HLM-3565: Fixed back to search not redirecting to search for member card after delete (#247)

* HLM-3565: Added localisation , added static screen for vie whouseholkd (#250)

* HLM-3565: Fixed yes no button for dialog (#253)

* HLM-3565: Commented code for household button (#254)

* HLM-3565: Added validation, Fixed button shrink issue on record dose, fixed reload issue (#255)

* HLM-3565: Validtion in progress

* HLM-3565:Added validation, Foxed button shrink issue, fixed reload issue

* HLM-3565: Removed hardcoded start & end date value

* HLM-3565: Removed print statement

* HLM-3074:: Button validation fixes on completion of cycle and current… (#245) (#256)

* HLM-3074:: Button validation fixes on completion of cycle and current cycle moved to context utility

* HLM-3074:: Table height fix

* HLM-3074:: Dose Criteria configuration for each delivery added (#257)

* HLM-3565: Fixed modal issue, added reload event (#258)

* HLM-3565: Added view household, fixed popup paddign issue

* HLM-3565: Fixed dialog issue, updated reload event

* HLM-3565

* HLM-3565: Fixed view to household not reloading future task

* HLM-3074:: Age Validation Fixes (#259)

* HLM-3074:: Age Validation Fixes

* Removed print statements

* Adverse events load on proximity search (#260)

* Multi round fixes :: task reload, Location null check , deliveries config changes

* Code commenting

* Proximity fixes for individual search for INDIVIDUAL based campaign (#263)

* Proximity fixes for individual search for INDIVIDUAL based campaign

* Proximity Toggle Fixes and UI?UX Audit fixes

* Demo fixes

* Beneficiary Details mapping fixes,Task Local Repository Search Fixes, UI/UX Bug Fixes,

* HLM-4320:: Status Updates

* Build pipeline fixes (#267)

* Hlm 2650 UI fixes (#268)

* HLM-2650:Added ui fixes for table height and left column issue

* UI/UX Audit Fixes

* Beneficary Details updated based on Beneficiary Type

* Nested Checklist Code Changes (#269)

* UI/UX Fixes

* Reverted script

* Dialog padding fixes

* resolved the sync issue

* removed the un-necessary bloc call

* Proximity fixes for Household Based

---------

Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Naveen <[email protected]>

* added sync fixes

* Adverse event entity name changed to Side Effect Entity (#271)

* Adverse event entity name changed to Side Effect Entity

* print logs removed

* Symptoms values mapping

* Side effect local and remote repository added to sync

* Task Oplog creation when resources are null (#273)

* Task Oplog creation when resources are null

* Code Reformatting

* Handle Pop of dialog on back button pressed

* Handle Pop of dialog on back button pressed

* Resolved review comments

* Resolved review comments

* Resolved review comments

* Resolved review comments

---------

Co-authored-by: roopeshegov <[email protected]>
Co-authored-by: Naveen <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>
Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>

* resolved conflicts

* resolved conflicts

* added dump-api

* HLM-4325:: Boundary Selection fix (#279)

* HLM-4325:: Boundary Selection fix

* HLM-4325:: Reset children dropdown values on change of parent value

* resolved conflicts

* removed un necessary extended class

---------

Co-authored-by: ajilo-eGov <[email protected]>
Co-authored-by: roopeshegov <[email protected]>
Co-authored-by: Ajil Oommen <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>
Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: kavi_elrey@1993 <[email protected]>

* V1.2.0 patch-1 (#284)

* v1.2.0-beta-version upgrade

* Validation fixes on Household Location non mandatory fields

* Sync Up fixes for empty string in address

* Sync Up fixes for empty string in address

* Validation messages added to localization for non mandatory fields

* HLM-3103:: Referral Management (#287)

* HLM-3103:: Referral Management

* HLM-3103:: View Beneficiary Card Status Text code refracting

* HLM-3103:: Referral comment added to additional fields

* HLM-3103:: Changes in validation messages and eligibility check nee… (#289)

* HLM-3103:: Changes in validation messages and eligibility n=check need to be first

* HLM-3103:: label style changes

* HLM-3103:: Additional field value check

* HLM-3103:: Code review changes

* Handle single click on Refer Beneficiary button

* Updated checkbox, toast and dropdown (#292)

* updated fonts and font sizes to be synced with design system and dialog size

* updated checkbox toast and dropdown

* pr comment update

---------

Co-authored-by: rachana-egov <[email protected]>

* Localization fixes and Current cycle fixes (#293)

* Hlm 2985 2d voucher (#291)

* Project Type added to local storage

* added voucher scanner

* added text trim

* added tag

* bug fixes

* bug fixes

* added scanner fixes

* added button border

* fixed border issue

* position fixes

* fixed de-linking of QR code

---------

Co-authored-by: Ramkrishna-egov <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>

* Delivery strategy need to be Direct delivery from Delivery Intervention page

* Develop to master (#298)

* Develop (#285)

* Hlm 2650 resource card multiround proximity (#283)

* [hlm-2825]: Fix project selection error (#162)

* Hlm 2742 and HLM 931 (#163)

* [hlm-2742]: Beneficiary progress bar

* [hlm-2742]: Report selection

* [hlm-2742]: Fix overflows

* [hlm-2742]: Intermittent

* [hlm-2742]: Update transaction search model

* [hlm-2742]: Intermittent

* [hlm-2742]: Intermittent

* [hlm-2742]: Fix report

* [hlm-2742]: Fix recon additional details

* [hlm-2742]: Fix localization

* [hlm-2742]: [Revert this commit]

* [hlm-2742]: Intermittent

* [hlm-2742]: Fix

* [hlm-2742]: Update report_details.dart

* Revert "[hlm-2742]: [Revert this commit]"

This reverts commit 8fd72d0b351630334eb59dae20a64f00a0d7b698.

* [hlm-2742]: Fix report selection i18n

* [hlm-2742]: Fix dependencies

* [hlm-2742]: Update report_details.dart (#164)

* Hlm 2742 fix localization (#165)

* [hlm-2742]: Update report_details.dart

* [hlm-2742]: Fix translation for tile

* [hlm-2054]: Decrease debounce duration (#169)

Co-authored-by: roopeshegov <[email protected]>

* Hlm 2765 fix project sync dialog (#168)

* [hlm-2765]: Update SDK constraints

* [hlm-2765]: Fix

* [hlm-2765]: Fix sync error type

* [hlm-2765]: Fix localization

* [hlm-2765]: Fix error after coming back online

* [hlm-2765]: Update pods

* Hlm 2547 locality fixes (#167)

* added help icon

* added call support

* added checklist plugin

* added help icon fixes

* removed images

* removed un-used code

* modified json

* added localization keys

* [hlm-2547]: Fix address locality model

* [hlm-2547]: Add locality for delivery intervention

* added applogo

* bug fixe
s

* added enum for beneficiary

* added individual delivery

* resolved

* resolved commits

* help icon and progress bar fixes

* added id check

* added lcoality for updates

* added address id

* fixed navigation issue

* added stock min and max validation

* updated validation

* fixed address id issue

* Hlm 2742 fix localization (#165)

* [hlm-2742]: Update report_details.dart

* [hlm-2742]: Fix translation for tile

* [hlm-2054]: Decrease debounce duration (#169)

Co-authored-by: roopeshegov <[email protected]>

* Hlm 2765 fix project sync dialog (#168)

* [hlm-2765]: Update SDK constraints

* [hlm-2765]: Fix

* [hlm-2765]: Fix sync error type

* [hlm-2765]: Fix localization

* [hlm-2765]: Fix error after coming back online

* [hlm-2765]: Update pods

* [hlm-2547]: Lints + fix build

* [hlm-2547]: Fix

* [hlm-2547]: Fix beneficiary type

* [hlm-2547]: Pluralize tasks

* [hlm-2547]: Pluralize beneficiaries

* [hlm-2547]: Update search_households.dart

* [hlm-2547]: Fix locality model

* [hlm-2547]: Typo

* [hlm-2547]: Fix target

* [hlm-2547]: Fix target count

* [hlm-2547]: Fix values

* [hlm-2547]: Add launcher icons

* [hlm-2547]: Fix manifest

---------

Co-authored-by: Ajil Oommen <[email protected]>
Co-authored-by: ajilo-eGov <[email protected]>
Co-authored-by: roopeshegov <[email protected]>

* [hlm-2478]: Fix is deleted (#170)

[hlm-2478]: Update models

* [hlm-000]: Add generated files (#173)

* [hlm-931]: Fix progress bar for non-distributor (#174)

* Hlm 2861 fix offline downsync (#172)

* [hlm-2765]: Update SDK constraints

* [hlm-2765]: Fix

* [hlm-2765]: Fix sync error type

* [hlm-2765]: Fix localization

* [hlm-2765]: Fix error after coming back online

* [hlm-2765]: Update pods

* [hlm-2861]: Fix double enum import in tables

* [hlm-2861]: Fixed scripts

* [hlm-2861]: Fix down sync problem

* [hlm-2861]: Fix no facility dialog on stock recon

* [hlm-2861]: Fix lints

* [hlm-000]: Build fix

* added delete check (#177)

* Hlm 2878 handle downsync failure (#175)

* [hlm-2878]: Handle down sync error

* [hlm-2878]: Fix build

* [hlm-2878]: Minor optimization

* [hlm-2878]: Update network_manager.dart

* Hlm 2879 firebase crashlytics (#178)

* [hlm-2879]: Add package base

* [hlm-2879]: Add ios bundle identifier

* [hlm-2879]: Fix auth

* [hlm-2879]: Update back_navigation_help_header.dart

* [hlm-2879]: Check for context

* [hlm-2879]: Intermittent

* [hlm-2879]: Add firebase config

* [hlm-2879]: Add crash enforcer

* [hlm-2879]: Fix config

* [hlm-2879]: Fix config

* [hlm-000]: Update README.md (#179)

* [hlm-000]: Update README.md


* [hlm-000]: Update sync docs

* Hlm 2977 profile update (#181)

* added profile page

* added user

* added bloc

* added update profile api integration

* added loader

* added localization codes

* added error fallback

* removed logs

* bug fixes

* added filters (#183)

* HLM-3161:: Split Age into years and Months across the application (#184)

* HLM-3161:: Split Age into years and Months across the application

* Updated Date Conversion functions

* Code commenting and minor UI fixes (#185)

* Code commenting and minor UI fixes

* HLM-3161:: Age Split in Table and css fixes for member card

* Update app_initialization.dart

* Update app_initialization.dart

* Digit Text Form Field suffix icon constraints css fixes

* Update auth.dart

* HLM-1361:: Date Conversion from months to date fixes

* Added trailing commas

* Error message changes for DOB field

* Error message changes for DOB field

* HLM-3161:: Updated age calculator logic and added Date utils to digit components  (#186)

* Digit Date Utils added, and handled years and age end cases

* Remove commented lines

* Added code commenting for Date Utils and DOB Picker

* Hlm 2876 auto sync (#176)

* [hlm-2878]: Handle down sync error

* [hlm-2878]: Fix build

* added auto sync

* fixed melos build issue

* added tost message

* [hlm-2878]: Minor optimization

* [hlm-2878]: Update network_manager.dart

* removed logs

* added filter bandwidth logic

* added background service logic

* intermetent commit

* auto sync fixed

* added isdeleted default value

* added error handling

* age issue fixed

* added error handling

* removed un-used code

* resloved conflicts

* removed duplicate

* handled bad state

* added retry count and row-version

* added code comments

* fixed typo and file renamed

* removed un-used code

* removed hard-coded credentials

* typo fixes

* added debouncing + filter checklist entity for sync-down

* Updated Age logic in DateExtensions

---------

Co-authored-by: Ajil Oommen <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>

* added filter for stock recon (#188)

* added filter for stock recon

* removed un-used code

* Updated Ade and months validations for DOB Picker (#189)

* HLM-3161:: Added Generic error message for the DOB Picker and handled negative years and months validation (#191)

* HLM-3161:: Negative months and years use cases validations added

* HLM-3161:: Added Generic error message for the DOB Picker

* HLM-3161:: Years and months conversion in Delivery intervention page

* HLM-3161:: input formatter added for text field

* bug fix for filter (#193)

* bug fix for filter

* removed un-used code

* [fix] added dropdown value population (#194)

* Hlm 2981 row version (#195)

* resolved conflicts

* resolved conflicts

* added row-version schema

* remove duplicate isar open

* removed un-used file

* added app version (#197)

* added app version

* added version

* HLM-3161:: Age and Date of Birth Fixes (#199)

* HLM-3161:: Age and Date of Birth Fixes

* HLM-3161:: Age and Date of Birth Fixes

* added client-audit-time

* HLM-2850:: Gender value Others not retaining on Edit Fixes

* HLM-2650: Added static screen for resource benificiary & added localisation

* HLM-2650: Updated dart.yaml (#204)

* HLM-2650: Updated dart.yaml (#204)

* added roles actions

* HLM-2650:Added Stepper for Doses

* removed commented code

* HLM-2650: Updated card for Resource

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* HLM-2650: Static screen in progress

* HLM-2650: Added Cycle table

* added client audit details

* Past delivery changes

* HLM-2650: Updated key for localisation

* added null check

* added null check

* HLM-2850:: Gender value Others not retaining on Edit Fixes (#202)

Co-authored-by: Naveen <[email protected]>

* added missing routers

* HLM-2650: Added project type model

* HLM-2650,HLM-3117: Added Bloc, Schema,Model

* added projectype mapping in beneficary Details page

* added fix for task client audit details

* added past delivery

* added table color schema

* added dynmaic resource card

* added minor validation

* removed print and un-used code

* added active cycle

* HLM-3117: Added localisation & fixed integer taking 0 value

* HLM-3117: Added popup data and updated stpper to dynamic

* HLM-3117: Added popup data and updated stpper to dynamic

* code seperation

* resolved conflicts

* HLM-3117: rebasing

* HLM-3117: future deliveries WIP

* fixed the dialog height and past deliverytable

* HLM-3117: Added futures deliveries

* HLM-3117: Addde localisation

* added past resources and active cycle and dose

* HLM-3950:: Digit Components changes pull out from CBO App (#210)

* HLM-4067: Added API integration for future delivery (#216)

* HLM-4067: Added API integration for future deliveires

* HLM-4067: clean up

* HLM-3560::Black Screen fixes on App launch (#211)

* HLM-3560::Black Screen fixes on App launch

* HLM-3560::Black Screen and Offline data fetch on App launch

* HLM-3560:: added Code commenting for Blank screen fixes

* Blank screen localizations changed to English

* HLM-4067: Added task resource api (#217)

* HLM-3117: Added Static screen for past record (#215)

* HLM-3117: Added static screen for past record

* HLM-3117: Added static screen for past record

* HLM-4067: Updated naming convention, handled dose administered, localisation (#218)

* HLM-4067: Updated naming convetion, handled dose

* HLM-4067: Added deliverystrategy in additionals fields & updated localisation for table

* Hlm 3068 adv events merge to multi round (#213)

* HLM-3068:: Adverse Events Static screen and Bloc, Models

* HLM-3068:: Adverse events static screen routing changes

* HLM-3068::Adverse Events API integration

* HLM-3068::Adverse Events, Localization changes for reattempts field

* HLM-3068::Adverse Events:: Search Response Fix

* Print statements removed

* Restrict Tracking of adverse events while updating Delivery, PendingSync Count fixes

* HLM-3068:: Adverse event fixes

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068:: Adverse events merging to Multi round campaign

* HLM-3068:: Adverse events changes added to multi round

* TODO comments added

* Adverse events fixes merged to multi round and UI fixes

* Comments and print statements removed

* Age Eligibility check added, Beneficiary Refused status updated.

* Beneficiary Refused check, Adverse events recorded check and Update Delivery removed

* Current and future cycle and Doses Fixes

* TODO comments added

* HLM-4065::Search Households clear event on Open Pressed (#219)

* added project type

* added resources

* added status

* HLM-4065::Fetch-Active and past cycle for Beneficiary Table data (#221)

* HLM-4065::Render Current and Past Cycles, Future delivery Bug fixes (#222)

* HLM-4064: Record Past Delivery Details  (#220)

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM-4064: Added dynamic form controlfor record past delivery, updated bloc to handled futureTask

* HLM-4064: Merge conflic fixes from /HLM-2650-resource-card-multiround

* HLM-4064: Added adverse event popup, updated localisation,updated bloc for futuretask (#223)

* HLM-4064: Added adevrse event popup, updated localisation,updated bloc for futuretask

* HLM-4064: Added enum for hardcoded values

* HLM-4064: Added null check for advrese event, Removed all hardcoded values

* Hlm 2982 added seperate server client time (#209)

* added client-audit-time

* added roles actions

* removed commented code

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* added client audit details

* added null check

* added null check

* added missing routers

* added fix for task client audit details

* added time stamp and removed the print statements

* HLM-4064,HLM-3565: Updated future Task back button, updated localisation for future task (#225)

* HLM-3565: Added code comment (#224)

* HLM-3565: Added code comment

* HLM-3565: Added localisation,removed help button,

* HLM-3565:Removed unwanted code

* HLM-4065:: Beneficiary Details fixes (#226)

* HLM-4065:: Beneficiary Details fixes

* Merge conflicts fixes

* Merge conflicts fixes

* HLM-3565: Added min age and max age& removed hardcoded values (#227)

* HLM-1890:: If Default identifier is ID, "ID Number" field should be hidden from the UI. (#208)

* added status reset

* HLM-3565: Added patches back to search not owrking, added null check for task data (#229)

* HLM-4065::Date validation fixes, and null check added (#230)

* HLM-4065::Date validation fixes, and null check added

* HLM-4065::Past Cycles in reverse order

* HLM-3565: Added dash on table (#232)

* HLM-3565: Added dash on table

* HLM-3565:Fixed conflict issue

* HLM-3565:: Reverted PR, and UI fixes (#233)

* Revert "HLM-3565: Added dash on table (#232)"

This reverts commit 7796aed9bb8f00f5932645eb13b03d331e1dd814.

* HLM-3565:: Reverted PR, and UI fixes

* HLM-3074:: Multi Round fixes (#234)

* HLM-3565: Added fixes for backward compatibility (#235)

* Hlm 3091 proximity based search (#190)

* added filter for stock recon

* removed un-used code

* added fallback code

* added query

* enabled proximity bases search

* modified the query

* modfied the query

* added clearing the  search bar when proximity search is triggered

* added filters

* Update dart.yml (#200)

* Update dart.yml

* Update dart.yml

* Update dart.yml

* Update dart.yml

* HLM-3379: Fixed proximity based search

* Revert "HLM-3379: Fixed proximity based search"

This reverts commit a22ef1cddcdb14ae132da2e9689b96c01803f0bc.

* HLM-3379: Fixed proximity based search (#205)

* HLM-3379: Fixed proximity based search

* HLM-3379: Code updated

* HLM-3379: Updated code

* Proximity Based search Code review changes

* HLM-3379:Updated distance display info inside brackets

---------

Co-authored-by: Ramkrishna-egov <[email protected]>

* HLM-3950:: Digit Components changes pull out from CBO App (#210)

* HLM-3560::Black Screen fixes on App launch (#211)

* HLM-3560::Black Screen fixes on App launch

* HLM-3560::Black Screen and Offline data fetch on App launch

* HLM-3560:: added Code commenting for Blank screen fixes

* Blank screen localizations changed to English

* Hlm 2982 added seperate server client time (#209)

* added client-audit-time

* added roles actions

* removed commented code

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* added client audit details

* added null check

* added null check

* added missing routers

* added fix for task client audit details

* added time stamp and removed the print statements

* removed TODO as it's been completed

* Update auth_model.dart

---------

Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>
Co-authored-by: Ramkrishna-egov <[email protected]>

* HLM-3565: Fixed back button for splash (#236)

* HLM-3565: Added validation for record past& fixed asterisk (#237)

* HLM-3565: Added patches for future task shwoing for all other child card (#238)

* HLM-3074:: Multi Round UI/UX Fixes and Validation fixes on Cycle reset (#239)

* HLM-3565: Hide back and help button for doseadminstered screen & prevented  physical back button click (#241)

* HLM-3565: Hide back and help button for doseadminstered screen & prevnt physical back button click

* HLM-3565: Removed print and added rethrow

* HLM-3565: Fixed back button navigating to household instead of search (#242)

* HLM-3565: Added default value as per the figma for future dose (#243)

* added button color

* added toggle button to view records

* removed the shadow

* HLM-3565: Fixed resource card delete option et to last element & fixed multiple card showing same value (#244)

* added padding

* HLM-3565:Added missing code for project bloc, fixed future task taking multiple data (#246)

* HLM-3565: Fixed back to search not redirecting to search for member card after delete (#247)

* HLM-3565: Added localisation , added static screen for vie whouseholkd (#250)

* HLM-3565: Fixed yes no button for dialog (#253)

* HLM-3565: Commented code for household button (#254)

* HLM-3565: Added validation, Fixed button shrink issue on record dose, fixed reload issue (#255)

* HLM-3565: Validtion in progress

* HLM-3565:Added validation, Foxed button shrink issue, fixed reload issue

* HLM-3565: Removed hardcoded start & end date value

* HLM-3565: Removed print statement

* HLM-3074:: Button validation fixes on completion of cycle and current… (#245) (#256)

* HLM-3074:: Button validation fixes on completion of cycle and current cycle moved to context utility

* HLM-3074:: Table height fix

* HLM-3074:: Dose Criteria configuration for each delivery added (#257)

* HLM-3565: Fixed modal issue, added reload event (#258)

* HLM-3565: Added view household, fixed popup paddign issue

* HLM-3565: Fixed dialog issue, updated reload event

* HLM-3565

* HLM-3565: Fixed view to household not reloading future task

* HLM-3074:: Age Validation Fixes (#259)

* HLM-3074:: Age Validation Fixes

* Removed print statements

* Adverse events load on proximity search (#260)

* Multi round fixes :: task reload, Location null check , deliveries config changes

* Code commenting

* Proximity fixes for individual search for INDIVIDUAL based campaign (#263)

* Proximity fixes for individual search for INDIVIDUAL based campaign

* Proximity Toggle Fixes and UI?UX Audit fixes

* Demo fixes

* Beneficiary Details mapping fixes,Task Local Repository Search Fixes, UI/UX Bug Fixes,

* HLM-4320:: Status Updates

* Build pipeline fixes (#267)

* Nested Checklist Code Changes (#269)

* Hlm 2650 UI fixes (#268)

* HLM-2650:Added ui fixes for table height and left column issue

* UI/UX Audit Fixes

* Beneficary Details updated based on Beneficiary Type

* Nested Checklist Code Changes (#269)

* UI/UX Fixes

* Reverted script

* Dialog padding fixes

* resolved the sync issue

* removed the un-necessary bloc call

* Proximity fixes for Household Based

---------

Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Naveen <[email protected]>

* added sync fixes

* Adverse event entity name changed to Side Effect Entity (#271)

* Adverse event entity name changed to Side Effect Entity

* print logs removed

* Symptoms values mapping

* Side effect local and remote repository added to sync

* Task Oplog creation when resources are null (#273)

* Task Oplog creation when resources are null

* Code Reformatting

* Handle Pop of dialog on back button pressed

* Handle Pop of dialog on back button pressed

* Resolved review comments

* Resolved review comments

* Resolved review comments

* Resolved review comments

* Hlm 2650 resource card multiround proximity (#275)

* added client-audit-time

* HLM-2850:: Gender value Others not retaining on Edit Fixes

* HLM-2650: Added static screen for resource benificiary & added localisation

* HLM-2650: Updated dart.yaml (#204)

* added roles actions

* HLM-2650:Added Stepper for Doses

* removed commented code

* HLM-2650: Updated card for Resource

* added client audit details

* updated the mason scripts - added client audit details

* added client audit details

* added time log in audiit

* added audit details

* added client modified Time

* added client audit details for member

* added client audit details

* added client audit details on household update

* added client audit details for delete

* added client aduit details for project beneficary

* HLM-2650: Static screen in progress

* HLM-2650: Added Cycle table

* added client audit details

* Past delivery changes

* HLM-2650: Updated key for localisation

* added null check

* added null check

* added missing routers

* HLM-2650: Added project type model

* HLM-2650,HLM-3117: Added Bloc, Schema,Model

* added projectype mapping in beneficary Details page

* added fix for task client audit details

* added past delivery

* added table color schema

* added dynmaic resource card

* added minor validation

* removed print and un-used code

* added active cycle

* HLM-3117: Added localisation & fixed integer taking 0 value

* HLM-3117: Added popup data and updated stpper to dynamic

* HLM-3117: Added popup data and updated stpper to dynamic

* code seperation

* resolved conflicts

* HLM-3117: rebasing

* HLM-3117: future deliveries WIP

* fixed the dialog height and past deliverytable

* HLM-3117: Added futures deliveries

* HLM-3117: Addde localisation

* added past resources and active cycle and dose

* HLM-4067: Added API integration for future delivery (#216)

* HLM-4067: Added API integration for future deliveires

* HLM-4067: clean up

* HLM-4067: Added task resource api (#217)

* HLM-3117: Added Static screen for past record (#215)

* HLM-3117: Added static screen for past record

* HLM-3117: Added static screen for past record

* HLM-4067: Updated naming convention, handled dose administered, localisation (#218)

* HLM-4067: Updated naming convetion, handled dose

* HLM-4067: Added deliverystrategy in additionals fields & updated localisation for table

* Hlm 3068 adv events merge to multi round (#213)

* HLM-3068:: Adverse Events Static screen and Bloc, Models

* HLM-3068:: Adverse events static screen routing changes

* HLM-3068::Adverse Events API integration

* HLM-3068::Adverse Events, Localization changes for reattempts field

* HLM-3068::Adverse Events:: Search Response Fix

* Print statements removed

* Restrict Tracking of adverse events while updating Delivery, PendingSync Count fixes

* HLM-3068:: Adverse event fixes

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068::  Navigate to success page if no adverse events observed

* HLM-3068:: Adverse events merging to Multi round campaign

* HLM-3068:: Adverse events changes added to multi round

* TODO comments added

* Adverse events fixes merged to multi round and UI fixes

* Comments and print statements removed

* Age Eligibility check added, Beneficiary Refused status updated.

* Beneficiary Refused check, Adverse events recorded check and Update Delivery removed

* Current and future cycle and Doses Fixes

* TODO comments added

* HLM-4065::Search Households clear event on Open Pressed (#219)

* added project type

* added resources

* added status

* HLM-4065::Fetch-Active and past cycle for Beneficiary Table data (#221)

* HLM-4065::Render Current and Past Cycles, Future delivery Bug fixes (#222)

* HLM-4064: Record Past Delivery Details  (#220)

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM:4064: Added bloc

* HLM:4064: Added bloc

* HLM-4064: clean up in progress

* HLM-4064: Added dynamic form controlfor record past delivery, updated bloc to handled futureTask

* HLM-4064: Merge conflic fixes from /HLM-2650-resource-card-multiround

* HLM-4064: Added adverse event popup, updated localisation,updated bloc for futuretask (#223)

* HLM-4064: Added adevrse event popup, updated localisation,updated bloc for futuretask

* HLM-4064: Added enum for hardcoded values

* HLM-4064: Added null check for advrese event, Removed all hardcoded values

* HLM-4064,HLM-3565: Updated future Task back button, updated localisation for future task (#225)

* HLM-3565: Added code comment (#224)

* HLM-3565: Added code comment

* HLM-3565: Added localisation,removed help button,

* HLM-3565:Removed unwanted code

* HLM-4065:: Beneficiary Details fixes (#226)

* HLM-4065:: Beneficiary Details fixes

* Merge conflicts fixes

* Merge conflicts fixes

* HLM-3565: Added min age and max age& removed hardcoded values (#227)

* added status reset

* HLM-3565: Added patches back to search not owrking, added null check for task data (#229)

* HLM-4065::Date validation fixes, and null check added (#230)

* HLM-4065::Date validation fixes, and null check added

* HLM-4065::Past Cycles in reverse order

* HLM-3565: Added dash on table (#232)

* HLM-3565: Added dash on table

* HLM-3565:Fixed conflict issue

* HLM-3565:: Reverted PR, and UI fixes (#233)

* Revert "HLM-3565: Added dash on table (#232)"

This reverts commit 7796aed9bb8f00f5932645eb13b03d331e1dd814.

* HLM-3565:: Reverted PR, and UI fixes

* HLM-3074:: Multi Round fixes (#234)

* HLM-3565: Added fixes for backward compatibility (#235)

* HLM-3565: Fixed back button for splash (#236)

* HLM-3565: Added validation for record past& fixed asterisk (#237)

* HLM-3565: Added patches for future task shwoing for all other child card (#238)

* HLM-3074:: Multi Round UI/UX Fixes and Validation fixes on Cycle reset (#239)

* HLM-3565: Hide back and help button for doseadminstered screen & prevented  physical back button click (#241)

* HLM-3565: Hide back and help button for doseadminstered screen & prevnt physical back button click

* HLM-3565: Removed print and added rethrow

* HLM-3565: Fixed back button navigating to household instead of search (#242)

* HLM-3565: Added default value as per the figma for future dose (#243)

* added button color

* added toggle button to view records

* removed the shadow

* HLM-3565: Fixed resource card delete option et to last element & fixed multiple card showing same value (#244)

* added padding

* HLM-3565:Added missing code for project bloc, fixed future task taking multiple data (#246)

* HLM-3565: Fixed back to search not redirecting to search for member card after delete (#247)

* HLM-3565: Added localisation , added static screen for vie whouseholkd (#250)

* HLM-3565: Fixed yes no button for dialog (#253)

* HLM-3565: Commented code for household button (#254)

* HLM-3565: Added validation, Fixed button shrink issue on record dose, fixed reload issue (#255)

* HLM-3565: Validtion in progress

* HLM-3565:Added validation, Foxed button shrink issue, fixed reload issue

* HLM-3565: Removed hardcoded start & end date value

* HLM-3565: Removed print statement

* HLM-3074:: Button validation fixes on completion of cycle and current… (#245) (#256)

* HLM-3074:: Button validation fixes on completion of cycle and current cycle moved to context utility

* HLM-3074:: Table height fix

* HLM-3074:: Dose Criteria configuration for each delivery added (#257)

* HLM-3565: Fixed modal issue, added reload event (#258)

* HLM-3565: Added view household, fixed popup paddign issue

* HLM-3565: Fixed dialog issue, updated reload event

* HLM-3565

* HLM-3565: Fixed view to household not reloading future task

* HLM-3074:: Age Validation Fixes (#259)

* HLM-3074:: Age Validation Fixes

* Removed print statements

* Adverse events load on proximity search (#260)

* Multi round fixes :: task reload, Location null check , deliveries config changes

* Code commenting

* Proximity fixes for individual search for INDIVIDUAL based campaign (#263)

* Proximity fixes for individual search for INDIVIDUAL based campaign

* Proximity Toggle Fixes and UI?UX Audit fixes

* Demo fixes

* Beneficiary Details mapping fixes,Task Local Repository Search Fixes, UI/UX Bug Fixes,

* HLM-4320:: Status Updates

* Build pipeline fixes (#267)

* Hlm 2650 UI fixes (#268)

* HLM-2650:Added ui fixes for table height and left column issue

* UI/UX Audit Fixes

* Beneficary Details updated based on Beneficiary Type

* Nested Checklist Code Changes (#269)

* UI/UX Fixes

* Reverted script

* Dialog padding fixes

* resolved the sync issue

* removed the un-necessary bloc call

* Proximity fixes for Household Based

---------

Co-authored-by: Anil Singha <[email protected]>
Co-authored-by: Naveen <[email protected]>

* added sync fixes

* Adverse event entity name changed to Side Effect Entity (#271)

* Adverse event entity name changed to Side Effect Entity

* print logs removed

* Symptoms values mapping

* Side effect local and remote repository added to sync

* Task Oplog creation when resources are null (#273)

* Task Oplog creation when resources are null

* Code Reformatting

* Handle Pop of dialog on back button pressed

* Handle Pop of dialog on back button pressed

* Resolved review comments

*…
  • Loading branch information
10 people authored Nov 2, 2023
1 parent 08d7091 commit fa6d545
Show file tree
Hide file tree
Showing 41 changed files with 3,346 additions and 903 deletions.
Binary file not shown.
Binary file not shown.
16 changes: 16 additions & 0 deletions apps/health_campaign_field_worker_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
PODS:
- audioplayers_darwin (0.0.1):
- Flutter
- battery_plus (1.0.0):
- Flutter
- connectivity_plus (0.0.1):
Expand Down Expand Up @@ -74,6 +76,7 @@ PODS:
- Flutter
- location (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
- nanopb (2.30909.0):
- nanopb/decode (= 2.30909.0)
- nanopb/encode (= 2.30909.0)
Expand All @@ -87,6 +90,9 @@ PODS:
- PromisesObjC (2.2.0)
- PromisesSwift (2.2.0):
- PromisesObjC (= 2.2.0)
- qr_code_scanner (0.2.0):
- Flutter
- MTBBarcodeScanner
- ReachabilitySwift (5.0.0)
- shared_preferences_foundation (0.0.1):
- Flutter
Expand Down Expand Up @@ -117,6 +123,7 @@ PODS:
- Flutter

DEPENDENCIES:
- audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
- battery_plus (from `.symlinks/plugins/battery_plus/ios`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
Expand All @@ -132,6 +139,7 @@ DEPENDENCIES:
- location (from `.symlinks/plugins/location/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
Expand All @@ -149,6 +157,7 @@ SPEC REPOS:
- FirebaseSessions
- GoogleDataTransport
- GoogleUtilities
- MTBBarcodeScanner
- nanopb
- PromisesObjC
- PromisesSwift
Expand All @@ -158,6 +167,8 @@ SPEC REPOS:
- Try

EXTERNAL SOURCES:
audioplayers_darwin:
:path: ".symlinks/plugins/audioplayers_darwin/ios"
battery_plus:
:path: ".symlinks/plugins/battery_plus/ios"
connectivity_plus:
Expand Down Expand Up @@ -188,6 +199,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
qr_code_scanner:
:path: ".symlinks/plugins/qr_code_scanner/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
speech_to_text:
Expand All @@ -200,6 +213,7 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/workmanager/ios"

SPEC CHECKSUMS:
audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
battery_plus: 9bff772a7e5e4d5381ca3ca92a97373a3d8b2738
connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
Expand All @@ -222,11 +236,13 @@ SPEC CHECKSUMS:
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
Expand Down
4 changes: 4 additions & 0 deletions apps/health_campaign_field_worker_app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
</array>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>io.flutter.embedded_views_preview</key>
<true/>
<key>NSCameraUsageDescription</key>
<string>This app needs camera access to scan QR codes</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
Expand Down
10 changes: 10 additions & 0 deletions apps/health_campaign_field_worker_app/lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'blocs/boundary/boundary.dart';
import 'blocs/localization/app_localization.dart';
import 'blocs/localization/localization.dart';
import 'blocs/project/project.dart';
import 'blocs/scanner/scanner.dart';
import 'blocs/user/user.dart';
import 'data/data_repository.dart';
import 'data/local_store/sql_store/sql_store.dart';
Expand Down Expand Up @@ -94,6 +95,15 @@ class MainApplicationState extends State<MainApplication>
),
),
),
BlocProvider(
create: (ctx) => ScannerBloc(
const ScannerState(),
projectBeneficiaryRepository: ctx
.read<NetworkManager>()
.repository<ProjectBeneficiaryModel,
ProjectBeneficiarySearchModel>(ctx),
),
),
BlocProvider(
create: (ctx) => BoundaryBloc(
const BoundaryState(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ class BeneficiaryRegistrationBloc

await projectBeneficiaryRepository.create(
ProjectBeneficiaryModel(
tag: event.tag,
rowVersion: 1,
tenantId: envConfig.variables.tenantId,
clientReferenceId: IdGen.i.identifier,
Expand Down Expand Up @@ -263,6 +264,19 @@ class BeneficiaryRegistrationBloc
),
),
);
final projectBeneficiary = await projectBeneficiaryRepository.search(
ProjectBeneficiarySearchModel(
beneficiaryClientReferenceId: [event.household.clientReferenceId],
),
);

if (projectBeneficiary.isNotEmpty) {
if (projectBeneficiary.first.tag != event.tag) {
await projectBeneficiaryRepository
.update(projectBeneficiary.first.copyWith(tag: event.tag));
}
}

for (var element in value.individualModel) {
await individualRepository.update(
element.copyWith(
Expand Down Expand Up @@ -310,7 +324,19 @@ class BeneficiaryRegistrationBloc
),
],
);

final projectBeneficiary = await projectBeneficiaryRepository.search(
ProjectBeneficiarySearchModel(
beneficiaryClientReferenceId: [event.model.clientReferenceId],
),
);
await individualRepository.update(individual);
if (projectBeneficiary.isNotEmpty) {
if (projectBeneficiary.first.tag != event.tag) {
await projectBeneficiaryRepository
.update(projectBeneficiary.first.copyWith(tag: event.tag));
}
}
} catch (error) {
rethrow;
} finally {
Expand Down Expand Up @@ -351,6 +377,7 @@ class BeneficiaryRegistrationBloc
if (event.beneficiaryType == BeneficiaryType.individual) {
await projectBeneficiaryRepository.create(
ProjectBeneficiaryModel(
tag: event.tag,
rowVersion: 1,
tenantId: envConfig.variables.tenantId,
clientReferenceId: IdGen.i.identifier,
Expand Down Expand Up @@ -429,24 +456,32 @@ class BeneficiaryRegistrationEvent with _$BeneficiaryRegistrationEvent {
required AddressModel addressModel,
required String userUuid,
required String projectId,
String? tag,
required BeneficiaryType beneficiaryType,
}) = BeneficiaryRegistrationAddMemberEvent;

const factory BeneficiaryRegistrationEvent.updateHouseholdDetails({
required HouseholdModel household,
AddressModel? addressModel,
String? tag,
}) = BeneficiaryRegistrationUpdateHouseholdDetailsEvent;

const factory BeneficiaryRegistrationEvent.updateIndividualDetails({
required IndividualModel model,
String? tag,
required AddressModel addressModel,
}) = BeneficiaryRegistrationUpdateIndividualDetailsEvent;

const factory BeneficiaryRegistrationEvent.create({
required String userUuid,
required String projectId,
required BoundaryModel boundary,
String? tag,
}) = BeneficiaryRegistrationCreateEvent;

const factory BeneficiaryRegistrationEvent.validate({
required String tag,
}) = BeneficiaryRegistrationTagEvent;
}

@freezed
Expand All @@ -466,13 +501,15 @@ class BeneficiaryRegistrationState with _$BeneficiaryRegistrationState {
required HouseholdModel householdModel,
required List<IndividualModel> individualModel,
required DateTime registrationDate,
ProjectBeneficiaryModel? projectBeneficiaryModel,
@Default(false) bool loading,
}) = BeneficiaryRegistrationEditHouseholdState;

const factory BeneficiaryRegistrationState.editIndividual({
required HouseholdModel householdModel,
required IndividualModel individualModel,
required AddressModel addressModel,
ProjectBeneficiaryModel? projectBeneficiaryModel,
@Default(false) bool loading,
}) = BeneficiaryRegistrationEditIndividualState;

Expand Down
Loading

0 comments on commit fa6d545

Please sign in to comment.