diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 35a11152d..0d45fc254 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -1,8 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
name: Run analysis and tests
on:
@@ -22,7 +17,13 @@ jobs:
- name: Flutter action
uses: subosito/flutter-action@v2.8.0
with:
- flutter-version: "3.16.5"
+ flutter-version: "3.22.1"
+
+ - name: Clean previous builds
+ run: flutter clean
+
+ - name: Install dependencies
+ run: flutter pub get
- name: Generate models
run: ./tools/install_bricks.sh
diff --git a/.github/workflows/flutter-build-apk.yml b/.github/workflows/flutter-build-apk.yml
new file mode 100644
index 000000000..a8995a1b0
--- /dev/null
+++ b/.github/workflows/flutter-build-apk.yml
@@ -0,0 +1,75 @@
+name: Build APK Workflow
+
+on:
+ push:
+ branches: [ 'develop', 'master' ] # This specifies that the workflow will run on any push to the 'develop' or 'master' branches
+ pull_request:
+ branches: [ 'develop', 'master' ] # Optionally, run on pull requests targeting the 'develop' or 'master' branches
+
+jobs:
+ build-apk:
+ runs-on: ubuntu-latest
+ environment: UAT
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+
+ - name: Set up JDK 17
+ uses: actions/setup-java@v3
+ with:
+ java-version: '17'
+ distribution: 'temurin' # Specify the Java distribution
+
+ - name: Flutter action
+ uses: subosito/flutter-action@v2.8.0
+ with:
+ flutter-version: "3.22.2"
+
+ - name: Set up Android SDK
+ uses: android-actions/setup-android@v2
+ with:
+ api-level: 33
+ build-tools: 33.0.2
+
+ - name: Install Dependencies
+ run: flutter pub get
+
+ - name: Create .env file
+ run: |
+ echo "BASE_URL=${{ vars.BASE_URL }}" >> apps/health_campaign_field_worker_app/.env
+ echo "MDMS_API_PATH=${{ vars.MDMS_API_PATH }}" >> apps/health_campaign_field_worker_app/.env
+ echo "TENANT_ID=${{ vars.TENANT_ID }}" >> apps/health_campaign_field_worker_app/.env
+ echo "ACTIONS_API_PATH=${{ vars.ACTIONS_API_PATH }}" >> apps/health_campaign_field_worker_app/.env
+ echo "SYNC_DOWN_RETRY_COUNT=${{ vars.SYNC_DOWN_RETRY_COUNT }}" >> apps/health_campaign_field_worker_app/.env
+ echo "RETRY_TIME_INTERVAL=${{ vars.RETRY_TIME_INTERVAL }}" >> apps/health_campaign_field_worker_app/.env
+ echo "CONNECT_TIMEOUT=${{ vars.CONNECT_TIMEOUT }}" >> apps/health_campaign_field_worker_app/.env
+ echo "RECEIVE_TIMEOUT=${{ vars.RECEIVE_TIMEOUT }}" >> apps/health_campaign_field_worker_app/.env
+ echo "SEND_TIMEOUT=${{ vars.SEND_TIMEOUT }}" >> apps/health_campaign_field_worker_app/.env
+ echo "CHECK_BANDWIDTH_API=${{ vars.CHECK_BANDWIDTH_API }}" >> apps/health_campaign_field_worker_app/.env
+ echo "HIERARCHY_TYPE=${{ vars.HIERARCHY_TYPE }}" >> apps/health_campaign_field_worker_app/.env
+ echo "ENV_NAME=${{ vars.ENV_NAME }}" >> apps/health_campaign_field_worker_app/.env
+
+ - name: Verify .env file
+ run: |
+ ls -l apps/health_campaign_field_worker_app/.env
+ cat apps/health_campaign_field_worker_app/.env
+
+ - name: Run APK build script
+ env:
+ BUILD_CONFIG: release # or profile depending on your choice
+ run: bash ./tools/generate-apk.sh
+
+ # Archive the APK as a build artifact so it can be downloaded
+ - name: Upload APKs
+ uses: actions/upload-artifact@v3
+ with:
+ name: app-release-apk
+ path: apps/health_campaign_field_worker_app/build/app/outputs/flutter-apk/app-release.apk
+
+ - name: Upload .env as artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: env-file
+ path: apps/health_campaign_field_worker_app/.env
+ include-hidden-files: true
diff --git a/.gitignore b/.gitignore
index 9793aec7d..21577b489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ migrate_working_dir/
*.iws
.idea/
-
# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
@@ -57,3 +56,7 @@ pubspec_overrides.yaml
apps/health_campaign_field_worker_app/.env
apps/health_campaign_field_worker_app/libisar.dylib
*.properties
+
+# FVM Version Cache
+.fvm/
+.fvmrc
\ No newline at end of file
diff --git a/README.md b/README.md
index b1562afae..99b8c1f4c 100644
--- a/README.md
+++ b/README.md
@@ -566,7 +566,7 @@ class _ChecklistDataShowcaseData {
import '../../../utils/i18_key_constants.dart' as i18;
import '../showcase_wrappers.dart';
-part 'checklist_data.dart';
+part 'survey_form_data.dart';
final checklistDataShowcaseData = _ChecklistDataShowcaseData();
```
diff --git a/apps/health_campaign_field_worker_app/.gitignore b/apps/health_campaign_field_worker_app/.gitignore
index ac43765ff..ce6d32b71 100644
--- a/apps/health_campaign_field_worker_app/.gitignore
+++ b/apps/health_campaign_field_worker_app/.gitignore
@@ -44,3 +44,7 @@ app.*.map.json
/android/app/debug
/android/app/profile
/android/app/release
+
+# FVM Version Cache
+.fvm/
+.fvmrc
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/android/app/build.gradle b/apps/health_campaign_field_worker_app/android/app/build.gradle
index 7ed3cf689..614262029 100644
--- a/apps/health_campaign_field_worker_app/android/app/build.gradle
+++ b/apps/health_campaign_field_worker_app/android/app/build.gradle
@@ -1,3 +1,10 @@
+plugins {
+ id 'com.android.application'
+ id 'kotlin-android'
+ id 'dev.flutter.flutter-gradle-plugin'
+ id 'com.google.gms.google-services'
+}
+
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
@@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) {
}
}
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
@@ -21,24 +23,18 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
-apply plugin: 'com.android.application'
-// START: FlutterFire Configuration
-apply plugin: 'com.google.gms.google-services'
-// END: FlutterFire Configuration
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
- compileSdkVersion 34
+ compileSdk = flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = '17'
}
sourceSets {
@@ -50,8 +46,8 @@ android {
applicationId "com.digit.hcm"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
- minSdkVersion 21
- targetSdkVersion flutter.targetSdkVersion
+ minSdk = flutter.minSdkVersion
+ targetSdk = flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
@@ -63,12 +59,16 @@ android {
signingConfig signingConfigs.debug
}
}
+
+ if (!project.hasProperty('USE_GOOGLE_SERVICES')) {
+ tasks.whenTaskAdded { task ->
+ if (task.name.contains("GoogleServices")) {
+ task.enabled = false
+ }
+ }
+ }
}
flutter {
source '../..'
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/android/app/src/main/AndroidManifest.xml b/apps/health_campaign_field_worker_app/android/app/src/main/AndroidManifest.xml
index 8599cae8b..5f39e8455 100644
--- a/apps/health_campaign_field_worker_app/android/app/src/main/AndroidManifest.xml
+++ b/apps/health_campaign_field_worker_app/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
+
@@ -10,7 +11,7 @@
-
+
@@ -28,16 +29,16 @@
android:allowBackup="false"
- android:fullBackupOnly="false"
android:fullBackupContent="false"
+ android:fullBackupOnly="false"
+ android:icon="@mipmap/ic_launcher"
+ android:label="HCM">
+ android:exported="false"
+ android:foregroundServiceType="location" />
-
-
+
+ MethodChannel(
+ flutterEngine!!.dartExecutor.binaryMessenger,
+ CHANNEL
+ ).setMethodCallHandler { call, result ->
when (call.method) {
"startLocationUpdates" -> {
val interval = (call.argument("interval")?.toLong()) ?: 60000L
- val stopAfterTimestamp = (call.argument("stopAfterTimestamp")?.toLong()) ?: (System.currentTimeMillis() + 60000L)
+ val stopAfterTimestamp = (call.argument("stopAfterTimestamp")?.toLong())
+ ?: (System.currentTimeMillis() + 60000L)
if (!isMyServiceRunning(LocationService::class.java)) {
startService(interval, stopAfterTimestamp)
} else {
- Toast.makeText(this, "Location service is already running", Toast.LENGTH_SHORT).show()
+ Toast.makeText(
+ this,
+ "Location service is already running",
+ Toast.LENGTH_SHORT
+ ).show()
}
result.success(null)
}
+
"stopLocationUpdates" -> {
stopService()
result.success(null)
}
+
else -> result.notImplemented()
}
}
- // Register the receiver for location updates
+ // Register the receiver for location updates, with proper export settings for Android 13+
val filter = IntentFilter("LocationUpdate")
- registerReceiver(locationReceiver, filter)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ registerReceiver(locationReceiver, filter, Context.RECEIVER_EXPORTED)
+ } else {
+ registerReceiver(locationReceiver, filter)
+ }
}
override fun onDestroy() {
@@ -90,7 +112,8 @@ class MainActivity : FlutterActivity() {
val manager = getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager
for (service in manager.getRunningServices(Int.MAX_VALUE)) {
if (serviceClass.name == service.service.className) {
- Toast.makeText(this, "Location service is already running", Toast.LENGTH_SHORT).show()
+ Toast.makeText(this, "Location service is already running", Toast.LENGTH_SHORT)
+ .show()
return true
}
}
diff --git a/apps/health_campaign_field_worker_app/android/app/src/main/kotlin/com/digit/hcm/location_service.kt b/apps/health_campaign_field_worker_app/android/app/src/main/kotlin/com/digit/hcm/location_service.kt
index 930d4a408..23756ee0e 100644
--- a/apps/health_campaign_field_worker_app/android/app/src/main/kotlin/com/digit/hcm/location_service.kt
+++ b/apps/health_campaign_field_worker_app/android/app/src/main/kotlin/com/digit/hcm/location_service.kt
@@ -92,10 +92,11 @@ class LocationService : Service() {
val intent = Intent("LocationUpdate")
intent.putExtra("latitude", location.latitude)
intent.putExtra("longitude", location.longitude)
+ intent.putExtra("accuracy", location.accuracy)
sendBroadcast(intent)
- Log.d("LocationSharing", "Location sent to MainActivity: Latitude ${location.latitude}, Longitude ${location.longitude}")
+ Log.d("LocationSharing", "Location sent to MainActivity: Latitude ${location.latitude}, Longitude ${location.longitude}, Accuracy ${location.accuracy}")
}
override fun onDestroy() {
@@ -129,8 +130,10 @@ class LocationService : Service() {
val notificationIntent = Intent(this, MainActivity::class.java)
val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
val timestamp = System.currentTimeMillis()
- val notificationContent = "Latitude: ${location.latitude}, Longitude: ${location.longitude},"
- writeToFile("Latitude: ${location.latitude}, Longitude: ${location.longitude}, isSync: false, timestamp: $timestamp")
+ val notificationContent = "Latitude: ${location.latitude}, Longitude: ${location.longitude}, Accuracy: ${location.accuracy}" // Include accuracy
+
+ // Write location and accuracy to file
+ writeToFile("Latitude: ${location.latitude}, Longitude: ${location.longitude}, Accuracy: ${location.accuracy}, isSync: false, timestamp: $timestamp")
val notification = NotificationCompat.Builder(this, CHANNEL_ID)
.setContentTitle("Location Service")
diff --git a/apps/health_campaign_field_worker_app/android/build.gradle b/apps/health_campaign_field_worker_app/android/build.gradle
index 240f9a683..bc157bd1a 100644
--- a/apps/health_campaign_field_worker_app/android/build.gradle
+++ b/apps/health_campaign_field_worker_app/android/build.gradle
@@ -1,19 +1,3 @@
-buildscript {
- ext.kotlin_version = '1.8.22'
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.1.2'
- // START: FlutterFire Configuration
- classpath 'com.google.gms:google-services:4.3.10'
- // END: FlutterFire Configuration
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
allprojects {
repositories {
google()
diff --git a/apps/health_campaign_field_worker_app/android/gradle/wrapper/gradle-wrapper.properties b/apps/health_campaign_field_worker_app/android/gradle/wrapper/gradle-wrapper.properties
index cb24abda1..41dfb8790 100644
--- a/apps/health_campaign_field_worker_app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/health_campaign_field_worker_app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/apps/health_campaign_field_worker_app/android/settings.gradle b/apps/health_campaign_field_worker_app/android/settings.gradle
index 44e62bcf0..a9fc22210 100644
--- a/apps/health_campaign_field_worker_app/android/settings.gradle
+++ b/apps/health_campaign_field_worker_app/android/settings.gradle
@@ -1,11 +1,27 @@
-include ':app'
+pluginManagement {
+ def flutterSdkPath = {
+ def properties = new Properties()
+ file("local.properties").withInputStream { properties.load(it) }
+ def flutterSdkPath = properties.getProperty("flutter.sdk")
+ assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+ return flutterSdkPath
+ }()
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+ includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+ repositories {
+ google()
+ mavenCentral()
+ gradlePluginPortal()
+ }
+}
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+ id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+ id "com.android.application" version "7.3.0" apply false
+ id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+ id "com.google.gms.google-services" version "4.4.0" apply false
+ id "com.google.firebase.crashlytics" version "2.9.9" apply false
+}
+
+include ":app"
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/assets/animated_json/alert.json b/apps/health_campaign_field_worker_app/assets/animated_json/alert.json
new file mode 100644
index 000000000..171b416cd
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/assets/animated_json/alert.json
@@ -0,0 +1,1127 @@
+{
+ "nm": "48 - Warning",
+ "ddd": 0,
+ "h": 500,
+ "w": 500,
+ "meta": {
+ "g": "LottieFiles AE "
+ },
+ "layers": [
+ {
+ "ty": 3,
+ "nm": "48 - Warning",
+ "sr": 1,
+ "st": 0,
+ "op": 144,
+ "ip": 0,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 60,
+ 60,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 180,
+ 180,
+ 100
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 250.045,
+ 290.339,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "ind": 1
+ },
+ {
+ "ty": 4,
+ "nm": "Line",
+ "sr": 1,
+ "st": 0,
+ "op": 144,
+ "ip": 12,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ -1,
+ 21.25,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0,
+ "y": 1
+ },
+ "s": [
+ 0,
+ 0,
+ 100
+ ],
+ "t": 12
+ },
+ {
+ "s": [
+ 55.556,
+ 55.556,
+ 100
+ ],
+ "t": 32
+ }
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 85.533,
+ 85.887,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0,
+ "y": 1
+ },
+ "s": [
+ 180
+ ],
+ "t": 12
+ },
+ {
+ "s": [
+ 0
+ ],
+ "t": 32
+ }
+ ],
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "gr",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Group",
+ "nm": "Shape 1",
+ "ix": 1,
+ "cix": 2,
+ "np": 3,
+ "it": [
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 1",
+ "ix": 1,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": false,
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -1,
+ 80
+ ],
+ [
+ -1,
+ -37.5
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "st",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Stroke",
+ "nm": "Stroke 1",
+ "lc": 2,
+ "lj": 1,
+ "ml": 4,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 4
+ },
+ "w": {
+ "a": 0,
+ "k": 28,
+ "ix": 5
+ },
+ "c": {
+ "a": 0,
+ "k": [
+ 1,
+ 1,
+ 1
+ ],
+ "ix": 3
+ }
+ },
+ {
+ "ty": "tr",
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ }
+ }
+ ]
+ },
+ {
+ "ty": "tm",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Trim",
+ "nm": "Trim Paths 1",
+ "ix": 2,
+ "e": {
+ "a": 0,
+ "k": 100,
+ "ix": 2
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 3
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0,
+ "y": 1
+ },
+ "s": [
+ 0
+ ],
+ "t": 22
+ },
+ {
+ "s": [
+ 40
+ ],
+ "t": 42
+ }
+ ],
+ "ix": 1
+ },
+ "m": 1
+ }
+ ],
+ "ind": 2,
+ "parent": 5
+ },
+ {
+ "ty": 4,
+ "nm": "Dot",
+ "sr": 1,
+ "st": 0,
+ "op": 144,
+ "ip": 12,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "gr",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Group",
+ "nm": "Shape 1",
+ "ix": 1,
+ "cix": 2,
+ "np": 4,
+ "it": [
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 1",
+ "ix": 1,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": false,
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -1,
+ 80
+ ],
+ [
+ -1,
+ -37.5
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "tm",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Trim",
+ "nm": "Trim Paths 1",
+ "ix": 2,
+ "e": {
+ "a": 0,
+ "k": 0.1,
+ "ix": 2
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 3
+ },
+ "s": {
+ "a": 0,
+ "k": 0,
+ "ix": 1
+ },
+ "m": 1
+ },
+ {
+ "ty": "st",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Stroke",
+ "nm": "Stroke 1",
+ "lc": 2,
+ "lj": 1,
+ "ml": 4,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 4
+ },
+ "w": {
+ "a": 0,
+ "k": 33,
+ "ix": 5
+ },
+ "c": {
+ "a": 0,
+ "k": [
+ 1,
+ 1,
+ 1
+ ],
+ "ix": 3
+ }
+ },
+ {
+ "ty": "tr",
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ }
+ }
+ ]
+ }
+ ],
+ "ind": 3,
+ "parent": 2
+ },
+ {
+ "ty": 4,
+ "nm": "Tri Outlines",
+ "sr": 1,
+ "st": 0,
+ "op": 144,
+ "ip": 10,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 85.513,
+ 72.848,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 0,
+ 0,
+ 100
+ ],
+ "t": 10
+ },
+ {
+ "s": [
+ 100,
+ 100,
+ 100
+ ],
+ "t": 15
+ }
+ ],
+ "ix": 6,
+ "x": "var $bm_rt;\nvar amp, freq, decay, n, t, v;\ntry {\n amp = $bm_div(effect('Scale - Overshoot')('ADBE Slider Control-0001'), 2.5), freq = $bm_div(effect('Scale - Bounce')('ADBE Slider Control-0001'), 20), decay = $bm_div(effect('Scale - Friction')('ADBE Slider Control-0001'), 20), n = 0, 0 < numKeys && (n = nearestKey(time).index, key(n).time > time && n--), t = 0 === n ? 0 : $bm_sub(time, key(n).time), $bm_rt = 0 < n ? (v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10))), $bm_sum(value, $bm_div($bm_mul($bm_mul($bm_div(v, 100), amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))))) : value;\n} catch (e$$4) {\n $bm_rt = value = value;\n}"
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 59.955,
+ 37.467,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [
+ {
+ "ty": 5,
+ "mn": "ADBE Slider Control",
+ "nm": "Scale - Overshoot",
+ "ix": 1,
+ "en": 1,
+ "ef": [
+ {
+ "ty": 0,
+ "mn": "ADBE Slider Control-0001",
+ "nm": "Slider",
+ "ix": 1,
+ "v": {
+ "a": 0,
+ "k": 10,
+ "ix": 1,
+ "x": "var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"
+ }
+ }
+ ]
+ },
+ {
+ "ty": 5,
+ "mn": "ADBE Slider Control",
+ "nm": "Scale - Bounce",
+ "ix": 2,
+ "en": 1,
+ "ef": [
+ {
+ "ty": 0,
+ "mn": "ADBE Slider Control-0001",
+ "nm": "Slider",
+ "ix": 1,
+ "v": {
+ "a": 0,
+ "k": 35,
+ "ix": 1,
+ "x": "var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"
+ }
+ }
+ ]
+ },
+ {
+ "ty": 5,
+ "mn": "ADBE Slider Control",
+ "nm": "Scale - Friction",
+ "ix": 3,
+ "en": 1,
+ "ef": [
+ {
+ "ty": 0,
+ "mn": "ADBE Slider Control-0001",
+ "nm": "Slider",
+ "ix": 1,
+ "v": {
+ "a": 0,
+ "k": 65,
+ "ix": 1,
+ "x": "var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"
+ }
+ }
+ ]
+ }
+ ],
+ "shapes": [
+ {
+ "ty": "gr",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Group",
+ "nm": "Group 1",
+ "ix": 1,
+ "cix": 2,
+ "np": 2,
+ "it": [
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 1",
+ "ix": 1,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": true,
+ "i": [
+ [
+ -3.315,
+ 5.634
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -3.267,
+ -5.554
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 6.537,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 3.268,
+ -5.554
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 3.315,
+ 5.634
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -6.536,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -81.948,
+ 59.861
+ ],
+ [
+ -7.284,
+ -67.044
+ ],
+ [
+ 7.284,
+ -67.044
+ ],
+ [
+ 81.948,
+ 59.861
+ ],
+ [
+ 74.664,
+ 72.598
+ ],
+ [
+ -74.664,
+ 72.598
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "fl",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Fill",
+ "nm": "Fill 1",
+ "c": {
+ "a": 0,
+ "k": [
+ 0.7255,
+ 0.098,
+ 0
+ ],
+ "ix": 4
+ },
+ "r": 1,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ }
+ },
+ {
+ "ty": "tr",
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 85.513,
+ 72.848
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ }
+ }
+ ]
+ }
+ ],
+ "ind": 4,
+ "parent": 1
+ },
+ {
+ "ty": 3,
+ "nm": "Tri",
+ "sr": 1,
+ "st": 0,
+ "op": 144,
+ "ip": 10,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 85.513,
+ 72.848,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 0,
+ 0,
+ 100
+ ],
+ "t": 10
+ },
+ {
+ "s": [
+ 100,
+ 100,
+ 100
+ ],
+ "t": 15
+ }
+ ],
+ "ix": 6,
+ "x": "var $bm_rt;\nvar amp, freq, decay, n, t, v;\ntry {\n amp = $bm_div(effect('Scale - Overshoot')('ADBE Slider Control-0001'), 2.5), freq = $bm_div(effect('Scale - Bounce')('ADBE Slider Control-0001'), 20), decay = $bm_div(effect('Scale - Friction')('ADBE Slider Control-0001'), 20), n = 0, 0 < numKeys && (n = nearestKey(time).index, key(n).time > time && n--), t = 0 === n ? 0 : $bm_sub(time, key(n).time), $bm_rt = 0 < n ? (v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10))), $bm_sum(value, $bm_div($bm_mul($bm_mul($bm_div(v, 100), amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))))) : value;\n} catch (e$$4) {\n $bm_rt = value = value;\n}"
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 59.955,
+ 37.467,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [
+ {
+ "ty": 5,
+ "mn": "ADBE Slider Control",
+ "nm": "Scale - Overshoot",
+ "ix": 1,
+ "en": 1,
+ "ef": [
+ {
+ "ty": 0,
+ "mn": "ADBE Slider Control-0001",
+ "nm": "Slider",
+ "ix": 1,
+ "v": {
+ "a": 0,
+ "k": 10,
+ "ix": 1,
+ "x": "var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"
+ }
+ }
+ ]
+ },
+ {
+ "ty": 5,
+ "mn": "ADBE Slider Control",
+ "nm": "Scale - Bounce",
+ "ix": 2,
+ "en": 1,
+ "ef": [
+ {
+ "ty": 0,
+ "mn": "ADBE Slider Control-0001",
+ "nm": "Slider",
+ "ix": 1,
+ "v": {
+ "a": 0,
+ "k": 35,
+ "ix": 1,
+ "x": "var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"
+ }
+ }
+ ]
+ },
+ {
+ "ty": 5,
+ "mn": "ADBE Slider Control",
+ "nm": "Scale - Friction",
+ "ix": 3,
+ "en": 1,
+ "ef": [
+ {
+ "ty": 0,
+ "mn": "ADBE Slider Control-0001",
+ "nm": "Slider",
+ "ix": 1,
+ "v": {
+ "a": 0,
+ "k": 65,
+ "ix": 1,
+ "x": "var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"
+ }
+ }
+ ]
+ }
+ ],
+ "ind": 5,
+ "parent": 1
+ },
+ {
+ "ty": 1,
+ "nm": "Plate_white",
+ "sr": 1,
+ "st": 0,
+ "op": 144,
+ "ip": 0,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 250,
+ 250,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 250,
+ 250,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "sc": "#ffffff",
+ "sh": 500,
+ "sw": 500,
+ "ind": 6
+ }
+ ],
+ "v": "5.5.7",
+ "fr": 48,
+ "op": 144,
+ "ip": 0,
+ "assets": []
+}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/assets/animated_json/error.json b/apps/health_campaign_field_worker_app/assets/animated_json/error.json
new file mode 100644
index 000000000..96b4f9626
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/assets/animated_json/error.json
@@ -0,0 +1,728 @@
+{
+ "nm": "ckeck",
+ "ddd": 0,
+ "h": 50,
+ "w": 50,
+ "meta": {
+ "g": "@lottiefiles/toolkit-js 0.33.2"
+ },
+ "layers": [
+ {
+ "ty": 4,
+ "nm": "! Outlines",
+ "sr": 1,
+ "st": 0,
+ "op": 213,
+ "ip": 0,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 2,
+ 12,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.653,
+ "y": -0.834
+ },
+ "i": {
+ "x": 0.667,
+ "y": 1
+ },
+ "s": [
+ 100,
+ 100,
+ 100
+ ],
+ "t": 60
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 115,
+ 115,
+ 100
+ ],
+ "t": 73
+ },
+ {
+ "o": {
+ "x": 0.333,
+ "y": 0
+ },
+ "i": {
+ "x": 0.127,
+ "y": 1.695
+ },
+ "s": [
+ 115,
+ 115,
+ 100
+ ],
+ "t": 83
+ },
+ {
+ "s": [
+ 100,
+ 100,
+ 100
+ ],
+ "t": 90
+ }
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 25,
+ 25,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "gr",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Group",
+ "nm": "Group 1",
+ "ix": 1,
+ "cix": 2,
+ "np": 4,
+ "it": [
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 1",
+ "ix": 1,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": true,
+ "i": [
+ [
+ 0,
+ 1.104
+ ],
+ [
+ -1.104,
+ 0
+ ],
+ [
+ 0,
+ -1.104
+ ],
+ [
+ 1.104,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ -1.104
+ ],
+ [
+ 1.104,
+ 0
+ ],
+ [
+ 0,
+ 1.104
+ ],
+ [
+ -1.104,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -2,
+ 10
+ ],
+ [
+ 0,
+ 8
+ ],
+ [
+ 2,
+ 10
+ ],
+ [
+ 0,
+ 12
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 2",
+ "ix": 2,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": true,
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ]
+ ],
+ "v": [
+ [
+ -1.036,
+ 5
+ ],
+ [
+ -2,
+ -6.625
+ ],
+ [
+ -2,
+ -12
+ ],
+ [
+ 2,
+ -12
+ ],
+ [
+ 2,
+ -6.625
+ ],
+ [
+ 1.052,
+ 5
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "mm",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Merge",
+ "nm": "Merge Paths 1",
+ "mm": 1
+ },
+ {
+ "ty": "fl",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Fill",
+ "nm": "Fill 1",
+ "c": {
+ "a": 0,
+ "k": [
+ 1,
+ 1,
+ 1
+ ],
+ "ix": 4
+ },
+ "r": 1,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ }
+ },
+ {
+ "ty": "tr",
+ "a": {
+ "a": 0,
+ "k": [
+ 0.099,
+ 9.982
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 2.099,
+ 21.982
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 0
+ ],
+ "t": 10
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 5
+ ],
+ "t": 12
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ -5
+ ],
+ "t": 14
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 5
+ ],
+ "t": 16
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ -5
+ ],
+ "t": 18
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ 5
+ ],
+ "t": 20
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0.167
+ },
+ "i": {
+ "x": 0.833,
+ "y": 0.833
+ },
+ "s": [
+ -5
+ ],
+ "t": 22
+ },
+ {
+ "s": [
+ 0
+ ],
+ "t": 24
+ }
+ ],
+ "ix": 6
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ }
+ }
+ ]
+ }
+ ],
+ "ind": 1
+ },
+ {
+ "ty": 4,
+ "nm": "Shape Layer 1",
+ "sr": 1,
+ "st": 0,
+ "op": 193,
+ "ip": 0,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 10,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.41,
+ "y": -0.602
+ },
+ "i": {
+ "x": 0.667,
+ "y": 1
+ },
+ "s": [
+ 100,
+ 100,
+ 100
+ ],
+ "t": 60
+ },
+ {
+ "o": {
+ "x": 0.333,
+ "y": 0
+ },
+ "i": {
+ "x": 0.436,
+ "y": 1.492
+ },
+ "s": [
+ 115,
+ 115,
+ 100
+ ],
+ "t": 83
+ },
+ {
+ "s": [
+ 100,
+ 100,
+ 100
+ ],
+ "t": 90
+ }
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 25,
+ 35,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "gr",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Group",
+ "nm": "Ellipse 1",
+ "ix": 1,
+ "cix": 2,
+ "np": 3,
+ "it": [
+ {
+ "ty": "el",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Ellipse",
+ "nm": "Ellipse Path 1",
+ "d": 1,
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 3
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 40,
+ 40
+ ],
+ "ix": 2
+ }
+ },
+ {
+ "ty": "st",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Stroke",
+ "nm": "Stroke 1",
+ "lc": 1,
+ "lj": 1,
+ "ml": 4,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 4
+ },
+ "w": {
+ "a": 0,
+ "k": 2,
+ "ix": 5
+ },
+ "c": {
+ "a": 0,
+ "k": [
+ 1,
+ 1,
+ 1
+ ],
+ "ix": 3
+ }
+ },
+ {
+ "ty": "tr",
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ }
+ }
+ ]
+ },
+ {
+ "ty": "tm",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Trim",
+ "nm": "Trim Paths 1",
+ "ix": 2,
+ "e": {
+ "a": 0,
+ "k": 100,
+ "ix": 2
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 3
+ },
+ "s": {
+ "a": 0,
+ "k": 0,
+ "ix": 1
+ },
+ "m": 1
+ }
+ ],
+ "ind": 2
+ }
+ ],
+ "v": "5.6.5",
+ "fr": 60,
+ "op": 180,
+ "ip": 0,
+ "assets": []
+}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/assets/animated_json/inline_loader.json b/apps/health_campaign_field_worker_app/assets/animated_json/inline_loader.json
new file mode 100644
index 000000000..e5a3cc656
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/assets/animated_json/inline_loader.json
@@ -0,0 +1 @@
+{"nm":"Main Scene","ddd":0,"h":500,"w":500,"meta":{"g":"@lottiefiles/creator 1.37.0"},"layers":[{"ty":4,"nm":"Shape Layer 5","sr":1,"st":20,"op":620,"ip":20,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":20},{"s":[360],"t":110}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[10,10]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.7765,0.2902,0.051]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":1},{"ty":4,"nm":"Shape Layer 4","sr":1,"st":15,"op":615,"ip":15,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":15},{"s":[360],"t":105}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[20,20]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.7765,0.2902,0.051]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":2},{"ty":4,"nm":"Shape Layer 3","sr":1,"st":10,"op":610,"ip":10,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":10},{"s":[360],"t":100}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[30,30]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.7765,0.2902,0.051]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":3},{"ty":4,"nm":"Shape Layer 2","sr":1,"st":5,"op":605,"ip":5,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":5},{"s":[360],"t":95}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[40,40]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.7765,0.2902,0.051]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":4},{"ty":4,"nm":"Shape Layer 1","sr":1,"st":0,"op":600,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[250,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":0},{"s":[360],"t":90}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[50,50],"t":0},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[40,40],"t":84},{"s":[50,50],"t":100}]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.7765,0.2902,0.051]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":5}],"v":"5.7.0","fr":60,"op":106,"ip":0,"assets":[]}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/assets/animated_json/overlay_loader.json b/apps/health_campaign_field_worker_app/assets/animated_json/overlay_loader.json
new file mode 100644
index 000000000..9a9759f2d
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/assets/animated_json/overlay_loader.json
@@ -0,0 +1 @@
+{"nm":"Main Scene","ddd":0,"h":500,"w":500,"meta":{"g":"@lottiefiles/creator 1.37.1"},"layers":[{"ty":4,"nm":"Shape Layer 5","sr":1,"st":20,"op":620,"ip":20,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":20},{"s":[360],"t":110}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[10,10]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[1,1,1]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":1},{"ty":4,"nm":"Shape Layer 4","sr":1,"st":15,"op":615,"ip":15,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":15},{"s":[360],"t":105}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[20,20]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[1,1,1]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":2},{"ty":4,"nm":"Shape Layer 3","sr":1,"st":10,"op":610,"ip":10,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":10},{"s":[360],"t":100}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[30,30]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[1,1,1]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":3},{"ty":4,"nm":"Shape Layer 2","sr":1,"st":5,"op":605,"ip":5,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":5},{"s":[360],"t":95}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[40,40]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[1,1,1]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":4},{"ty":4,"nm":"Shape Layer 1","sr":1,"st":0,"op":600,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[250,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":0},{"s":[360],"t":90}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[50,50],"t":0},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[40,40],"t":84},{"s":[50,50],"t":100}]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[1,1,1]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":5}],"v":"5.7.0","fr":60,"op":106,"ip":0,"assets":[]}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/assets/animated_json/page_loader.json b/apps/health_campaign_field_worker_app/assets/animated_json/page_loader.json
new file mode 100644
index 000000000..ef02f47ca
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/assets/animated_json/page_loader.json
@@ -0,0 +1 @@
+{"nm":"Main Scene","ddd":0,"h":500,"w":500,"meta":{"g":"@lottiefiles/creator 1.37.1"},"layers":[{"ty":4,"nm":"Shape Layer 5","sr":1,"st":20,"op":620,"ip":20,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":20},{"s":[360],"t":110}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[10,10]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.0353,0.2902,0.4]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":1},{"ty":4,"nm":"Shape Layer 4","sr":1,"st":15,"op":615,"ip":15,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":15},{"s":[360],"t":105}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[20,20]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.0353,0.2902,0.4]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":2},{"ty":4,"nm":"Shape Layer 3","sr":1,"st":10,"op":610,"ip":10,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":10},{"s":[360],"t":100}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[30,30]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.0353,0.2902,0.4]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":3},{"ty":4,"nm":"Shape Layer 2","sr":1,"st":5,"op":605,"ip":5,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[251,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":5},{"s":[360],"t":95}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":0,"k":[40,40]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.0353,0.2902,0.4]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":4},{"ty":4,"nm":"Shape Layer 1","sr":1,"st":0,"op":600,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[250,250]},"r":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[0],"t":0},{"s":[360],"t":90}]},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"shapes":[{"ty":"gr","bm":0,"hd":false,"mn":"ADBE Vector Group","nm":"Ellipse 1","ix":1,"cix":2,"np":3,"it":[{"ty":"el","bm":0,"hd":false,"mn":"ADBE Vector Shape - Ellipse","nm":"Ellipse Path 1","d":1,"p":{"a":0,"k":[0,-100]},"s":{"a":1,"k":[{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[50,50],"t":0},{"o":{"x":0.333,"y":0},"i":{"x":0.667,"y":1},"s":[40,40],"t":84},{"s":[50,50],"t":100}]}},{"ty":"st","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Stroke","nm":"Stroke 1","lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":0},"c":{"a":0,"k":[0,0,0]}},{"ty":"fl","bm":0,"hd":false,"mn":"ADBE Vector Graphic - Fill","nm":"Fill 1","c":{"a":0,"k":[0.0353,0.2902,0.4]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"sk":{"a":0,"k":0,"ix":4},"p":{"a":0,"k":[0,0],"ix":2},"r":{"a":0,"k":0,"ix":6},"sa":{"a":0,"k":0,"ix":5},"o":{"a":0,"k":100,"ix":7}}]}],"ind":5}],"v":"5.7.0","fr":60,"op":106,"ip":0,"assets":[]}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/assets/animated_json/success.json b/apps/health_campaign_field_worker_app/assets/animated_json/success.json
new file mode 100644
index 000000000..43192f708
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/assets/animated_json/success.json
@@ -0,0 +1,917 @@
+{
+ "nm": "sucess",
+ "ddd": 0,
+ "h": 120,
+ "w": 120,
+ "meta": {
+ "g": "LottieFiles AE 0.1.21"
+ },
+ "layers": [
+ {
+ "ty": 3,
+ "nm": "scale up null",
+ "sr": 1,
+ "st": 0,
+ "op": 300.00001221925,
+ "ip": 0,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0
+ },
+ "i": {
+ "x": 0.833,
+ "y": 1
+ },
+ "s": [
+ 111,
+ 111,
+ 100
+ ],
+ "t": 27
+ },
+ {
+ "o": {
+ "x": 0.167,
+ "y": 0
+ },
+ "i": {
+ "x": 0.833,
+ "y": 1
+ },
+ "s": [
+ 101,
+ 101,
+ 100
+ ],
+ "t": 36
+ },
+ {
+ "s": [
+ 121,
+ 121,
+ 100
+ ],
+ "t": 42.0000017106951
+ }
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 60,
+ 60,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "ind": 1
+ },
+ {
+ "ty": 4,
+ "nm": "spark",
+ "sr": 1,
+ "st": 35.0000014255792,
+ "op": 335.00001364483,
+ "ip": 35.0000014255792,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0.5,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "gr",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Group",
+ "nm": "Rectangle 1",
+ "ix": 1,
+ "cix": 2,
+ "np": 3,
+ "it": [
+ {
+ "ty": "rc",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Rect",
+ "nm": "Rectangle Path 1",
+ "d": 1,
+ "p": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.333,
+ "y": 0
+ },
+ "i": {
+ "x": 0.667,
+ "y": 1
+ },
+ "s": [
+ 0,
+ -21
+ ],
+ "t": 35,
+ "ti": [
+ 0,
+ 1.5
+ ],
+ "to": [
+ 0,
+ -1.5
+ ]
+ },
+ {
+ "s": [
+ 0,
+ -30
+ ],
+ "t": 53.0000021587343
+ }
+ ],
+ "ix": 3
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.976,
+ "y": 0
+ },
+ "i": {
+ "x": 0.667,
+ "y": 1
+ },
+ "s": [
+ 2,
+ 0
+ ],
+ "t": 35
+ },
+ {
+ "o": {
+ "x": 0.33299999999999996,
+ "y": 0
+ },
+ "i": {
+ "x": 0.15355432054499818,
+ "y": 0.9999999999999999
+ },
+ "s": [
+ 2,
+ 8
+ ],
+ "t": 42
+ },
+ {
+ "s": [
+ 1.633,
+ 0
+ ],
+ "t": 53.0000021587343
+ }
+ ],
+ "ix": 2
+ }
+ },
+ {
+ "ty": "fl",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Fill",
+ "nm": "Fill 1",
+ "c": {
+ "a": 0,
+ "k": [
+ 0.9804,
+ 0.9804,
+ 0.9804
+ ],
+ "ix": 4
+ },
+ "r": 1,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ }
+ },
+ {
+ "ty": "tr",
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0,
+ "ix": 4
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ -8
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 6
+ },
+ "sa": {
+ "a": 0,
+ "k": 0,
+ "ix": 5
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 7
+ }
+ }
+ ]
+ },
+ {
+ "ty": "rp",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Repeater",
+ "nm": "Repeater 1",
+ "ix": 2,
+ "m": 1,
+ "c": {
+ "a": 0,
+ "k": 8,
+ "ix": 1
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 2
+ },
+ "tr": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100
+ ],
+ "ix": 3
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 45,
+ "ix": 4
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "so": {
+ "a": 0,
+ "k": 100,
+ "ix": 5
+ },
+ "eo": {
+ "a": 0,
+ "k": 100,
+ "ix": 6
+ }
+ }
+ }
+ ],
+ "ind": 2,
+ "parent": 1
+ },
+ {
+ "ty": 4,
+ "nm": "check",
+ "sr": 1,
+ "st": 10.0000004073083,
+ "op": 310.000012626559,
+ "ip": 22.0000008960784,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 1",
+ "ix": 1,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": false,
+ "i": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ 3.5,
+ 3.75
+ ],
+ [
+ -12.973,
+ 5.349
+ ],
+ [
+ -6.124,
+ -9.992
+ ],
+ [
+ 12.125,
+ -7.431
+ ],
+ [
+ 7.431,
+ 12.125
+ ]
+ ],
+ "o": [
+ [
+ 0,
+ 0
+ ],
+ [
+ 0,
+ 0
+ ],
+ [
+ -3.5,
+ -3.75
+ ],
+ [
+ 10.764,
+ -2.941
+ ],
+ [
+ 7.431,
+ 12.125
+ ],
+ [
+ -12.125,
+ 7.431
+ ],
+ [
+ -7.431,
+ -12.125
+ ]
+ ],
+ "v": [
+ [
+ 15.25,
+ -9.688
+ ],
+ [
+ -5.75,
+ 10.062
+ ],
+ [
+ -16,
+ 0.25
+ ],
+ [
+ -6.777,
+ -24.849
+ ],
+ [
+ 21.955,
+ -13.456
+ ],
+ [
+ 13.456,
+ 21.955
+ ],
+ [
+ -21.955,
+ 13.456
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "tm",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Trim",
+ "nm": "Trim Paths 1",
+ "ix": 2,
+ "e": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.714,
+ "y": 0
+ },
+ "i": {
+ "x": 0.351,
+ "y": 1
+ },
+ "s": [
+ 100
+ ],
+ "t": 10
+ },
+ {
+ "s": [
+ 23
+ ],
+ "t": 40.0000016292334
+ }
+ ],
+ "ix": 2
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 3
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.742,
+ "y": 0
+ },
+ "i": {
+ "x": 0.363,
+ "y": 1
+ },
+ "s": [
+ 100
+ ],
+ "t": 17
+ },
+ {
+ "s": [
+ 0
+ ],
+ "t": 45.0000018328876
+ }
+ ],
+ "ix": 1
+ },
+ "m": 1
+ },
+ {
+ "ty": "st",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Stroke",
+ "nm": "Stroke 1",
+ "lc": 1,
+ "lj": 1,
+ "ml": 4,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 4
+ },
+ "w": {
+ "a": 0,
+ "k": 4,
+ "ix": 5
+ },
+ "c": {
+ "a": 0,
+ "k": [
+ 0.9804,
+ 0.9804,
+ 0.9804
+ ],
+ "ix": 3
+ }
+ }
+ ],
+ "ind": 3,
+ "parent": 1
+ },
+ {
+ "ty": 4,
+ "nm": "circle",
+ "sr": 1,
+ "st": 0,
+ "op": 300.00001221925,
+ "ip": 0,
+ "hd": false,
+ "ddd": 0,
+ "bm": 0,
+ "hasMask": false,
+ "ao": 0,
+ "ks": {
+ "a": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 1
+ },
+ "s": {
+ "a": 0,
+ "k": [
+ 100,
+ 100,
+ 100
+ ],
+ "ix": 6
+ },
+ "sk": {
+ "a": 0,
+ "k": 0
+ },
+ "p": {
+ "a": 0,
+ "k": [
+ 0,
+ 0,
+ 0
+ ],
+ "ix": 2
+ },
+ "r": {
+ "a": 0,
+ "k": 0,
+ "ix": 10
+ },
+ "sa": {
+ "a": 0,
+ "k": 0
+ },
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 11
+ }
+ },
+ "ef": [],
+ "shapes": [
+ {
+ "ty": "sh",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Shape - Group",
+ "nm": "Path 1",
+ "ix": 1,
+ "d": 1,
+ "ks": {
+ "a": 0,
+ "k": {
+ "c": true,
+ "i": [
+ [
+ -14.221,
+ 0
+ ],
+ [
+ 0,
+ -14.221
+ ],
+ [
+ 14.221,
+ 0
+ ],
+ [
+ 0,
+ 14.221
+ ]
+ ],
+ "o": [
+ [
+ 14.221,
+ 0
+ ],
+ [
+ 0,
+ 14.221
+ ],
+ [
+ -14.221,
+ 0
+ ],
+ [
+ 0,
+ -14.221
+ ]
+ ],
+ "v": [
+ [
+ 0,
+ -25.75
+ ],
+ [
+ 25.75,
+ 0
+ ],
+ [
+ 0,
+ 25.75
+ ],
+ [
+ -25.75,
+ 0
+ ]
+ ]
+ },
+ "ix": 2
+ }
+ },
+ {
+ "ty": "st",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Graphic - Stroke",
+ "nm": "Stroke 1",
+ "lc": 1,
+ "lj": 1,
+ "ml": 4,
+ "o": {
+ "a": 0,
+ "k": 100,
+ "ix": 4
+ },
+ "w": {
+ "a": 0,
+ "k": 2,
+ "ix": 5
+ },
+ "c": {
+ "a": 0,
+ "k": [
+ 0.9804,
+ 0.9804,
+ 0.9804
+ ],
+ "ix": 3
+ }
+ },
+ {
+ "ty": "tm",
+ "bm": 0,
+ "hd": false,
+ "mn": "ADBE Vector Filter - Trim",
+ "nm": "Trim Paths 1",
+ "ix": 3,
+ "e": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.714,
+ "y": 0
+ },
+ "i": {
+ "x": 0.351,
+ "y": 1
+ },
+ "s": [
+ 100
+ ],
+ "t": 0
+ },
+ {
+ "s": [
+ 100
+ ],
+ "t": 30.0000012219251
+ }
+ ],
+ "ix": 2
+ },
+ "o": {
+ "a": 0,
+ "k": 0,
+ "ix": 3
+ },
+ "s": {
+ "a": 1,
+ "k": [
+ {
+ "o": {
+ "x": 0.742,
+ "y": 0
+ },
+ "i": {
+ "x": 0.363,
+ "y": 1
+ },
+ "s": [
+ 100
+ ],
+ "t": 7
+ },
+ {
+ "s": [
+ 0
+ ],
+ "t": 33.0000013441176
+ }
+ ],
+ "ix": 1
+ },
+ "m": 1
+ }
+ ],
+ "ind": 4,
+ "parent": 1
+ }
+ ],
+ "v": "5.5.7",
+ "fr": 29.9700012207031,
+ "op": 60.0000024438501,
+ "ip": 0,
+ "assets": []
+}
\ No newline at end of file
diff --git a/apps/health_campaign_field_worker_app/lib/app.dart b/apps/health_campaign_field_worker_app/lib/app.dart
index 7d90ae5da..b5fa3fb6c 100644
--- a/apps/health_campaign_field_worker_app/lib/app.dart
+++ b/apps/health_campaign_field_worker_app/lib/app.dart
@@ -18,6 +18,7 @@ import 'package:registration_delivery/models/entities/household.dart';
import 'package:registration_delivery/models/entities/household_member.dart';
import 'package:registration_delivery/models/entities/project_beneficiary.dart';
import 'package:registration_delivery/models/entities/task.dart';
+import 'package:survey_form/survey_form.dart';
import 'blocs/app_initialization/app_initialization.dart';
import 'blocs/auth/auth.dart';
@@ -25,6 +26,8 @@ import 'blocs/localization/localization.dart';
import 'blocs/project/project.dart';
import 'data/local_store/app_shared_preferences.dart';
import 'data/network_manager.dart';
+import 'data/remote_client.dart';
+import 'data/repositories/remote/bandwidth_check.dart';
import 'data/repositories/remote/localization.dart';
import 'data/repositories/remote/mdms.dart';
import 'router/app_navigator_observer.dart';
@@ -181,13 +184,8 @@ class MainApplicationState extends State
widget.sql)
..add(
LocalizationEvent.onLoadLocalization(
- module: localizationModulesList.interfaces
- .where((element) =>
- element.type ==
- Modules.localizationModule)
- .map((e) => e.name.toString())
- .join(',')
- .toString(),
+ module:
+ "hcm-boundary-${envConfig.variables.hierarchyType.toLowerCase()},${localizationModulesList.interfaces.where((element) => element.type == Modules.localizationModule).map((e) => e.name.toString()).join(',')}",
tenantId: appConfig.tenantId.toString(),
locale: firstLanguage,
path: Constants.localizationApiPath,
@@ -201,6 +199,11 @@ class MainApplicationState extends State
),
BlocProvider(
create: (ctx) => ProjectBloc(
+ bandwidthCheckRepository: BandwidthCheckRepository(
+ DioClient().dio,
+ bandwidthPath:
+ envConfig.variables.checkBandwidthApiPath,
+ ),
mdmsRepository: MdmsRepository(widget.client),
dashboardRemoteRepository:
DashboardRemoteRepository(widget.client),
diff --git a/apps/health_campaign_field_worker_app/lib/blocs/app_initialization/app_initialization.dart b/apps/health_campaign_field_worker_app/lib/blocs/app_initialization/app_initialization.dart
index 4530ae776..938819889 100644
--- a/apps/health_campaign_field_worker_app/lib/blocs/app_initialization/app_initialization.dart
+++ b/apps/health_campaign_field_worker_app/lib/blocs/app_initialization/app_initialization.dart
@@ -313,6 +313,7 @@ class MdmsConfig {
final List serviceRegistryList;
final DashboardConfigSchema? dashboardConfigSchema;
+
const MdmsConfig(
{required this.appConfigs,
required this.serviceRegistryList,
diff --git a/apps/health_campaign_field_worker_app/lib/blocs/localization/app_localizations_delegate.dart b/apps/health_campaign_field_worker_app/lib/blocs/localization/app_localizations_delegate.dart
index 7eaf5b020..9d8b05f12 100644
--- a/apps/health_campaign_field_worker_app/lib/blocs/localization/app_localizations_delegate.dart
+++ b/apps/health_campaign_field_worker_app/lib/blocs/localization/app_localizations_delegate.dart
@@ -1,7 +1,6 @@
import 'package:collection/collection.dart';
import 'package:digit_data_model/data/local_store/sql_store/sql_store.dart';
import 'package:flutter/material.dart';
-import 'package:isar/isar.dart';
import '../../data/local_store/no_sql/schema/app_configuration.dart';
import 'app_localization.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/blocs/project/project.dart b/apps/health_campaign_field_worker_app/lib/blocs/project/project.dart
index 18e420dea..07347633e 100644
--- a/apps/health_campaign_field_worker_app/lib/blocs/project/project.dart
+++ b/apps/health_campaign_field_worker_app/lib/blocs/project/project.dart
@@ -3,6 +3,7 @@ import 'dart:async';
import 'dart:core';
import 'package:attendance_management/attendance_management.dart';
+import 'package:survey_form/survey_form.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:digit_components/digit_components.dart';
import 'package:digit_data_model/data_model.dart';
@@ -19,10 +20,12 @@ import '../../data/local_store/no_sql/schema/app_configuration.dart';
import '../../data/local_store/no_sql/schema/row_versions.dart';
import '../../data/local_store/no_sql/schema/service_registry.dart';
import '../../data/local_store/secure_store/secure_store.dart';
+import '../../data/repositories/remote/bandwidth_check.dart';
import '../../data/repositories/remote/mdms.dart';
import '../../models/app_config/app_config_model.dart';
import '../../models/auth/auth_model.dart';
import '../../models/entities/roles_type.dart';
+import '../../utils/background_service.dart';
import '../../utils/environment_config.dart';
import '../../utils/utils.dart';
@@ -35,6 +38,8 @@ class ProjectBloc extends Bloc {
final Isar isar;
final MdmsRepository mdmsRepository;
+ final BandwidthCheckRepository bandwidthCheckRepository;
+
/// Project Staff Repositories
final RemoteRepository
projectStaffRemoteRepository;
@@ -76,6 +81,7 @@ class ProjectBloc extends Bloc {
final RemoteRepository stockRemoteRepository;
final LocalRepository stockLocalRepository;
+ /// Service Definition Repositories
final RemoteRepository
serviceDefinitionRemoteRepository;
final LocalRepository
@@ -103,6 +109,7 @@ class ProjectBloc extends Bloc {
ProjectBloc({
LocalSecureStore? localSecureStore,
+ required this.bandwidthCheckRepository,
required this.projectStaffRemoteRepository,
required this.projectRemoteRepository,
required this.projectStaffLocalRepository,
@@ -154,8 +161,8 @@ class ProjectBloc extends Bloc {
title: 'ProjectBloc',
);
- final isOnline = connectivityResult == ConnectivityResult.wifi ||
- connectivityResult == ConnectivityResult.mobile;
+ final isOnline = connectivityResult.firstOrNull == ConnectivityResult.wifi ||
+ connectivityResult.firstOrNull == ConnectivityResult.mobile;
final selectedProject = await localSecureStore.selectedProject;
final isProjectSetUpComplete = await localSecureStore
.isProjectSetUpComplete(selectedProject?.id ?? "noProjectId");
@@ -169,6 +176,7 @@ class ProjectBloc extends Bloc {
}
FutureOr _loadOnline(ProjectEmitter emit) async {
+ final batchSize = await _getBatchSize();
final userObject = await localSecureStore.userRequestModel;
final uuid = userObject?.uuid;
@@ -288,8 +296,11 @@ class ProjectBloc extends Bloc {
}
if (projects.isNotEmpty) {
+
+ // INFO : Need to add project load functions
+
try {
- await _loadProjectFacilities(projects);
+ await _loadProjectFacilities(projects, batchSize);
} catch (_) {
emit(
state.copyWith(
@@ -360,7 +371,8 @@ class ProjectBloc extends Bloc {
);
}
- FutureOr _loadProjectFacilities(List projects) async {
+ FutureOr _loadProjectFacilities(
+ List projects, int batchSize) async {
final projectFacilities = await projectFacilityRemoteRepository.search(
ProjectFacilitySearchModel(
projectId: projects.map((e) => e.id).toList(),
@@ -371,6 +383,7 @@ class ProjectBloc extends Bloc {
final facilities = await facilityRemoteRepository.search(
FacilitySearchModel(tenantId: envConfig.variables.tenantId),
+ limit: batchSize,
);
await facilityLocalRepository.bulkCreate(facilities);
@@ -584,8 +597,6 @@ class ProjectBloc extends Bloc {
loading: false,
syncError: ProjectSyncErrorType.boundary,
));
-
- return;
}
emit(state.copyWith(
@@ -594,6 +605,25 @@ class ProjectBloc extends Bloc {
syncError: null,
));
}
+
+ FutureOr _getBatchSize() async {
+ try {
+ final configs = await isar.appConfigurations.where().findAll();
+
+ final double speed = await bandwidthCheckRepository.pingBandwidthCheck(
+ bandWidthCheckModel: null,
+ );
+
+ int configuredBatchSize = getBatchSizeToBandwidth(
+ speed,
+ configs,
+ isDownSync: true,
+ );
+ return configuredBatchSize;
+ } catch (e) {
+ rethrow;
+ }
+ }
}
@freezed
diff --git a/apps/health_campaign_field_worker_app/lib/blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart b/apps/health_campaign_field_worker_app/lib/blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart
index a443250b1..61c278aeb 100644
--- a/apps/health_campaign_field_worker_app/lib/blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart
+++ b/apps/health_campaign_field_worker_app/lib/blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart
@@ -2,14 +2,14 @@
import 'dart:async';
import 'package:digit_data_model/data_model.dart';
-import 'package:disk_space/disk_space.dart';
+import 'package:disk_space_update/disk_space_update.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:registration_delivery/registration_delivery.dart';
+import 'package:sync_service/sync_service_lib.dart';
import '../../data/local_store/no_sql/schema/app_configuration.dart';
import '../../data/local_store/secure_store/secure_store.dart';
-import '../../data/network_manager.dart';
import '../../data/repositories/remote/bandwidth_check.dart';
import '../../models/downsync/downsync.dart';
import '../../utils/background_service.dart';
@@ -27,7 +27,6 @@ class BeneficiaryDownSyncBloc
downSyncRemoteRepository;
final LocalRepository
downSyncLocalRepository;
- final NetworkManager networkManager;
final BandwidthCheckRepository bandwidthCheckRepository;
final LocalRepository
householdLocalRepository;
@@ -39,12 +38,11 @@ class BeneficiaryDownSyncBloc
final LocalRepository
sideEffectLocalRepository;
final LocalRepository
- referralLocalRepository;
+ referralLocalRepository;
BeneficiaryDownSyncBloc({
required this.individualLocalRepository,
required this.downSyncRemoteRepository,
required this.downSyncLocalRepository,
- required this.networkManager,
required this.bandwidthCheckRepository,
required this.householdLocalRepository,
required this.householdMemberLocalRepository,
@@ -203,7 +201,9 @@ class BeneficiaryDownSyncBloc
);
// check if the API response is there or it failed
if (downSyncResults.isNotEmpty) {
- await networkManager.writeToEntityDB(downSyncResults, [
+ await SyncServiceSingleton()
+ .entityMapper
+ ?.writeToEntityDB(downSyncResults, [
individualLocalRepository,
householdLocalRepository,
householdMemberLocalRepository,
diff --git a/apps/health_campaign_field_worker_app/lib/data/data_manager.dart b/apps/health_campaign_field_worker_app/lib/data/data_manager.dart
deleted file mode 100644
index 7d649d73e..000000000
--- a/apps/health_campaign_field_worker_app/lib/data/data_manager.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-import 'dart:async';
-
-import 'package:digit_data_model/data_model.dart';
-
-class DataManager {
- final RemoteRepository remoteRepository;
- final LocalRepository localRepository;
- final PersistenceConfiguration configuration;
-
- const DataManager({
- required this.localRepository,
- required this.remoteRepository,
- required this.configuration,
- });
-
- DataRepository _getRepository(PersistenceConfiguration configuration) {
- switch (configuration) {
- case PersistenceConfiguration.offline:
- return localRepository;
- case PersistenceConfiguration.online:
- return remoteRepository;
- }
- }
-
- FutureOr> search(R query) =>
- _getRepository(configuration).search(query);
-
- FutureOr create(D entity) =>
- _getRepository(configuration).create(entity);
-
- FutureOr update(D entity) =>
- _getRepository(configuration).update(entity);
-}
-
-enum PersistenceConfiguration { offline, online }
diff --git a/apps/health_campaign_field_worker_app/lib/data/local_store/no_sql/schema/entity_mapper.dart b/apps/health_campaign_field_worker_app/lib/data/local_store/no_sql/schema/entity_mapper.dart
index d1efb0e67..3dbaa40eb 100644
--- a/apps/health_campaign_field_worker_app/lib/data/local_store/no_sql/schema/entity_mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/data/local_store/no_sql/schema/entity_mapper.dart
@@ -1,4 +1,7 @@
+import 'package:complaints/complaints.dart';
+
import 'package:attendance_management/models/entities/attendance_log.dart';
+import 'package:survey_form/survey_form.dart';
import 'package:digit_data_model/data/local_store/no_sql/schema/entity_mapper_listener.dart';
import 'package:digit_data_model/data_model.dart';
import 'package:digit_data_model/models/entities/user_action.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/data/network_manager.dart b/apps/health_campaign_field_worker_app/lib/data/network_manager.dart
index 5a1b16971..34125ce56 100644
--- a/apps/health_campaign_field_worker_app/lib/data/network_manager.dart
+++ b/apps/health_campaign_field_worker_app/lib/data/network_manager.dart
@@ -1,18 +1,6 @@
-import 'dart:async';
-import 'dart:convert';
-
import 'package:digit_data_model/data_model.dart';
import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_background_service/flutter_background_service.dart';
import 'package:provider/provider.dart';
-import 'package:registration_delivery/registration_delivery.dart';
-
-import '../models/bandwidth/bandwidth_model.dart';
-import 'local_store/secure_store/secure_store.dart';
-import 'repositories/sync/remote_type.dart';
-import 'repositories/sync/sync_down.dart';
-import 'repositories/sync/sync_up.dart';
class NetworkManager {
final NetworkManagerConfiguration configuration;
@@ -30,194 +18,6 @@ class NetworkManager {
return context.read>();
}
}
-
-/* This function will read the params and get the records which are not synced
- and pushes to the sync-up and sync-down methods */
-
- FutureOr performSync({
- required List localRepositories,
- required List remoteRepositories,
- required BandwidthModel bandwidthModel,
- ServiceInstance? service,
- }) async {
- if (configuration.persistenceConfig ==
- PersistenceConfiguration.onlineOnly) {
- throw Exception('Sync up is not valid for online only configuration');
- }
- bool isSyncCompleted = false;
-
- final futuresSyncDown = await Future.wait(
- localRepositories
- .map((e) => e.getItemsToBeSyncedDown(bandwidthModel.userId)),
- );
- final pendingSyncDownEntries = futuresSyncDown.expand((e) => e).toList();
-
- final futuresSyncUp = await Future.wait(
- localRepositories
- .map((e) => e.getItemsToBeSyncedUp(bandwidthModel.userId)),
- );
- final pendingSyncUpEntries = futuresSyncUp.expand((e) => e).toList();
-
- SyncError? syncError;
-
-// Perform the sync Down Operation
-
- try {
- await PerformSyncDown.syncDown(
- bandwidthModel: bandwidthModel,
- localRepositories: localRepositories.toSet().toList(),
- remoteRepositories: remoteRepositories.toSet().toList(),
- configuration: configuration,
- );
- } catch (e) {
- syncError = SyncDownError(e);
- service?.stopSelf();
- }
-
-// Perform the sync up Operation
-
- try {
- await PerformSyncUp.syncUp(
- bandwidthModel: bandwidthModel,
- localRepositories: localRepositories.toSet().toList(),
- remoteRepositories: remoteRepositories.toSet().toList(),
- );
- } catch (e) {
- if (kDebugMode) {
- print('Sync Up Error: $e');
- }
- syncError ??= SyncUpError(e);
- service?.stopSelf();
- }
-
- if (syncError != null) throw syncError;
-
- // Recursive function which will call the Perfom Sync
-
- if (pendingSyncUpEntries.isNotEmpty || pendingSyncDownEntries.isNotEmpty) {
- await Future.delayed(const Duration(seconds: 3));
- isSyncCompleted = await performSync(
- bandwidthModel: bandwidthModel,
- localRepositories: localRepositories,
- remoteRepositories: remoteRepositories,
- );
- } else if (pendingSyncUpEntries.isEmpty && pendingSyncDownEntries.isEmpty) {
- await LocalSecureStore.instance.setManualSyncTrigger(false);
- isSyncCompleted = true;
- }
-
- return isSyncCompleted;
- }
-
- //
- FutureOr writeToEntityDB(
- Map response,
- List localRepositories,
- ) async {
- try {
- for (int i = 0; i <= response.keys.length - 1; i++) {
- if (response.keys.elementAt(i) != 'DownsyncCriteria') {
- final local = RepositoryType.getLocalForType(
- DataModels.getDataModelForEntityName(response.keys.elementAt(i)),
- localRepositories,
- );
- final List entityResponse =
- response[response.keys.elementAt(i)] ?? [];
-
- final entityList =
- entityResponse.whereType>().toList();
-
- switch (response.keys.elementAt(i)) {
- case "Individuals":
- final entity = entityList
- .map((e) => IndividualModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- case "Households":
- final entity = entityList
- .map((e) => HouseholdModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- case "HouseholdMembers":
- final entity = entityList
- .map(
- (e) => HouseholdMemberModelMapper.fromJson(
- jsonEncode(e),
- ),
- )
- .toList();
- await local.bulkCreate(entity);
- case "ProjectBeneficiaries":
- final entity = entityList
- .map((e) =>
- ProjectBeneficiaryModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- case "Tasks":
- final entity = entityList
- .map((e) => TaskModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- case "SideEffects":
- final entity = entityList
- .map((e) => SideEffectModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- case "Referrals":
- final entity = entityList
- .map((e) => ReferralModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- default:
- final entity = entityList
- .map((e) => EntityModelMapper.fromJson(jsonEncode(e)))
- .toList();
- await local.bulkCreate(entity);
- }
- }
- }
- } catch (e) {
- rethrow;
- }
- }
-
- FutureOr getPendingSyncRecordsCount(
- List localRepositories,
- String userId,
- ) async =>
- (await Future.wait(localRepositories.map((e) {
- return e.getItemsToBeSyncedUp(userId);
- })))
- .expand((element) => element)
- .length;
-}
-
-FutureOr> filterEntitybyBandwidth(
- int batchSize,
- List entities,
-) async {
- final List items = [];
- final int size = batchSize < entities.length ? batchSize : entities.length;
-
- for (var i = 0; i < size; i++) {
- items.add(entities[i]);
- }
-
- return items;
-}
-
-Future>> filterOpLogByBandwidth(
- int batchSize,
- List> entities,
-) async {
- final List> items = [];
- final int size = batchSize < entities.length ? batchSize : entities.length;
-
- for (var i = 0; i < size; i++) {
- items.add(entities[i]);
- }
-
- return items;
}
class NetworkManagerConfiguration {
@@ -227,17 +27,3 @@ class NetworkManagerConfiguration {
this.persistenceConfig = PersistenceConfiguration.offlineFirst,
});
}
-
-abstract class SyncError implements Exception {
- final dynamic error;
-
- const SyncError([this.error]);
-}
-
-class SyncUpError extends SyncError {
- const SyncUpError([super.error]);
-}
-
-class SyncDownError extends SyncError {
- const SyncDownError([super.error]);
-}
diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/local/localization.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/local/localization.dart
index bd9fc1e08..2ea70837d 100644
--- a/apps/health_campaign_field_worker_app/lib/data/repositories/local/localization.dart
+++ b/apps/health_campaign_field_worker_app/lib/data/repositories/local/localization.dart
@@ -10,98 +10,113 @@ import '../../local_store/no_sql/schema/localization.dart';
class LocalizationLocalRepository {
FutureOr> returnLocalizationFromSQL(
LocalSqlDataStore sql) async {
- final selectQuery = sql.select(sql.localization).join([]);
-
- // List to hold the AND conditions
- final andConditions = >[];
-
- // Add condition for locale if provided
- if (LocalizationParams().locale != null) {
- final localeString = '${LocalizationParams().locale!}';
- andConditions.add(sql.localization.locale.equals(localeString));
- }
-
- // Add conditions for modules and codes
- if (LocalizationParams().module != null &&
- LocalizationParams().module!.isNotEmpty) {
- final moduleToExclude = LocalizationParams().module!;
-
- if (LocalizationParams().exclude == true) {
- // Exclude modules but include records where the code matches
- final moduleCondition =
- sql.localization.module.contains(moduleToExclude).not();
- final codeCondition = LocalizationParams().code != null &&
- LocalizationParams().code!.isNotEmpty
- ? sql.localization.code.isIn(LocalizationParams().code!.toList())
- : const Constant(false); // True if no code filter
-
- // Combine conditions: exclude module unless code matches
- andConditions.add(buildAnd([moduleCondition | codeCondition]));
- } else {
- // Include specified modules and optionally filter by code
- final moduleCondition =
- sql.localization.module.contains(moduleToExclude);
- final codeCondition = LocalizationParams().code != null &&
- LocalizationParams().code!.isNotEmpty
- ? sql.localization.code.isIn(LocalizationParams().code!.toList())
- : const Constant(false);
-
- // Combine conditions: module matches and optionally code filter
- andConditions.add(buildAnd([moduleCondition | codeCondition]));
+ return retryLocalCallOperation(() async {
+ final selectQuery = sql.select(sql.localization).join([]);
+
+ // List to hold the AND conditions
+ final andConditions = >[];
+
+ // Add condition for locale if provided
+ if (LocalizationParams().locale != null) {
+ final localeString = '${LocalizationParams().locale!}';
+ andConditions.add(sql.localization.locale.equals(localeString));
+ }
+
+ // Add conditions for modules and codes
+ if (LocalizationParams().module != null &&
+ LocalizationParams().module!.isNotEmpty) {
+ final moduleToExclude = LocalizationParams().module!;
+
+ if (LocalizationParams().exclude == true) {
+ // Exclude modules but include records where the code matches
+ final moduleCondition =
+ sql.localization.module.contains(moduleToExclude).not();
+ final codeCondition = LocalizationParams().code != null &&
+ LocalizationParams().code!.isNotEmpty
+ ? sql.localization.code.isIn(LocalizationParams().code!.toList())
+ : const Constant(false); // True if no code filter
+
+ // Combine conditions: exclude module unless code matches
+ andConditions.add(buildAnd([moduleCondition | codeCondition]));
+ } else {
+ // Include specified modules and optionally filter by code
+ final moduleCondition =
+ sql.localization.module.contains(moduleToExclude);
+ final codeCondition = LocalizationParams().code != null &&
+ LocalizationParams().code!.isNotEmpty
+ ? sql.localization.code.isIn(LocalizationParams().code!.toList())
+ : const Constant(false);
+
+ // Combine conditions: module matches and optionally code filter
+ andConditions.add(buildAnd([moduleCondition | codeCondition]));
+ }
+ } else if (LocalizationParams().code != null &&
+ LocalizationParams().code!.isNotEmpty) {
+ // If no module filter, just apply code filter
+ andConditions.add(
+ sql.localization.code.isIn(LocalizationParams().code!.toList()));
+ }
+
+ // Apply the combined conditions to the query
+ if (andConditions.isNotEmpty) {
+ selectQuery.where(buildAnd(andConditions));
}
- } else if (LocalizationParams().code != null &&
- LocalizationParams().code!.isNotEmpty) {
- // If no module filter, just apply code filter
- andConditions
- .add(sql.localization.code.isIn(LocalizationParams().code!.toList()));
- }
-
- // Apply the combined conditions to the query
- if (andConditions.isNotEmpty) {
- selectQuery.where(buildAnd(andConditions));
- }
-
- final result = await selectQuery.get();
-
- return result.map((row) {
- final data = row.readTableOrNull(sql.localization);
-
- return Localization()
- ..code = data!.code
- ..locale = data.locale
- ..module = data.module
- ..message = data.message;
- }).toList();
+
+ final result = await selectQuery.get();
+
+ return result.map((row) {
+ final data = row.readTableOrNull(sql.localization);
+ if (data == null) {
+ throw StateError('No data found for localization');
+ }
+
+ return Localization()
+ ..code = data.code
+ ..locale = data.locale
+ ..module = data.module
+ ..message = data.message;
+ }).toList();
+ });
}
FutureOr> fetchLocalization(
{required LocalSqlDataStore sql,
required String locale,
required String module}) async {
- final query = sql.select(sql.localization).join([])
- ..where(
- buildOr([
- sql.localization.locale.equals(locale),
- sql.localization.module.contains(module),
- ]),
- );
-
- final results = await query.get();
-
- return results.map((e) {
- final data = e.readTableOrNull(sql.localization);
- return Localization()
- ..code = data!.code
- ..locale = data.locale
- ..module = data.module
- ..message = data.message;
- }).toList();
+ return retryLocalCallOperation(() async {
+ final query = sql.select(sql.localization).join([])
+ ..where(
+ buildOr([
+ sql.localization.locale.equals(locale),
+ sql.localization.module.contains(module),
+ ]),
+ );
+
+ final results = await query.get();
+
+ return results.map((e) {
+ final data = e.readTableOrNull(sql.localization);
+
+ if (data == null) {
+ throw StateError('No data found for localization');
+ }
+
+ return Localization()
+ ..code = data.code
+ ..locale = data.locale
+ ..module = data.module
+ ..message = data.message;
+ }).toList();
+ });
}
FutureOr create(
List result, LocalSqlDataStore sql) async {
- return sql.batch((batch) {
- batch.insertAll(sql.localization, result);
+ if (result.isEmpty) return;
+ return retryLocalCallOperation(() async {
+ return sql.batch((batch) {
+ batch.insertAll(sql.localization, result);
+ });
});
}
}
diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/remote/bandwidth_check.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/remote/bandwidth_check.dart
index e38f93aac..80c4adc52 100644
--- a/apps/health_campaign_field_worker_app/lib/data/repositories/remote/bandwidth_check.dart
+++ b/apps/health_campaign_field_worker_app/lib/data/repositories/remote/bandwidth_check.dart
@@ -29,7 +29,7 @@ class BandwidthCheckRepository {
final speed = (((800 / timeconsumed) / 1000));
return speed;
- } on DioError catch (e) {
+ } on DioException catch (e) {
rethrow;
}
}
diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/remote/mdms.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/remote/mdms.dart
index 748d821d1..35136b342 100644
--- a/apps/health_campaign_field_worker_app/lib/data/repositories/remote/mdms.dart
+++ b/apps/health_campaign_field_worker_app/lib/data/repositories/remote/mdms.dart
@@ -257,11 +257,11 @@ class MdmsRepository {
final List? checklistTypes =
element?.checklistTypes.map((e) {
- final checklist = ChecklistTypes()
+ final surveyForm = ChecklistTypes()
..name = e.name
..code = e.code;
- return checklist;
+ return surveyForm;
}).toList();
final List? transportTypes =
diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/sync/remote_type.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/sync/remote_type.dart
index c1217f919..8b1378917 100644
--- a/apps/health_campaign_field_worker_app/lib/data/repositories/sync/remote_type.dart
+++ b/apps/health_campaign_field_worker_app/lib/data/repositories/sync/remote_type.dart
@@ -1,39 +1 @@
-import 'package:collection/collection.dart';
-import 'package:digit_data_model/data_model.dart';
-
-class RepositoryType {
- static RemoteRepository getRemoteForType(
- DataModelType type,
- List remoteRepositories,
- ) {
- final repository = remoteRepositories.firstWhereOrNull(
- (e) => e.type == type,
- );
-
- if (repository == null) {
- throw Exception(
- 'Remote repository is not configured in the network manager',
- );
- }
-
- return repository;
- }
-
- static LocalRepository getLocalForType(
- DataModelType type,
- List localRepositories,
- ) {
- final repository = localRepositories.firstWhereOrNull(
- (e) => e.type == type,
- );
-
- if (repository == null) {
- throw Exception(
- 'Local repository is not configured in the network manager',
- );
- }
-
- return repository;
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/sync/sync_down.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/sync/sync_down.dart
deleted file mode 100644
index e8f07d0e4..000000000
--- a/apps/health_campaign_field_worker_app/lib/data/repositories/sync/sync_down.dart
+++ /dev/null
@@ -1,740 +0,0 @@
-import 'dart:async';
-
-import 'package:attendance_management/attendance_management.dart';
-import 'package:collection/collection.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:inventory_management/models/entities/stock.dart';
-import 'package:inventory_management/models/entities/stock_reconciliation.dart';
-import 'package:referral_reconciliation/referral_reconciliation.dart';
-import 'package:registration_delivery/models/entities/household.dart';
-import 'package:registration_delivery/models/entities/household_member.dart';
-import 'package:registration_delivery/models/entities/project_beneficiary.dart';
-import 'package:registration_delivery/models/entities/referral.dart';
-import 'package:registration_delivery/models/entities/side_effect.dart';
-import 'package:registration_delivery/models/entities/task.dart';
-
-import '../../../models/bandwidth/bandwidth_model.dart';
-import '../../../utils/environment_config.dart';
-import '../../network_manager.dart';
-import './remote_type.dart';
-
-class PerformSyncDown {
- static FutureOr syncDown({
- required BandwidthModel bandwidthModel,
- required List localRepositories,
- required List remoteRepositories,
- required NetworkManagerConfiguration configuration,
- }) async {
- const taskResourceIdKey = 'taskResourceId';
- const individualIdentifierIdKey = 'individualIdentifierId';
- const householdAddressIdKey = 'householdAddressId';
- const individualAddressIdKey = 'individualAddressId';
-
- if (configuration.persistenceConfig ==
- PersistenceConfiguration.onlineOnly) {
- throw Exception('Sync down is not valid for online only configuration');
- }
-
- final futures = await Future.wait(
- localRepositories
- .map((e) => e.getItemsToBeSyncedDown(bandwidthModel.userId)),
- );
-
- final pendingSyncEntries = futures.expand((e) => e).toList();
- pendingSyncEntries.sort((a, b) => a.createdAt.compareTo(b.createdAt));
-
- final groupedEntries = pendingSyncEntries
- .where((element) => element.type != DataModelType.service)
- .toList()
- .groupListsBy(
- (element) => element.type,
- );
-
- for (final typeGroupedEntity in groupedEntries.entries) {
- final groupedOperations = typeGroupedEntity.value.groupListsBy(
- (element) => element.operation,
- );
-
- final remote = RepositoryType.getRemoteForType(
- typeGroupedEntity.key,
- remoteRepositories,
- );
-
- final local = RepositoryType.getLocalForType(
- typeGroupedEntity.key,
- localRepositories,
- );
-
- for (final operationGroupedEntity in groupedOperations.entries) {
- final entities = operationGroupedEntity.value.map((e) {
- final serverGeneratedId = e.serverGeneratedId;
- final rowVersion = e.rowVersion;
- if (serverGeneratedId != null && !e.nonRecoverableError) {
- return local.opLogManager.applyServerGeneratedIdToEntity(
- e.entity,
- serverGeneratedId,
- rowVersion,
- );
- }
-
- return e.entity;
- }).toList();
-
- List responseEntities = [];
-
- switch (typeGroupedEntity.key) {
- case DataModelType.individual:
- responseEntities = await remote.search(IndividualSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as IndividualModel;
- final responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- final identifierAdditionalIds = responseEntity?.identifiers
- ?.map((e) {
- final id = e.id;
-
- if (id == null) return null;
-
- return AdditionalId(
- idType: individualIdentifierIdKey,
- id: id,
- );
- })
- .whereNotNull()
- .toList();
-
- final addressAdditionalIds = responseEntity?.address
- ?.map((e) {
- final id = e.id;
-
- if (id == null) return null;
-
- return AdditionalId(
- idType: individualAddressIdKey,
- id: id,
- );
- })
- .whereNotNull()
- .toList();
-
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- nonRecoverableError: entity.nonRecoverableError,
- additionalIds: [
- if (identifierAdditionalIds != null)
- ...identifierAdditionalIds,
- if (addressAdditionalIds != null) ...addressAdditionalIds,
- ],
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.household:
- responseEntities = await remote.search(HouseholdSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as HouseholdModel;
- final responseEntity =
- responseEntities.whereType().firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- final addressAdditionalId = responseEntity?.address?.id == null
- ? null
- : AdditionalId(
- idType: householdAddressIdKey,
- id: responseEntity!.address!.id!,
- );
-
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- additionalIds: [
- if (addressAdditionalId != null) addressAdditionalId,
- ],
- dataOperation: element.operation,
- rowVersion: rowVersion,
- nonRecoverableError: element.nonRecoverableError,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.householdMember:
- responseEntities = await remote.search(HouseholdMemberSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as HouseholdMemberModel;
- final responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.sideEffect:
- responseEntities = await remote.search(SideEffectSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in typeGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as SideEffectModel;
- var responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- case DataModelType.referral:
- responseEntities = await remote.search(ReferralSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in typeGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as ReferralModel;
- var responseEntity =
- responseEntities.whereType().firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- case DataModelType.projectBeneficiary:
- responseEntities =
- await remote.search(ProjectBeneficiarySearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as ProjectBeneficiaryModel;
- final responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
- case DataModelType.task:
- responseEntities = await remote.search(TaskSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- isDeleted: true,
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final taskModel = element.entity as TaskModel;
- var responseEntity =
- responseEntities.whereType().firstWhereOrNull(
- (e) =>
- e.clientReferenceId == taskModel.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
-
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: taskModel.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- additionalIds: responseEntity?.resources
- ?.map((e) {
- final id = e.id;
- if (id == null) return null;
-
- return AdditionalId(
- idType: taskResourceIdKey,
- id: id,
- );
- })
- .whereNotNull()
- .toList(),
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(taskModel.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- taskModel.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.hFReferral:
- responseEntities = await remote.search(
- HFReferralSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- ),
- );
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as HFReferralModel;
- final responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- nonRecoverableError: entity.nonRecoverableError,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.attendance:
- responseEntities = await remote.search(AttendanceLogSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId!)
- .whereNotNull()
- .toList(),
- tenantId: envConfig.variables.tenantId,
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as AttendanceLogModel;
- final responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId.toString(),
- serverGeneratedId: serverGeneratedId,
- nonRecoverableError: entity.nonRecoverableError,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable =
- await local.opLogManager.updateSyncDownRetry(
- entity.clientReferenceId.toString(),
- );
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.stock:
- responseEntities = await remote.search(
- StockSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- ),
- );
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as StockModel;
- final responseEntity =
- responseEntities.whereType().firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
-
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId!,
- serverGeneratedId: serverGeneratedId,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- case DataModelType.stockReconciliation:
- responseEntities =
- await remote.search(StockReconciliationSearchModel(
- clientReferenceId: entities
- .whereType()
- .map((e) => e.clientReferenceId)
- .whereNotNull()
- .toList(),
- ));
-
- for (var element in operationGroupedEntity.value) {
- if (element.id == null) return;
- final entity = element.entity as StockReconciliationModel;
- final responseEntity = responseEntities
- .whereType()
- .firstWhereOrNull(
- (e) => e.clientReferenceId == entity.clientReferenceId,
- );
-
- final serverGeneratedId = responseEntity?.id;
- final rowVersion = responseEntity?.rowVersion;
-
- if (serverGeneratedId != null) {
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serverGeneratedId,
- dataOperation: element.operation,
- rowVersion: rowVersion,
- ),
- );
- } else {
- final bool markAsNonRecoverable = await local.opLogManager
- .updateSyncDownRetry(entity.clientReferenceId);
-
- if (markAsNonRecoverable) {
- await local.update(
- entity.copyWith(
- nonRecoverableError: true,
- ),
- createOpLog: false,
- );
- }
- }
- }
-
- break;
-
- // Note: Uncomment the following code block to enable complaints sync down
-
- // case DataModelType.complaints:
- // if (remote is! PgrServiceRemoteRepository) continue;
- //
- // final futures = entities
- // .whereType()
- // .map((e) => e.serviceRequestId)
- // .whereNotNull()
- // .map(
- // (e) {
- // final future = remote.searchWithoutClientReferenceId(
- // PgrServiceSearchModel(
- // serviceRequestId: e,
- // ),
- // );
- //
- // return Future.sync(() => future);
- // },
- // );
- //
- // final resolvedFutures = await Future.wait(futures);
- //
- // responseEntities = resolvedFutures
- // .expand((element) => element)
- // .whereType()
- // // We only need serviceRequestId and application status
- // .map((e) => PgrServiceModel(
- // clientReferenceId: '',
- // tenantId: e.tenantId ?? '',
- // serviceCode: e.serviceCode ?? '',
- // description: e.description ?? '',
- // serviceRequestId: e.serviceRequestId,
- // applicationStatus: e.applicationStatus ??
- // PgrServiceApplicationStatus.pendingAssignment,
- // user: PgrComplainantModel(
- // clientReferenceId: '',
- // tenantId: '',
- // complaintClientReferenceId: e.serviceRequestId ?? '',
- // ),
- // address: PgrAddressModel(),
- // ))
- // .toList();
- //
- // for (var element in operationGroupedEntity.value) {
- // if (element.id == null) return;
- // final entity = element.entity as PgrServiceModel;
- // final responseEntity = responseEntities
- // .whereType()
- // .firstWhereOrNull(
- // (e) => e.clientReferenceId == entity.clientReferenceId,
- // );
- //
- // final serverGeneratedId = responseEntity?.serviceRequestId;
- // final rowVersion = responseEntity?.rowVersion;
- //
- // if (serverGeneratedId != null) {
- // await local.opLogManager.updateServerGeneratedIds(
- // model: UpdateServerGeneratedIdModel(
- // clientReferenceId: entity.clientReferenceId,
- // serverGeneratedId: serverGeneratedId,
- // dataOperation: element.operation,
- // rowVersion: rowVersion,
- // ),
- // );
- // }
- // }
- //
- // break;
-
- default:
- continue;
- }
-
- for (var element in responseEntities) {
- await local.update(element, createOpLog: false);
- }
- }
- }
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/sync/sync_up.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/sync/sync_up.dart
deleted file mode 100644
index fdf1ab1dd..000000000
--- a/apps/health_campaign_field_worker_app/lib/data/repositories/sync/sync_up.dart
+++ /dev/null
@@ -1,316 +0,0 @@
-import 'dart:async';
-
-import 'package:collection/collection.dart';
-import 'package:digit_components/utils/app_logger.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:registration_delivery/models/entities/household.dart';
-import 'package:registration_delivery/models/entities/task.dart';
-
-import '../../../models/bandwidth/bandwidth_model.dart';
-import '../../../utils/environment_config.dart';
-import 'remote_type.dart';
-
-class PerformSyncUp {
- static FutureOr syncUp({
- required BandwidthModel bandwidthModel,
- required List localRepositories,
- required List remoteRepositories,
- }) async {
- const taskResourceIdKey = 'taskResourceId';
- const individualIdentifierIdKey = 'individualIdentifierId';
- const householdAddressIdKey = 'householdAddressId';
- const individualAddressIdKey = 'individualAddressId';
-
- List getEntityModel(
- List> opLogList,
- LocalRepository local,
- ) {
- return opLogList
- .map((e) {
- final oplogEntryEntity = e.entity;
-
- final serverGeneratedId = e.serverGeneratedId;
- final rowVersion = e.rowVersion;
- if (serverGeneratedId != null) {
- var updatedEntity =
- local.opLogManager.applyServerGeneratedIdToEntity(
- oplogEntryEntity,
- serverGeneratedId,
- rowVersion,
- );
-
- if (updatedEntity is HouseholdModel) {
- final addressId = e.additionalIds.firstWhereOrNull(
- (element) {
- return element.idType == householdAddressIdKey;
- },
- )?.id;
-
- updatedEntity = updatedEntity.copyWith(
- address: updatedEntity.address?.copyWith(
- id: updatedEntity.address?.id ?? addressId,
- ),
- );
- }
-
- if (updatedEntity is IndividualModel) {
- final identifierId = e.additionalIds.firstWhereOrNull(
- (element) {
- return element.idType == individualIdentifierIdKey;
- },
- )?.id;
-
- final addressId = e.additionalIds.firstWhereOrNull(
- (element) {
- return element.idType == individualAddressIdKey;
- },
- )?.id;
-
- updatedEntity = updatedEntity.copyWith(
- identifiers: updatedEntity.identifiers?.map((e) {
- return e.copyWith(
- id: e.id ?? identifierId,
- );
- }).toList(),
- address: updatedEntity.address?.map((e) {
- return e.copyWith(
- id: e.id ?? addressId,
- );
- }).toList(),
- );
- }
-
- if (updatedEntity is TaskModel) {
- final resourceId = e.additionalIds
- .firstWhereOrNull(
- (element) => element.idType == taskResourceIdKey,
- )
- ?.id;
-
- updatedEntity = updatedEntity.copyWith(
- resources: updatedEntity.resources?.map((e) {
- if (resourceId != null) {
- return e.copyWith(
- taskId: serverGeneratedId,
- id: e.id ?? resourceId,
- );
- }
-
- return e.copyWith(taskId: serverGeneratedId);
- }).toList(),
- );
- }
-
- return updatedEntity;
- }
-
- return oplogEntryEntity;
- })
- .whereNotNull()
- .toList();
- }
-
- final futures = await Future.wait(
- localRepositories
- .map((e) => e.getItemsToBeSyncedUp(bandwidthModel.userId)),
- );
-
- final pendingSyncEntries = futures.expand((e) => e).toList();
- pendingSyncEntries.sort((a, b) => a.createdAt.compareTo(b.createdAt));
- final groupedEntries = pendingSyncEntries.groupListsBy(
- (element) => element.type,
- );
-
-// Note : Sort the entries by DataModelType enum
- final entries = groupedEntries.entries.toList();
- entries.sort((a, b) => DataModelType.values
- .indexOf(a.key)
- .compareTo(DataModelType.values.indexOf(b.key)));
-
- for (final typeGroupedEntity in entries) {
- final groupedOperations = typeGroupedEntity.value.groupListsBy(
- (element) => element.operation,
- );
-
- final remote = RepositoryType.getRemoteForType(
- typeGroupedEntity.key,
- remoteRepositories,
- );
-
- final local = RepositoryType.getLocalForType(
- typeGroupedEntity.key,
- localRepositories,
- );
-
- for (final operationGroupedEntity in groupedOperations.entries) {
- // [returns list of oplogs whose nonRecoverableError is false and syncedup is false]
- final opLogList = operationGroupedEntity.value
- .where(
- (element) => !element.nonRecoverableError && !element.syncedUp,
- )
- .toList();
- // [returns list of oplogs whose nonRecoverableError is true]
- final opLogErrorList = operationGroupedEntity.value
- .where((element) => element.nonRecoverableError)
- .toList();
-
- // [returns list of oplogs whose nonRecoverableError is false and retry count is equal to configured value]
- final nonRecoverableErrorList = operationGroupedEntity.value
- .where((element) =>
- !element.nonRecoverableError &&
- element.syncDownRetryCount >=
- envConfig.variables.syncDownRetryCount)
- .toList();
-
- final List>> listOfBatchedOpLogList =
- opLogList.slices(bandwidthModel.batchSize).toList();
-
- final List>> listOfBatchedOpLogErrorList =
- opLogErrorList.slices(bandwidthModel.batchSize).toList();
-
- final List>>
- listOfBatchedNonRecoverableErrorList =
- nonRecoverableErrorList.slices(bandwidthModel.batchSize).toList();
-
- if (listOfBatchedNonRecoverableErrorList.isNotEmpty) {
- for (final sublist in listOfBatchedNonRecoverableErrorList) {
- final nonRecoverableErrorEntities = getEntityModel(sublist, local);
- await remote.dumpError(
- nonRecoverableErrorEntities,
- operationGroupedEntity.key,
- );
- for (final syncedEntity in sublist) {
- if (syncedEntity.type == DataModelType.complaints) continue;
- await local.markSyncedUp(
- entry: syncedEntity,
- nonRecoverableError: syncedEntity.nonRecoverableError,
- clientReferenceId: syncedEntity.clientReferenceId,
- id: syncedEntity.id,
- );
- }
- }
- }
-
- if (listOfBatchedOpLogErrorList.isNotEmpty) {
- for (final sublist in listOfBatchedOpLogErrorList) {
- final errorEntities = getEntityModel(sublist, local);
- await remote.dumpError(
- errorEntities,
- operationGroupedEntity.key,
- );
- for (final syncedEntity in sublist) {
- await local.markSyncedUp(
- entry: syncedEntity,
- nonRecoverableError: syncedEntity.nonRecoverableError,
- clientReferenceId: syncedEntity.clientReferenceId,
- id: syncedEntity.id,
- );
- }
- }
- }
- if (listOfBatchedOpLogList.isNotEmpty) {
- for (final sublist in listOfBatchedOpLogList) {
- final entities = getEntityModel(sublist, local);
- if (operationGroupedEntity.key == DataOperation.create) {
- switch (typeGroupedEntity.key) {
- case DataModelType.complaints:
- for (final entity in entities) {
- if (remote is PgrServiceRemoteRepository &&
- entity is PgrServiceModel) {
- final response = await remote.create(entity);
- final responseData = response.data;
- if (responseData is! Map) {
- AppLogger.instance.error(
- title: 'NetworkManager : PgrServiceRemoteRepository',
- message: responseData,
- stackTrace: StackTrace.current,
- );
- continue;
- }
-
- PgrServiceCreateResponseModel
- pgrServiceCreateResponseModel;
- PgrComplaintResponseModel pgrComplaintModel;
- try {
- pgrServiceCreateResponseModel =
- PgrServiceCreateResponseModelMapper.fromMap(
- responseData,
- );
- pgrComplaintModel =
- pgrServiceCreateResponseModel.serviceWrappers.first;
- } catch (e) {
- rethrow;
- }
-
- final service = pgrComplaintModel.service;
- final serviceRequestId = service.serviceRequestId;
-
- if (serviceRequestId == null ||
- serviceRequestId.isEmpty) {
- AppLogger.instance.error(
- title: 'NetworkManager : PgrServiceRemoteRepository',
- message: 'Service Request ID is null',
- stackTrace: StackTrace.current,
- );
- continue;
- }
-
- await local.markSyncedUp(
- entry: sublist.firstWhere((element) =>
- element.clientReferenceId ==
- entity.clientReferenceId),
- clientReferenceId: entity.clientReferenceId,
- nonRecoverableError: entity.nonRecoverableError,
- );
-
- await local.opLogManager.updateServerGeneratedIds(
- model: UpdateServerGeneratedIdModel(
- clientReferenceId: entity.clientReferenceId,
- serverGeneratedId: serviceRequestId,
- dataOperation: operationGroupedEntity.key,
- rowVersion: entity.rowVersion,
- ),
- );
-
- await local.update(
- entity.copyWith(
- serviceRequestId: serviceRequestId,
- id: service.id,
- applicationStatus: service.applicationStatus,
- accountId: service.accountId,
- ),
- createOpLog: false,
- );
- }
- }
- break;
- default:
- await remote.bulkCreate(entities);
- }
- } else if (operationGroupedEntity.key == DataOperation.update) {
- await Future.delayed(const Duration(seconds: 1));
- await remote.bulkUpdate(entities);
- } else if (operationGroupedEntity.key == DataOperation.delete) {
- await Future.delayed(const Duration(seconds: 1));
- await remote.bulkDelete(entities);
- }
- if (operationGroupedEntity.key == DataOperation.singleCreate) {
- for (var element in entities) {
- await remote.singleCreate(element);
- }
- }
- for (final syncedEntity in sublist) {
- if (syncedEntity.type == DataModelType.complaints) continue;
- await local.markSyncedUp(
- entry: syncedEntity,
- id: syncedEntity.id,
- nonRecoverableError: syncedEntity.nonRecoverableError,
- clientReferenceId: syncedEntity.clientReferenceId,
- );
- }
- }
- }
- }
- }
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/data/sync_registry.dart b/apps/health_campaign_field_worker_app/lib/data/sync_registry.dart
new file mode 100644
index 000000000..331e08373
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/lib/data/sync_registry.dart
@@ -0,0 +1,140 @@
+import 'package:complaints/data/repositories/remote/pgr_service.dart';
+import 'package:complaints/models/pgr_complaints.dart';
+import 'package:complaints/models/pgr_complaints_response.dart';
+import 'package:digit_components/utils/app_logger.dart';
+import 'package:digit_data_model/data_model.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:sync_service/data/repositories/sync/sync_up.dart';
+
+class CustomSyncRegistry implements SyncUpOperation {
+ final RemoteRepository remote;
+
+ CustomSyncRegistry(this.remote);
+
+ @override
+ Future update(List entities, LocalRepository local) async {
+ try {
+ await remote.bulkUpdate(entities);
+ } catch (e) {
+ debugPrint('$e');
+ }
+ }
+
+ @override
+ Future delete(List entities, LocalRepository local) async {
+ try {
+ await remote.bulkDelete(entities);
+ } catch (e) {
+ debugPrint('$e');
+ }
+ }
+
+ @override
+ Future singleCreate(EntityModel entity, LocalRepository local) async {
+ try {
+ await remote.singleCreate(entity);
+ } catch (e) {
+ debugPrint('$e');
+ }
+ }
+
+ @override
+ Future create(
+ {required List> entry,
+ required List entities,
+ required LocalRepository local,
+ required MapEntry>>
+ operationGroupedEntity,
+ required MapEntry>>
+ typeGroupedEntity}) async {
+ try {
+ switch (typeGroupedEntity.key) {
+ case DataModelType.complaints:
+ for (final entity in entities) {
+ if (remote is PgrServiceRemoteRepository &&
+ entity is PgrServiceModel) {
+ final response = await remote.create(entity);
+ final responseData = response.data;
+ if (responseData is! Map) {
+ AppLogger.instance.error(
+ title: 'NetworkManager : PgrServiceRemoteRepository',
+ message: responseData,
+ stackTrace: StackTrace.current,
+ );
+ continue;
+ }
+
+ PgrServiceCreateResponseModel pgrServiceCreateResponseModel;
+ PgrComplaintResponseModel pgrComplaintModel;
+ try {
+ pgrServiceCreateResponseModel =
+ PgrServiceCreateResponseModelMapper.fromMap(
+ responseData,
+ );
+ pgrComplaintModel =
+ pgrServiceCreateResponseModel.serviceWrappers.first;
+ } catch (e) {
+ rethrow;
+ }
+
+ final service = pgrComplaintModel.service;
+ final serviceRequestId = service.serviceRequestId;
+
+ if (serviceRequestId == null || serviceRequestId.isEmpty) {
+ AppLogger.instance.error(
+ title: 'NetworkManager : PgrServiceRemoteRepository',
+ message: 'Service Request ID is null',
+ stackTrace: StackTrace.current,
+ );
+ continue;
+ }
+
+ await local.markSyncedUp(
+ entry: entry.firstWhere((element) =>
+ element.clientReferenceId == entity.clientReferenceId),
+ clientReferenceId: entity.clientReferenceId,
+ nonRecoverableError: entity.nonRecoverableError,
+ );
+
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serviceRequestId,
+ dataOperation: operationGroupedEntity.key,
+ rowVersion: entity.rowVersion,
+ ),
+ );
+
+ await local.update(
+ entity.copyWith(
+ serviceRequestId: serviceRequestId,
+ id: service.id,
+ applicationStatus: service.applicationStatus,
+ accountId: service.accountId,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ default:
+ await remote.bulkCreate(entities);
+ }
+ } catch (e) {
+ debugPrint('$e');
+ }
+ }
+
+ @override
+ Future localMarkSyncUp(List> entity,
+ LocalRepository local) async {
+ for (final syncedEntity in entity) {
+ if (syncedEntity.type == DataModelType.complaints) continue;
+ await local.markSyncedUp(
+ entry: syncedEntity,
+ id: syncedEntity.id,
+ nonRecoverableError: syncedEntity.nonRecoverableError,
+ clientReferenceId: syncedEntity.clientReferenceId,
+ );
+ }
+ }
+}
diff --git a/apps/health_campaign_field_worker_app/lib/data/sync_service_mapper.dart b/apps/health_campaign_field_worker_app/lib/data/sync_service_mapper.dart
new file mode 100644
index 000000000..9389bf865
--- /dev/null
+++ b/apps/health_campaign_field_worker_app/lib/data/sync_service_mapper.dart
@@ -0,0 +1,862 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:attendance_management/attendance_management.dart';
+import 'package:collection/collection.dart';
+import 'package:digit_data_model/data_model.dart';
+import 'package:inventory_management/inventory_management.dart';
+import 'package:referral_reconciliation/referral_reconciliation.dart';
+import 'package:registration_delivery/registration_delivery.dart';
+import 'package:sync_service/data/repositories/sync/remote_type.dart';
+import 'package:sync_service/data/sync_entity_mapper_listener.dart';
+
+import '../utils/environment_config.dart';
+
+class SyncServiceMapper extends SyncEntityMapperListener {
+ @override
+ FutureOr writeToEntityDB(
+ Map response,
+ List>
+ localRepositories) async {
+ try {
+ for (int i = 0; i <= response.keys.length - 1; i++) {
+ if (response.keys.elementAt(i) != 'DownsyncCriteria') {
+ final local = RepositoryType.getLocalForType(
+ DataModels.getDataModelForEntityName(response.keys.elementAt(i)),
+ localRepositories,
+ );
+ final List entityResponse =
+ response[response.keys.elementAt(i)] ?? [];
+
+ final entityList =
+ entityResponse.whereType>().toList();
+
+ switch (response.keys.elementAt(i)) {
+ case "Individuals":
+ final entity = entityList
+ .map((e) => IndividualModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ case "Households":
+ final entity = entityList
+ .map((e) => HouseholdModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ case "HouseholdMembers":
+ final entity = entityList
+ .map(
+ (e) => HouseholdMemberModelMapper.fromJson(
+ jsonEncode(e),
+ ),
+ )
+ .toList();
+ await local.bulkCreate(entity);
+ case "ProjectBeneficiaries":
+ final entity = entityList
+ .map((e) =>
+ ProjectBeneficiaryModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ case "Tasks":
+ final entity = entityList
+ .map((e) => TaskModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ case "SideEffects":
+ final entity = entityList
+ .map((e) => SideEffectModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ case "Referrals":
+ final entity = entityList
+ .map((e) => ReferralModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ default:
+ final entity = entityList
+ .map((e) => EntityModelMapper.fromJson(jsonEncode(e)))
+ .toList();
+ await local.bulkCreate(entity);
+ }
+ }
+ }
+ } catch (e) {
+ rethrow;
+ }
+ }
+
+ @override
+ int getSyncCount(List opLogs) {
+ int count = opLogs.where((element) {
+ if (element.syncedDown == false && element.syncedUp == true) {
+ switch (element.entityType) {
+ case DataModelType.household:
+ case DataModelType.individual:
+ case DataModelType.householdMember:
+ case DataModelType.projectBeneficiary:
+ case DataModelType.task:
+ case DataModelType.stock:
+ case DataModelType.stockReconciliation:
+ case DataModelType.sideEffect:
+ case DataModelType.referral:
+ case DataModelType.hFReferral:
+ case DataModelType.attendance:
+ return true;
+ default:
+ return false;
+ }
+ } else {
+ switch (element.entityType) {
+ case DataModelType.household:
+ case DataModelType.individual:
+ case DataModelType.householdMember:
+ case DataModelType.projectBeneficiary:
+ case DataModelType.task:
+ case DataModelType.stock:
+ case DataModelType.stockReconciliation:
+ case DataModelType.service:
+ case DataModelType.complaints:
+ case DataModelType.sideEffect:
+ case DataModelType.referral:
+ case DataModelType.hFReferral:
+ case DataModelType.attendance:
+ case DataModelType.userLocation:
+ return true;
+ default:
+ return false;
+ }
+ }
+ }).length;
+
+ return count;
+ }
+
+ @override
+ Future> syncDownEntityResponse(
+ MapEntry>> typeGroupedEntity,
+ MapEntry>>
+ operationGroupedEntity,
+ List entities,
+ RemoteRepository remote,
+ LocalRepository local) async {
+ List responseEntities = [];
+ const taskResourceIdKey = 'taskResourceId';
+ const individualIdentifierIdKey = 'individualIdentifierId';
+ const householdAddressIdKey = 'householdAddressId';
+ const individualAddressIdKey = 'individualAddressId';
+
+ switch (typeGroupedEntity.key) {
+ case DataModelType.individual:
+ responseEntities = await remote.search(IndividualSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as IndividualModel;
+ final responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ final identifierAdditionalIds = responseEntity?.identifiers
+ ?.map((e) {
+ final id = e.id;
+
+ if (id == null) return null;
+
+ return AdditionalId(
+ idType: individualIdentifierIdKey,
+ id: id,
+ );
+ })
+ .whereNotNull()
+ .toList();
+
+ final addressAdditionalIds = responseEntity?.address
+ ?.map((e) {
+ final id = e.id;
+
+ if (id == null) return null;
+
+ return AdditionalId(
+ idType: individualAddressIdKey,
+ id: id,
+ );
+ })
+ .whereNotNull()
+ .toList();
+
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ nonRecoverableError: entity.nonRecoverableError,
+ additionalIds: [
+ if (identifierAdditionalIds != null)
+ ...identifierAdditionalIds,
+ if (addressAdditionalIds != null) ...addressAdditionalIds,
+ ],
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ case DataModelType.household:
+ responseEntities = await remote.search(HouseholdSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as HouseholdModel;
+ final responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ final addressAdditionalId = responseEntity?.address?.id == null
+ ? null
+ : AdditionalId(
+ idType: householdAddressIdKey,
+ id: responseEntity!.address!.id!,
+ );
+
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ additionalIds: [
+ if (addressAdditionalId != null) addressAdditionalId,
+ ],
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ nonRecoverableError: element.nonRecoverableError,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ case DataModelType.householdMember:
+ responseEntities = await remote.search(HouseholdMemberSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as HouseholdMemberModel;
+ final responseEntity = responseEntities
+ .whereType()
+ .firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ case DataModelType.sideEffect:
+ responseEntities = await remote.search(SideEffectSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in typeGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as SideEffectModel;
+ var responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ case DataModelType.referral:
+ responseEntities = await remote.search(ReferralSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in typeGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as ReferralModel;
+ var responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ case DataModelType.projectBeneficiary:
+ responseEntities = await remote.search(ProjectBeneficiarySearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as ProjectBeneficiaryModel;
+ final responseEntity = responseEntities
+ .whereType()
+ .firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+ case DataModelType.task:
+ responseEntities = await remote.search(TaskSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ isDeleted: true,
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final taskModel = element.entity as TaskModel;
+ var responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == taskModel.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: taskModel.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ additionalIds: responseEntity?.resources
+ ?.map((e) {
+ final id = e.id;
+ if (id == null) return null;
+
+ return AdditionalId(
+ idType: taskResourceIdKey,
+ id: id,
+ );
+ })
+ .whereNotNull()
+ .toList(),
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(taskModel.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ taskModel.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+ case DataModelType.hFReferral:
+ responseEntities = await remote.search(
+ HFReferralSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ ),
+ );
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as HFReferralModel;
+ final responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ nonRecoverableError: entity.nonRecoverableError,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ case DataModelType.attendance:
+ responseEntities = await remote.search(AttendanceLogSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId!)
+ .whereNotNull()
+ .toList(),
+ tenantId: envConfig.variables.tenantId,
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as AttendanceLogModel;
+ final responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId.toString(),
+ serverGeneratedId: serverGeneratedId,
+ nonRecoverableError: entity.nonRecoverableError,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable =
+ await local.opLogManager.updateSyncDownRetry(
+ entity.clientReferenceId.toString(),
+ );
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ case DataModelType.stock:
+ responseEntities = await remote.search(
+ StockSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ ),
+ );
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as StockModel;
+ final responseEntity =
+ responseEntities.whereType().firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId!,
+ serverGeneratedId: serverGeneratedId,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ case DataModelType.stockReconciliation:
+ responseEntities = await remote.search(StockReconciliationSearchModel(
+ clientReferenceId: entities
+ .whereType()
+ .map((e) => e.clientReferenceId)
+ .whereNotNull()
+ .toList(),
+ ));
+
+ for (var element in operationGroupedEntity.value) {
+ if (element.id == null) continue;
+ final entity = element.entity as StockReconciliationModel;
+ final responseEntity = responseEntities
+ .whereType()
+ .firstWhereOrNull(
+ (e) => e.clientReferenceId == entity.clientReferenceId,
+ );
+
+ final serverGeneratedId = responseEntity?.id;
+ final rowVersion = responseEntity?.rowVersion;
+
+ if (serverGeneratedId != null) {
+ await local.opLogManager.updateServerGeneratedIds(
+ model: UpdateServerGeneratedIdModel(
+ clientReferenceId: entity.clientReferenceId,
+ serverGeneratedId: serverGeneratedId,
+ dataOperation: element.operation,
+ rowVersion: rowVersion,
+ ),
+ );
+ } else {
+ final bool markAsNonRecoverable = await local.opLogManager
+ .updateSyncDownRetry(entity.clientReferenceId);
+
+ if (markAsNonRecoverable) {
+ await local.update(
+ entity.copyWith(
+ nonRecoverableError: true,
+ ),
+ createOpLog: false,
+ );
+ }
+ }
+ }
+
+ break;
+
+ // case DataModelType.complaints:
+ // if (remote is! PgrServiceRemoteRepository) return responseEntities;
+ //
+ // final futures = entities
+ // .whereType()
+ // .map((e) => e.serviceRequestId)
+ // .whereNotNull()
+ // .map(
+ // (e) {
+ // final future = remote.searchWithoutClientReferenceId(
+ // PgrServiceSearchModel(
+ // serviceRequestId: e,
+ // ),
+ // );
+ //
+ // return Future.sync(() => future);
+ // },
+ // );
+ //
+ // final resolvedFutures = await Future.wait(futures);
+ //
+ // responseEntities = resolvedFutures
+ // .expand((element) => element)
+ // .whereType()
+ // // We only need serviceRequestId and application status
+ // .map((e) => PgrServiceModel(
+ // clientReferenceId: '',
+ // tenantId: e.tenantId ?? '',
+ // serviceCode: e.serviceCode ?? '',
+ // description: e.description ?? '',
+ // serviceRequestId: e.serviceRequestId,
+ // applicationStatus: e.applicationStatus ??
+ // PgrServiceApplicationStatus.pendingAssignment,
+ // user: PgrComplainantModel(
+ // clientReferenceId: '',
+ // tenantId: '',
+ // complaintClientReferenceId: e.serviceRequestId ?? '',
+ // ),
+ // address: PgrAddressModel(),
+ // ))
+ // .toList();
+ //
+ // for (var element in operationGroupedEntity.value) {
+ // if (element.id == null) continue;
+ // final entity = element.entity as PgrServiceModel;
+ // final responseEntity =
+ // responseEntities.whereType().firstWhereOrNull(
+ // (e) => e.clientReferenceId == entity.clientReferenceId,
+ // );
+ //
+ // final serverGeneratedId = responseEntity?.serviceRequestId;
+ // final rowVersion = responseEntity?.rowVersion;
+ //
+ // if (serverGeneratedId != null) {
+ // await local.opLogManager.updateServerGeneratedIds(
+ // model: UpdateServerGeneratedIdModel(
+ // clientReferenceId: entity.clientReferenceId,
+ // serverGeneratedId: serverGeneratedId,
+ // dataOperation: element.operation,
+ // rowVersion: rowVersion,
+ // ),
+ // );
+ // }
+ // }
+ // break;
+
+ default:
+ break;
+ }
+
+ return responseEntities;
+ }
+
+ @override
+ EntityModel updatedEntity(EntityModel entity, OpLogEntry e,
+ String? serverGeneratedId) {
+ var updatedEntity = entity;
+
+ const taskResourceIdKey = 'taskResourceId';
+ const individualIdentifierIdKey = 'individualIdentifierId';
+ const householdAddressIdKey = 'householdAddressId';
+ const individualAddressIdKey = 'individualAddressId';
+
+ if (updatedEntity is HouseholdModel) {
+ final addressId = e.additionalIds.firstWhereOrNull(
+ (element) {
+ return element.idType == householdAddressIdKey;
+ },
+ )?.id;
+
+ updatedEntity = updatedEntity.copyWith(
+ address: updatedEntity.address?.copyWith(
+ id: updatedEntity.address?.id ?? addressId,
+ ),
+ );
+ }
+
+ if (updatedEntity is IndividualModel) {
+ final identifierId = e.additionalIds.firstWhereOrNull(
+ (element) {
+ return element.idType == individualIdentifierIdKey;
+ },
+ )?.id;
+
+ final addressId = e.additionalIds.firstWhereOrNull(
+ (element) {
+ return element.idType == individualAddressIdKey;
+ },
+ )?.id;
+
+ updatedEntity = updatedEntity.copyWith(
+ identifiers: updatedEntity.identifiers?.map((e) {
+ return e.copyWith(
+ id: e.id ?? identifierId,
+ );
+ }).toList(),
+ address: updatedEntity.address?.map((e) {
+ return e.copyWith(
+ id: e.id ?? addressId,
+ );
+ }).toList(),
+ );
+ }
+
+ if (updatedEntity is TaskModel) {
+ final resourceId = e.additionalIds
+ .firstWhereOrNull(
+ (element) => element.idType == taskResourceIdKey,
+ )
+ ?.id;
+
+ updatedEntity = updatedEntity.copyWith(
+ resources: updatedEntity.resources?.map((e) {
+ if (resourceId != null) {
+ return e.copyWith(
+ taskId: serverGeneratedId,
+ id: e.id ?? resourceId,
+ );
+ }
+
+ return e.copyWith(taskId: serverGeneratedId);
+ }).toList(),
+ );
+ }
+
+ return updatedEntity;
+ }
+}
diff --git a/apps/health_campaign_field_worker_app/lib/main.dart b/apps/health_campaign_field_worker_app/lib/main.dart
index f46e21059..5fe3d6b17 100644
--- a/apps/health_campaign_field_worker_app/lib/main.dart
+++ b/apps/health_campaign_field_worker_app/lib/main.dart
@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
import 'package:digit_components/digit_components.dart';
import 'package:digit_data_model/data/local_store/sql_store/sql_store.dart';
import 'package:dio/dio.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/bandwidth/bandwidth_model.dart b/apps/health_campaign_field_worker_app/lib/models/bandwidth/bandwidth_model.dart
deleted file mode 100644
index 7a1b455dd..000000000
--- a/apps/health_campaign_field_worker_app/lib/models/bandwidth/bandwidth_model.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'bandwidth_model.freezed.dart';
-part 'bandwidth_model.g.dart';
-
-@freezed
-class BandwidthModel with _$BandwidthModel {
- const factory BandwidthModel({
- required String userId,
- required int batchSize,
- }) = _BandwidthModel;
-
- factory BandwidthModel.fromJson(Map json) =>
- _$BandwidthModelFromJson(json);
-}
diff --git a/apps/health_campaign_field_worker_app/lib/models/downsync/downsync.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/downsync/downsync.mapper.dart
index 3a667fb18..41a7184be 100644
--- a/apps/health_campaign_field_worker_app/lib/models/downsync/downsync.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/downsync/downsync.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'downsync.dart';
@@ -130,10 +130,8 @@ mixin DownsyncSearchModelMappable {
@override
bool operator ==(Object other) {
- return identical(this, other) ||
- (runtimeType == other.runtimeType &&
- DownsyncSearchModelMapper.ensureInitialized()
- .isValueEqual(this as DownsyncSearchModel, other));
+ return DownsyncSearchModelMapper.ensureInitialized()
+ .equalsValue(this as DownsyncSearchModel, other);
}
@override
@@ -357,10 +355,8 @@ mixin DownsyncModelMappable {
@override
bool operator ==(Object other) {
- return identical(this, other) ||
- (runtimeType == other.runtimeType &&
- DownsyncModelMapper.ensureInitialized()
- .isValueEqual(this as DownsyncModel, other));
+ return DownsyncModelMapper.ensureInitialized()
+ .equalsValue(this as DownsyncModel, other);
}
@override
@@ -569,10 +565,8 @@ mixin DownsyncAdditionalFieldsMappable {
@override
bool operator ==(Object other) {
- return identical(this, other) ||
- (runtimeType == other.runtimeType &&
- DownsyncAdditionalFieldsMapper.ensureInitialized()
- .isValueEqual(this as DownsyncAdditionalFields, other));
+ return DownsyncAdditionalFieldsMapper.ensureInitialized()
+ .equalsValue(this as DownsyncAdditionalFields, other);
}
@override
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/additional_fields_type.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/additional_fields_type.mapper.dart
index 9d30d89b3..52eac602f 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/additional_fields_type.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/additional_fields_type.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'additional_fields_type.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/mdms_master_enums.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/mdms_master_enums.mapper.dart
index 870f84eeb..43fa7b7f3 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/mdms_master_enums.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/mdms_master_enums.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'mdms_master_enums.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/mdms_module_enums.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/mdms_module_enums.mapper.dart
index e71180b05..8910d16b3 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/mdms_module_enums.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/mdms_module_enums.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'mdms_module_enums.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/roles.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/roles.mapper.dart
index c08d84d1d..504594772 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/roles.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/roles.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'roles.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/roles_type.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/roles_type.mapper.dart
index cdb2482b8..3ec8e82bd 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/roles_type.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/roles_type.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'roles_type.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/scanner_type.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/scanner_type.mapper.dart
index 32b70ae86..5b44d4208 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/scanner_type.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/scanner_type.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'scanner_type.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/status.dart b/apps/health_campaign_field_worker_app/lib/models/entities/status.dart
index e7996833c..878c3fe09 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/status.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/status.dart
@@ -2,17 +2,28 @@
import 'package:dart_mappable/dart_mappable.dart';
part 'status.mapper.dart';
+
@MappableEnum(caseStyle: CaseStyle.upperCase)
enum Status {
- @MappableValue("DELIVERED") delivered,
- @MappableValue("NOT_DELIVERED") notDelivered,
- @MappableValue("VISITED") visited,
- @MappableValue("NOT_VISITED") notVisited,
- @MappableValue("BENEFICIARY_REFUSED") beneficiaryRefused,
- @MappableValue("BENEFICIARY_REFERRED") beneficiaryReferred,
- @MappableValue("ADMINISTERED_SUCCESS") administeredSuccess,
- @MappableValue("ADMINISTERED_FAILED") administeredFailed,
- @MappableValue("IN_COMPLETE") inComplete,
- @MappableValue("TO_ADMINISTER") toAdminister,
+ @MappableValue("DELIVERED")
+ delivered,
+ @MappableValue("NOT_DELIVERED")
+ notDelivered,
+ @MappableValue("VISITED")
+ visited,
+ @MappableValue("NOT_VISITED")
+ notVisited,
+ @MappableValue("BENEFICIARY_REFUSED")
+ beneficiaryRefused,
+ @MappableValue("BENEFICIARY_REFERRED")
+ beneficiaryReferred,
+ @MappableValue("ADMINISTERED_SUCCESS")
+ administeredSuccess,
+ @MappableValue("ADMINISTERED_FAILED")
+ administeredFailed,
+ @MappableValue("IN_COMPLETE")
+ inComplete,
+ @MappableValue("TO_ADMINISTER")
+ toAdminister,
;
-}
\ No newline at end of file
+}
diff --git a/apps/health_campaign_field_worker_app/lib/models/entities/status.mapper.dart b/apps/health_campaign_field_worker_app/lib/models/entities/status.mapper.dart
index dffb822cc..2581632e6 100644
--- a/apps/health_campaign_field_worker_app/lib/models/entities/status.mapper.dart
+++ b/apps/health_campaign_field_worker_app/lib/models/entities/status.mapper.dart
@@ -1,7 +1,7 @@
// coverage:ignore-file
// GENERATED CODE - DO NOT MODIFY BY HAND
// ignore_for_file: type=lint
-// ignore_for_file: unused_element, unnecessary_cast
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
part of 'status.dart';
diff --git a/apps/health_campaign_field_worker_app/lib/pages/authenticated.dart b/apps/health_campaign_field_worker_app/lib/pages/authenticated.dart
index 1f7baf504..c7f98a48f 100644
--- a/apps/health_campaign_field_worker_app/lib/pages/authenticated.dart
+++ b/apps/health_campaign_field_worker_app/lib/pages/authenticated.dart
@@ -9,10 +9,11 @@ import 'package:flutter_portal/flutter_portal.dart';
import 'package:isar/isar.dart';
import 'package:location/location.dart';
import 'package:registration_delivery/registration_delivery.dart';
+import 'package:survey_form/survey_form.dart';
+import 'package:sync_service/sync_service_lib.dart';
import '../blocs/localization/app_localization.dart';
import '../blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart';
-import '../blocs/sync/sync.dart';
import '../data/remote_client.dart';
import '../data/repositories/remote/bandwidth_check.dart';
import '../models/downsync/downsync.dart';
@@ -43,7 +44,7 @@ class AuthenticatedPageWrapper extends StatelessWidget {
return Portal(
child: Scaffold(
- backgroundColor: DigitTheme.instance.colorScheme.background,
+ backgroundColor: DigitTheme.instance.colorScheme.surface,
appBar: AppBar(
backgroundColor: DigitTheme.instance.colorScheme.primary,
actions: showDrawer
@@ -108,6 +109,7 @@ class AuthenticatedPageWrapper extends StatelessWidget {
drawer: showDrawer ? const Drawer(child: SideBar()) : null,
body: MultiBlocProvider(
providers: [
+ // INFO : Need to add bloc of package Here
BlocProvider(
create: (context) {
final userId = context.loggedInUserUuid;
@@ -115,7 +117,7 @@ class AuthenticatedPageWrapper extends StatelessWidget {
final isar = context.read();
final bloc = SyncBloc(
isar: isar,
- networkManager: context.read(),
+ syncService: SyncService(),
);
if (!bloc.isClosed) {
@@ -134,7 +136,9 @@ class AuthenticatedPageWrapper extends StatelessWidget {
bloc.add(
SyncRefreshEvent(
userId,
- getSyncCount(event),
+ SyncServiceSingleton()
+ .entityMapper!
+ .getSyncCount(event),
),
);
}
@@ -153,7 +157,9 @@ class AuthenticatedPageWrapper extends StatelessWidget {
bloc.add(
SyncRefreshEvent(
userId,
- getSyncCount(event),
+ SyncServiceSingleton()
+ .entityMapper!
+ .getSyncCount(event),
),
);
}
@@ -183,7 +189,6 @@ class AuthenticatedPageWrapper extends StatelessWidget {
downSyncLocalRepository: ctx.read<
LocalRepository>(),
- networkManager: ctx.read(),
householdLocalRepository: ctx.read<
LocalRepository>(),
diff --git a/apps/health_campaign_field_worker_app/lib/pages/boundary_selection.dart b/apps/health_campaign_field_worker_app/lib/pages/boundary_selection.dart
index a4acf7a33..622a47208 100644
--- a/apps/health_campaign_field_worker_app/lib/pages/boundary_selection.dart
+++ b/apps/health_campaign_field_worker_app/lib/pages/boundary_selection.dart
@@ -10,11 +10,13 @@ import 'package:digit_data_model/data_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:reactive_forms/reactive_forms.dart';
+import 'package:sync_service/blocs/sync/sync.dart';
import '../blocs/app_initialization/app_initialization.dart';
import '../blocs/localization/localization.dart';
import '../blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart';
-import '../blocs/sync/sync.dart';
+import '../data/local_store/app_shared_preferences.dart';
+import '../data/local_store/no_sql/schema/app_configuration.dart';
import '../data/local_store/app_shared_preferences.dart';
import '../data/local_store/no_sql/schema/app_configuration.dart';
import '../models/entities/roles_type.dart';
@@ -41,19 +43,21 @@ class _BoundarySelectionPageState
int i = 0;
int pendingSyncCount = 0;
final clickedStatus = ValueNotifier(false);
- var expenseTypeCtrl = TextEditingController();
StreamController downloadProgress = StreamController();
Map dropdownControllers = {};
+ late StreamSubscription syncSubscription;
@override
void initState() {
+ context.syncRefresh();
LocalizationParams().setModule('common', false);
context.read().add(SyncRefreshEvent(context.loggedInUserUuid));
context.read().add(
const DownSyncResetStateEvent(),
);
super.initState();
+ listenToSyncCount();
}
@override
@@ -67,6 +71,7 @@ class _BoundarySelectionPageState
@override
void dispose() {
clickedStatus.dispose();
+ syncSubscription.cancel();
super.dispose();
}
@@ -124,8 +129,14 @@ class _BoundarySelectionPageState
children: [
Expanded(
child: ListView.builder(
- itemCount: labelList.length,
+ itemCount: labelList.length+1,
itemBuilder: (context, labelIndex) {
+
+ if (labelIndex == labelList.length) {
+ // Return a SizedBox for whitespace after the last item
+ return const SizedBox(height: kPadding*3); // Adjust height as needed
+ }
+
final label = labelList.elementAt(labelIndex);
final filteredItems =
@@ -525,41 +536,31 @@ class _BoundarySelectionPageState
padding: const EdgeInsets.fromLTRB(
kPadding, 0, kPadding, 0),
child: SafeArea(
- child: BlocListener(
- listener: (context, syncState) {
- setState(() {
- pendingSyncCount = syncState.maybeWhen(
- orElse: () => 0,
- pendingSync: (count) => count,
- );
- });
- },
- child: ValueListenableBuilder(
- valueListenable: clickedStatus,
- builder: (context, bool isClicked, _) {
- return DigitElevatedButton(
- onPressed: selectedBoundary == null ||
- isClicked
- ? null
- : () async {
- if (!form.valid ||
- validateAllBoundarySelection()) {
- clickedStatus.value = false;
- await DigitToast.show(
- context,
- options:
- DigitToastOptions(
- localizations.translate(i18
- .common
- .corecommonRequired),
- true,
- Theme.of(context),
- ),
- );
- } else {
- setState(() {
- shouldPop = true;
- });
+ child: ValueListenableBuilder(
+ valueListenable: clickedStatus,
+ builder: (context, bool isClicked, _) {
+ return DigitElevatedButton(
+ onPressed: selectedBoundary == null ||
+ isClicked
+ ? null
+ : () async {
+ if (!form.valid ||
+ validateAllBoundarySelection()) {
+ clickedStatus.value = false;
+ await DigitToast.show(
+ context,
+ options: DigitToastOptions(
+ localizations.translate(i18
+ .common
+ .corecommonRequired),
+ true,
+ Theme.of(context),
+ ),
+ );
+ } else {
+ setState(() {
+ shouldPop = true;
+ });
context
.read()
@@ -632,7 +633,6 @@ class _BoundarySelectionPageState
),
),
),
- ),
],
),
),
@@ -699,4 +699,16 @@ class _BoundarySelectionPageState
// Return false if none of the form controls have a null value
return false;
}
+
+ void listenToSyncCount() async {
+ syncSubscription = context.syncCount().listen((state) {
+ state.maybeWhen(
+ orElse: () {},
+ pendingSync: (count) {
+ setState(() {
+ pendingSyncCount = count;
+ });
+ });
+ });
+ }
}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist.dart b/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist.dart
deleted file mode 100644
index b4f053759..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist.dart
+++ /dev/null
@@ -1,178 +0,0 @@
-import 'package:digit_components/digit_components.dart';
-import 'package:digit_components/widgets/digit_project_cell.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../utils/constants.dart';
-import 'package:recase/recase.dart';
-
-import '../../blocs/auth/auth.dart';
-import '../../router/app_router.dart';
-import '../../utils/extensions/extensions.dart';
-import '../../utils/i18_key_constants.dart' as i18;
-import '../../widgets/action_card/action_card.dart';
-import '../../widgets/header/back_navigation_help_header.dart';
-import '../../widgets/localized.dart';
-import '../../widgets/no_result_card/no_result_card.dart';
-
-@RoutePage()
-class ChecklistPage extends LocalizedStatefulWidget {
- const ChecklistPage({
- Key? key,
- super.appLocalizations,
- }) : super(key: key);
-
- @override
- State createState() => _ChecklistPageState();
-}
-
-class _ChecklistPageState extends LocalizedState {
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- return Scaffold(
- body: ScrollableContent(
- header: const Column(children: [
- BackNavigationHelpHeaderWidget(),
- ]),
- children: [
- BlocBuilder(
- builder: (context, state) {
- return state.map(
- empty: (value) => const Text('No Checklist'),
- isloading: (value) => const Center(
- child: CircularProgressIndicator(),
- ),
- serviceDefinitionFetch:
- (ServiceDefinitionServiceFetchedState value) {
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.min,
- children: [
- Padding(
- padding: const EdgeInsets.only(left: 8),
- child: Align(
- alignment: Alignment.centerLeft,
- child: Padding(
- padding: const EdgeInsets.all(
- kPadding,
- ),
- child: Text(
- localizations
- .translate(i18.checklist.checklistlabel),
- style: theme.textTheme.displayMedium,
- ),
- ),
- ),
- ),
- BlocBuilder(
- builder: (context, authstate) {
- return authstate.maybeMap(
- orElse: () => const Offstage(),
- authenticated: (res) {
- List roles = res.userModel.roles
- .map((e) => e.code.snakeCase.toUpperCase())
- .toList();
- final values = value.serviceDefinitionList.where(
- (item) =>
- !roles
- .indexOf(
- item.code!.split('.').lastOrNull!,
- )
- .isNegative &&
- !item.code!.contains(Constants
- .healthFacilityChecklistPrefix) &&
- (item.code ?? '').contains(
- context.selectedProject.name));
-
- if (values.isEmpty) {
- return Column(
- children: [
- NoResultCard(
- align: Alignment.center,
- label: localizations.translate(
- i18.common.noResultsFound,
- ),
- ),
- ],
- );
- }
-
- return Column(
- children: values
- .map((e) => DigitProjectCell(
- projectText: localizations
- .translate('${e.code}'),
- onTap: () {
- context
- .read()
- .add(
- ServiceDefinitionSelectionEvent(
- serviceDefinition: e,
- ),
- );
- DigitActionDialog.show(
- context,
- widget: ActionCard(items: [
- ActionCardModel(
- icon: Icons.edit_calendar,
- label: localizations.translate(i18
- .checklist
- .checklistCreateActionLabel),
- action: () {
- context.router.push(
- ChecklistBoundaryViewRoute(),
- );
- Navigator.of(
- context,
- rootNavigator: true,
- ).pop();
- },
- ),
- ActionCardModel(
- icon: Icons.visibility,
- label: localizations.translate(i18
- .checklist
- .checklistViewActionLabel),
- action: () {
- context
- .read()
- .add(
- ServiceSearchEvent(
- serviceSearchModel:
- ServiceSearchModel(
- id: e.id,
- ),
- ),
- );
- context.router.push(
- ChecklistPreviewRoute(),
- );
- Navigator.of(
- context,
- rootNavigator: true,
- ).pop();
- },
- ),
- ]),
- );
- },
- ))
- .toList(),
- );
- },
- );
- },
- ),
- ],
- );
- },
- );
- },
- ),
- ],
- ),
- );
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_boundary_view.dart b/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_boundary_view.dart
deleted file mode 100644
index 40f2f05f4..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_boundary_view.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-import 'package:digit_components/digit_components.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-
-import '../../router/app_router.dart';
-import '../../utils/i18_key_constants.dart' as i18;
-import '../../utils/utils.dart';
-import '../../widgets/header/back_navigation_help_header.dart';
-import '../../widgets/localized.dart';
-
-@RoutePage()
-class ChecklistBoundaryViewPage extends LocalizedStatefulWidget {
- const ChecklistBoundaryViewPage({
- Key? key,
- super.appLocalizations,
- }) : super(key: key);
-
- @override
- State createState() =>
- _ChecklistBoundaryViewPageState();
-}
-
-class _ChecklistBoundaryViewPageState
- extends LocalizedState {
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- return Scaffold(
- body: ScrollableContent(
- header: const Column(children: [
- BackNavigationHelpHeaderWidget(),
- ]),
- footer: DigitCard(
- child: DigitElevatedButton(
- onPressed: () => context.router.push(ChecklistViewRoute()),
- child: Text(localizations.translate(
- i18.common.coreCommonContinue,
- )),
- ),
- ),
- children: [
- DigitCard(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.min,
- children: [
- Text(
- localizations.translate(
- i18.checklist.checklistDetailLabel,
- ),
- style: theme.textTheme.displayMedium,
- ),
- DigitTextField(
- readOnly: true,
- label: localizations.translate(
- i18.checklist.checklistdate,
- ),
- suffixIcon: const Padding(
- padding: EdgeInsets.all(8),
- child: Icon(
- Icons.date_range_outlined,
- ),
- ),
- controller: TextEditingController(
- text: DateFormat('dd MMMM yyyy').format(DateTime.now()),
- ),
- ),
- DigitTextField(
- readOnly: true,
- label: localizations.translate(
- i18.householdLocation.administrationAreaFormLabel,
- ),
- controller: TextEditingController(
- text: localizations
- .translate(context.boundary.code.toString()),
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_preview.dart b/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_preview.dart
deleted file mode 100644
index 105936fc5..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_preview.dart
+++ /dev/null
@@ -1,283 +0,0 @@
-import 'package:digit_components/digit_components.dart';
-import 'package:digit_components/widgets/atoms/digit_divider.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../widgets/no_result_card/no_result_card.dart';
-import 'package:intl/intl.dart';
-
-import '../../router/app_router.dart';
-import '../../utils/constants.dart';
-import '../../utils/i18_key_constants.dart' as i18;
-import '../../widgets/header/back_navigation_help_header.dart';
-import '../../widgets/localized.dart';
-
-@RoutePage()
-class ChecklistPreviewPage extends LocalizedStatefulWidget {
- const ChecklistPreviewPage({
- Key? key,
- super.appLocalizations,
- }) : super(key: key);
-
- @override
- State createState() => _ChecklistPreviewPageState();
-}
-
-class _ChecklistPreviewPageState extends LocalizedState {
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- return Scaffold(
- body: ScrollableContent(
- header: const Column(children: [
- BackNavigationHelpHeaderWidget(),
- ]),
- footer: BlocBuilder(
- builder: (context, state) {
- return state.maybeWhen(
- orElse: () => const Offstage(),
- serviceSearch: (value1, value2, value3) {
- return value2 != null
- ? DigitCard(
- child: DigitElevatedButton(
- onPressed: () {
- context.read().add(
- ServiceResetEvent(serviceList: value1),
- );
- },
- child: Text(
- localizations.translate(i18.common.corecommonclose),
- ),
- ),
- )
- : const Offstage();
- },
- );
- },
- ),
- children: [
- BlocBuilder(builder: (context, state) {
- return state.maybeWhen(
- orElse: () => const Offstage(),
- serviceSearch: (serviceList, selectedService, loading) {
- return selectedService == null
- ? serviceList.isNotEmpty
- ? Column(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- ...serviceList
- .map((e) => e.serviceDefId != null
- ? DigitCard(
- child: Column(
- mainAxisAlignment:
- MainAxisAlignment.spaceBetween,
- children: [
- Align(
- alignment: Alignment.centerLeft,
- child: Text(
- DateFormat(Constants
- .checklistPreviewDateFormat)
- .format(
- DateFormat(Constants
- .defaultDateFormat)
- .parse(
- e.createdAt.toString(),
- ),
- ),
- style: theme
- .textTheme.headlineMedium,
- ),
- ),
- Row(
- mainAxisAlignment:
- MainAxisAlignment
- .spaceBetween,
- children: [
- SizedBox(
- child: Text(
- localizations.translate(
- '${e.tenantId}',
- ),
- ),
- ),
- DigitOutLineButton(
- label:
- localizations.translate(
- i18.searchBeneficiary
- .iconLabel,
- ),
- onPressed: () {
- context
- .read()
- .add(
- ServiceSelectionEvent(
- service: e,
- ),
- );
- },
- buttonStyle: OutlinedButton
- .styleFrom(
- shape:
- const RoundedRectangleBorder(
- borderRadius:
- BorderRadius.zero,
- ),
- ),
- ),
- ],
- ),
- ],
- ),
- )
- : const Offstage())
- .toList(),
- ],
- )
- : Expanded(
- child: Center(
- child: Padding(
- padding: const EdgeInsets.all(10),
- child: NoResultCard(
- align: Alignment.center,
- label: localizations.translate(
- i18.checklist.noChecklistFound),
- ),
- ),
- ),
- )
- : BlocBuilder(builder: (context, state) {
- return state.maybeWhen(
- serviceDefinitionFetch: (
- item1,
- item2,
- ) {
- return DigitCard(
- child: Column(
- children: [
- Container(
- width: MediaQuery.of(context).size.width,
- margin: const EdgeInsets.all(8),
- child: Column(
- mainAxisAlignment:
- MainAxisAlignment.start,
- children: [
- Align(
- alignment: Alignment.centerLeft,
- child: Text(
- localizations.translate(
- item2?.code ?? '',
- ),
- style:
- theme.textTheme.displayMedium,
- ),
- ),
- ...(selectedService.attributes ?? [])
- .where((a) =>
- a.value !=
- i18.checklist
- .notSelectedKey &&
- a.value != '')
- .map(
- (e) => Padding(
- padding:
- const EdgeInsets.all(8),
- child: Column(
- mainAxisAlignment:
- MainAxisAlignment.start,
- children: [
- Align(
- alignment:
- Alignment.centerLeft,
- child: Text(
- localizations.translate(
- "${item2?.code ?? ''}.${e.attributeCode!}",
- ),
- style: theme.textTheme
- .headlineSmall,
- ),
- ),
- Container(
- margin: const EdgeInsets
- .only()
- .copyWith(
- top: kPadding,
- bottom: kPadding,
- ),
- child: Align(
- alignment: Alignment
- .centerLeft,
- child: Text(
- e.dataType ==
- 'SingleValueList'
- ? localizations
- .translate(
- 'CORE_COMMON_${e.value.toString().toUpperCase()}',
- )
- : e.value ?? "",
- ),
- ),
- ),
- e.additionalDetails != '' &&
- e.additionalDetails !=
- null
- ? Container(
- margin:
- const EdgeInsets
- .only()
- .copyWith(
- top: kPadding,
- bottom: kPadding,
- ),
- child: Column(
- children: [
- Align(
- alignment:
- Alignment
- .centerLeft,
- child: Text(
- localizations
- .translate(
- "${item2?.code ?? ''}.${e.attributeCode!}.ADDITIONAL_FIELD",
- ),
- ),
- ),
- Align(
- alignment:
- Alignment
- .centerLeft,
- child: Text(
- localizations
- .translate(
- e.additionalDetails,
- ),
- ),
- ),
- ],
- ),
- )
- : const Offstage(),
- const DigitDivider(),
- ],
- ),
- ),
- ),
- ].toList(),
- ),
- ),
- ],
- ),
- );
- },
- orElse: () => const Offstage(),
- );
- });
- },
- );
- }),
- ],
- ),
- );
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_view.dart b/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_view.dart
deleted file mode 100644
index 55599817f..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_view.dart
+++ /dev/null
@@ -1,1104 +0,0 @@
-import 'dart:math';
-
-import 'package:digit_components/digit_components.dart';
-import 'package:digit_components/utils/date_utils.dart';
-import 'package:digit_components/widgets/atoms/selection_card.dart';
-import 'package:digit_components/widgets/digit_sync_dialog.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:group_radio_button/group_radio_button.dart';
-
-import '../../models/data_model.dart';
-import '../../models/entities/roles_type.dart';
-import '../../router/app_router.dart';
-import '../../utils/i18_key_constants.dart' as i18;
-import '../../utils/utils.dart';
-import '../../widgets/header/back_navigation_help_header.dart';
-import '../../widgets/localized.dart';
-
-@RoutePage()
-class ChecklistViewPage extends LocalizedStatefulWidget {
- final String? referralClientRefId;
-
- const ChecklistViewPage({
- Key? key,
- this.referralClientRefId,
- super.appLocalizations,
- }) : super(key: key);
-
- @override
- State createState() => _ChecklistViewPageState();
-}
-
-class _ChecklistViewPageState extends LocalizedState {
- String isStateChanged = '';
- var submitTriggered = false;
- bool triggerLocalization = false;
- List controller = [];
- List additionalController = [];
- List? initialAttributes;
- ServiceDefinitionModel? selectedServiceDefinition;
- bool isControllersInitialized = false;
- List visibleChecklistIndexes = [];
- GlobalKey checklistFormKey = GlobalKey();
-
- @override
- void initState() {
- context.read().add(
- ServiceChecklistEvent(
- value: Random().nextInt(100).toString(),
- submitTriggered: true,
- ),
- );
- super.initState();
- }
-
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- bool isHealthFacilityWorker = context.loggedInUserRoles
- .where((role) => role.code == RolesType.healthFacilityWorker.toValue())
- .toList()
- .isNotEmpty;
-
- return WillPopScope(
- onWillPop: isHealthFacilityWorker && widget.referralClientRefId != null
- ? () async => false
- : () async => _onBackPressed(context),
- child: Scaffold(
- body: BlocBuilder(
- builder: (context, state) {
- state.mapOrNull(
- serviceDefinitionFetch: (value) {
- selectedServiceDefinition = value.selectedServiceDefinition;
- initialAttributes = value.selectedServiceDefinition?.attributes;
- if (!isControllersInitialized) {
- initialAttributes?.forEach((e) {
- controller.add(TextEditingController());
- if (!(isHealthFacilityWorker &&
- widget.referralClientRefId != null)) {
- additionalController.add(TextEditingController());
- }
- });
-
- // Set the flag to true after initializing controllers
- isControllersInitialized = true;
- }
- },
- );
-
- return state.maybeMap(
- orElse: () => Text(state.runtimeType.toString()),
- serviceDefinitionFetch: (value) {
- return ScrollableContent(
- header: Column(children: [
- if (!(isHealthFacilityWorker &&
- widget.referralClientRefId != null))
- const BackNavigationHelpHeaderWidget(),
- ]),
- enableFixedButton: true,
- footer: BlocListener(
- listener: (context, state) async {
- if(state.accuracy != null && triggerLocalization){
- if (!mounted) return;
- triggerLocalization = false;
- final router = context.router;
- // close the location capturing `dialog`
- DigitComponentsUtils().hideDialog(context);
-
-
- // Wait for the location to be obtained
- final locationState =
- context.read().state;
- double? latitude = locationState.latitude;
- double? longitude = locationState.longitude;
-
-
- final shouldSubmit = await DigitDialog.show(
- context,
- options: DigitDialogOptions(
- titleText: localizations.translate(
- i18.checklist.checklistDialogLabel,
- ),
- content: Text(localizations.translate(
- i18.checklist.checklistDialogDescription,
- )),
- primaryAction: DigitDialogActions(
- label: localizations.translate(
- i18.checklist.checklistDialogPrimaryAction,
- ),
- action: (ctx) {
- final referenceId = IdGen.i.identifier;
- List attributes = [];
- for (int i = 0; i < controller.length; i++) {
- final attribute = initialAttributes;
- attributes.add(ServiceAttributesModel(
- auditDetails: AuditDetails(
- createdBy: context.loggedInUserUuid,
- createdTime:
- context.millisecondsSinceEpoch(),
- ),
- attributeCode: '${attribute?[i].code}',
- dataType: attribute?[i].dataType,
- clientReferenceId: IdGen.i.identifier,
- referenceId: isHealthFacilityWorker &&
- widget.referralClientRefId != null
- ? widget.referralClientRefId
- : referenceId,
- value: attribute?[i].dataType !=
- 'SingleValueList'
- ? controller[i]
- .text
- .toString()
- .trim()
- .isNotEmpty
- ? controller[i].text.toString()
- : ''
- : visibleChecklistIndexes.contains(i)
- ? controller[i].text.toString()
- : i18.checklist.notSelectedKey,
- rowVersion: 1,
- tenantId: attribute?[i].tenantId,
- additionalDetails: isHealthFacilityWorker &&
- widget.referralClientRefId != null
- ? null
- : ((attribute?[i].values?.length == 2 ||
- attribute?[i]
- .values
- ?.length ==
- 3) &&
- controller[i].text ==
- attribute?[i]
- .values?[1]
- .trim())
- ? additionalController[i]
- .text
- .toString()
- .isEmpty
- ? null
- : additionalController[i]
- .text
- .toString()
- : null,
- additionalFields:
- ServiceAttributesAdditionalFields(
- version: 1,
- fields: [
- AdditionalField(
- 'latitude',
- latitude,
- ),
- AdditionalField(
- 'longitude',
- longitude,
- ),
- ],
- ),
- ));
- }
-
- context.read().add(
- ServiceCreateEvent(
- serviceModel: ServiceModel(
- createdAt: DigitDateUtils
- .getDateFromTimestamp(
- DateTime.now()
- .toLocal()
- .millisecondsSinceEpoch,
- dateFormat: Constants
- .checklistViewDateFormat,
- ),
- tenantId: value
- .selectedServiceDefinition!
- .tenantId,
- clientId: isHealthFacilityWorker &&
- widget.referralClientRefId !=
- null
- ? widget.referralClientRefId
- .toString()
- : referenceId,
- serviceDefId: value
- .selectedServiceDefinition?.id,
- attributes: attributes,
- rowVersion: 1,
- accountId: context.projectId,
- auditDetails: AuditDetails(
- createdBy: context.loggedInUserUuid,
- createdTime: DateTime.now()
- .millisecondsSinceEpoch,
- ),
- clientAuditDetails:
- ClientAuditDetails(
- createdBy: context.loggedInUserUuid,
- createdTime: context
- .millisecondsSinceEpoch(),
- lastModifiedBy:
- context.loggedInUserUuid,
- lastModifiedTime: context
- .millisecondsSinceEpoch(),
- ),
- additionalFields:
- ServiceAdditionalFields(
- version: 1,
- fields: [
- AdditionalField(
- 'latitude',
- latitude,
- ),
- AdditionalField(
- 'longitude',
- longitude,
- ),
- AdditionalField(
- 'localityCode',
- context.boundary.code,
- ),
- ],
- ),
- additionalDetails: {
- "boundaryCode":
- context.boundary.code,
- 'lat': latitude,
- 'lng': longitude,
- },
- ),
- ),
- );
-
- Navigator.of(
- context,
- rootNavigator: true,
- ).pop(true);
- },
- ),
- secondaryAction: DigitDialogActions(
- label: localizations.translate(
- i18.checklist.checklistDialogSecondaryAction,
- ),
- action: (context) {
- Navigator.of(
- context,
- rootNavigator: true,
- ).pop(false);
- },
- ),
- ),
- );
- if (shouldSubmit ?? false) {
- router.navigate(ChecklistRoute());
-
- router.push(AcknowledgementRoute());
- }
- }
- },
- child: DigitCard(
- margin: const EdgeInsets.fromLTRB(0, kPadding, 0, 0),
- padding:
- const EdgeInsets.fromLTRB(kPadding, 0, kPadding, 0),
- child: DigitElevatedButton(
- onPressed: () async {
- submitTriggered = true;
-
- context.read().add(
- const ServiceChecklistEvent(
- value: '',
- submitTriggered: true,
- ),
- );
- final isValid =
- checklistFormKey.currentState?.validate();
- if (!isValid!) {
- return;
- }
- final itemsAttributes = initialAttributes;
-
- for (int i = 0; i < controller.length; i++) {
- if (itemsAttributes?[i].required == true &&
- ((itemsAttributes?[i].dataType ==
- 'SingleValueList' &&
- visibleChecklistIndexes
- .any((e) => e == i) &&
- (controller[i].text == '')) ||
- (itemsAttributes?[i].dataType !=
- 'SingleValueList' &&
- (controller[i].text == '' &&
- !(isHealthFacilityWorker &&
- widget.referralClientRefId !=
- null))))) {
- return;
- }
- }
-
- triggerLocalization = true;
-
- // Request location from LocationBloc
- context.read().add(const LocationEvent.load());
- DigitComponentsUtils().showLocationCapturingDialog(
- context,
- localizations.translate(i18.common.locationCapturing),
- DigitSyncDialogType.inProgress,
- );
-
-
- },
- child: Text(
- localizations.translate(i18.common.coreCommonSubmit),
- ),
- ),
- ),
- ),
- children: [
- Form(
- key: checklistFormKey, //assigning key to form
- child: DigitCard(
- child: Column(children: [
- Padding(
- padding: const EdgeInsets.only(bottom: 8),
- child: Text(
- '${localizations.translate(
- value.selectedServiceDefinition!.code
- .toString(),
- )} ${localizations.translate(i18.checklist.checklist)}',
- style: theme.textTheme.displayMedium,
- textAlign: TextAlign.left,
- ),
- ),
- ...initialAttributes!.map((
- e,
- ) {
- int index = (initialAttributes ?? []).indexOf(e);
-
- return Column(children: [
- if (e.dataType == 'String' &&
- !(e.code ?? '').contains('.')) ...[
- DigitTextField(
- onChange: (value) {
- checklistFormKey.currentState?.validate();
- },
- isRequired: false,
- controller: controller[index],
- inputFormatter: [
- FilteringTextInputFormatter.allow(RegExp(
- "[a-zA-Z0-9]",
- )),
- ],
- validator: (value) {
- if (((value == null || value == '') &&
- e.required == true)) {
- return localizations
- .translate("${e.code}_REQUIRED");
- }
- if (e.regex != null) {
- return (RegExp(e.regex!).hasMatch(value!))
- ? null
- : localizations
- .translate("${e.code}_REGEX");
- }
-
- return null;
- },
- label: localizations.translate(
- '${value.selectedServiceDefinition?.code}.${e.code}',
- ),
- ),
- ] else if (e.dataType == 'Number' &&
- !(e.code ?? '').contains('.')) ...[
- DigitTextField(
- onChange: (value) {
- checklistFormKey.currentState?.validate();
- },
- textStyle: theme.textTheme.headlineMedium,
- textInputType: TextInputType.number,
- inputFormatter: [
- FilteringTextInputFormatter.allow(RegExp(
- "[0-9]",
- )),
- ],
- validator: (value) {
- if (((value == null || value == '') &&
- e.required == true)) {
- return localizations.translate(
- i18.common.corecommonRequired,
- );
- }
- if (e.regex != null) {
- return (RegExp(e.regex!).hasMatch(value!))
- ? null
- : localizations
- .translate("${e.code}_REGEX");
- }
-
- return null;
- },
- controller: controller[index],
- label: '${localizations.translate(
- '${value.selectedServiceDefinition?.code}.${e.code}',
- ).trim()} ${e.required == true ? '*' : ''}',
- ),
- ] else if (e.dataType == 'MultiValueList' &&
- !(e.code ?? '').contains('.')) ...[
- Align(
- alignment: Alignment.topLeft,
- child: Padding(
- padding: const EdgeInsets.all(kPadding * 2),
- child: Column(
- children: [
- Text(
- '${localizations.translate(
- '${value.selectedServiceDefinition?.code}.${e.code}',
- )} ${e.required == true ? '*' : ''}',
- style: theme.textTheme.headlineSmall,
- ),
- ],
- ),
- ),
- ),
- BlocBuilder(
- builder: (context, state) {
- // Validation logic to check if required field is empty
- final hasError = (e.required == true &&
- controller[index].text.isEmpty &&
- submitTriggered);
-
- return Column(
- crossAxisAlignment:
- CrossAxisAlignment.start,
- children: [
- // Checkbox options
- Column(
- children: e.values!
- .map((item) => Padding(
- padding:
- const EdgeInsets.only(
- left: kPadding * 2),
- child: DigitCheckboxTile(
- label: item,
- value: controller[index]
- .text
- .split('.')
- .contains(item),
- onChanged: (value) {
- context
- .read()
- .add(
- ServiceChecklistEvent(
- value: item
- .toString(),
- submitTriggered:
- submitTriggered,
- ),
- );
-
- // Split the controller text into a list of values
- var val = controller[index].text.split('.').where((v) => v.trim().isNotEmpty).toList();
- if (val
- .contains(item)) {
- val.remove(item);
- } else {
- val.add(item);
- }
-
- // Update the controller with the selected values
- controller[index]
- .value =
- TextEditingController
- .fromValue(
- TextEditingValue(
- text: val.join('.'),
- ),
- ).value;
-
- // If the field is required and no option is selected, trigger validation
- if (e.required ==
- true &&
- val.isEmpty) {
- submitTriggered =
- true;
- }
- },
- ),
- ))
- .toList(),
- ),
- // Error message display if validation fails
- Offstage(
- offstage: !hasError,
- child: Align(
- alignment: Alignment.centerLeft,
- child: Text(
- localizations.translate(
- i18.common.corecommonRequired,
- ),
- style: TextStyle(
- color: theme.colorScheme.error,
- ),
- ),
- ),
- ),
- ],
- );
- },
- ),
- ] else if (e.dataType == 'SingleValueList') ...[
- if (!(e.code ?? '').contains('.'))
- DigitCard(
- child: _buildChecklist(
- e,
- index,
- value.selectedServiceDefinition,
- context,
- ),
- ),
- ] else if (e.dataType == 'Boolean') ...[
- if (!(e.code ?? '').contains('.'))
- DigitCard(
- child: Column(
- children: [
- Align(
- alignment: Alignment.topLeft,
- child: Padding(
- padding: const EdgeInsets.all(8),
- child: Column(
- children: [
- Text(
- '${localizations.translate(
- '${selectedServiceDefinition?.code}.${e.code}',
- )} ${e.required == true ? '*' : ''}',
- style: theme
- .textTheme.headlineSmall,
- ),
- ],
- ),
- ),
- ),
- BlocBuilder(
- builder: (context, state) {
- return SelectionBox(
- //label: e,
- allowMultipleSelection: false,
- width: 110,
- valueMapper: (value) {
- return value
- ? localizations.translate(
- i18.common
- .coreCommonYes,
- )
- : localizations.translate(
- i18.common.coreCommonNo,
- );
- },
- initialSelection:
- controller[index].text ==
- 'true'
- ? [true]
- : controller[index]
- .text ==
- 'false'
- ? [false]
- : [],
- options: const [
- true,
- false
- ], // TODO: need to update
- onSelectionChanged: (curValue) {
- if (curValue.isNotEmpty) {
- context
- .read()
- .add(
- ServiceChecklistEvent(
- value: curValue
- .toString(),
- submitTriggered:
- submitTriggered,
- ),
- );
- controller[index].value =
- TextEditingValue(
- text: curValue.first
- .toString(),
- );
- }
- },
- );
- },
- ),
- ],
- ),
- ),
- ],
- ]);
- }),
- const SizedBox(
- height: 15,
- ),
- ]),
- ),
- ),
- ],
- );
- },
- );
- },
- ),
- ),
- );
- }
-
- Widget _buildChecklist(
- AttributesModel item,
- int index,
- ServiceDefinitionModel? selectedServiceDefinition,
- BuildContext context,
- ) {
- bool isHealthFacilityWorker = context.loggedInUserRoles
- .where((role) => role.code == RolesType.healthFacilityWorker.toValue())
- .toList()
- .isNotEmpty;
- final theme = Theme.of(context);
- /* Check the data type of the attribute*/
- if (item.dataType == 'SingleValueList') {
- final childItems = getNextQuestions(
- item.code.toString(),
- initialAttributes ?? [],
- );
- List excludedIndexes = [];
-
- // Ensure the current index is added to visible indexes and not excluded
- if (!visibleChecklistIndexes.contains(index) &&
- !excludedIndexes.contains(index)) {
- visibleChecklistIndexes.add(index);
- }
-
- // Determine excluded indexes
- for (int i = 0; i < (initialAttributes ?? []).length; i++) {
- if (!visibleChecklistIndexes.contains(i)) {
- excludedIndexes.add(i);
- }
- }
-
- return Column(
- children: [
- Align(
- alignment: Alignment.topLeft,
- child: Padding(
- padding: const EdgeInsets.all(16.0), // Add padding here
- child: Text(
- '${localizations.translate(
- '${selectedServiceDefinition?.code}.${item.code}',
- )} ${item.required == true ? '*' : ''}',
- style: theme.textTheme.headlineSmall,
- ),
- ),
- ),
- Column(
- children: [
- BlocBuilder(
- builder: (context, state) {
- return RadioGroup.builder(
- groupValue: controller[index].text.trim(),
- onChanged: (value) {
- context.read().add(
- ServiceChecklistEvent(
- value: Random().nextInt(100).toString(),
- submitTriggered: submitTriggered,
- ),
- );
- setState(() {
- // Clear child controllers and update visibility
- for (final matchingChildItem in childItems) {
- final childIndex =
- initialAttributes?.indexOf(matchingChildItem);
- if (childIndex != null) {
- // controller[childIndex].clear();
- visibleChecklistIndexes
- .removeWhere((v) => v == childIndex);
- }
- }
-
- // Update the current controller's value
- controller[index].value =
- TextEditingController.fromValue(
- TextEditingValue(
- text: value!,
- ),
- ).value;
-
- if (excludedIndexes.isNotEmpty) {
- for (int i = 0; i < excludedIndexes.length; i++) {
- // Clear excluded child controllers
- if (item.dataType != 'SingleValueList') {
- // controller[excludedIndexes[i]].value =
- // TextEditingController.fromValue(
- // const TextEditingValue(
- // text: '',
- // ),
- // ).value;
- }
- }
- }
-
- // Remove corresponding controllers based on the removed attributes
- });
- },
- items: item.values != null
- ? item.values!
- .where((e) => e != i18.checklist.notSelectedKey)
- .toList()
- : [],
- itemBuilder: (item) => RadioButtonBuilder(
- localizations.translate(
- item.trim().toUpperCase(),
- ),
- ),
- );
- },
- ),
- BlocBuilder(
- builder: (context, state) {
- return (controller[index].text == item.values?[1].trim() &&
- !(isHealthFacilityWorker &&
- widget.referralClientRefId != null))
- ? Padding(
- padding: const EdgeInsets.only(
- left: 4.0,
- right: 4.0,
- bottom: 16,
- ),
- child: DigitTextField(
- maxLength: 1000,
- isRequired: true,
- controller: additionalController[index],
- label: localizations.translate(
- '${selectedServiceDefinition?.code}.${item.code}.ADDITIONAL_FIELD',
- ),
- validator: (value1) {
- if (value1 == null || value1 == '') {
- return localizations.translate(
- i18.common.coreCommonReasonRequired,
- );
- }
-
- return null;
- },
- ),
- )
- : const SizedBox();
- },
- ),
- BlocBuilder(
- builder: (context, state) {
- final hasError = (item.required == true &&
- controller[index].text.isEmpty &&
- submitTriggered);
-
- return Offstage(
- offstage: !hasError,
- child: Align(
- alignment: Alignment.centerLeft,
- child: Text(
- localizations.translate(
- i18.common.corecommonRequired,
- ),
- style: TextStyle(
- color: theme.colorScheme.error,
- ),
- ),
- ),
- );
- },
- ),
- ],
- ),
- if (childItems.isNotEmpty &&
- controller[index].text.trim().isNotEmpty) ...[
- _buildNestedChecklists(
- item.code.toString(),
- index,
- controller[index].text.trim(),
- context,
- ),
- ],
- ],
- );
- } else if (item.dataType == 'String') {
- return Padding(
- padding: const EdgeInsets.all(8.0),
- child: DigitTextField(
- maxLength: 1000,
- onChange: (value) {
- checklistFormKey.currentState?.validate();
- },
- isRequired: item.required ?? true,
- controller: controller[index],
- inputFormatter: [
- FilteringTextInputFormatter.allow(RegExp(
- "[a-zA-Z0-9 ]",
- )),
- ],
- validator: (value) {
- if (((value == null || value == '') && item.required == true)) {
- return localizations.translate("${item.code}_REQUIRED");
- }
- if (item.regex != null) {
- return (RegExp(item.regex!).hasMatch(value!))
- ? null
- : localizations.translate("${item.code}_REGEX");
- }
-
- return null;
- },
- label: localizations.translate(
- '${selectedServiceDefinition?.code}.${item.code}',
- ),
- ),
- );
- } else if (item.dataType == 'Number') {
- return DigitTextField(
- onChange: (value) {
- checklistFormKey.currentState?.validate();
- },
- textStyle: theme.textTheme.headlineMedium,
- textInputType: TextInputType.number,
- inputFormatter: [
- FilteringTextInputFormatter.allow(RegExp(
- "[0-9]",
- )),
- ],
- validator: (value) {
- if (((value == null || value == '') && item.required == true)) {
- return localizations.translate(
- i18.common.corecommonRequired,
- );
- }
- if (item.regex != null) {
- return (RegExp(item.regex!).hasMatch(value!))
- ? null
- : localizations.translate("${item.code}_REGEX");
- }
-
- return null;
- },
- controller: controller[index],
- label: '${localizations.translate(
- '${selectedServiceDefinition?.code}.${item.code}',
- ).trim()} ${item.required == true ? '*' : ''}',
- );
- } else if (item.dataType == 'MultiValueList') {
- return Column(
- children: [
- Align(
- alignment: Alignment.topLeft,
- child: Padding(
- padding: const EdgeInsets.all(8),
- child: Column(
- children: [
- Text(
- '${localizations.translate(
- '${selectedServiceDefinition?.code}.${item.code}',
- )} ${item.required == true ? '*' : ''}',
- style: theme.textTheme.headlineSmall,
- ),
- ],
- ),
- ),
- ),
- BlocBuilder(
- builder: (context, state) {
- return Column(
- children: item.values!
- .map((e) => DigitCheckboxTile(
- label: e,
- value: controller[index].text.split('.').contains(e),
- onChanged: (value) {
- context.read().add(
- ServiceChecklistEvent(
- value: e.toString(),
- submitTriggered: submitTriggered,
- ),
- );
- final String ele;
- var val = controller[index].text.split('.');
- if (val.contains(e)) {
- val.remove(e);
- ele = val.join(".");
- } else {
- ele = "${controller[index].text}.$e";
- }
- controller[index].value =
- TextEditingController.fromValue(
- TextEditingValue(
- text: ele,
- ),
- ).value;
- },
- ))
- .toList(),
- );
- },
- ),
- ],
- );
- } else if (item.dataType == 'Boolean') {
- return Column(
- children: [
- Align(
- alignment: Alignment.topLeft,
- child: Padding(
- padding: const EdgeInsets.all(8),
- child: Column(
- children: [
- Text(
- '${localizations.translate(
- '${selectedServiceDefinition?.code}.${item.code}',
- )} ${item.required == true ? '*' : ''}',
- style: theme.textTheme.headlineSmall,
- ),
- ],
- ),
- ),
- ),
- BlocBuilder(
- builder: (context, state) {
- return SelectionBox(
- //label: e,
- allowMultipleSelection: false,
- width: 110,
- valueMapper: (value) {
- return value ? 'Yes' : 'No';
- },
- initialSelection: const [false],
- options: const [true, false],
- onSelectionChanged: (valuec) {
- print(submitTriggered);
- print(controller[index].text.split('.').contains(e));
- context.read().add(
- ServiceChecklistEvent(
- value: valuec.toString(),
- submitTriggered: submitTriggered,
- ),
- );
- final String ele;
- var val = controller[index].text.split('.');
- if (val.contains(e)) {
- val.remove(e);
- ele = val.join(".");
- } else {
- ele = "${controller[index].text}.$e";
- }
- controller[index].value = TextEditingController.fromValue(
- TextEditingValue(
- text: ele,
- ),
- ).value;
- },
- );
- },
- ),
- ],
- );
- } else {
- return const SizedBox.shrink();
- }
- }
-
- // Function to build nested checklists for child attributes
- Widget _buildNestedChecklists(
- String parentCode,
- int parentIndex,
- String parentControllerValue,
- BuildContext context,
- ) {
- // Retrieve child items for the given parent code
- final childItems = getNextQuestions(
- parentCode,
- initialAttributes ?? [],
- );
-
- return Column(
- children: [
- // Build cards for each matching child attribute
- for (final matchingChildItem in childItems.where((childItem) =>
- childItem.code!.startsWith('$parentCode.$parentControllerValue.')))
- Card(
- margin: const EdgeInsets.only(bottom: 8.0, left: 4.0, right: 4.0),
- color: countDots(matchingChildItem.code ?? '') % 4 == 2
- ? const Color.fromRGBO(238, 238, 238, 1)
- : const DigitColors().white,
- child: _buildChecklist(
- matchingChildItem,
- initialAttributes?.indexOf(matchingChildItem) ?? parentIndex,
- // Pass parentIndex here as we're building at the same level
- selectedServiceDefinition,
- context,
- ),
- ),
- ],
- );
- }
-
- // Function to get the next questions (child attributes) based on a parent code
- List getNextQuestions(
- String parentCode,
- List checklistItems,
- ) {
- final childCodePrefix = '$parentCode.';
- final nextCheckLists = checklistItems.where((item) {
- return item.code!.startsWith(childCodePrefix) &&
- item.code?.split('.').length == parentCode.split('.').length + 2;
- }).toList();
-
- return nextCheckLists;
- }
-
- int countDots(String inputString) {
- int dotCount = 0;
- for (int i = 0; i < inputString.length; i++) {
- if (inputString[i] == '.') {
- dotCount++;
- }
- }
-
- return dotCount;
- }
-
- Future _onBackPressed(BuildContext context) async {
- bool? shouldNavigateBack = await showDialog(
- context: context,
- builder: (context) => DigitDialog(
- options: DigitDialogOptions(
- titleText: localizations.translate(
- i18.checklist.checklistBackDialogLabel,
- ),
- content: Text(localizations.translate(
- i18.checklist.checklistBackDialogDescription,
- )),
- primaryAction: DigitDialogActions(
- label: localizations
- .translate(i18.checklist.checklistBackDialogPrimaryAction),
- action: (ctx) {
- Navigator.of(
- context,
- rootNavigator: true,
- ).pop(true);
- },
- ),
- secondaryAction: DigitDialogActions(
- label: localizations
- .translate(i18.checklist.checklistBackDialogSecondaryAction),
- action: (context) {
- Navigator.of(
- context,
- rootNavigator: true,
- ).pop(false);
- },
- ),
- ),
- ),
- );
-
- return shouldNavigateBack ?? false;
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_details_view.dart b/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_details_view.dart
deleted file mode 100644
index b4c644922..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_details_view.dart
+++ /dev/null
@@ -1,274 +0,0 @@
-import 'package:digit_components/digit_components.dart';
-import 'package:digit_components/widgets/atoms/digit_divider.dart';
-import 'package:flutter/material.dart';
-import 'package:recase/recase.dart';
-import 'package:digit_data_model/data_model.dart';
-
-import '../../../blocs/localization/app_localization.dart';
-import '../../../router/app_router.dart';
-import '../../../utils/i18_key_constants.dart' as i18;
-import '../../../utils/utils.dart';
-import '../../../widgets/header/back_navigation_help_header.dart';
-
-@RoutePage()
-class ComplaintsDetailsViewPage extends StatelessWidget {
- final PgrServiceModel complaint;
-
- const ComplaintsDetailsViewPage({
- Key? key,
- required this.complaint,
- }) : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- final router = context.router;
- final theme = Theme.of(context);
- final localizations = AppLocalizations.of(context);
-
- return Scaffold(
- body: ScrollableContent(
- enableFixedButton: true,
- header: Column(
- children: [
- const BackNavigationHelpHeaderWidget(),
- Align(
- alignment: Alignment.centerLeft,
- child: Padding(
- padding: const EdgeInsets.only(left: 8.0, top: 20.0),
- child: Text(
- localizations
- .translate(i18.complaints.complaintsDetailsLabel),
- style: theme.textTheme.displayMedium,
- ),
- ),
- ),
- ],
- ),
- footer: SizedBox(
- child: DigitCard(
- margin: const EdgeInsets.fromLTRB(0, kPadding, 0, 0),
- padding: const EdgeInsets.fromLTRB(kPadding, 0, kPadding, 0),
- child: DigitElevatedButton(
- onPressed: () {
- router.pop();
- },
- child: Center(
- child: Text(
- localizations.translate(i18.common.corecommonclose),
- ),
- ),
- ),
- ),
- ),
- children: [
- DigitCard(
- child: Column(
- children: [
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.inboxNumberLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- complaint.serviceRequestId ??
- "${localizations.translate(i18.complaints.inboxNotGeneratedLabel)}\n${localizations.translate(i18.complaints.inboxSyncRequiredLabel)}",
- style: TextStyle(
- color: complaint.serviceRequestId != null
- ? theme.colorScheme.secondary
- : const DigitColors().woodsmokeBlack,
- ),
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.inboxTypeLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(
- complaint.serviceCode.snakeCase
- .toUpperCase()
- .trim(),
- ),
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.inboxDateLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- complaint.auditDetails?.createdTime.toDateTime
- .getFormattedDate() ??
- "",
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.complainantName),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- complaint.user.name ?? "",
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.inboxAreaLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- complaint.address.locality?.name ?? "",
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations.translate(
- i18.complaints.complainantContactNumber,
- ),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- complaint.user.mobileNumber ?? "",
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.inboxStatusLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(
- "COMPLAINTS_STATUS_${complaint.applicationStatus.name.snakeCase.toUpperCase()}",
- ),
- ),
- ),
- ],
- ),
- ),
- const DigitDivider(),
- Padding(
- padding: const EdgeInsets.only(top: 16, bottom: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 3,
- child: Text(
- localizations
- .translate(i18.complaints.complaintDescription),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(
- complaint.description,
- ),
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox.dart b/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox.dart
deleted file mode 100644
index ce0b8f0b6..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox.dart
+++ /dev/null
@@ -1,370 +0,0 @@
-import 'package:digit_components/digit_components.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:recase/recase.dart';
-
-import '../../../blocs/complaints_inbox/complaints_inbox.dart';
-import '../../../blocs/localization/app_localization.dart';
-import '../../../router/app_router.dart';
-import '../../../utils/i18_key_constants.dart' as i18;
-import '../../../utils/utils.dart';
-import '../../../widgets/header/back_navigation_help_header.dart';
-import '../../../widgets/localized.dart';
-import '../../../widgets/no_result_card/no_result_card.dart';
-
-@RoutePage()
-class ComplaintsInboxPage extends LocalizedStatefulWidget {
- const ComplaintsInboxPage({
- super.key,
- super.appLocalizations,
- });
-
- @override
- State createState() => _ComplaintsInboxPageState();
-}
-
-class _ComplaintsInboxPageState extends LocalizedState {
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
- final router = context.router;
-
- return Scaffold(
- body: BlocBuilder(
- builder: (context, state) {
- final inboxItems =
- state.isFiltered ? state.filteredComplaints : state.complaints;
-
- // TODO(ajil): Fix this scrollable component
- return Column(
- children: [
- Expanded(
- child: ScrollableContent(
- header: const Column(
- children: [
- BackNavigationHelpHeaderWidget(),
- ],
- ),
- slivers: [
- SliverToBoxAdapter(
- child: Padding(
- padding: const EdgeInsets.only(
- left: kPadding*2,
- bottom: kPadding,
- ),
- child: Text(
- localizations.translate(
- i18.complaints.inboxHeading,
- ),
- style: theme.textTheme.displayMedium,
- ),
- ),
- ),
- ...[
- SliverToBoxAdapter(
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- TextButton(
- style: TextButton.styleFrom(
- foregroundColor: theme.colorScheme.secondary,
- padding: const EdgeInsets.only(left: kPadding*2),
- ),
- onPressed: () {
- router.push(ComplaintsInboxSearchRoute());
- },
- child: Row(
- children: [
- const Icon(Icons.search),
- const SizedBox(width: 5,),
- Text(localizations.translate(
- i18.complaints.searchCTA,
- )),
- ],
- ),
- ),
- TextButton(
- style: TextButton.styleFrom(
- foregroundColor: theme.colorScheme.secondary,
- padding: EdgeInsets.zero,
- ),
- onPressed: () {
- router.push(ComplaintsInboxFilterRoute());
- },
- child: Row(
- children: [
- const Icon(Icons.filter_list_alt),
- const SizedBox(width: 5,),
- Text(localizations.translate(
- i18.complaints.filterCTA,
- )),
- ],
- ),
- ),
- TextButton(
- style: TextButton.styleFrom(
- foregroundColor: theme.colorScheme.secondary,
- padding: const EdgeInsets.only(right: kPadding*2),
- ),
- onPressed: () {
- router.push(ComplaintsInboxSortRoute());
- },
- child: Row(
- children: [
- const Icon(Icons.segment),
- const SizedBox(width: 5,),
- Text(localizations.translate(
- i18.complaints.sortCTA,
- )),
- ],
- ),
- ),
- ],
- ),
- ),
- SliverList(
- delegate: SliverChildBuilderDelegate(
- (context, index) {
- final item = inboxItems.elementAt(index);
-
- return _ComplaintsInboxItem(
- item: item,
- localizations: localizations,
- );
- },
- childCount: inboxItems.length,
- ),
- ),
- ],
- ],
- children: [
- if (inboxItems.isEmpty)
- Expanded(
- child: Center(
- child: Padding(
- padding: const EdgeInsets.all(10),
- child: NoResultCard(
- align: Alignment.center,
- label: localizations
- .translate(i18.complaints.noComplaintsExist),
- ),
- ),
- ),
- ),
- ],
- ),
- ),
- SizedBox(
- child: DigitCard(
- margin: const EdgeInsets.fromLTRB(0, kPadding, 0, 0),
- padding: const EdgeInsets.fromLTRB(kPadding, 0, kPadding, 0),
- child: DigitElevatedButton(
- onPressed: () async {
- var loggedInUserUuid = context.loggedInUserUuid;
- final bloc = context.read();
-
- await router.push(
- ComplaintsRegistrationWrapperRoute(),
- );
-
- try {
- bloc.add(
- ComplaintInboxLoadComplaintsEvent(
- createdByUserId: loggedInUserUuid,
- ),
- );
- } catch (error) {
- AppLogger.instance.error(
- title: 'Error',
- message: 'Error while loading complaints',
- );
- }
- },
- child: Center(
- child: Text(
- localizations.translate(
- i18.complaints.fileComplaintAction,
- ),
- ),
- ),
- ),
- ),
- ),
- ],
- );
- },
- ),
- );
- }
-}
-
-class _ComplaintsInboxItem extends StatelessWidget {
- final AppLocalizations localizations;
- final PgrServiceModel item;
-
- const _ComplaintsInboxItem({
- Key? key,
- required this.localizations,
- required this.item,
- }) : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- return DigitCard(
- child: Column(
- children: [
- Padding(
- padding: const EdgeInsets.only(top: kPadding, bottom: kPadding),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children: [
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(i18.complaints.inboxNumberLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 3,
- child: Text(
- item.serviceRequestId ??
- "${localizations.translate(i18.complaints.inboxNotGeneratedLabel)}\n${localizations.translate(i18.complaints.inboxSyncRequiredLabel)}",
- style: TextStyle(
- color: item.serviceRequestId != null
- ? theme.colorScheme.secondary
- : const DigitColors().woodsmokeBlack,
- ),
- ),
- ),
- ],
- ),
- ),
- Padding(
- padding: const EdgeInsets.only(top: kPadding, bottom: kPadding),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children: [
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(i18.complaints.inboxTypeLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 3,
- child: Text(
- localizations.translate(
- item.serviceCode.snakeCase.toUpperCase().trim(),
- ),
- ),
- ),
- ],
- ),
- ),
- Padding(
- padding: const EdgeInsets.only(top: kPadding, bottom: kPadding),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(i18.complaints.inboxDateLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 3,
- child: Text(
- item.auditDetails?.createdTime.toDateTime
- .getFormattedDate() ??
- "",
- ),
- ),
- ],
- ),
- ),
- Padding(
- padding: const EdgeInsets.only(top: kPadding, bottom: kPadding),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(i18.complaints.inboxAreaLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 3,
- child: Text(
- item.address.locality?.name ?? "",
- ),
- ),
- ],
- ),
- ),
- Padding(
- padding: const EdgeInsets.only(top: kPadding, bottom: 8),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- Expanded(
- flex: 2,
- child: Text(
- localizations.translate(i18.complaints.inboxStatusLabel),
- style: theme.textTheme.headlineSmall,
- ),
- ),
- Expanded(
- flex: 3,
- child: Text(
- localizations.translate(
- "COMPLAINTS_STATUS_${item.applicationStatus.name.snakeCase.toUpperCase()}",
- ),
- ),
- ),
- ],
- ),
- ),
- Padding(
- padding: const EdgeInsets.only(top: kPadding*2),
- child: Row(
- children: [
- Expanded(
- flex: 1,
- child: OutlinedButton(
- onPressed: () {
- context.router.push(ComplaintsDetailsViewRoute(
- complaint: item,
- ));
- },
- style: OutlinedButton.styleFrom(
- side: BorderSide(
- width: 1.0,
- color: theme.colorScheme.secondary,
- ),
- shape: const RoundedRectangleBorder(
- borderRadius: BorderRadius.zero,
- ),
- ),
- child: Text(
- localizations.translate(i18.searchBeneficiary.iconLabel),
- style: DigitTheme.instance.mobileTheme.textTheme.headlineSmall?.apply(color: theme.colorScheme.secondary,),
- ),
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox_filter.dart b/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox_filter.dart
deleted file mode 100644
index 5f27d8a07..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox_filter.dart
+++ /dev/null
@@ -1,403 +0,0 @@
-import 'dart:collection';
-
-import 'package:digit_components/digit_components.dart';
-import 'package:digit_components/widgets/atoms/digit_checkbox.dart';
-import 'package:digit_data_model/data_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:group_radio_button/group_radio_button.dart';
-import 'package:reactive_forms/reactive_forms.dart';
-import 'package:recase/recase.dart';
-
-import '../../../blocs/auth/auth.dart';
-import '../../../blocs/complaints_inbox/complaints_inbox.dart';
-import '../../../router/app_router.dart';
-import '../../../utils/i18_key_constants.dart' as i18;
-import '../../../utils/utils.dart';
-import '../../../widgets/localized.dart';
-
-@RoutePage()
-class ComplaintsInboxFilterPage extends LocalizedStatefulWidget {
- const ComplaintsInboxFilterPage({
- super.key,
- super.appLocalizations,
- });
-
- @override
- State createState() =>
- _ComplaintsInboxFilterPageState();
-}
-
-class _ComplaintsInboxFilterPageState
- extends LocalizedState {
- static const _complaintType = "complaintType";
- static const _complaintLocality = "complaintLocality";
- static const _complaintAssignmentType = "complaintAssignmentType";
- static const _complaintStatus = "complaintStatus";
- static final _complaintAssignmentTypes = [
- i18.complaints.assignedToAll,
- i18.complaints.assignedToSelf,
- ];
- Map selected = {
- PgrServiceApplicationStatus.created: false,
- PgrServiceApplicationStatus.cancelled: false,
- PgrServiceApplicationStatus.pendingAssignment: false,
- PgrServiceApplicationStatus.rejected: false,
- PgrServiceApplicationStatus.resolved: false,
- };
- bool isFirstBuild = true;
- Set statuses = HashSet();
-
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
-
- return Scaffold(
- backgroundColor: theme.colorScheme.onPrimary,
- body: BlocBuilder(
- builder: (context, state) {
- return ReactiveFormBuilder(
- form: () => buildForm(state),
- builder: (context, formGroup, child) {
- List selectedStatuses =
- state.filters?.complaintStatus?.toList() ?? [];
-
- if (isFirstBuild) {
- for (var element in selectedStatuses) {
- selected[element] = true;
- statuses.add(element);
- }
- isFirstBuild = false;
- }
-
- return ScrollableContent(
- header: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.end,
- children: [
- TextButton(
- style: TextButton.styleFrom(
- foregroundColor: theme.colorScheme.onBackground,
- padding: EdgeInsets.zero,
- ),
- onPressed: () => context.router.maybePop(),
- child: const Row(
- children: [
- Icon(Icons.close),
- ],
- ),
- ),
- ],
- ),
- Padding(
- padding: const EdgeInsets.only(left: 16),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- const Icon(
- Icons.filter_alt,
- size: 32,
- ),
- Text(
- localizations.translate(
- i18.complaints.complaintInboxFilterHeading,
- ),
- style: theme.textTheme.displayMedium,
- ),
- Padding(
- padding: const EdgeInsets.only(left: 5),
- child: TextButton(
- onPressed: () {
- clearFilters(formGroup);
- },
- style: TextButton.styleFrom(
- foregroundColor: theme.colorScheme.onBackground,
- padding: const EdgeInsets.all(9),
- side: BorderSide(
- width: 1,
- color: theme.colorScheme.outline,
- ),
- ),
- child: const Column(
- children: [
- Icon(Icons.autorenew),
- ],
- ),
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- footer: SizedBox(
- child: DigitCard(
- margin: const EdgeInsets.fromLTRB(0, kPadding, 0, 0),
- padding:
- const EdgeInsets.fromLTRB(kPadding, 0, kPadding, 0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.center,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Expanded(
- flex: 1,
- child: DigitOutLineButton(
- label: localizations.translate(
- i18.complaints.complaintsFilterClearAll,
- ),
- onPressed: () {
- clearFilters(formGroup);
- },
- buttonStyle: OutlinedButton.styleFrom(
- shape: const BeveledRectangleBorder(),
- padding: const EdgeInsets.all(14),
- side: BorderSide(
- width: 1.0,
- color: theme.colorScheme.secondary,
- ),
- ),
- ),
- ),
- const SizedBox(width: 10),
- Expanded(
- flex: 1,
- child: DigitElevatedButton(
- onPressed: () {
- if (!formGroup.valid) return;
-
- final bloc = context.read();
- final userBloc = context.read();
-
- final assignedTo = formGroup
- .control(_complaintAssignmentType)
- .value as String?;
-
- final complaintType = formGroup
- .control(_complaintType)
- .value as String?;
-
- final locality = formGroup
- .control(_complaintLocality)
- .value as String?;
-
- bloc.add(
- ComplaintInboxFilterComplaintsEvent(
- complaintAssignedTo: assignedTo,
- currentUserName: userBloc.state.whenOrNull(
- authenticated: (
- accessToken,
- refreshToken,
- userModel,
- actions,
- individualId,
- ) {
- return userModel.name;
- },
- ),
- complaintTypeCode: complaintType,
- locality: locality,
- complaintStatus: statuses.toList(),
- createdByUserId: context.loggedInUserUuid,
- ),
- );
-
- context.router.pop();
- },
- child: Center(
- child: Text(
- localizations
- .translate(i18.complaints.filterCTA),
- ),
- ),
- ),
- ),
- ],
- ),
- ),
- ),
- children: [
- Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- children: [
- BlocBuilder(
- builder: (context, state) {
- Set complaintTypes = HashSet();
- Set locality = HashSet();
-
- Set uniqueStatuses =
- HashSet();
- Map statusCount = HashMap();
-
- state.maybeWhen(
- orElse: () {
- return;
- },
- complaints: (
- loading,
- isFiltered,
- complaints,
- filteredComplaints,
- filters,
- searchKeys,
- ) {
- for (var e in complaints) {
- complaintTypes.add(e.serviceCode.toString());
-
- if (e.address.locality?.name != null) {
- locality.add(
- e.address.locality?.name ?? "",
- );
- }
-
- var status = e.applicationStatus;
- uniqueStatuses.add(status);
- if (statusCount.containsKey(status.index)) {
- int count = statusCount[status.index] ?? 0;
- statusCount[status.index] = count + 1;
- } else {
- statusCount[status.index] = 1;
- }
- }
- },
- );
-
- return Column(
- children: [
- BlocBuilder(
- builder: (context, state) {
- return RadioGroup.builder(
- groupValue: formGroup
- .control(_complaintAssignmentType)
- .value ??
- "",
- onChanged: (changedValue) {
- setState(() {
- formGroup
- .control(_complaintAssignmentType)
- .value = changedValue;
- });
- },
- items: _complaintAssignmentTypes,
- itemBuilder: (item) => RadioButtonBuilder(
- localizations.translate(item.trim()),
- ),
- );
- },
- ),
- DigitReactiveSearchDropdown(
- label: localizations.translate(
- i18.complaints.complaintsTypeHeading,
- ),
- form: formGroup,
- menuItems: complaintTypes.toList(),
- formControlName: _complaintType,
- valueMapper: (value) {
- return localizations.translate(
- value
- .toString()
- .trim()
- .snakeCase
- .toUpperCase(),
- );
- },
- emptyText: localizations
- .translate(i18.common.noMatchFound),
- ),
- DigitReactiveSearchDropdown(
- label: localizations
- .translate(i18.complaints.locality),
- form: formGroup,
- menuItems: locality.toList(),
- formControlName: _complaintLocality,
- valueMapper: (value) => localizations
- .translate(value.toString().trim()),
- emptyText: localizations
- .translate(i18.common.noMatchFound),
- ),
- if (uniqueStatuses.isNotEmpty) ...[
- LabeledField(
- label: localizations.translate(
- i18.complaints.inboxStatusLabel,
- ),
- child: Column(
- children: [
- ...uniqueStatuses.map((e) => Padding(
- padding: const EdgeInsets.only(
- top: 16,
- ),
- child: DigitCheckbox(
- label:
- '${localizations.translate('COMPLAINTS_STATUS_${e.name.snakeCase.toUpperCase()}')} (${statusCount[e.index]})',
- value: selected[e] ?? false,
- onChanged: (value) {
- setState(() {
- if (selected[e]!) {
- statuses.remove(e);
- selected[e] = false;
-
- return;
- }
-
- selected[e] = true;
- statuses.add(e);
- });
- },
- ),
- )),
- ],
- ),
- ),
- ],
- ],
- );
- },
- ),
- ],
- ),
- ),
- ],
- );
- },
- );
- },
- ),
- );
- }
-
- void clearFilters(FormGroup formGroup) {
- setState(() {
- selected.forEach((key, value) {
- selected[key] = false;
- });
- statuses.clear();
- formGroup.control(_complaintType).value = null;
- formGroup.control(_complaintAssignmentType).value = null;
- formGroup.control(_complaintStatus).value = null;
- formGroup.control(_complaintLocality).value = null;
- });
- }
-
- FormGroup buildForm(ComplaintInboxState state) {
- return fb.group({
- _complaintType: FormControl(
- value: state.filters?.complaintTypeCode,
- validators: [],
- ),
- _complaintLocality: FormControl(
- value: state.filters?.locality,
- validators: [],
- ),
- _complaintAssignmentType: FormControl(
- value: state.filters?.complaintAssignedTo,
- validators: [],
- ),
- _complaintStatus: FormControl(
- validators: [],
- ),
- });
- }
-}
diff --git a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox_search.dart b/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox_search.dart
deleted file mode 100644
index bb6d3dcfe..000000000
--- a/apps/health_campaign_field_worker_app/lib/pages/complaints/inbox/complaints_inbox_search.dart
+++ /dev/null
@@ -1,188 +0,0 @@
-import 'package:digit_components/digit_components.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:reactive_forms/reactive_forms.dart';
-
-import '../../../blocs/complaints_inbox/complaints_inbox.dart';
-import '../../../router/app_router.dart';
-import '../../../utils/i18_key_constants.dart' as i18;
-import '../../../utils/utils.dart';
-import '../../../widgets/localized.dart';
-import 'package:flutter/services.dart';
-
-@RoutePage()
-class ComplaintsInboxSearchPage extends LocalizedStatefulWidget {
- const ComplaintsInboxSearchPage({
- super.key,
- super.appLocalizations,
- });
-
- @override
- State createState() =>
- _ComplaintsInboxSearchPageState();
-}
-
-class _ComplaintsInboxSearchPageState
- extends LocalizedState {
- static const _complaintNumber = "complaintNumber";
- static const _mobileNumber = "mobileNumber";
-
- @override
- Widget build(BuildContext context) {
- final theme = Theme.of(context);
- final bloc = context.read();
-
- return Scaffold(
- backgroundColor: theme.colorScheme.onPrimary,
- body: BlocBuilder(
- builder: (context, state) {
- return ReactiveFormBuilder(
- form: () => buildForm(state),
- builder: (context, formGroup, child) {
- return ScrollableContent(
- header: Column(
- children: [
- Row(
- mainAxisAlignment: MainAxisAlignment.end,
- children: [
- TextButton(
- style: TextButton.styleFrom(
- foregroundColor: theme.colorScheme.onBackground,
- padding: EdgeInsets.zero,
- ),
- onPressed: () => context.router.pop(),
- child: const Row(
- children: [
- Icon(Icons.close),
- ],
- ),
- ),
- ],
- ),
- Padding(
- padding: const EdgeInsets.only(left: 20),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Text(
- localizations.translate(
- i18.complaints.complaintInboxSearchHeading,
- ),
- style: theme.textTheme.displayMedium,
- ),
- ],
- ),
- ),
- ],
- ),
- footer: SizedBox(
- child: DigitCard(
- margin: const EdgeInsets.fromLTRB(0, kPadding, 0, 0),
- padding:
- const EdgeInsets.fromLTRB(kPadding, 0, kPadding, 0),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.center,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Expanded(
- flex: 1,
- child: DigitElevatedButton(
- onPressed: () {
- formGroup.markAllAsTouched();
-
- if (!formGroup.valid) return;
-
- final complaintNumberValue =
- formGroup.control(_complaintNumber).value;
- final mobileNumberValue =
- formGroup.control(_mobileNumber).value;
-
- bloc.add(
- ComplaintInboxSearchComplaintsEvent(
- mobileNumber: mobileNumberValue == ""
- ? null
- : mobileNumberValue,
- complaintNumber: complaintNumberValue == ""
- ? null
- : complaintNumberValue,
- createdByUserId: context.loggedInUserUuid,
- ),
- );
-
- context.router.pop();
- },
- child: Center(
- child: Text(
- localizations
- .translate(i18.complaints.searchCTA),
- ),
- ),
- ),
- ),
- ],
- ),
- ),
- ),
- children: [
- Column(
- children: [
- BlocBuilder