diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2f2c25f..c0ebb2d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,10 +14,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup JDK 1.8 - uses: actions/setup-java@v1 + - name: Setup JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '11' + cache: 'gradle' - name: Environment info run: | @@ -48,5 +50,3 @@ jobs: with: name: openimis-policies-aab-${{github.run_number}}-${{github.sha}} path: ./app/build/outputs/**/*.aab - - diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index ee6323be..5de822b1 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -24,6 +24,9 @@ on: cli_res_dir: description: Resources folder for icons. Only works with application_id_suffix .cli required: false + cli_assets_dir: + description: Asserts folder for images, json files.... Only works with .cli + required: false # Branch is chosen by default in github manual actions jobs: @@ -33,10 +36,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup JDK 1.8 - uses: actions/setup-java@v1 + - name: Setup JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'temurin' + java-version: '11' + cache: 'gradle' - uses: actions/cache@v2 with: @@ -60,6 +65,7 @@ jobs: echo app dir ${{ github.event.inputs.app_dir }} echo CLI_JAVA_DIR "${{ github.event.inputs.cli_java_dir }}" echo CLI_RES_DIR "${{ github.event.inputs.cli_res_dir }}" + echo CLI_ASSETS_DIR "${{ github.event.inputs.cli_assets_dir }}" echo APPLICATION_ID "${{ github.event.inputs.application_id }}" - name: build @@ -71,6 +77,7 @@ jobs: CLI_APP_DIR: "${{ github.event.inputs.app_dir }}" CLI_JAVA_DIR: "${{ github.event.inputs.cli_java_dir }}" CLI_RES_DIR: "${{ github.event.inputs.cli_res_dir }}" + CLI_ASSETS_DIR: "${{ github.event.inputs.cli_assets_dir }}" APPLICATION_ID: "${{ github.event.inputs.application_id }}" - name: Environment info @@ -90,5 +97,3 @@ jobs: # with: # name: openimis-claims-aab-${{github.run_number}}-${{github.sha}} # path: ./claimManagement/build/outputs/**/*.aab - - diff --git a/.gitignore b/.gitignore index 64246e5f..f9061fb5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ out/ # Gradle files .gradle/ build/ -release/ # Local configuration file (sdk path, etc) local.properties diff --git a/app/build.gradle b/app/build.gradle index dfbace7b..e991e41d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,13 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter apply plugin: 'com.android.application' +apply plugin: "org.ajoberstar.grgit" apply from: "$project.rootDir/script-git-version.gradle" -apply plugin: 'com.android.application' // Load keystore def keystorePropertiesFile = file("keystore.properties") def keystoreProperties = new Properties() -if ( keystorePropertiesFile.exists() ) { +if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } @@ -20,9 +20,9 @@ static def getDate() { } android { - compileSdkVersion 30 - buildToolsVersion '30.0.3' - if ( keystorePropertiesFile.exists() ) { + compileSdkVersion 33 + buildToolsVersion '33.0.0' + if (keystorePropertiesFile.exists()) { signingConfigs { releaseConfig { storeFile file(keystoreProperties['storeFile']) @@ -35,11 +35,10 @@ android { defaultConfig { applicationId "org.openimis.imispolicies" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 33 versionCode gitVersionCode versionName gitVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - useLibrary('org.apache.http.legacy') vectorDrawables { useSupportLibrary = true } @@ -50,14 +49,23 @@ android { shrinkResources false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' debuggable = false - if ( keystorePropertiesFile.exists() ) { + if (keystorePropertiesFile.exists()) { signingConfig signingConfigs.releaseConfig } - buildConfigField "boolean", "LOG", "false" + buildConfigField "boolean", "LOGGING_ENABLED", "false" + + // Refer to https://developer.android.com/reference/android/util/Log for the log level values + // Irrelevant if LOGGING_ENABLED = false + buildConfigField "int", "CONSOLE_LOG_LEVEL", '8' //Assert + buildConfigField "int", "FILE_LOG_LEVEL", '8' //Assert } debug { debuggable = true - buildConfigField "boolean", "LOG", "true" + buildConfigField "boolean", "LOGGING_ENABLED", "true" + + // Refer to https://developer.android.com/reference/android/util/Log for the log level values + buildConfigField "int", "CONSOLE_LOG_LEVEL", '2' //Verbose + buildConfigField "int", "FILE_LOG_LEVEL", '5' //Warn } flavorDimensions 'std' } @@ -68,7 +76,7 @@ android { buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false' buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"' buildConfigField "String", "API_VERSION", '"3"' - buildConfigField "String", "APP_DIR", '"IMIS"' + buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en"' resValue "string", "app_name_policies", "Policies" resValue "string", "ReleaseDateValue", getDate() } @@ -76,43 +84,28 @@ android { demoProd { applicationId "org.openimis.imispolicies.demoProd" buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/rest/"' - buildConfigField "String", "APP_DIR", '"IMIS-DEMOPROD"' resValue "string", "app_name_policies", "Policies Demo" dimension = 'std' } - demoRelease { applicationId "org.openimis.imispolicies.demoRelease" buildConfigField "String", "API_BASE_URL", '"https://release.openimis.org/rest/"' - buildConfigField "String", "APP_DIR", '"IMIS-DEMORELEASE"' resValue "string", "app_name_policies", "Policies Release" + dimension = 'std' } - chfDev { applicationId "org.openimis.imispolicies.chfdev" buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/rest/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true' - buildConfigField "String", "APP_DIR", '"IMIS-CHFDEV"' + buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-tz"' resValue "string", "app_name_policies", "Policies CHF DEV" dimension = 'std' } - - chfProd { - applicationId "org.openimis.imispolicies.chf" - buildConfigField "String", "API_BASE_URL", '"http://chf-imis.or.tz/restapi/"' - buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false' - buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true' - buildConfigField "String", "APP_DIR", '"IMIS-CHFPROD"' - resValue "string", "app_name_policies", "Policies CHF" - dimension = 'std' - } - mvDev { applicationId "org.openimis.imispolicies.mv" buildConfigField "String", "API_BASE_URL", '"http://imis-mv.swisstph-mis.ch/rest/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' - buildConfigField "String", "APP_DIR", '"IMIS-MVDEV"' buildConfigField "String", "API_VERSION", '"3"' resValue "string", "app_name_policies", "Policies MV DEV" dimension = 'std' @@ -120,46 +113,33 @@ android { bephaDev { applicationId "org.openimis.imispolicies.bepha" buildConfigField "String", "API_BASE_URL", '"http://149.210.235.40/devupgrade/rest/"' - buildConfigField "String", "APP_DIR", '"IMIS-BEPHADEV"' + buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-cm"' resValue "string", "app_name_policies", "Policies BEPHA DEV" dimension = 'std' } tchadDev { applicationId "org.openimis.imispolicies.tchadDev" buildConfigField "String", "API_BASE_URL", '"http://imis-tchad-dev.swisstph-mis.ch/rest/"' - buildConfigField "String", "APP_DIR", '"IMIS-TCHADDEV"' resValue "string", "app_name_policies", "Policies TCHAD DEV" dimension = 'std' } local { applicationId "org.openimis.imispolicies.local" buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"' - buildConfigField "String", "APP_DIR", '"IMIS-LOCAL"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' resValue "string", "app_name_policies", "Policies Local" dimension = 'std' versionCode = gitVersionCodeTime } - chfsit { - applicationId "org.openimis.imispolicies.chfsit" - buildConfigField "String", "API_BASE_URL", '"http://196.192.73.26/restapi/"' - buildConfigField "String", "APP_DIR", '"IMIS-CHFSIT"' - buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' - buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true' - resValue "string", "app_name_policies", "Policies CHF SIT" - } niger { - print("Building niger flavour" + "API_BASE_URL" + '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"') - print("App name: " + System.getenv("CLI_APP_NAME") ?: "Polices Niger") applicationId "org.openimis.imispolicies.niger" buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"' - buildConfigField "String", "APP_DIR", '"' + (System.getenv("CLI_APP_DIR") ?: 'IMIS-POL') + '"' resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Polices Niger" + dimension = 'std' } cli { applicationIdSuffix System.getenv("APPLICATION_ID") ?: "org.openimis.imispolicies.cli" buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://10.0.2.2:35787/') + '"' - buildConfigField "String", "APP_DIR", '"' + (System.getenv("CLI_APP_DIR") ?: 'IMIS-CLI') + '"' resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies CLI" dimension 'std' } @@ -168,74 +148,77 @@ android { buildConfigField "String", "API_BASE_URL", '"https://formation.cnass-mauritanie.swisstph-mis.ch/rest/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false' buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false' - buildConfigField "String", "APP_DIR", '"IMIS-MAURITANIA-TRAIN"' resValue "string", "app_name_policies", "Policies CNASS TRAIN" dimension = 'std' } } sourceSets { chfDev.java.srcDir 'src/chf/java' - chfDev.res.srcDir 'src/chf/res' - - chfProd.java.srcDir 'src/chf/java' - chfProd.res.srcDir 'src/chf/res' - - chfsit.java.srcDir 'src/chf/java' - chfsit.res.srcDir 'src/chf/res' + chfDev.res.srcDirs = ['src/chf/res', 'src/localeChf/res'] mvDev.java.srcDir 'src/master/java' - mvDev.res.srcDirs 'src/master/res' + mvDev.res.srcDirs = ['src/master/res', 'src/localeMv/res'] local.java.srcDir 'src/master/java' - local.res.srcDir 'src/master/res' + local.res.srcDirs = ['src/master/res', 'src/localeMv/res'] bephaDev.java.srcDir 'src/bepha/java' - bephaDev.res.srcDir 'src/bepha/res' + bephaDev.res.srcDirs = ['src/bepha/res', 'src/localeBepha/res'] niger.java.srcDir 'src/niger/java' niger.res.srcDir 'src/niger/res' + niger.assets.srcDir 'src/niger/assets' tchadDev.java.srcDir 'src/tchad/java' tchadDev.res.srcDir 'src/tchad/res' demoProd.java.srcDir 'src/master/java' - demoProd.res.srcDir 'src/demoProd/res' + demoProd.res.srcDirs = ['src/demoProd/res', 'src/localeMv/res'] demoRelease.java.srcDir 'src/master/java' - demoRelease.res.srcDir 'src/demoRelease/res' + demoRelease.res.srcDirs = ['src/demoRelease/res', 'src/localeMv/res'] cli.java.srcDir System.getenv("CLI_JAVA_DIR") ?: 'src/master/java' cli.res.srcDir System.getenv("CLI_RES_DIR") ?: 'src/demoProd/res' + if (System.getenv("CLI_ASSETS_DIR")) { + cli.assets.srcDir System.getenv("CLI_ASSETS_DIR") + } mauritaniaTrain.java.srcDir 'src/master/java' } -// Apply custom flavours - if(file('custom-flavours.gradle').exists()){ + // Apply custom flavours + if (file('custom-flavours.gradle').exists()) { apply from: 'custom-flavours.gradle' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + + packagingOptions { + resources { + excludes += ['META-INF/DEPENDENCIES'] + } } } dependencies { - implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') + implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support.constraint:constraint-layout:2.0.4' - implementation 'com.squareup.picasso:picasso:2.5.2' + implementation 'com.squareup.picasso:picasso:2.71828' implementation 'commons-io:commons-io:2.11.0' implementation 'com.android.support:support-v4:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'org.apache.commons:commons-lang3:3.12.0' - + implementation 'org.jetbrains:annotations:15.0' + implementation 'cz.msebera.android:httpclient:4.5.8' androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - testImplementation 'junit:junit:4.12' - //compile 'com.android.support:support-annotations:27.1.1' + testImplementation 'junit:junit:4.13.2' } diff --git a/app/custom-flavours.gradle.dist b/app/custom-flavours.gradle.dist index 9eae42e4..885e1633 100644 --- a/app/custom-flavours.gradle.dist +++ b/app/custom-flavours.gradle.dist @@ -6,7 +6,6 @@ android { buildConfigField "String", "API_BASE_URL", [API_BASE_URL] buildConfigField "boolean", "SHOW_PAYMENT_MENU", [SHOW_PAYMENT_MENU] buildConfigField "boolean", "SHOW_BULK_CN_MENU", [SHOW_BULK_CN_MENU] - buildConfigField "String", "APP_DIR", [APP_DIR_NAME] buildConfigField "String", "API_VERSION", [API_VERSION] buildConfigField "String", "RAR_PASSWORD", [RAR_PASSWORD] resValue "string", "app_name_policies", [APP_NAME] diff --git a/app/src/chf/res/values-sw/strings.xml b/app/src/chf/res/values-sw/strings.xml deleted file mode 100644 index 55a6e6e3..00000000 --- a/app/src/chf/res/values-sw/strings.xml +++ /dev/null @@ -1,439 +0,0 @@ - - - Fungua kielezi cha uabiri - Funga kielezi cha uabiri - mpangilio - Tafadhali subiri.. - Ukurasa unafunguka... - Mikataba wa CHF - admin@imis.com - Nyumbani - Usajili - Huisha - Maoni - Tuma Taarifa - Kuhusu - Funga - Mkoa - Wilaya - Manispaa - Kijiji/Mataa - Masikini - Aina ya uthibitisho - Namba ya uthibitisho - Kikundi - Kabila - Anwani - Mbele - Chagua mkoa - Chagua Wilaya - Chagua Manispaa - Chagua kijiji/mtaa - Ndiyo - Hapana - Hali ya umasikini - Chagua aina ya uthibitisho - Chagua aina ya kundi - Sawa - Hakikisha umejaza vipengele vyote vyenye alama nyekundu - CHFID - Majina mengine - Jina la ukoo - Tarehe ya kuzaliwa - Jinsia - Hali ya ndoa - Namba ya mwanachama - Wilaya anapoishi - Manispaa ya sasa - Mtaa/Kijiji anapoishi - Kitongoji/Mtaa - Taaluma - Elimu - Namba ya simu - Barua pepe - Aina ya kitambulisho - Namba ya kitambulisho - Wilaya ya FSP - Ngazi ya FSP - Kituo cha huduma - Chagua jinsia - Me - Ke - Nyingine - Chagua hali ya ndoa - Ameoa/Ameolewa - Hajaoa/Hajaolewa - Mjane/Mgane - Mtalaka - Haijulikani - Chagua hali ya kadi - Chagua taaluma - Chagua elimu - Chagua aina ya kitambulisho - Chagua ngazi ya kituo - Zahanati - Kituo cha afya - Hospitali - Chagua kituo - Hifadhi - Uhusiano - Chagua uhusiano - Familia imehifadhiwa - Tatizo limetokea wakati wa kuchakata taarifa. - Tatizo limetokea wakati wa kujaza taarifa - Tatizo limetokea wakati wa kurekebisha taarifa - Mwanachama mwenye namba hii ya CHF yupo kwenye mfumo - Ongeza - Mpya - Chagua afisa - Chagua bidhaa - chagua mwezi - Tarehe ya kujiunga - Bidhaa - Tarehe ya kulipa - Tarehe ya kuanza - Tarehe ya mwisho - Afisa - Hali ya mkataba : - Kiasi cha mkataba : - Baki : - Mchango : - Utambuzi - Mlipaji - Tarehe ya malipo - Aina ya mchango - Namba ya risiti - Michango iliyolipwa - Aina ya malipo - Chagua mlipaji - Chagua ngazi - Malipo ya CHF - Malipo ya picha - Chagua aina ya malipo - Fedha taslimu - Simu - Benki - Namba ya risiti : - Expired - Active - Idle - Suspended - Namba ya risiti imejirudia - Bidhaa imelipiwa. Tafadhali futa malipo kwanza - Policy imefutwa - Malipo yamefutwa - Mwanachama amefutwa - Huwezi kufuta mkuu wa kaya. - Familia tayari ina mkataba,tafadhali futa mkataba kwanza - Mwanachama hajafutika - Familia imefutika - Scan - Jina la mwanachama - SD kadi imeweka katika hali isiyo sahihi. Weka SD katika hali ya read/write na zima/washa programu tena. - Mkataba wa CHF unahitaji kadi ya kumbukumbu ya nje ili kuendeshwa. Tafadhali ingiza kadi ya kumbukumbu na uanze tena. - Prgramu imejifunga - Tafadhali ingiza CHFID - CHFID batili - Tafuta taarifa za mwanachama… - Pata takwimu za ujumla… - Pata taarifa za kipindi fulani… - Mwanachama mwenye CHFID hatambuliki. - Hakuna taarifa ya kuhuisha iliyopatikana - Tafadhali washa intaneti yako. - !Mchakato umeshindikana, Faili or Namba ya msimbo si sahihi. - Tuma - Futa hii familia - Unauhakika unataka kufuta hii familia? - Namba ya bidhaa - Inafunguka... - Taarifa imetumwa kumpyuta kuu. - Taarifa imekataliwa na kompuyta kuu. Taarifa imehifadhiwa kwenye folda la rejected la simu. - Taarifa imetumwa kumpyuta kuu. Tafadhali angalia Rejected/Accepted folda kuhakikisha taarifa ulizotuma. - Tafadhali ingiza namba ya Afisa - Faili limehifadhiwa kwenye simu. - Inatuma… - Hakuna maoni yaliyopatikana - Unahitaji intaneti kuangalia taarifa. - Omba taarifa - Hakuna taarifa iliyopatikana - Takwimu - Namba ya dai - Umewahi kutibiwa kwenye hicho kituo? - Uliombwa utoe fedha za matibabu kwenye kituo? - Je, uliandikiwa dawa? - Ulipata dawa kwenye kituo? - Umeridhika kiasi gani na huduma uliyopata kwenye kituo? Jaza ulivyoridhika 1–5 (1= Sijaridhika kabisa; 5= Nimeridhika sana) - Tuma maoni… - Tuma maoni yote - Tafadhali ingiza Namba ya Afisa mwandikishaji - Tafadhali jaza namba ya dai - Jaza CHFID - Maswali yote yanatakiwa yajibiwe. - Tarehe ya mwisho - Jaza tarehe ya mwisho - Inaendelea... - Jaza tarehe ya mwanzo - Jaza namba ya risiti. - Jaza namba ya bidhaa - Ingiza kiasi - Namba ya risiti imetumika. - Hakuna faili lililopatikana. - ya - Jina - Umekosea - Nywila - Ingiza Nywila ya RAR - Namba ya Afisa : - Namba ya Afisa batili - Ingia - Imeshindikana kuunganishwa na kompuyta kuu. Huduma imesitishwa. - Kuna kitu hakijakaa sawa kwenye kompuyta kuu. - Familia imeshindikana kuingizwa. - Familia imetumwa - Familia haina mkuu wa kaya - Mwanachama mwenye CHFID hii yumo kwenye mfumo - Risiti namba imetumika - Risiti namba uliyoingiza imeshatumika - Imeshindikana kupakua masta data. - Pakua masta data - Master data imepakuliwa vizuri - Futa - Rekebisha - Malipo - Master data haipatikani, unataka kupakua master data..? - Programu ya uandikishaji - Toleo - Jina - Tarehe ya toleo - Jumla ya familia - Jumla ya mwanachama - Jumla ya mikataba - Juma ya malipo - Tuma Usajili - Tengeneza usajili XML - Tuma Uhuishaji - Tuma maoni - Pakua master data - Tafadhali subiri.. - Lugha - Familia - Ongeza familia mpya - Familia na wanachama - Familia na mikataba - Ingiza/Rekebisha Mwanachama - Ingiza/Rekebisha mkataba - michango - Ingiza/Rekebisha mchango - je Unahitaji kuachana na Mikatabas CHF? - Tuma ripoti - Nenda - Mwanachama - Tarehe ya mwisho - Jina kamili - Jina la kituo - Tarehe ya mwanzo na mwisho - Muda wa kuboresha - Sitisha - Imeshindikana kutuma maoni,tafadhali jaribu tena baadae - Imeshindikana kutuma uhuishaji,tafadhali jaribu tena baadae - Mkoa wa FSP - Mkoa wa sasa - Taarifa imetumwakikamilifu. Tafadhali angalia kwenye jalada la kukubali /kukataa - Imeshindikana kufuta - Familia hii ina mkataba kwenye kompyuta kuu, Hivyo imefutwa kwenye sim tu. - Kiasi cha mkataba na tarehe ya kujiunga : - Imebadilishwa - Je tuweke mkataba kuwa hai?]]> - Mikataba hii imefikia idadi kamili ya wanachama wanaohitajika, wanachama wataongezwa kwenye familia ingawa hawataweza kupata matibabu : - Piga picha - Taarifa imehifadhiwa kwenye kitunzio cha simu. - Taarifa haijatumwa kwenye kompuyta kuu. Imehifadhiwa kwenye kitunzio cha simu. - Picha zimetumwa. - Picha zimehifadhiwa kikamilifu. - Hakuna picha iliyopatikana. - Tafadhali piga picha - Tuma picha zote - Picha zimetumwa kikamilifu - Hakuna picha iliopatikana - Tuma picha - Tafuta - Rekebisha familia - Pakua familia - Marekebisho ya Familia - Marekebisho ya Wanachama - Marekebisho ya Mikataba - Marekebisho ya michango - CHFID haipo - CHIFD inahitajika - Futa ... - internet inahitajika kufuta taarifa zilizoko mtandaoni - Tafadhali ingia kwanza kufuta data iliyopo mtandaoni - Ukifuta mkataba na kiasi kilicholipwa kitafutika - Ukifuta familia, wanachama, mkataba na fedha zitafutika, - Futa - Toka - Familia tayari ipo kwenye simu - Kuna toleo jipya la openIMIS sasa - Bofya hapa kupakua - Ina hifadhi... - Tatizo limejitokeza tafadhali hakikisha unamtandao - Hakuna familia iliyotumwa - Hakuna taarifa iliyopatikana - Faili la XML limetengenezwa kikamilifu - Imeshindikana kutengeneza XML - Hakauna taarifa iliyopatikana - Tafadhali Ingiza nambari ya Bima - bila mkataba/mchango - bila picha - Imeshindikana kupakia taarifa. - imefutwa kikamilifu - Barua pepe sio sahihi! - Tatizo limejitokeza kwenye kompuyta kuu, imegoma kuweka data - Taarifa za malipo za mkataba wako zipo sahihi. Unahitaji kuongeza malipo? - Malipo yamezidi kiasi kilichopo kwenye mkataba - Malipo ya gaharama za mkataba bado hazijakamilika, tafadhali changua hatua zifuatazo kuendelea. - Tafadhali chagua hatua zifuatazo kuendela.]]> - Ripoti - Takwmi za ujumla - Takwimu kwa kipindi fulani - Idadi ya familia zenye mikataba iliyotumika - Idadi ya familia zenye mikataba iliyokwisha - Idadi ya familia zenye mikataba iliyo \'idle\' - Idadi ya familia zenye mikataba iliyosimamishwa - Namba ya Mikataba mpya - Namba ya mikataba iliyohuishwa - mikataba iliyokwisha muda wake - Idadi ya mikataba iliyosimamishwa - Kiasi kilichokusanywa - Takwimu za leo - Tengeneza Maoni XML - Tengeneza Uhuishaji XML - Mkuu wa kaya ameonekana mara mbili,tafadhali wasiliana na Afisa TEHAMA - Mikataba mipya isiyo kwenye orodha - Huisha Mkataba wako - Jina - Namba ya dai - Andika Hapa - Tafadhali weka jina na nywila yako - Umefanikiwa kuingia - Umekosea - Jumla ya malipo - Ankara Namba - Taarifa za mikataba - Taarifa za Namba za Ankara - Namba za Ankara - Taarifa za mikataba - Taarifa za Namba za Ankara - Jina la bidhaa: - Tarehe ya kutuma: - Tarehe ya kuomba: - Namba ya bidhaa: - Majina: - Huisha - Namba ya BIma - Imeombwa Kwa - Imeombwa Kutoka - Zimetumwa kwa - Mpaka - Zimetumwa kutoka - Namba ya bidhaa - Futa - Zilizoombwa - Mikataba iliyopatikana - Kiasi cha mchango - Mchakato umekamilika - Tafadhali chagua mkataba/mikataba uliyoomba - kamilifu - Huna ruhusa - Sawa - Hakuna taarifa iliyochaguliwa kufutwa - Omba Namba ya Ankara - Mikataba haijafutwa kwa sababu haikutumwa - ya - Maombi yametumwa kikamilifu - Mkataba huu hauwezi kufutwa kwakuwa bado haujatumwa - Aina ya malipo - Omba - HAKUNA MTANDAO - Unataka kuweka faili kwenye database - Hakuna faili lililowekwa - Pakia faili: - Haijakamilika! - Angalia Kamisheni - Mwaka - Kulipwa - Kagua - Pata Kamisheni - Ripoti ya Kamisheni - Kiasi - Kamisheni - Tafuta Mikataba iliyosajiliwa - Namba za Ankara - Mapitio - Mikataba - Hakuna data - Tafadhali jaza mwaka - Taarifa za familia hii zitafutwa kwenye simu tu. - Malipo ya mwisho. - Mikataba Iliyosajiliwa - Mikataba isiyosajiliwa - Maombi ya Mikataba isiyosajiliwa - Namba ya simu haijatolewa - Bidhaa ya bima ya Mikataba iliyochaguliwa sio ya kipekee - Kiasi cha mchango - Chagua Tarehe - Kupata - Tarehe Kutoka - Tarehe To - Tuma SMS - Imeombwa SMS - Jumla ya kilingilio kilichobaki - jumla ya mahudhurio yaliyobaki - Jumla iliyobaki katika kuonana na daktari - Jumla iliyobaki katika kujifungua - Jumla iliyobaki katika kujifungua - Jumla iliyobaki katika kuzaa kabla - Kiasi kilichobaki katika kuonana na daktari - Kiasi kilichobaki katika upasuaji - Kiasi kilichobaki katika kulazwa - Kiasi kilichobaki katika kuzaa kabla - Kiasi kilichobaki cha Kujifungua - Tafadhali ingia kwanza, kuangalia nambari ya risiti. - Mpangilio orodha wa IMIS haukuweza kutengenezwa - Takwimu kwa kipindi fulani - Lugha ya SMS - Indhinisha SMS - Muhtasari wa Malipo - Pata malipo ya ankara kwa mikataba iliyosajiliwa - Pata malipo ya ankara kwa mikataba isiyosajiliwa - Muhtasari wa malipo ya Ankara - Tafadhali ingia kwanza kupakua uhuishaji - Chagua wote - Usichague wote - Inafanyiwa kazi - Mazingira magumu - Chagua mazingira magumu - Namba za ankara kwa wingi - namba za ankara zilizopangiwa - Namba za ankara zisizotumika - Chukua namba za ankara kwa wingi - Chukua - Tafadhali ingia kwanza chukua namba ya ankara - Hakuna namba ya ankara imebaki kwa bidhaa hii. Tafadhali chukua namba za ankara au toa namba ya ankara kutoka kwa chanzo kingine. - Namba za Ankara - Hakuna namba ya ankara iliyowekwa kwenye mkataba huu. Tafadhali chukua namba za ankara au toa namba ya ankara kutoka kwa chanzo kingine. - Faili la taarifa - Ufikiaji wa Hifadhi ya Nje - Ili kufanya kazi kwa usahihi, %1$s inahitaji ufikiaji wa hifadhi ya nje. Tafadhali ruhusu kwa %1$s kwenye skirini inayofuata ili utumie programu. - Ruhusa - Kufanya kazi kwa usahihi, %1$s inahitaji ruhusa nyingi. Tafadhali waruhusu kwenye skrini inayofuata ili utumie programu. - Tafadhali jaza mwezi - Taarifa za kuhuisha zimepokelewa - Taarifa za kuhuisha zimeishapokelewa - Taarifa za kuhuisha zimekataliwa - Muda wa matazamio umeisha - Kuna makosa kwenye namba ya malipo - Hitilafu isiyotarajiwa - Faili la kuhuisha ni batili - Namba ya malipo \"%1$s\" haipo kwenye simu,tafadhali hakiki namba kabla ya kuendelea. - diff --git a/app/src/debug/java/org/openimis/imispolicies/tools/Log.java b/app/src/debug/java/org/openimis/imispolicies/tools/Log.java new file mode 100644 index 00000000..31313260 --- /dev/null +++ b/app/src/debug/java/org/openimis/imispolicies/tools/Log.java @@ -0,0 +1,159 @@ +package org.openimis.imispolicies.tools; + +import android.content.Context; +import android.net.Uri; +import android.support.v4.content.FileProvider; + +import org.openimis.imispolicies.AppInformation; +import org.openimis.imispolicies.BuildConfig; +import org.openimis.imispolicies.Global; +import org.openimis.imispolicies.util.FileUtils; +import org.openimis.imispolicies.util.ZipUtils; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.Locale; + +/** + * This class is a wrapper for the default android Log class, adding additional functionality while + * keeping the android.util.Log api + */ +public class Log { + public static final boolean isLoggingEnabled = BuildConfig.LOGGING_ENABLED; + + private static final String logFilePrefix = "log-"; + private static final String logExportFileName = "logs.zip"; + private static final String[] levelMapping = {"V", "D", "I", "W", "E", "A"}; + private static File logFile = null; + + public static void v(String tag, String msg) { + log(tag, msg, android.util.Log.VERBOSE); + } + + public static void v(String tag, String msg, Throwable thr) { + log(tag, String.format("%s\n%s", msg, android.util.Log.getStackTraceString(thr)), android.util.Log.VERBOSE); + } + + public static void d(String tag, String msg) { + log(tag, msg, android.util.Log.DEBUG); + } + + public static void d(String tag, String msg, Throwable thr) { + log(tag, String.format("%s\n%s", msg, android.util.Log.getStackTraceString(thr)), android.util.Log.DEBUG); + } + + public static void i(String tag, String msg) { + log(tag, msg, android.util.Log.INFO); + } + + public static void i(String tag, String msg, Throwable thr) { + log(tag, String.format("%s\n%s", msg, android.util.Log.getStackTraceString(thr)), android.util.Log.INFO); + } + + public static void w(String tag, String msg) { + log(tag, msg, android.util.Log.WARN); + } + + public static void w(String tag, String msg, Throwable thr) { + log(tag, String.format("%s\n%s", msg, android.util.Log.getStackTraceString(thr)), android.util.Log.WARN); + } + + public static void e(String tag, String msg) { + log(tag, msg, android.util.Log.ERROR); + } + + public static void e(String tag, String msg, Throwable thr) { + log(tag, String.format("%s\n%s", msg, android.util.Log.getStackTraceString(thr)), android.util.Log.ERROR); + } + + private static void log(String tag, String msg, int level) { + if (level < 2 || level > 7) { + throw new RuntimeException("Unknown log level: " + level); + } + + if (isLoggingEnabled) { + new Thread(() -> { + + if (level >= BuildConfig.CONSOLE_LOG_LEVEL) { + android.util.Log.println(level, tag, msg); + } + + if (level >= BuildConfig.FILE_LOG_LEVEL) { + storeLog(tag, msg, level); + } + }).start(); + } + } + + public static void zipLogFiles(Context context) { + File cacheDir = Global.getContext().getCacheDir(); + File logsDir = new File(cacheDir, "logs"); + FileUtils.createDirectoryWithSubdirectories(logsDir); + File[] logFiles = logsDir.listFiles((dir, filename) -> filename.startsWith(logFilePrefix)); + File targetFile = new File(logsDir, logExportFileName); + + if (logFiles != null) { + ArrayList filesToZip = new ArrayList<>(Arrays.asList(logFiles)); + ZipUtils.zipFiles(filesToZip, targetFile, ""); + } + + Uri logExportUri = FileProvider.getUriForFile(Global.getContext(), + String.format("%s.fileprovider", BuildConfig.APPLICATION_ID), + targetFile); + + Global.getGlobal().sendFile(context, logExportUri, "application/octet-stream"); + } + + public static void deleteLogFiles() { + File cacheDir = Global.getContext().getCacheDir(); + File logsDir = new File(cacheDir, "logs"); + FileUtils.createDirectoryWithSubdirectories(logsDir); + File[] logFiles = logsDir.listFiles((dir, filename) -> filename.startsWith(logFilePrefix)); + if (logFiles != null) { + for (File f : logFiles) { + f.delete(); + } + } + } + + private synchronized static void storeLog(String tag, String msg, int level) { + Date date = new Date(); + initializeLogFile(date); + try { + OutputStream os = new FileOutputStream(logFile, true); + os.write(buildLogLine(tag, msg, level, date).getBytes(StandardCharsets.UTF_8)); + os.close(); + } catch (IOException e) { + throw new RuntimeException("Writing to log file failed", e); + } + } + + private static void initializeLogFile(Date date) { + if (logFile == null || !logFile.exists()) { + File cacheDir = Global.getContext().getCacheDir(); + File logsDir = new File(cacheDir, "logs"); + FileUtils.createDirectoryWithSubdirectories(logsDir); + + String filename = String.format("%s%s.txt",logFilePrefix, AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(date)); + logFile = new File(logsDir, filename); + + try { + if (!logFile.createNewFile()) + throw new RuntimeException("Log file creation failed"); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + private static String buildLogLine(String tag, String msg, int level, Date date) { + String dateString = AppInformation.DateTimeInfo.getDefaultIsoDatetimeFormatter().format(date); + return String.format(Locale.US, "%s %s %s %s\n", dateString, levelMapping[level - 2], tag, msg); + } +} diff --git a/app/src/bepha/res/values/strings.xml b/app/src/localeBepha/res/values-en-rCM/strings.xml similarity index 90% rename from app/src/bepha/res/values/strings.xml rename to app/src/localeBepha/res/values-en-rCM/strings.xml index fcf79fc3..4ae7a116 100644 --- a/app/src/bepha/res/values/strings.xml +++ b/app/src/localeBepha/res/values-en-rCM/strings.xml @@ -436,4 +436,45 @@ Unexpected exception Invalid renewal file Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en_CM + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s diff --git a/app/src/bepha/res/values-fr/strings.xml b/app/src/localeBepha/res/values-fr-rCM/strings.xml similarity index 90% rename from app/src/bepha/res/values-fr/strings.xml rename to app/src/localeBepha/res/values-fr-rCM/strings.xml index b62d6ca8..1deddc82 100644 --- a/app/src/bepha/res/values-fr/strings.xml +++ b/app/src/localeBepha/res/values-fr-rCM/strings.xml @@ -133,7 +133,7 @@ openIMIS a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application. Fermeture forcée Veuillez entrer le numéro d\'assurance - Invalid Insurance number + Numéro d\'assuré invalide Obtenir des informations sur l\'assurance... Obtention d\'un aperçu général... Obtention d\'un rapport cumulatif... @@ -242,7 +242,7 @@ Suppression échouée Cette famille a été supprimée seulement hors ligne parce qu\'elle a un contrat en ligne. Contrat avec date d\'adhésion : - \" Modifié \" + " Modifié " Voulez-vous activer cet assuré ?]]> Les contrats avec les dates d\'adhésion suivantes ont atteint leur nombre maximum de membres et, par conséquent, cette assurance ne sera pas couverte par ces polices, mais l\'assuré est ajouté à la famille : Acquérir @@ -256,7 +256,7 @@ Photos envoyées avec succès Aucune photo trouvée Envoyer les photos - \"Recherche \" + "Recherche " Modifier la famille Télécharger la famille Familles éditées @@ -436,4 +436,45 @@ Unexpected exception Invalid renewal file Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + fr_CM + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s diff --git a/app/src/localeBepha/res/values/strings.xml b/app/src/localeBepha/res/values/strings.xml new file mode 100644 index 00000000..4ae7a116 --- /dev/null +++ b/app/src/localeBepha/res/values/strings.xml @@ -0,0 +1,480 @@ + + + Open navigation drawer + Close navigation drawer + Settings + Please wait + Page is loading + BEPHA Policies + admin@imis.com + Home + Enrolment + Renewal + Feedback + Sync + About + Quit + Region + Diocese + Parish + Village + Poverty Status + Confirmation Type + Confirmation No. + Group Type + Ethnicity + Permanent Address Details + Next + Select Region + Select Diocese + Select Parish + Select Village + Yes + No + Select Poverty Status + Select confirmation type + Select Group type + OK + Please verify all the required fields marked in red border + Adherent number + Other Names + Last Name + Birth Date + Gender + Marital Status + Beneficiary Card + Current Diocese + Current Parish + Current Village + Current Address Details + Profession + Education + Phone number + Email + Identification Type + NIC Number + Diocese of FSP + Level of FSP + First Service Point + Select Gender + Male + Female + Other + Select marital status + Married + Single + Divorced + Widowed + Not specified + Select card status + Select profession + Select education + Select identification type + Select HF level + Dispensary + Health Centre + Hospital + Select Health facility + Save + Relationship + Select Relationship + Household saved successfully + Error occurred while processing data + Error while inserting data + Error while updating data + Member with this Adherent number already exists + Add + New + Select Agent + Select Product + Select Month + Enrolment date + Product + Effective Date + Start Date + Expire Date + Agent + Policy Status : + Policy Value : + Balance : + Contribution : + Enquire + Payer + Payment Date + Contribution Category + Receipt No + Contribution Paid + Payment Type + Select Payer + Select Level + Contribution and Others + Photo Fee + Select Payment Type + Cash + Mobile Phone + Bank Transfer + Receipt No : + Expired + Active + Idle + Suspended + Receipt number must be unique + Policy has contribution. Please delete contributions first + Policy deleted successfully + Contribution deleted successfully + Adherent deleted successfully + You can not delete the head of the Household. + Household has policy please delete the policy first + Adherent has not deleted + Household deleted + Scan + Adherent Name + SD Card is set to read only mode. Please set the mode to read/write and restart the application. + BEPHA Policies needs external memory card to run. Please insert memory card and restart the application. + Force Close + Please enter the Adherent number + Invalid Adherent number + Getting adherent info… + Getting Snap Shots Report… + Getting Cumulative Report… + Member with this Adherent number does not exist. + No renewal found + Please check your internet connection. + Process Failed, Wrong File or Agent code. + Submit + Discontinue this policy + Do you want to discontinue this policy? + Product Code + loading + Data uploaded on the server successfully. + Data is rejected by the server. Data is moved to the rejected folder of the phone. + Data has been uploaded successfully. Please check your Rejected/Accepted folders to verify the server response. + Please enter Agent code + File is saved on external storage. + Uploading… + No feedback found + Internet connection is required to view the statistics. + Preview + No data found + Statistics + Claim Code + Have you been treated at the facility on the said date? + Have you been asked for a payment to the facility or staff? + Have drugs been prescribed to you? + Did you get drugs from the facility? + How satisfied are you with the care you received at the health facility? Rate on a scale 1–5 (1= not satisfied; 5= very satisfied) + Uploading feedback… + Upload all feedback + Please enter Agent Code + Please enter Claim ID + Please enter the Adherent number + All the questions must be answered. + End Date + Please enter End Date + In Progress + Please enter Start Date + Please enter Receipt No. + Please enter product code + Please enter amount + This receipt number is already used. + No file found. + Of + Login Name + Login Failed + Password + Enter Rar Password + Agent Code: + Incorrect Agent code + Login + Unable to connect the server. Operation aborted. + Something went wrong on the server. + Household could not be inserted. + Household uploaded successfully + Given household has no HOF + Household with this Adherent number already exists + Duplicate Adherent number found + Duplicate receipt number found + Could not download master data. + Downloading master data + Data downloaded successfully + Delete + Edit + Payment + Master data not found, would you like to Download? + Enrolment Application + Version + Name + Release Date + Total Households + Total Adherents + Total Policies + Total Contributions + Upload Enrolments + Create Enrolments XML + Upload Renewals + Upload FeedBacks + Download Master Data + Please Wait… + Language + Families + Add new Household + Household and Adherents + Household and Policies + Add/Edit Adherent + Add/Edit Policy + Contributions + Add/Edit Contribution + Do you want to quit BEPHA Policies? + Upload report + Go + Adherent + Date To + Full Name + Health Facility + Date From And To + Updated time + Cancel + Feedback could not be uploaded please, try again later + Renewal could not be uploaded please, try again later + Region of FSP + Current Region + Upload successful please check Accepted/Rejected folders + Delete Failed + This Household has been deleted only offline because it has a policy online. + Value of policy with the enrolment date : + Changed + Do you want to activate this Adherent?]]> + Policies with the following enrolment dates have reached to their maximum number of members count and therefore this adherent will not be covered by these policies however the adherent is added to the household : + Acquire + Data has been saved on the external memory card. + Data could not be sent to the server. Saved on the external memory card. + Photo uploaded successfully. + Photo saved successfully. + No images found. + Please capture an Image + Upload all Images + Photos uploaded successfully + No photos found + Upload Photos + Search + Modify household + Downloading household + Edited Households + Edited Adherents + Edited Policies + Edited Contributions + Adherent number not found + Adherent number required + Deleting… + Internet connection is required to delete online data. + Please login first, to delete online data + Deleting policy will also delete premium on it + Deleting of household will also Delete all Adherents, Policies and Premiums of this Household + Confirm + Logout + Household already exists in phone + New release of BEPHA Policies is now available. + Click here to download. + Saving… + Process has been interrupted. Please check your internet connection. + No Household was uploaded + No data available + XML has been created + Failed to create XML + No data was created + Please Enter the Adherent number + without a policy/a contribution + without a photo + Failed to upload + Deleted successfully + Invalid Email + Something went wrong on the server. Failed to upload data. + Price of the policy is covered. Do you still want to add contribution? + Contribution exceeds the price of the policy + Price of the policy not covered yet. Please select action to perform. + Price of the policy not covered yet. Please select action to perform.]]> + Reports + Snapshot Indicators + Cumulative Indicators + Number of Families with Active Policies + Number of Families with Expired Policies + Number of Families with Idle Policies + Number of Families with Suspended Polices + Number of New Policies + Number of renewed Policies + Number of Expired Policies + Number of Suspended Polices + Amount of collected contribution + Today\'s Statistics + Create Feedback XML + Create Renewals XML + Double head of household found on server. Please contact your IT manager. + Unlisted Renewal Policies + Renew Your Policy + Username + Claim Code + Type here + Please enter username and password + Login Successful + Invalid input + Total Amount + Control Numbers + Overview Policies + Overview Control Numbers + Control Numbers + Overview policies + Overview control numbers + Product Name: + Uploaded Date: + Requested Date: + Product Code: + Names: + Renewal: + ID adherent + Requested To + Requested From + Uploaded To + TO + Uploaded From + Insurance product + Clear + Requested + Number of found policies + Amount of contribution + Process Complete + Please select a policy/policies to request + Successfully + Not authorized + OK + No data was selected to delete + Get Control Number + policies where not deleted because they are not uploaded + of + Request has been sent successfully + This policy can\'t be deleted because it has not been uploaded yet. + Type of payment + Request + NO INTERNET CONNECTION + Do you want to import .txt file from your DATABASE folder? + There are no file explorer clients installed. + Load file: + Incomplete! + Check Commission + Year + Paid + Check + Get Commissions + Commissions Report + Amount + commissions + Search enrolled Policies + Search Control Numbers + Overviews + Policies + No data + Please fill the year + Deleting of Household will also Delete all Adherents, Policies and Premiums of this Household + Last Installment + Enrolled Policies + Not Enrolled Policies + Request for Not Enrolled Policies + Phone number not provided + Insurance products of the selected policies are not unique + Amount of contribution + Pick Date + Get + Date From + Date To + Send SMS + Requested SMS + TotalAdmissionsLeft + TotalVisitsLeft + TotalConsultationsLeft + TotalSurgeriesLeft + TotalDeliveriesLeft + TotalAntenatalLeft + ConsultationAmountLeft + SurgeryAmountLeft + HospitalizationAmountLeft + AntenatalAmountLeft + DeliveryAmountLeft + Please login first, to check receipt number. + IMIS Directory could not be created. + Cumulative Indicators + Language Of SMS + Approval Of SMS + Payment Overview + Get payment CN for enrolled policies + Get payment CN for not enrolled policies + Overview payment CN + Please login first, to download renewals. + Select All + Deselect All + Synchronization processing + Vulnerability + Select Vulnerability + Bulk Control Numbers + Assigned Control Numbers: + Free Control Numbers: + Fetch Bulk Control Numbers + Fetch + Please log in first, to fetch control numbers. + No control numbers left for this product. Please fetch control numbers or provide control number from other source. + Control Number : + No control number assigned to this policy. Please fetch control numbers or provide control number from other source. + Master Data + External Storage Access + To work correctly, %1$s requires external storage access. Please allow it for %1$s in next screen in order to use the application. + Permissions + To work correctly, %1$s requires multiple permissions. Please allow them in next screen in order to use the application. + Please fill the month + Renewal accepted + Renewal already accepted + Renewal rejected + Grace period expired + Control number error + Unexpected exception + Invalid renewal file + Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en_CM + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s + diff --git a/app/src/chf/res/values/strings.xml b/app/src/localeChf/res/values-en-rTZ/strings.xml similarity index 90% rename from app/src/chf/res/values/strings.xml rename to app/src/localeChf/res/values-en-rTZ/strings.xml index 017cf23e..886901ae 100644 --- a/app/src/chf/res/values/strings.xml +++ b/app/src/localeChf/res/values-en-rTZ/strings.xml @@ -436,4 +436,45 @@ Unexpected exception Invalid renewal file Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en_TZ + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/localeChf/res/values-sw/strings.xml similarity index 90% rename from app/src/main/res/values-sw/strings.xml rename to app/src/localeChf/res/values-sw/strings.xml index 55a6e6e3..64e3e991 100644 --- a/app/src/main/res/values-sw/strings.xml +++ b/app/src/localeChf/res/values-sw/strings.xml @@ -436,4 +436,45 @@ Hitilafu isiyotarajiwa Faili la kuhuisha ni batili Namba ya malipo \"%1$s\" haipo kwenye simu,tafadhali hakiki namba kabla ya kuendelea. + Je unataka kuchagua faili la kuhuisha? + Nywila ya RAR + Hifadhi Nywila ya RAR + Weka Nywila + Nywila ya RAR + Subiri sekunde %1$s + \"Namba za malipo zimekwisha jaribu tena baada ya sekunde %1$s + Kikomo cha namba za malipo kimefikiwa + Hakuna namba za malipo zilizopokelewa kwenye kompyuta kuu + Huwezi pata namba ya malipo kwa bidhaa hizi + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + sw + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s diff --git a/app/src/localeChf/res/values/strings.xml b/app/src/localeChf/res/values/strings.xml new file mode 100644 index 00000000..886901ae --- /dev/null +++ b/app/src/localeChf/res/values/strings.xml @@ -0,0 +1,480 @@ + + + Open navigation drawer + Close navigation drawer + Settings + Please wait + Page is loading + CHF Policies + admin@imis.com + Home + Enrolment + Renewal + Feedback + Sync + About + Quit + Region + District + Ward + Village + Poverty Status + Confirmation Type + Confirmation No. + Group Type + Ethnicity + Permanent Address Details + Next + Select Region + Select District + Select Ward + Select Village + Yes + No + Select Poverty Status + Select confirmation type + Select Group type + OK + Please verify all the required fields marked in red border + CHF number + Other Names + Last Name + Birth Date + Gender + Marital Status + Beneficiary Card + Current District + Current Ward + Current Village + Current Address Details + Profession + Education + Phone number + Email + Identification Type + Identification Number + District of FSP + Level of FSP + First Service Point + Select Gender + Male + Female + Other + Select marital status + Married + Single + Divorced + Widowed + Not specified + Select card status + Select profession + Select education + Select identification type + Select HF level + Dispensary + Health Centre + Hospital + Select Health facility + Save + Relationship + Select Relationship + Family saved successfully + Error occurred while processing data + Error while inserting data + Error while updating data + Member with this CHF number already exists + Add + New + Select Enrolment Officer + Select Product + Select Month + Enrolment date + Product + Effective Date + Start Date + Expire Date + Enrolment Officer + Policy Status : + Policy Value : + Balance : + Contribution : + Enquire + Payer + Payment Date + Contribution Category + Receipt No + Contribution Paid + Payment Type + Select Payer + Select Level + Contribution and Others + Photo Fee + Select Payment Type + Cash + Mobile Phone + Bank Transfer + Receipt No : + Expired + Active + Idle + Suspended + Receipt number must be unique + Policy has contribution. Please delete contributions first + Policy deleted successfully + Contribution deleted successfully + Insuree deleted successfully + You can not delete the head of the family. + Family has policy please delete the policy first + Insuree has not deleted + Family deleted + Scan + Insuree Name + SD Card is set to readonly mode. Please set the mode to read/write and restart the application. + CHF Policies needs external memory card to run. Please insert memory card and restart the application. + Force Close + Please enter the CHF number + Invalid CHF number + Getting insuree info… + Getting Snap Shots Report… + Getting Cumulative Report… + Member with this CHF number does not exist. + No renewal found + Please check your internet connection. + Process Failed, Wrong File or Enrolment Officer code. + Submit + Discontinue this policy + Do you want to discontinue this policy? + Product Code + loading + Data uploaded on the server successfully. + Data is rejected by the server. Data is moved to the rejected folder of the phone. + Data has been uploaded successfully. Please check your Rejected/Accepted folders to verify the server response. + Please enter Enrolment Officer code + File is saved on external storage. + Uploading… + No feedback found + Internet connection is required to view the statistics. + Preview + No data found + Statistics + Claim Code + Have you been treated at the facility on the said date? + Have you been asked for a payment to the facility or staff? + Have drugs been prescribed to you? + Did you get drugs from the facility? + How satisfied are you with the care you received at the health facility? Rate on a scale 1–5 (1= not satisfied; 5= very satisfied) + Uploading feedback… + Upload all feedback + Please enter Enrolment Officer Code + Please enter Claim ID + Please enter the CHF number + All the questions must be answered. + End Date + Please enter End Date + In Progress + Please enter Start Date + Please enter Receipt No. + Please enter product code + Please enter amount + This receipt number is already used. + No file found. + Of + Login Name + Login Failed + Password + Enter Rar Password + Enrolment Officer Code: + Incorrect Enrolment Officer code + Login + Unable to connect the server. Operation aborted. + Something went wrong on the server. + Family could not be inserted. + Family uploaded successfully + Given family has no HOF + Family with this CHF number already exists + Duplicate CHF number found + Duplicate receipt number found + Could not download master data. + Downloading master data + Data downloaded successfully + Delete + Edit + Payment + Master data not found, would you like to Download? + Enrolment Application + Version + Name + Release Date + Total Families + Total Insurees + Total Policies + Total Contributions + Upload Enrolments + Create Enrolments XML + Upload Renewals + Upload FeedBacks + Download Master Data + Please Wait… + Language + Families + Add new family + Family and Insurees + Family and Policies + Add/Edit Insuree + Add/Edit Policy + Contributions + Add/Edit Contribution + Do you want to quit CHF Policies? + Upload report + Go + Insuree + Date To + Full Name + HF Name + Date From And To + Updated time + Cancel + Feedback could not be uploaded please, try again later + Renewal could not be uploaded please, try again later + Region of FSP + Current Region + Upload successful please check Accepted/Rejected folders + Delete Failed + This Family has been deleted only offline because it has a policy online. + Value of policy with the enrolment date : + Changed + Do you want to activate this Insuree?]]> + Policies with the following enrolment dates have reached to their maximum number of members count and therefore this insuree will not be covered by these policies however the insuree is added to the family : + Acquire + Data has been saved on the external memory card. + Data could not be sent to the server. Saved on the external memory card. + Photo uploaded successfully. + Photo saved successfully. + No images found. + Please capture an Image + Upload all Images + Photos uploaded successfully + No photos found + Upload Photos + Search + Modify family + Downloading family + Edited Families + Edited Insurees + Edited Policies + Edited Contributions + CHF number not found + CHF number required + Deleting… + Internet connection is required to delete online data. + Please login first, to delete online data + Deleting policy will also delete premium on it + Deleting of family will also Delete all Insurees, Policies and Premiums of this Family + Confirm + Logout + Family already exists in phone + New release of CHF Policies is now available. + Click here to download. + Saving… + Process has been interrupted. Please check your internet connection. + No Family was uploaded + No data available + XML has been created + Failed to create XML + No data was created + Please Enter the CHF number + without a policy/a contribution + without a photo + Failed to upload + Deleted successfully + Invalid Email + Something went wrong on the server. Failed to upload data. + Price of the policy is covered. Do you still want to add contribution? + Contribution exceeds the price of the policy + Price of the policy not covered yet. Please select action to perform. + Price of the policy not covered yet. Please select action to perform.]]> + Reports + Snapshot Indicators + Cumulative Indicators + Number of Families with Active Policies + Number of Families with Expired Policies + Number of Families with Idle Policies + Number of Families with Suspended Polices + Number of New Policies + Number of renewed Policies + Number of Expired Policies + Number of Suspended Polices + Amount of collected contribution + Today\'s Statistics + Create Feedback XML + Create Renewals XML + Double head of family found on server. Please contact your IT manager. + Unlisted Renewal Policies + Renew Your Policy + Username + Claim Code + Type here + Please enter username and password + Login Successful + Invalid input + Total Amount + Control Numbers + Overview Policies + Overview Control Numbers + Control Numbers + Overview policies + Overview control numbers + Product Name: + Uploaded Date: + Requested Date: + Product Code: + Names: + Renewal: + Insurance No. + Requested To + Requested From + Uploaded To + TO + Uploaded From + Insurance product + Clear + Requested + Number of found policies + Amount of contribution + Process Complete + Please select a policy/policies to request + Successfully + Not authorized + OK + No data was selected to delete + Get Control Number + policies where not deleted because they are not uploaded + of + Request has been sent successfully + This policy can\'t be deleted because it has not been uploaded yet. + Type of payment + Request + NO INTERNET CONNECTION + Do you want to import .txt file from your DATABASE folder? + There are no file explorer clients installed. + Load file: + Incomplete! + Check Commission + Year + Paid + Check + Get Commissions + Commissions Report + Amount + commissions + Search enrolled Policies + Search Control Numbers + Overviews + Policies + No data + Please fill the year + Deleting of family will also Delete all Insurees, Policies and Premiums of this Family + Last Installment + Enrolled Policies + Not Enrolled Policies + Request for Not Enrolled Policies + Phone number not provided + Insurance products of the selected policies are not unique + Amount of contribution + Pick Date + Get + Date From + Date To + Send SMS + Requested SMS + TotalAdmissionsLeft + TotalVisitsLeft + TotalConsultationsLeft + TotalSurgeriesLeft + TotalDeliveriesLeft + TotalAntenatalLeft + ConsultationAmountLeft + SurgeryAmountLeft + HospitalizationAmountLeft + AntenatalAmountLeft + DeliveryAmountLeft + Please login first, to check receipt number. + IMIS Directory could not be created. + Cumulative Indicators + Language Of SMS + Approval Of SMS + Payment Overview + Get payment CN for enrolled policies + Get payment CN for not enrolled policies + Overview payment CN + Please login first, to download renewals. + Select All + Deselect All + Synchronization processing + Vulnerability + Select Vulnerability + Bulk Control Numbers + Assigned Control Numbers: + Free Control Numbers: + Fetch Bulk Control Numbers + Fetch + Please log in first, to fetch control numbers. + No control numbers left for this product. Please fetch control numbers or provide control number from other source. + Control Number : + No control number assigned to this policy. Please fetch control numbers or provide control number from other source. + Master Data + External Storage Access + To work correctly, %1$s requires external storage access. Please allow it for %1$s in next screen in order to use the application. + Permissions + To work correctly, %1$s requires multiple permissions. Please allow them in next screen in order to use the application. + Please fill the month + Renewal accepted + Renewal already accepted + Renewal rejected + Grace period expired + Control number error + Unexpected exception + Invalid renewal file + Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en_TZ + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s + diff --git a/app/src/localeMv/res/values-en/strings.xml b/app/src/localeMv/res/values-en/strings.xml new file mode 100644 index 00000000..9d113651 --- /dev/null +++ b/app/src/localeMv/res/values-en/strings.xml @@ -0,0 +1,480 @@ + + + Open navigation drawer + Close navigation drawer + Settings + Please wait + Page is loading + openIMIS Policies + admin@imis.com + Home + Enrolment + Renewal + Feedback + Sync + About + Quit + Region + District + Municipality + Village + Poverty Status + Confirmation Type + Confirmation No. + Group Type + Ethnicity + Permanent Address Details + Next + Select Region + Select District + Select Municipality + Select Village + Yes + No + Select Poverty Status + Select confirmation type + Select Group type + OK + Please verify all the required fields marked in red border + Insuree number + Other Names + Last Name + Birth Date + Gender + Marital Status + Beneficiary Card + Current District + Current Municipality + Current Village + Current Address Details + Profession + Education + Phone number + Email + Identification Type + Identification Number + District of FSP + Level of FSP + First Service Point + Select Gender + Male + Female + Other + Select marital status + Married + Single + Divorced + Widowed + Not specified + Select card status + Select profession + Select education + Select identification type + Select HF level + Dispensary + Health Centre + Hospital + Select Health facility + Save + Relationship + Select Relationship + Family saved successfully + Error occurred while processing data + Error while inserting data + Error while updating data + Member with this Insuree number already exists + Add + New + Select Enrolment Officer + Select Product + Select Month + Enrolment date + Product + Effective Date + Start Date + Expire Date + Enrolment Officer + Policy Status : + Policy Value : + Balance : + Contribution : + Enquire + Payer + Payment Date + Contribution Category + Receipt No + Contribution Paid + Payment Type + Select Payer + Select Level + Contribution and Others + Photo Fee + Select Payment Type + Cash + Mobile Phone + Bank Transfer + Receipt No : + Expired + Active + Idle + Suspended + Receipt number must be unique + Policy has contribution. Please delete contributions first + Policy deleted successfully + Contribution deleted successfully + Insuree deleted successfully + You can not delete the head of the family. + Family has policy please delete the policy first + Insuree has not deleted + Family deleted + Scan + Insuree Name + SD Card is set to readonly mode. Please set the mode to read/write and restart the application. + openIMIS Policies needs external memory card to run. Please insert memory card and restart the application. + Force Close + Please enter the Insuree number + Invalid Insuree number + Getting insuree info… + Getting Snap Shots Report… + Getting Cumulative Report… + Member with this Insuree number does not exist. + No renewal found + Please check your internet connection. + Process Failed, Wrong File or Enrolment Officer code. + Submit + Discontinue this policy + Do you want to discontinue this policy? + Product Code + loading + Data uploaded on the server successfully. + Data is rejected by the server. Data is moved to the rejected folder of the phone. + Data has been uploaded successfully. Please check your Rejected/Accepted folders to verify the server response. + Please enter Enrolment Officer code + File is saved on external storage. + Uploading… + No feedback found + Internet connection is required to view the statistics. + Preview + No data found + Statistics + Claim Code + Have you been treated at the facility on the said date? + Have you been asked for a payment to the facility or staff? + Have drugs been prescribed to you? + Did you get drugs from the facility? + How satisfied are you with the care you received at the health facility? Rate on a scale 1–5 (1= not satisfied; 5= very satisfied) + Uploading feedback… + Upload all feedback + Please enter Enrolment Officer Code + Please enter Claim ID + Please enter the Insuree number + All the questions must be answered. + End Date + Please enter End Date + In Progress + Please enter Start Date + Please enter Receipt No. + Please enter product code + Please enter amount + This receipt number is already used. + No file found. + Of + Login Name + Login Failed + Password + Enter Rar Password + Enrolment Officer Code: + Incorrect Enrolment Officer code + Login + Unable to connect the server. Operation aborted. + Something went wrong on the server. + Family could not be inserted. + Family uploaded successfully + Given family has no HOF + Family with this Insuree number already exists + Duplicate Insuree number found + Duplicate receipt number found + Could not download master data. + Downloading master data + Data downloaded successfully + Delete + Edit + Payment + Master data not found, would you like to Download? + Enrolment Application + Version + Name + Release Date + Total Families + Total Insurees + Total Policies + Total Contributions + Upload Enrolments + Create Enrolments XML + Upload Renewals + Upload FeedBacks + Download Master Data + Please Wait… + Language + Families + Add new family + Family and Insurees + Family and Policies + Add/Edit Insuree + Add/Edit Policy + Contributions + Add/Edit Contribution + Do you want to quit openIMIS Policies? + Upload report + Go + Insuree + Date To + Full Name + HF Name + Date From And To + Updated time + Cancel + Feedback could not be uploaded please, try again later + Renewal could not be uploaded please, try again later + Region of FSP + Current Region + Upload successful please check Accepted/Rejected folders + Delete Failed + This Family has been deleted only offline because it has a policy online. + Value of policy with the enrolment date : + Changed + Do you want to activate this Insuree?]]> + Policies with the following enrolment dates have reached to their maximum number of members count and therefore this insuree will not be covered by these policies however the insuree is added to the family : + Acquire + Data has been saved on the external memory card. + Data could not be sent to the server. Saved on the external memory card. + Photo uploaded successfully. + Photo saved successfully. + No images found. + Please capture an Image + Upload all Images + Photos uploaded successfully + No photos found + Upload Photos + Search + Modify family + Downloading family + Edited Families + Edited Insurees + Edited Policies + Edited Contributions + Insuree number not found + Insuree number required + Deleting… + Internet connection is required to delete online data. + Please login first, to delete online data + Deleting policy will also delete premium on it + Deleting of family will also Delete all Insurees, Policies and Premiums of this Family + Confirm + Logout + Family already exists in phone + New release of openIMIS Policies is now available. + Click here to download. + Saving… + Process has been interrupted. Please check your internet connection. + No Family was uploaded + No data available + XML has been created + Failed to create XML + No data was created + Please Enter the Insuree number + without a policy/a contribution + without a photo + Failed to upload + Deleted successfully + Invalid Email + Something went wrong on the server. Failed to upload data. + Price of the policy is covered. Do you still want to add contribution? + Contribution exceeds the price of the policy + Price of the policy not covered yet. Please select action to perform. + Price of the policy not covered yet. Please select action to perform.]]> + Reports + Snapshot Indicators + Cumulative Indicators + Number of Families with Active Policies + Number of Families with Expired Policies + Number of Families with Idle Policies + Number of Families with Suspended Polices + Number of New Policies + Number of renewed Policies + Number of Expired Policies + Number of Suspended Polices + Amount of collected contribution + Today\'s Statistics + Create Feedback XML + Create Renewals XML + Double head of family found on server. Please contact your IT manager. + Unlisted Renewal Policies + Renew Your Policy + Username + Claim Code + Type here + Please enter username and password + Login Successful + Invalid input + Total Amount + Control Numbers + Overview Policies + Overview Control Numbers + Control Numbers + Overview policies + Overview control numbers + Product Name: + Uploaded Date: + Requested Date: + Product Code: + Names: + Renewal: + Insurance No. + Requested To + Requested From + Uploaded To + TO + Uploaded From + Insurance product + Clear + Requested + Number of found policies + Amount of contribution + Process Complete + Please select a policy/policies to request + Successfully + Not authorized + OK + No data was selected to delete + Get Control Number + policies where not deleted because they are not uploaded + of + Request has been sent successfully + This policy can\'t be deleted because it has not been uploaded yet. + Type of payment + Request + NO INTERNET CONNECTION + Do you want to import .txt file from your DATABASE folder? + There are no file explorer clients installed. + Load file: + Incomplete! + Check Commission + Year + Paid + Check + Get Commissions + Commissions Report + Amount + commissions + Search enrolled Policies + Search Control Numbers + Overviews + Policies + No data + Please fill the year + Deleting of family will also Delete all Insurees, Policies and Premiums of this Family + Last Installment + Enrolled Policies + Not Enrolled Policies + Request for Not Enrolled Policies + Phone number not provided + Insurance products of the selected policies are not unique + Amount of contribution + Pick Date + Get + Date From + Date To + Send SMS + Requested SMS + TotalAdmissionsLeft + TotalVisitsLeft + TotalConsultationsLeft + TotalSurgeriesLeft + TotalDeliveriesLeft + TotalAntenatalLeft + ConsultationAmountLeft + SurgeryAmountLeft + HospitalizationAmountLeft + AntenatalAmountLeft + DeliveryAmountLeft + Please login first, to check receipt number. + IMIS Directory could not be created. + Cumulative Indicators + Language Of SMS + Approval Of SMS + Payment Overview + Get payment CN for enrolled policies + Get payment CN for not enrolled policies + Overview payment CN + Please login first, to download renewals. + Select All + Deselect All + Synchronization processing + Vulnerability + Select Vulnerability + Bulk Control Numbers + Assigned Control Numbers: + Free Control Numbers: + Fetch Bulk Control Numbers + Fetch + Please log in first, to fetch control numbers. + No control numbers left for this product. Please fetch control numbers or provide control number from other source. + Control Number : + No control number assigned to this policy. Please fetch control numbers or provide control number from other source. + Master Data + External Storage Access + To work correctly, %1$s requires external storage access. Please allow it for %1$s in next screen in order to use the application. + Permissions + To work correctly, %1$s requires multiple permissions. Please allow them in next screen in order to use the application. + Please fill the month + Renewal accepted + Renewal already accepted + Renewal rejected + Grace period expired + Control number error + Unexpected exception + Invalid renewal file + Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/localeMv/res/values-fr/strings.xml similarity index 87% rename from app/src/main/res/values-fr/strings.xml rename to app/src/localeMv/res/values-fr/strings.xml index 3575685b..e0675292 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/localeMv/res/values-fr/strings.xml @@ -133,7 +133,7 @@ openIMIS a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application. Fermeture forcée Veuillez entrer le numéro d\'assurance - Invalid Insurance number + Numéro d\'assuré invalide Obtenir des informations sur l\'assurance... Obtention d\'un aperçu général... Obtention d\'un rapport cumulatif... @@ -242,7 +242,7 @@ Suppression échouée Cette famille a été supprimée seulement hors ligne parce qu\'elle a un contrat en ligne. Contrat avec date d\'adhésion : - \" Modifié \" + " Modifié " Voulez-vous activer cet assuré ?]]> Les contrats avec les dates d\'adhésion suivantes ont atteint leur nombre maximum de membres et, par conséquent, cette assurance ne sera pas couverte par ces polices, mais l\'assuré est ajouté à la famille : Acquérir @@ -256,7 +256,7 @@ Photos téléversées avec succès Aucune photo trouvée Téléverser les photos - \"Recherche \" + "Recherche " Modifier la famille Télécharger la famille Familles éditées @@ -336,7 +336,7 @@ Téléversé au au Téléversé du - Paquet de bénéfice + Paquet de bénéfices Effacer Demandé Nombre de polices trouvé @@ -355,7 +355,7 @@ Type de paiement Requête PAS DE CONNECTION INTERNET - Voulez-vous importer le ficher .txt dans la base de donnée ? + Voulez-vous importer le ficher .txt dans la base de données ? Il n\'y a pas d\'application de gestion des fichiers d\'installé. Chargement fichier: Incomplet! @@ -393,20 +393,20 @@ TotalSurgeriesLeft TotalDeliveriesLeft TotalAntenatalLeft - ConsultationAmountLeft - SurgeryAmountLeft - HospitalizationAmountLeft - AntenatalAmountLeft - DeliveryAmountLeft + Montant restant consultation + Montant restant chirurgie + Montant restant hospitalisation + Montant restant soin anténatal + Montant restant accouchement Veuillez d\'abord vous connecter pour vérifier le numéro de reçu. Le répertoire IMIS n\'a pas pu être créé. Indicateurs cumulatifs Langue des SMS Approbation de SMS Aperçu des paiements - Obtenir le CN de paiement pour les polices inscrites - Obtenir le CN de paiement pour les polices non inscrites - Aperçu paiement CN + Obtenir le numéro de contrôle de paiement pour les polices inscrites + Obtenir le numéro de contrôle de paiement pour les polices non inscrites + Aperçu du numéro de contrôle de paiement Veuillez d\'abord vous connecter pour télécharger les renouvellements. Tout sélectionner Tout déselectionner @@ -428,12 +428,53 @@ Autorisations Pour fonctionner correctement, %1$s nécessite plusieurs autorisations. Veuillez les autoriser dans l\'écran suivant afin d\'utiliser l\'application. Veuillez remplir le mois - Renewal accepted - Renewal already accepted - Renewal rejected - Grace period expired - Control number error + Demande de renouvellement acceptée + Demande de renouvellement déjà acceptée + Demande de renouvellement rejetée + Période d\'approbation expirée + Erreur de numéro de contrôle Exception inattendue Fichier de renouvellements invalide Le numéro de contrôle \"%1$s\" n\'est pas présent dans la mémoire du téléphone. Veuillez confirmer que ce numéro est correct. + Voulez-vous sélectionner le fichier de renouvellement à importer? + Mot de passe RAR + Sauvegarder le mot de passe RAR + Définir le mot de passe RAR par défaut + Mot de passe RAR par défaut + Attendez %1$s secondes + La demande de numéro de contrôle (CN) est terminée. Si le montant disponible de CN n\'augmente pas, veuillez réessayer dans %1$s secondes. + Limite CN atteinte + Aucun numéro de contrôle reçu du serveur + Vous ne pouvez pas recevoir plus de numéros de contrôle pour ce produit + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + fr + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s diff --git a/app/src/localeMv/res/values/strings.xml b/app/src/localeMv/res/values/strings.xml new file mode 100644 index 00000000..9d113651 --- /dev/null +++ b/app/src/localeMv/res/values/strings.xml @@ -0,0 +1,480 @@ + + + Open navigation drawer + Close navigation drawer + Settings + Please wait + Page is loading + openIMIS Policies + admin@imis.com + Home + Enrolment + Renewal + Feedback + Sync + About + Quit + Region + District + Municipality + Village + Poverty Status + Confirmation Type + Confirmation No. + Group Type + Ethnicity + Permanent Address Details + Next + Select Region + Select District + Select Municipality + Select Village + Yes + No + Select Poverty Status + Select confirmation type + Select Group type + OK + Please verify all the required fields marked in red border + Insuree number + Other Names + Last Name + Birth Date + Gender + Marital Status + Beneficiary Card + Current District + Current Municipality + Current Village + Current Address Details + Profession + Education + Phone number + Email + Identification Type + Identification Number + District of FSP + Level of FSP + First Service Point + Select Gender + Male + Female + Other + Select marital status + Married + Single + Divorced + Widowed + Not specified + Select card status + Select profession + Select education + Select identification type + Select HF level + Dispensary + Health Centre + Hospital + Select Health facility + Save + Relationship + Select Relationship + Family saved successfully + Error occurred while processing data + Error while inserting data + Error while updating data + Member with this Insuree number already exists + Add + New + Select Enrolment Officer + Select Product + Select Month + Enrolment date + Product + Effective Date + Start Date + Expire Date + Enrolment Officer + Policy Status : + Policy Value : + Balance : + Contribution : + Enquire + Payer + Payment Date + Contribution Category + Receipt No + Contribution Paid + Payment Type + Select Payer + Select Level + Contribution and Others + Photo Fee + Select Payment Type + Cash + Mobile Phone + Bank Transfer + Receipt No : + Expired + Active + Idle + Suspended + Receipt number must be unique + Policy has contribution. Please delete contributions first + Policy deleted successfully + Contribution deleted successfully + Insuree deleted successfully + You can not delete the head of the family. + Family has policy please delete the policy first + Insuree has not deleted + Family deleted + Scan + Insuree Name + SD Card is set to readonly mode. Please set the mode to read/write and restart the application. + openIMIS Policies needs external memory card to run. Please insert memory card and restart the application. + Force Close + Please enter the Insuree number + Invalid Insuree number + Getting insuree info… + Getting Snap Shots Report… + Getting Cumulative Report… + Member with this Insuree number does not exist. + No renewal found + Please check your internet connection. + Process Failed, Wrong File or Enrolment Officer code. + Submit + Discontinue this policy + Do you want to discontinue this policy? + Product Code + loading + Data uploaded on the server successfully. + Data is rejected by the server. Data is moved to the rejected folder of the phone. + Data has been uploaded successfully. Please check your Rejected/Accepted folders to verify the server response. + Please enter Enrolment Officer code + File is saved on external storage. + Uploading… + No feedback found + Internet connection is required to view the statistics. + Preview + No data found + Statistics + Claim Code + Have you been treated at the facility on the said date? + Have you been asked for a payment to the facility or staff? + Have drugs been prescribed to you? + Did you get drugs from the facility? + How satisfied are you with the care you received at the health facility? Rate on a scale 1–5 (1= not satisfied; 5= very satisfied) + Uploading feedback… + Upload all feedback + Please enter Enrolment Officer Code + Please enter Claim ID + Please enter the Insuree number + All the questions must be answered. + End Date + Please enter End Date + In Progress + Please enter Start Date + Please enter Receipt No. + Please enter product code + Please enter amount + This receipt number is already used. + No file found. + Of + Login Name + Login Failed + Password + Enter Rar Password + Enrolment Officer Code: + Incorrect Enrolment Officer code + Login + Unable to connect the server. Operation aborted. + Something went wrong on the server. + Family could not be inserted. + Family uploaded successfully + Given family has no HOF + Family with this Insuree number already exists + Duplicate Insuree number found + Duplicate receipt number found + Could not download master data. + Downloading master data + Data downloaded successfully + Delete + Edit + Payment + Master data not found, would you like to Download? + Enrolment Application + Version + Name + Release Date + Total Families + Total Insurees + Total Policies + Total Contributions + Upload Enrolments + Create Enrolments XML + Upload Renewals + Upload FeedBacks + Download Master Data + Please Wait… + Language + Families + Add new family + Family and Insurees + Family and Policies + Add/Edit Insuree + Add/Edit Policy + Contributions + Add/Edit Contribution + Do you want to quit openIMIS Policies? + Upload report + Go + Insuree + Date To + Full Name + HF Name + Date From And To + Updated time + Cancel + Feedback could not be uploaded please, try again later + Renewal could not be uploaded please, try again later + Region of FSP + Current Region + Upload successful please check Accepted/Rejected folders + Delete Failed + This Family has been deleted only offline because it has a policy online. + Value of policy with the enrolment date : + Changed + Do you want to activate this Insuree?]]> + Policies with the following enrolment dates have reached to their maximum number of members count and therefore this insuree will not be covered by these policies however the insuree is added to the family : + Acquire + Data has been saved on the external memory card. + Data could not be sent to the server. Saved on the external memory card. + Photo uploaded successfully. + Photo saved successfully. + No images found. + Please capture an Image + Upload all Images + Photos uploaded successfully + No photos found + Upload Photos + Search + Modify family + Downloading family + Edited Families + Edited Insurees + Edited Policies + Edited Contributions + Insuree number not found + Insuree number required + Deleting… + Internet connection is required to delete online data. + Please login first, to delete online data + Deleting policy will also delete premium on it + Deleting of family will also Delete all Insurees, Policies and Premiums of this Family + Confirm + Logout + Family already exists in phone + New release of openIMIS Policies is now available. + Click here to download. + Saving… + Process has been interrupted. Please check your internet connection. + No Family was uploaded + No data available + XML has been created + Failed to create XML + No data was created + Please Enter the Insuree number + without a policy/a contribution + without a photo + Failed to upload + Deleted successfully + Invalid Email + Something went wrong on the server. Failed to upload data. + Price of the policy is covered. Do you still want to add contribution? + Contribution exceeds the price of the policy + Price of the policy not covered yet. Please select action to perform. + Price of the policy not covered yet. Please select action to perform.]]> + Reports + Snapshot Indicators + Cumulative Indicators + Number of Families with Active Policies + Number of Families with Expired Policies + Number of Families with Idle Policies + Number of Families with Suspended Polices + Number of New Policies + Number of renewed Policies + Number of Expired Policies + Number of Suspended Polices + Amount of collected contribution + Today\'s Statistics + Create Feedback XML + Create Renewals XML + Double head of family found on server. Please contact your IT manager. + Unlisted Renewal Policies + Renew Your Policy + Username + Claim Code + Type here + Please enter username and password + Login Successful + Invalid input + Total Amount + Control Numbers + Overview Policies + Overview Control Numbers + Control Numbers + Overview policies + Overview control numbers + Product Name: + Uploaded Date: + Requested Date: + Product Code: + Names: + Renewal: + Insurance No. + Requested To + Requested From + Uploaded To + TO + Uploaded From + Insurance product + Clear + Requested + Number of found policies + Amount of contribution + Process Complete + Please select a policy/policies to request + Successfully + Not authorized + OK + No data was selected to delete + Get Control Number + policies where not deleted because they are not uploaded + of + Request has been sent successfully + This policy can\'t be deleted because it has not been uploaded yet. + Type of payment + Request + NO INTERNET CONNECTION + Do you want to import .txt file from your DATABASE folder? + There are no file explorer clients installed. + Load file: + Incomplete! + Check Commission + Year + Paid + Check + Get Commissions + Commissions Report + Amount + commissions + Search enrolled Policies + Search Control Numbers + Overviews + Policies + No data + Please fill the year + Deleting of family will also Delete all Insurees, Policies and Premiums of this Family + Last Installment + Enrolled Policies + Not Enrolled Policies + Request for Not Enrolled Policies + Phone number not provided + Insurance products of the selected policies are not unique + Amount of contribution + Pick Date + Get + Date From + Date To + Send SMS + Requested SMS + TotalAdmissionsLeft + TotalVisitsLeft + TotalConsultationsLeft + TotalSurgeriesLeft + TotalDeliveriesLeft + TotalAntenatalLeft + ConsultationAmountLeft + SurgeryAmountLeft + HospitalizationAmountLeft + AntenatalAmountLeft + DeliveryAmountLeft + Please login first, to check receipt number. + IMIS Directory could not be created. + Cumulative Indicators + Language Of SMS + Approval Of SMS + Payment Overview + Get payment CN for enrolled policies + Get payment CN for not enrolled policies + Overview payment CN + Please login first, to download renewals. + Select All + Deselect All + Synchronization processing + Vulnerability + Select Vulnerability + Bulk Control Numbers + Assigned Control Numbers: + Free Control Numbers: + Fetch Bulk Control Numbers + Fetch + Please log in first, to fetch control numbers. + No control numbers left for this product. Please fetch control numbers or provide control number from other source. + Control Number : + No control number assigned to this policy. Please fetch control numbers or provide control number from other source. + Master Data + External Storage Access + To work correctly, %1$s requires external storage access. Please allow it for %1$s in next screen in order to use the application. + Permissions + To work correctly, %1$s requires multiple permissions. Please allow them in next screen in order to use the application. + Please fill the month + Renewal accepted + Renewal already accepted + Renewal rejected + Grace period expired + Control number error + Unexpected exception + Invalid renewal file + Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 106fe306..56cb49d2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,13 +14,17 @@ - + + + - @@ -80,10 +81,8 @@ android:screenOrientation="portrait" /> + + + + + + + + + + + - \ No newline at end of file + diff --git a/app/src/main/assets/JSON/default_ints.json b/app/src/main/assets/JSON/default_ints.json index e2e62eff..165ba47d 100644 --- a/app/src/main/assets/JSON/default_ints.json +++ b/app/src/main/assets/JSON/default_ints.json @@ -1,5 +1,6 @@ { "image_width_limit": 400, + "image_height_limit": 400, "image_jpeg_quality": 40, - "image_height_limit": 400 + "min_cn_request_interval": 60 } \ No newline at end of file diff --git a/app/src/main/assets/JSON/hflevels.json b/app/src/main/assets/JSON/hflevels.json new file mode 100644 index 00000000..747adb80 --- /dev/null +++ b/app/src/main/assets/JSON/hflevels.json @@ -0,0 +1,5 @@ +[ + {"code":"D", "string": "Dispensary"}, + {"code":"C", "string": "HealthCentre"}, + {"code":"H", "string": "Hospital"} +] \ No newline at end of file diff --git a/app/src/main/assets/pages/About.html b/app/src/main/assets/pages/About.html index 26e07984..29fbaf86 100644 --- a/app/src/main/assets/pages/About.html +++ b/app/src/main/assets/pages/About.html @@ -45,7 +45,7 @@

  • - 2.1.0 + 2.2.0
  • diff --git a/app/src/main/assets/pages/Enrollment.js b/app/src/main/assets/pages/Enrollment.js index 0b3edec6..302a2e5d 100644 --- a/app/src/main/assets/pages/Enrollment.js +++ b/app/src/main/assets/pages/Enrollment.js @@ -39,8 +39,11 @@ $(document).ready(function () { height: "auto", width: 350, modal: true, - buttons: { - OK: function () { + buttons: [ + { + text: Android.getString("Ok"), + click: function () { + if (isOffline == 0 || isOffline == 2) { //deletedSuccess = parseInt(Android.DeleteOnlineData(FamilyId, 'F')); var resul = Android.DeleteOnlineDataF(FamilyId); @@ -67,11 +70,15 @@ $(document).ready(function () { } } $(this).dialog("close"); + } }, - Cancel: function () { - $(this).dialog("close"); + { + text: Android.getString("Cancel"), + click: function () { + $(this).dialog("close"); + } } - } + ] }); } }); diff --git a/app/src/main/assets/pages/FamilyPolicies.js b/app/src/main/assets/pages/FamilyPolicies.js index 2f84a6e0..af1903bb 100644 --- a/app/src/main/assets/pages/FamilyPolicies.js +++ b/app/src/main/assets/pages/FamilyPolicies.js @@ -57,29 +57,35 @@ $(document).ready(function () { height: "auto", width: 350, modal: true, - buttons: { - OK: function () { - - if (isOffline == 0 || isOffline == 2) { - - PolicyDeleted = parseInt(Android.DeleteOnlineData(PolicyId, 'PO')); - } - else { - PolicyDeleted = Android.DeletePolicy(PolicyId); + buttons: [ + { + text: Android.getString("Ok"), + click: function () { + + if (isOffline == 0 || isOffline == 2) { + + PolicyDeleted = parseInt(Android.DeleteOnlineData(PolicyId, 'PO')); + } + else { + PolicyDeleted = Android.DeletePolicy(PolicyId); + } + if (PolicyDeleted == 1) { + Android.ShowDialog(Android.getString('PolicyDeleted')); + window.open('FamilyPolicies.html?f=' + FamilyId + "&l=" + LocationId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); + } + else if (PolicyDeleted == -1) { + Android.ShowDialog(Android.getString('LoginToDeleteOnlineData')); + } + $(this).dialog("close"); } - if (PolicyDeleted == 1) { - Android.ShowDialog(Android.getString('PolicyDeleted')); - window.open('FamilyPolicies.html?f=' + FamilyId + "&l=" + LocationId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); - } - else if (PolicyDeleted == -1) { - Android.ShowDialog(Android.getString('LoginToDeleteOnlineData')); - } - $(this).dialog("close"); }, - Cancel: function () { - $(this).dialog("close"); + { + text: Android.getString("Cancel"), + click: function () { + $(this).dialog("close"); + } } - } + ] }); } } diff --git a/app/src/main/assets/pages/Insuree.html b/app/src/main/assets/pages/Insuree.html index 6534cfab..56a2c2f6 100644 --- a/app/src/main/assets/pages/Insuree.html +++ b/app/src/main/assets/pages/Insuree.html @@ -128,6 +128,10 @@
  • Identification Number +
    • +
  • + Vulnerability +
  • @@ -145,10 +149,6 @@ First Service Point
    • -
  • - Vulnerability - -
diff --git a/app/src/main/assets/pages/Insuree.js b/app/src/main/assets/pages/Insuree.js index d3744785..e70883e6 100644 --- a/app/src/main/assets/pages/Insuree.js +++ b/app/src/main/assets/pages/Insuree.js @@ -98,19 +98,18 @@ $(document).ready(function () { var ExceedThreshold = -1; if (PolicyId > 0 && IsNewIns == 0) { - var PolicyStatus = Android.getPolicyStatus(PolicyId); if (TotalIns >= MemberCount) { ExceedThreshold = 0; Android.ShowDialog(Android.getString('ExceedMemberCount')); } else if (TotalIns >= Threshold) { ExceedThreshold = 1; - } else if (PolicyStatus == 2) { + } else { ExceedThreshold = 0; } } var InsureeId = Android.SaveInsuree(jsonInsuree, FamilyId, 0, parseInt(ExceedThreshold), PolicyId); - if (InsureeId == 7 || InsureeId == 6) { + if (PolicyId > 0 && TotalIns >= MemberCount) { $("#divProgress").hide(); } else { $("#divProgress").hide(); @@ -193,15 +192,7 @@ $(document).ready(function () { }); $('#btnScan').click(function () { - var InsuranceNo = Android.getScannedNumber(); - var ans = Android.isValidInsuranceNumber(InsuranceNo); - if (ans != true) { - $('#txtInsuranceNumber').val(""); - $('#txtInsuranceNumber').focus(); - } else { - $('#txtInsuranceNumber').val(InsuranceNo); - getImage(); - } + Android.getScannedNumber(); }); if ($('#hfIsOffline').val() == "0") { @@ -235,6 +226,18 @@ function selectImageCallback(imagePath) { } } +// called from java after the image was selected by the user +function scanQrCallback(insureeNumber) { + var ans = Android.isValidInsuranceNumber(insureeNumber); + if (ans) { + $('#txtInsuranceNumber').val(insureeNumber); + getImage(); + } else { + $('#txtInsuranceNumber').val(""); + $('#txtInsuranceNumber').focus(); + } +} + function fillRelationship() { $textLanguage = "Relation"; if (Android.getSelectedLanguage() != "en") { diff --git a/app/src/main/assets/pages/Policy.js b/app/src/main/assets/pages/Policy.js index 8f33528d..e05031b3 100644 --- a/app/src/main/assets/pages/Policy.js +++ b/app/src/main/assets/pages/Policy.js @@ -131,15 +131,21 @@ $(document).ready(function () { height: "auto", width: 300, modal: true, - buttons: { - Yes: function () { + buttons: [ + { + text: Android.getString("Yes"), + click: function () { savePolicy(); $(this).dialog("close"); - }, - No: function () { + } + }, + { + text: Android.getString("No"), + click: function () { $(this).dialog("close"); } } + ] }); } else { diff --git a/app/src/main/assets/pages/Premium.js b/app/src/main/assets/pages/Premium.js index e277c053..82a7eb87 100644 --- a/app/src/main/assets/pages/Premium.js +++ b/app/src/main/assets/pages/Premium.js @@ -78,17 +78,23 @@ $(document).ready(function () { height: "auto", width: 300, modal: true, - buttons: { - Yes: function () { + buttons: [ + { + text: Android.getString("Yes"), + click: function () { $('#div-details').show(); $('.footer').show(); $(this).dialog("close"); - }, - No: function () { + } + }, + { + text: Android.getString("No"), + click: function () { window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); $(this).dialog("close"); } } + ] }); } } @@ -160,38 +166,50 @@ $(document).ready(function () { height: "auto", width: 300, modal: true, - buttons: { - Wait: function () { - policystatus = IdlePolicy; - var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); - Paydate = $('#txtPayDate').val(); - Android.UpdatePolicy(parseInt(policyId), Paydate, policystatus); - Android.UpdateInsureePolicy(parseInt(policyId)); - window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); - $(this).dialog("close"); - }, - Suspend: function () { - policystatus = SuspendedPolicy; - var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); - Paydate = $('#txtPayDate').val(); - Android.UpdatePolicy(parseInt(policyId), Paydate, policystatus); - Android.UpdateInsureePolicy(parseInt(policyId)); - window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); - $(this).dialog("close"); - }, - Enforce: function () { - policystatus = ActivePolicy; - var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); - Paydate = $('#txtPayDate').val(); - Android.UpdatePolicy(parseInt(policyId), Paydate, policystatus); - Android.UpdateInsureePolicy(parseInt(policyId)); - window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); - $(this).dialog("close"); - }, - No: function () { - $(this).dialog("close"); - } - } + buttons: [ + { + text: Android.getString("Wait"), + click: function () { + policystatus = IdlePolicy; + var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); + Paydate = $('#txtPayDate').val(); + Android.UpdatePolicy(parseInt(policyId), Paydate, policystatus); + Android.UpdateInsureePolicy(parseInt(policyId)); + window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); + $(this).dialog("close"); + } + }, + { + text: Android.getString("Suspend"), + click: function () { + policystatus = SuspendedPolicy; + var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); + Paydate = $('#txtPayDate').val(); + Android.UpdatePolicy(parseInt(policyId), Paydate, policystatus); + Android.UpdateInsureePolicy(parseInt(policyId)); + window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); + $(this).dialog("close"); + } + }, + { + text: Android.getString("Enforce"), + click: function () { + policystatus = ActivePolicy; + var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); + Paydate = $('#txtPayDate').val(); + Android.UpdatePolicy(parseInt(policyId), Paydate, policystatus); + Android.UpdateInsureePolicy(parseInt(policyId)); + window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); + $(this).dialog("close"); + } + }, + { + text: Android.getString("No"), + click: function () { + $(this).dialog("close"); + } + } + ] }); } else { $("#msgAlert").text(Android.getString('PriceBelow')); @@ -200,8 +218,10 @@ $(document).ready(function () { height: "auto", width: 300, modal: true, - buttons: { - OK: function () { + buttons: [ + { + text: Android.getString("Ok"), + click: function () { policystatus = IdlePolicy; var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); Paydate = $('#txtPayDate').val(); @@ -209,8 +229,11 @@ $(document).ready(function () { Android.UpdateInsureePolicy(parseInt(policyId)); window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); $(this).dialog("close"); - }, - Enforce: function () { + } + }, + { + text: Android.getString("Enforce"), + click: function () { policystatus = ActivePolicy; var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); $('#btnSave').attr("disabled", "disabled"); @@ -219,11 +242,15 @@ $(document).ready(function () { Android.UpdateInsureePolicy(parseInt(policyId)); window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); $(this).dialog("close"); - }, - No: function () { + } + }, + { + text: Android.getString("No"), + click: function () { $(this).dialog("close"); } } + ] }); } @@ -241,8 +268,10 @@ $(document).ready(function () { height: "auto", width: 300, modal: true, - buttons: { - OK: function () { + buttons: [ + { + text: Android.getString("Ok"), + click: function () { policystatus = IdlePolicy; var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); Paydate = $('#txtPayDate').val(); @@ -250,8 +279,11 @@ $(document).ready(function () { Android.UpdateInsureePolicy(parseInt(policyId)); window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); $(this).dialog("close"); - }, - Enforce: function () { + } + }, + { + text: Android.getString("Enforce"), + click: function () { policystatus = ActivePolicy; var PremiumId = Android.SavePremiums(jsonPremium, parseInt(policyId), parseInt(premiumId), parseInt(FamilyId)); $('#btnSave').attr("disabled", "disabled"); @@ -260,11 +292,15 @@ $(document).ready(function () { Android.UpdateInsureePolicy(parseInt(policyId)); window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); $(this).dialog("close"); - }, - No: function () { + } + }, + { + text: Android.getString("No"), + click: function () { $(this).dialog("close"); } } + ] }); } else if (results != false) { window.open('PolicyPremium.html?p=' + policyId + '&l=' + LocationId + '&f=' + FamilyId + '&r=' + RegionId + '&d=' + DistrictId, "_self"); diff --git a/app/src/main/assets/pages/Search.js b/app/src/main/assets/pages/Search.js index 132a6641..2f49c3c3 100644 --- a/app/src/main/assets/pages/Search.js +++ b/app/src/main/assets/pages/Search.js @@ -11,22 +11,9 @@ $(document).ready(function () { if (InsuranceNumber.length > 0) { $("#divProgress").show(); setTimeout(function () { - var Result = Android.ModifyFamily(InsuranceNumber); - //alert(Result); - if (Result == 1) { - //Android.ShowDialog(Android.getString('DataDownloadedSuccess')); + if (Android.ModifyFamily(InsuranceNumber) == 1) { window.open("Enrollment.html", "_self"); } - else if (Result == 2) { - Android.ShowDialog(Android.getString('FamilyExists')); - //window.open("Enrollment.html", "_self"); - } - else if (Result == 0) { - Android.ShowDialog(Android.getString('InsuranceNumberNotFound')); - } - else if (Result == 3) { - Android.ShowDialog(Android.getString('NoInternet')); - } $("#divProgress").hide(); }, 500) } diff --git a/app/src/main/assets/pages/Settings.html b/app/src/main/assets/pages/Settings.html index cd836f04..159c8294 100644 --- a/app/src/main/assets/pages/Settings.html +++ b/app/src/main/assets/pages/Settings.html @@ -1,38 +1,64 @@ + Settings - + - + + -
-
    -
  • - RAR Password - -
    • -
- -
- -
+
+
    +
  • + RAR Password + +
    • +
+ +
+ +
-

+
-
    -
  • - Set the default RAR password -
    • -
-
- +
    +
  • + Set the default RAR password +
    • +
+
+ +
+ +
+
+
    +
  • + Export logs +
    • +
+
+ +
+ +
+ +
    +
  • + Clear logs +
    • +
+
+ +
+
-
+ \ No newline at end of file diff --git a/app/src/main/assets/pages/Settings.js b/app/src/main/assets/pages/Settings.js index 4acf4f45..e3ef61b8 100644 --- a/app/src/main/assets/pages/Settings.js +++ b/app/src/main/assets/pages/Settings.js @@ -25,4 +25,16 @@ $(document).ready(function () { Android.ShowDialog(e.message); } }); + + if (Android.isLoggingEnabled()) { + $('#btnExportLogs').click(function () { + Android.exportLogs() + }); + + $('#btnClearLogs').click(function () { + Android.clearLogs() + }); + } else { + $('#logSection').hide(); + } }); diff --git a/app/src/main/assets/pages/Sync.js b/app/src/main/assets/pages/Sync.js index 305ce367..736e77a4 100644 --- a/app/src/main/assets/pages/Sync.js +++ b/app/src/main/assets/pages/Sync.js @@ -38,17 +38,17 @@ $(document).ready(function () { break; case "liCreateRenewalXML": - Android.zipFeedBackRenewal('Renewal'); + Android.CreateRenewalExport(); break; case "liUploadFeedback": if (!Android.isLoggedIn()) { window.open("Login.html?s=0", "_self"); } else { - Android.UploadOfflineFeedbackRenewal('feedback'); + Android.uploadFeedbacks(); } break; case "liCreateFeedbackXML": - Android.zipFeedBackRenewal('Feedback'); + Android.CreateFeedbackExport(); break; case "liDownloadMasterData": diff --git a/app/src/main/java/org/openimis/imispolicies/Acquire.java b/app/src/main/java/org/openimis/imispolicies/Acquire.java index 425781ce..90ba2296 100644 --- a/app/src/main/java/org/openimis/imispolicies/Acquire.java +++ b/app/src/main/java/org/openimis/imispolicies/Acquire.java @@ -41,13 +41,19 @@ import android.location.LocationManager; import android.net.Uri; import android.os.Bundle; +import android.provider.MediaStore; import android.support.v4.app.ActivityCompat; import android.support.v4.content.FileProvider; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; + +import org.openimis.imispolicies.tools.ImageManager; +import org.openimis.imispolicies.tools.Log; +import org.openimis.imispolicies.tools.StorageManager; +import org.openimis.imispolicies.util.FileUtils; + import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -63,16 +69,13 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Locale; - -import static android.provider.MediaStore.EXTRA_OUTPUT; +import java.util.Date; public class Acquire extends AppCompatActivity { private static final String LOG_TAG = "ACQUIRE"; private static final int SCAN_QR_REQUEST_CODE = 0; private static final int TAKE_PHOTO_REQUEST_CODE = 1; + private static final String TEMP_PHOTO_PATH = "images/acquireTemp.jpg"; private Global global; @@ -85,19 +88,17 @@ public class Acquire extends AppCompatActivity { private String Path = null; private int result = 0; - private String msg = ""; private double Longitude, Latitude; private LocationManager lm; private String towers; private ClientAndroidInterface ca; private SQLHandler sqlHandler; - - private File tempPhotoFile; private Uri tempPhotoUri; private Picasso picasso; + private StorageManager storageManager; - private Target imageTarget = new Target() { + private final Target imageTarget = new Target() { @Override public void onBitmapLoaded(final Bitmap bitmap, Picasso.LoadedFrom from) { theImage = bitmap; @@ -105,8 +106,8 @@ public void onBitmapLoaded(final Bitmap bitmap, Picasso.LoadedFrom from) { } @Override - public void onBitmapFailed(Drawable errorDrawable) { - Log.e(LOG_TAG, "Loading acquired photo failed"); + public void onBitmapFailed(Exception exception, Drawable errorDrawable) { + Log.e(LOG_TAG, "Loading acquired photo failed", exception); } @Override @@ -120,33 +121,16 @@ public void onCreate(Bundle savedInstanceState) { setContentView(R.layout.acquire_main); final ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setTitle(getResources().getString(R.string.Acquire)); - + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setTitle(getResources().getString(R.string.Acquire)); + } global = (Global) getApplicationContext(); ca = new ClientAndroidInterface(this); - - picasso = new Picasso.Builder(this) - .listener((picasso, uri, exception) -> Log.e(LOG_TAG, String.format("Image load failed: %s", uri.toString()), exception)) - .loggingEnabled(BuildConfig.LOG) - .build(); - - Path = global.getSubdirectory("Images") + "/"; - tempPhotoFile = new File(Path, "temp.jpg"); - try { - if (tempPhotoFile.delete()) { - Log.i(LOG_TAG, "Leftover temp image deleted"); - } - if (!tempPhotoFile.createNewFile()) { - Log.w(LOG_TAG, "Temp photo file already exists"); - } - tempPhotoUri = FileProvider.getUriForFile(this, - String.format("%s.fileprovider", BuildConfig.APPLICATION_ID), - tempPhotoFile); - } catch (IOException e) { - Log.e(LOG_TAG, "Temp photo file creation failed", e); - } + picasso = new Picasso.Builder(this).build(); + storageManager = StorageManager.of(this); + sqlHandler = new SQLHandler(this); etCHFID = findViewById(R.id.etCHFID); iv = findViewById(R.id.imageView); @@ -154,7 +138,15 @@ public void onCreate(Bundle savedInstanceState) { btnScan = findViewById(R.id.btnScan); btnSubmit = findViewById(R.id.btnSubmit); - sqlHandler = new SQLHandler(this); + File tempPhotoFile = FileUtils.createTempFile(this, TEMP_PHOTO_PATH); + if (tempPhotoFile != null) { + tempPhotoUri = FileProvider.getUriForFile(this, + String.format("%s.fileprovider", BuildConfig.APPLICATION_ID), + tempPhotoFile); + if (tempPhotoUri == null) { + Log.w(LOG_TAG, "Failed to create temp photo URI"); + } + } etCHFID.addTextChangedListener(new TextWatcher() { @Override @@ -166,14 +158,14 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { } @Override - public void afterTextChanged(Editable InsNo) { - String path = null; - if (!InsNo.toString().isEmpty()) { - path = ca.GetListOfImagesContain(InsNo.toString()); + public void afterTextChanged(Editable text) { + File photoFile = null; + String insureeNumber = text.toString(); + if (!insureeNumber.isEmpty()) { + photoFile = ImageManager.of(Acquire.this).getNewestInsureeImage(insureeNumber); } - if (path != null && !"".equals(path)) { - File file = new File(path); - picasso.load(file) + if (photoFile != null) { + picasso.load(photoFile) .placeholder(R.drawable.person) .error(R.drawable.person) .into(iv); @@ -188,7 +180,7 @@ public void afterTextChanged(Editable InsNo) { Criteria c = new Criteria(); towers = lm.getBestProvider(c, false); if (towers != null) { - Location loc = null; + Location loc; if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { // TODO: Consider calling // ActivityCompat#requestPermissions @@ -207,19 +199,25 @@ public void afterTextChanged(Editable InsNo) { } } else { - Toast.makeText(Acquire.this, "No providers found", Toast.LENGTH_LONG).show(); + Log.w(LOG_TAG, "No location providers found"); + Toast.makeText(Acquire.this, "No location providers found", Toast.LENGTH_LONG).show(); } iv.setOnClickListener(v -> { }); btnTakePhoto.setOnClickListener(v -> { - try { - Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(EXTRA_OUTPUT, tempPhotoUri); - startActivityForResult(intent, TAKE_PHOTO_REQUEST_CODE); - } catch (ActivityNotFoundException e) { - Log.e(LOG_TAG, "Image capture activity not found", e); + if (!etCHFID.getText().toString().isEmpty()) { + try { + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, tempPhotoUri); + global.grantUriPermissions(this, tempPhotoUri, intent, Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + startActivityForResult(intent, TAKE_PHOTO_REQUEST_CODE); + } catch (ActivityNotFoundException e) { + Log.e(LOG_TAG, "Image capture activity not found", e); + } + } else { + Toast.makeText(this, R.string.MissingCHFID, Toast.LENGTH_LONG).show(); } }); @@ -252,15 +250,6 @@ public void afterTextChanged(Editable InsNo) { } runOnUiThread(() -> { - switch (result) { - case 1: - msg = getResources().getString(R.string.PhotoSaved); - break; - default: - msg = getResources().getString(R.string.CouldNotUpload); - break; - } - Toast.makeText(Acquire.this, getResources().getString(R.string.PhotoSaved), Toast.LENGTH_LONG).show(); etCHFID.setText(""); @@ -276,10 +265,7 @@ public void afterTextChanged(Editable InsNo) { @Override protected void onDestroy() { super.onDestroy(); - - if (!tempPhotoFile.delete()) { - Log.w(LOG_TAG, "Temp photo file deletion failed"); - } + FileUtils.removeTempFile(this, TEMP_PHOTO_PATH); } @Override @@ -289,8 +275,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == RESULT_OK) { picasso.invalidate(tempPhotoUri); picasso.load(tempPhotoUri) - .resize(global.getIntSetting("image_width_limit", 400), - global.getIntSetting("image_height_limit", 400)) + .resize(global.getIntKey("image_width_limit", 400), + global.getIntKey("image_height_limit", 400)) .centerInside() .into(imageTarget); } @@ -324,32 +310,39 @@ protected boolean isValidate() { } private int SubmitData() throws IOException, UserException { - int Uploaded = 0; - File myDir = new File(Path); - - //Get current date and format it in yyyyMMdd format - SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss", Locale.US); - Calendar cal = Calendar.getInstance(); - String d = format.format(cal.getTime()); - - String fName = etCHFID.getText() + "_" + global.getOfficerCode() + "_" + d + "_" + Latitude + "_" + Longitude + ".jpg"; - //Create file and delete if exists - File file = new File(myDir, fName); - if (file.exists()) file.delete(); - Uploaded = 1; - FileOutputStream out = new FileOutputStream(file); - theImage.compress(Bitmap.CompressFormat.JPEG, global.getIntSetting("image_jpeg_quality", 40), out); + String date = AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(new Date()); + String fName = etCHFID.getText() + "_" + global.getOfficerCode() + "_" + date + "_" + Latitude + "_" + Longitude + ".jpg"; - out.flush(); + File[] oldInsureeImages = ImageManager.of(this).getInsureeImages(etCHFID.getText().toString()); + + File file = new File(global.getSubdirectory("Images"), fName); + if (file.exists()) { + Log.w(LOG_TAG, String.format("File already exists: %s", file.getAbsolutePath())); + } + + FileOutputStream out = new FileOutputStream(file); + theImage.compress(Bitmap.CompressFormat.JPEG, global.getIntKey("image_jpeg_quality", 40), out); out.close(); + if (file.length() == 0L) { + Log.w(LOG_TAG, "Compressing photo failed, the resulting file has no content"); + if (!file.delete()) { + Log.w(LOG_TAG, "Deleting empty output file failed"); + } + return 0; + } else { + FileUtils.deleteFiles(oldInsureeImages); + } + ContentValues contentValues = new ContentValues(); contentValues.put("PhotoPath", file.getAbsolutePath()); String[] whereArgs = {etCHFID.getText().toString()}; - sqlHandler.updateData("tblInsuree", contentValues, "CHFID = ?", whereArgs); + if (sqlHandler.updateData("tblInsuree", contentValues, "CHFID = ?", whereArgs, false) == 0) { + Log.w(LOG_TAG, String.format("Cannot update photo path. No insuree for CHFID: %s", etCHFID.getText().toString())); + } - return Uploaded; + return 1; } @Override diff --git a/app/src/main/java/org/openimis/imispolicies/BulkControlNumbersActivity.java b/app/src/main/java/org/openimis/imispolicies/BulkControlNumbersActivity.java index bc899fd3..50a31966 100644 --- a/app/src/main/java/org/openimis/imispolicies/BulkControlNumbersActivity.java +++ b/app/src/main/java/org/openimis/imispolicies/BulkControlNumbersActivity.java @@ -3,17 +3,20 @@ import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; -import android.util.Log; +import org.openimis.imispolicies.tools.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.ArrayAdapter; +import android.widget.Button; import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.Spinner; @@ -29,6 +32,9 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; public class BulkControlNumbersActivity extends AppCompatActivity { private static final String LOG_TAG = "BULKCN"; @@ -49,6 +55,7 @@ public class BulkControlNumbersActivity extends AppCompatActivity { private Spinner dropdownSpinner; private AlertDialog productDialog; + private ScheduledExecutorService productDialogTimer; private ProgressDialog progressDialog; BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { @@ -87,17 +94,25 @@ protected void onCreate(Bundle savedInstanceState) { assignedCNCount.setText(CN_COUNT_INITIAL_VALUE); freeCNCount.setText(CN_COUNT_INITIAL_VALUE); + officerCode = global.getOfficerCode(); + availableProducts = sqlHandler.getAvailableProducts(officerCode); + createProductDialog(); + fetchBulkCn.setOnClickListener((view) -> { - if (global.isNetworkAvailable() && global.isLoggedIn()) + if (global.isNetworkAvailable() && global.isLoggedIn()) { productDialog.show(); - else { + shutdownTimer(); + startTimer(productCodes[dropdownSpinner.getSelectedItemPosition()], productDialog); + } else { Toast.makeText(this, R.string.LogInToFetchCn, Toast.LENGTH_LONG).show(); } }); + } - officerCode = global.getOfficerCode(); - availableProducts = sqlHandler.getAvailableProducts(officerCode); - productDialog = createProductDialog(); + @Override + protected void onDestroy() { + super.onDestroy(); + shutdownTimer(); } @Override @@ -119,10 +134,14 @@ protected void onPause() { private void handleRequestResult(Intent intent) { if (intent.getAction().equals(ControlNumberService.ACTION_REQUEST_ERROR)) { String errorMessage = intent.getStringExtra(ControlNumberService.FIELD_ERROR_MESSAGE); - Toast.makeText(this,errorMessage,Toast.LENGTH_LONG).show(); + Toast.makeText(this, errorMessage, Toast.LENGTH_LONG).show(); } progressDialog.dismiss(); - refreshCNCount(); + + new AlertDialog.Builder(this) + .setMessage(getResources().getString(R.string.CnRequestComplete, String.valueOf(global.getIntKey("min_cn_request_interval", 60)))) + .setPositiveButton(R.string.Ok, (dialog, id) -> refreshCNCount()) + .show(); } protected void refreshCNCount() { @@ -175,7 +194,7 @@ protected SimpleAdapter createCnDetailsAdapter(List> data) { ); } - protected AlertDialog createProductDialog() { + protected void createProductDialog() { LayoutInflater li = LayoutInflater.from(this); View productDropDown = li.inflate(R.layout.dropdown_dialog, (ViewGroup) null); @@ -199,18 +218,89 @@ protected AlertDialog createProductDialog() { } ArrayAdapter arrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, productNames); - dropdownSpinner.setAdapter(arrayAdapter); + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); alertDialogBuilder.setView(productDropDown); - - return alertDialogBuilder + productDialog = alertDialogBuilder .setPositiveButton(getResources().getString(R.string.Fetch), (dialog, id) -> { + shutdownTimer(); progressDialog = ProgressDialog.show(this, "", getResources().getString(R.string.FetchBulkCN)); - ControlNumberService.fetchBulkControlNumbers(this, productCodes[dropdownSpinner.getSelectedItemPosition()]); + String productCode = productCodes[dropdownSpinner.getSelectedItemPosition()]; + global.setLongKey(String.format("last_%s_request", productCode), System.currentTimeMillis()); + ControlNumberService.fetchBulkControlNumbers(this, productCode); }) .setNegativeButton(getResources().getString(R.string.Cancel), - (dialog, id) -> dialog.cancel()) + (dialog, id) -> { + shutdownTimer(); + dialog.cancel(); + }) + .setOnCancelListener((dialog) -> shutdownTimer()) .create(); + + //disable button by default, enable after interval check + productDialog.setOnShowListener((dialog) -> ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)); + + dropdownSpinner.setAdapter(arrayAdapter); + dropdownSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + shutdownTimer(); + startTimer(productCodes[position], productDialog); + } + + @Override + public void onNothingSelected(AdapterView parent) { + shutdownTimer(); + } + }); + } + + protected void checkProductRequest(String productCode, final AlertDialog productDialog) { + checkLastProductRequestInterval(productCode, productDialog); + } + + protected void checkLastProductRequestInterval(String productCode, final AlertDialog productDialog) { + int minInterval = (global.getIntKey("min_cn_request_interval", 60)); + long lastProductRequestMillis = global.getLongKey(String.format("last_%s_request", productCode), 0); + long currentMillis = System.currentTimeMillis(); + long interval = (currentMillis - lastProductRequestMillis) / 1000L; + if (interval >= minInterval) { + this.runOnUiThread(() -> enableFetchButton(productDialog)); + shutdownTimer(); + } else { + this.runOnUiThread(() -> disableFetchButton(getResources().getString(R.string.WaitXSeconds, String.valueOf(minInterval - interval)), productDialog)); + } + } + + protected void startTimer(String productCode, final AlertDialog productDialog) { + Log.i("BULKCN", "Async timer starting"); + productDialogTimer = Executors.newSingleThreadScheduledExecutor(); + productDialogTimer.scheduleAtFixedRate(() -> checkProductRequest(productCode, productDialog), 0, 1000, TimeUnit.MILLISECONDS); + } + + protected void shutdownTimer() { + if (productDialogTimer != null && !productDialogTimer.isShutdown()) { + Log.i("BULKCN", "Async timer stopping"); + productDialogTimer.shutdown(); + } + } + + protected void enableFetchButton(final AlertDialog productDialog) { + Button fetchButton = productDialog.getButton(DialogInterface.BUTTON_POSITIVE); + if (fetchButton != null) { + fetchButton.setEnabled(true); + fetchButton.setText(getResources().getString(R.string.Fetch)); + fetchButton.invalidate(); + } + } + + protected void disableFetchButton(String buttonLabel, final AlertDialog productDialog) { + Button fetchButton = productDialog.getButton(DialogInterface.BUTTON_POSITIVE); + if (fetchButton != null) { + fetchButton.setEnabled(false); + fetchButton.setText(buttonLabel); + fetchButton.invalidate(); + } } } diff --git a/app/src/main/java/org/openimis/imispolicies/CheckCommission.java b/app/src/main/java/org/openimis/imispolicies/CheckCommission.java index b480c42a..76531aeb 100644 --- a/app/src/main/java/org/openimis/imispolicies/CheckCommission.java +++ b/app/src/main/java/org/openimis/imispolicies/CheckCommission.java @@ -6,7 +6,9 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.util.Log; + +import org.openimis.imispolicies.tools.Log; + import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -18,9 +20,10 @@ import android.widget.TextView; import android.widget.Toast; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -453,7 +456,7 @@ public void LoginDialogBox() { e.printStackTrace(); } - tokenl.saveTokenText(token, validTo); + tokenl.saveTokenText(token, validTo, global.getOfficerCode()); final String finalToken = token; runOnUiThread(() -> { diff --git a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java index 3d978127..22753647 100644 --- a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java +++ b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java @@ -25,13 +25,11 @@ package org.openimis.imispolicies; -import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.ContentValues; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; @@ -43,6 +41,7 @@ import android.icu.text.DecimalFormat; import android.net.Uri; import android.os.Build; +import android.os.Parcelable; import android.provider.MediaStore; import android.support.annotation.RequiresApi; import android.support.v7.widget.DividerItemDecoration; @@ -50,8 +49,12 @@ import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.util.Base64; -import android.util.Log; -import android.util.Xml; + +import org.openimis.imispolicies.util.UriUtils; +import org.openimis.imispolicies.util.ZipUtils; +import org.openimis.imispolicies.tools.ImageManager; +import org.openimis.imispolicies.tools.Log; + import android.view.LayoutInflater; import android.view.View; import android.webkit.JavascriptInterface; @@ -61,6 +64,7 @@ import com.exact.CallSoap.CallSoap; import com.exact.InsureeImages; import com.exact.uploadfile.UploadFile; +import com.google.zxing.client.android.CaptureActivity; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; @@ -73,10 +77,9 @@ import java.util.Arrays; import java.util.Date; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; import org.json.JSONArray; import org.json.JSONException; @@ -95,6 +98,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Random; @@ -102,16 +107,18 @@ import java.util.Set; import java.util.regex.Pattern; -import org.openimis.imispolicies.Util.AndroidUtil; -import org.xmlpull.v1.XmlSerializer; +import org.openimis.imispolicies.tools.StorageManager; +import org.openimis.imispolicies.util.AndroidUtils; +import org.openimis.imispolicies.util.FileUtils; +import org.openimis.imispolicies.util.JsonUtils; +import org.openimis.imispolicies.util.StringUtils; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; import javax.net.ssl.HttpsURLConnection; import static android.database.sqlite.SQLiteDatabase.openOrCreateDatabase; -import static org.openimis.imispolicies.Util.JsonUtil.isStringEmpty; -import static org.openimis.imispolicies.Util.StringUtil.isEmpty; +import static android.provider.MediaStore.EXTRA_OUTPUT; public class ClientAndroidInterface { private static final String LOG_TAG_RENEWAL = "RENEWAL"; @@ -124,23 +131,16 @@ public class ClientAndroidInterface { private HashMap controls = new HashMap<>(); private String Path; private File[] files; - private File[] JSONfiles; - private int TotalFiles; - private int UploadCounter; // - private File XMLFile; private int result; private int UserId; - private Date edate; public static boolean Activate = false; private int IsFamilyAvailable; - private String payerId; private int DataDeleted; private int rtPolicyId = 0; private int rtPremiumId = 0; private int rtInsureeId = 0; private int rtEnrolledId = 0; private int enrol_result; - private Bitmap myBitmap; private String resu; private String fname = null; private Bitmap theImage; @@ -151,14 +151,13 @@ public class ClientAndroidInterface { EnrollmentReport enrollmentReport; - StringBuffer buffer = new StringBuffer(); - private ArrayList mylist = new ArrayList<>(); - private String salt; Picasso picassoInstance; Target imageTarget; + StorageManager storageManager; + ClientAndroidInterface(Context c) { mContext = c; @@ -166,13 +165,14 @@ public class ClientAndroidInterface { sqlHandler = new SQLHandler(c); getControls(); SQLiteDatabase database = sqlHandler.getReadableDatabase(); - Path = global.getMainDirectory(); + Path = global.getAppDirectory(); filePath = database.getPath(); + storageManager = StorageManager.of(mContext); database.close(); // activity = (Activity) c.getApplicationContext(); picassoInstance = new Picasso.Builder(mContext) .listener((picasso, path, exception) -> Log.e("Images", String.format("Image load failed: %s", path.toString()), exception)) - .loggingEnabled(BuildConfig.LOG) + .loggingEnabled(BuildConfig.LOGGING_ENABLED) .build(); } @@ -183,7 +183,6 @@ public void SetUrl(String Url) { } private void getControls() { - String tableName = "tblControls"; String[] columns = {"FieldName", "Adjustibility"}; String where = null; @@ -201,10 +200,7 @@ private void getControls() { } catch (JSONException e) { e.printStackTrace(); } - - } - } public String getSpecificControl(String FieldName) { @@ -270,12 +266,12 @@ public String getControl(String ctl) { @JavascriptInterface public void ShowToast(String msg) { - AndroidUtil.showToast(mContext, msg); + AndroidUtils.showToast(mContext, msg); } @JavascriptInterface public AlertDialog ShowDialog(String msg) { - return AndroidUtil.showDialog(mContext, msg); + return AndroidUtils.showDialog(mContext, msg); } @JavascriptInterface @@ -681,34 +677,25 @@ public String getRelationships() { @JavascriptInterface public String getHFLevels() { - JSONArray HFLevels = new JSONArray(); - JSONObject object = new JSONObject(); + JSONArray jsonHFLevels = new JSONArray(); + JSONObject jsonObject = new JSONObject(); + LinkedHashMap hfLevels = global.getHFLevels(); try { - object.put("Code", ""); - object.put("HFLevel", mContext.getResources().getString(R.string.SelectHFLevel)); - HFLevels.put(object); - - object = new JSONObject(); - object.put("Code", "D");//Uploaded = 1; - object.put("HFLevel", mContext.getResources().getString(R.string.Dispensary)); - HFLevels.put(object); - - object = new JSONObject(); - object.put("Code", "C"); - object.put("HFLevel", mContext.getResources().getString(R.string.HealthCentre)); - HFLevels.put(object); - - object = new JSONObject(); - object.put("Code", "H"); - object.put("HFLevel", mContext.getResources().getString(R.string.Hospital)); - HFLevels.put(object); - + jsonObject.put("Code", ""); + jsonObject.put("HFLevel", mContext.getResources().getString(R.string.SelectHFLevel)); + jsonHFLevels.put(jsonObject); + for (String key : hfLevels.keySet()) { + jsonObject = new JSONObject(); + jsonObject.put("Code", key); + jsonObject.put("HFLevel", hfLevels.get(key)); + jsonHFLevels.put(jsonObject); + } } catch (JSONException e) { e.printStackTrace(); } - return HFLevels.toString(); + return jsonHFLevels.toString(); } @JavascriptInterface @@ -817,7 +804,7 @@ public int SaveFamily(String FamilyData, String InsureeData) { Online = 2; values.put("isOffline", 2); } - sqlHandler.updateData("tblFamilies", values, "FamilyId = ? AND (isOffline = ? OR isOffline = ?) ", new String[]{String.valueOf(FamilyId), String.valueOf(isOffline), String.valueOf(Online)}); + sqlHandler.updateData("tblFamilies", values, "FamilyId = ? AND (isOffline = ? OR isOffline = ?) ", new String[]{String.valueOf(FamilyId), String.valueOf(isOffline), String.valueOf(Online)}, false); //Automatic sync /* if (isOffline == 0 && global.getUserId() > 0) { @@ -894,7 +881,11 @@ private JSONObject getFamilySMS(String familyId) { String query = "SELECT * FROM tblFamilySMS where FamilyId = ? LIMIT 1;"; String[] queryArgs = {familyId}; try { - JSONObject result = sqlHandler.getResult(query, queryArgs).getJSONObject(0); + JSONObject result = null; + JSONArray array = sqlHandler.getResult(query, queryArgs); + if (array.length() > 0) { + result = array.getJSONObject(0); + } return result; } catch (JSONException e) { e.printStackTrace(); @@ -957,8 +948,6 @@ public int SaveInsuree(String InsureeData, int FamilyId, int isHead, int ExceedT int isOffline = 1; int insureeIsOffline = 1; int MaxInsureeId = 0; - Boolean res = false; - int newInsureeId = 0; try { global = (Global) mContext.getApplicationContext(); HashMap data = jsonToTable(InsureeData); @@ -1071,7 +1060,6 @@ public int SaveInsuree(String InsureeData, int FamilyId, int isHead, int ExceedT if (global.isNetworkAvailable()) { //if (isOffline == 0){ MaxInsureeId = -MaxInsureeId; - newInsureeId = MaxInsureeId; //} values.put("InsureeId", MaxInsureeId); @@ -1126,41 +1114,11 @@ else if (ExceedThreshold == 0) values.put("isOffline", insureeIsOffline); sqlHandler.updateData("tblInsuree", values, "InsureeId = ? AND (isOffline = ?)", new String[]{String.valueOf(InsureeId), String.valueOf(insureeIsOffline)}); } - if (global.isNetworkAvailable()) { - if (isOffline == 0 || isOffline == 2) { - if (isOffline == 2) isOffline = 0; - if (global.getUserId() > 0) { - if (rtInsureeId > 0) { - newInsureeId = -rtInsureeId; - } else { - newInsureeId = rtInsureeId; - } - if (rtInsureeId == 0 && res) { - inProgress = false; - } else { - } - inProgress = false; - } - inProgress = false; - } else { - inProgress = false; - } - inProgress = false; - } else { - inProgress = false; - } - - - } catch (NumberFormatException e) { + } catch (NumberFormatException | UserException e) { e.printStackTrace(); throw new Exception(e.getMessage()); - } catch (UserException e) { - e.printStackTrace(); - throw new Exception(e.getMessage()); - } - while (inProgress) { } - inProgress = false; + return rtInsureeId; } @@ -1178,19 +1136,22 @@ private String copyImageFromGalleryToApplication(String selectedPath, String Ins Calendar cal = Calendar.getInstance(); String d = format.format(cal.getTime()); - String outputFileName = global.getImageFolder() + InsuranceNumber + "_" + global.getOfficerCode() + "_" + d + "_0_0.jpg"; - File outputFile = new File(outputFileName); + File[] oldFiles = ImageManager.of(mContext).getInsureeImages(InsuranceNumber); + Runnable deleteOldFiles = () -> FileUtils.deleteFiles(oldFiles); + + String outputFileName = InsuranceNumber + "_" + global.getOfficerCode() + "_" + d + "_0_0.jpg"; + File outputFile = new File(global.getImageFolder(), outputFileName); if (!outputFile.createNewFile()) { Log.e("IMAGES", "Creating image copy failed"); } FileOutputStream outputStream = new FileOutputStream(outputFile); - imageTarget = new OutputStreamImageTarget(outputStream, global.getIntSetting("image_jpeg_quality", 40)); + imageTarget = new OutputStreamImageTarget(outputStream, global.getIntKey("image_jpeg_quality", 40), deleteOldFiles); try { ((Activity) mContext).runOnUiThread(() -> picassoInstance.load(selectedPath) - .resize(global.getIntSetting("image_width_limit", 400), - global.getIntSetting("image_height_limit", 400)) + .resize(global.getIntKey("image_width_limit", 400), + global.getIntKey("image_height_limit", 400)) .centerInside() .into(imageTarget)); } catch (ClassCastException e) { @@ -1211,19 +1172,12 @@ public AlertDialog deleteDialog(String msg, final int FamilyId) { .setMessage(msg) .setIcon(R.drawable.ic_about) .setCancelable(false) - .setPositiveButton(R.string.Yes, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - if (DeleteFamily(FamilyId) == 1) { - ShowDialog(mContext.getResources().getString(R.string.FamilyDeleted)); - } + .setPositiveButton(R.string.Yes, (dialogInterface, i) -> { + if (DeleteFamily(FamilyId) == 1) { + ShowDialog(mContext.getResources().getString(R.string.FamilyDeleted)); } }) - .setNegativeButton(R.string.No, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - //some code when you click No - } + .setNegativeButton(R.string.No, (dialog, which) -> { }).show(); } @@ -1452,6 +1406,7 @@ else if (dateWithGracePeriod4 != null && (dEnrollDate.compareTo(dateWithGracePer } + public static Uri tempPhotoUri = null; public static int RESULT_LOAD_IMG = 1; public static int RESULT_SCAN = 100; public static String ImagePath; @@ -1460,8 +1415,22 @@ else if (dateWithGracePeriod4 != null && (dEnrollDate.compareTo(dateWithGracePer @JavascriptInterface public void selectPicture() { + Path = global.getSubdirectory("Images") + "/"; + + File tempPhotoFile = FileUtils.createTempFile(mContext, "images/selectPictureTemp.jpeg"); + tempPhotoUri = UriUtils.createUriForFile(mContext, tempPhotoFile); + if (tempPhotoUri == null) return; + Intent galleryIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); - ((Activity) mContext).startActivityForResult(galleryIntent, RESULT_LOAD_IMG); + + final List cameraIntents = new ArrayList<>(); + Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); + cameraIntent.putExtra(EXTRA_OUTPUT, tempPhotoUri); + cameraIntents.add(cameraIntent); + + final Intent chooserIntent = Intent.createChooser(galleryIntent, "Select Source"); + chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, cameraIntents.toArray(new Parcelable[cameraIntents.size()])); + ((Activity) mContext).startActivityForResult(chooserIntent, RESULT_LOAD_IMG); } @JavascriptInterface @@ -1675,49 +1644,6 @@ public double getPolicyValue(String enrollDate, int ProductId, int FamilyId, Str return PolicyValue; } -/* String imagefile ="/sdcard/DCIM/100ANDRO/DSC_0530.jpg"; - Bitmap bm = ShrinkBitmap(imagefile, 300, 300); - - //this method compresses the image and saves into a location in sdcard - Bitmap ShrinkBitmap(String file, int width, int height){ - - BitmapFactory.Options bmpFactoryOptions = new BitmapFactory.Options(); - bmpFactoryOptions.inJustDecodeBounds = true; - Bitmap bitmap = BitmapFactory.decodeFile(file, bmpFactoryOptions); - - int heightRatio = (int)Math.ceil(bmpFactoryOptions.outHeight/(float)height); - int widthRatio = (int)Math.ceil(bmpFactoryOptions.outWidth/(float)width); - - if (heightRatio > 1 || widthRatio > 1) - { - if (heightRatio > widthRatio) - { - bmpFactoryOptions.inSampleSize = heightRatio; - } else { - bmpFactoryOptions.inSampleSize = widthRatio; - } - } - - bmpFactoryOptions.inJustDecodeBounds = false; - bitmap = BitmapFactory.decodeFile(file, bmpFactoryOptions); - - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream); - byte[] imageInByte = stream.toByteArray(); - //this gives the size of the compressed image in kb - long lengthbmp = imageInByte.length / 1024; - - try { - bitmap.compress(CompressFormat.JPEG, 100, new FileOutputStream("/sdcard/mediaAppPhotos/compressed_new.jpg")); - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return bitmap; - }*/ - @JavascriptInterface public String getOfficers(int LocationId, String EnrolmentDate) { @@ -2084,14 +2010,14 @@ public int SavePremiums(String PremiumData, int PolicyId, int PremiumId, int Fam @JavascriptInterface public String getPayers(int RegionId, int DistrictId) { - String Query = "SELECT PayerId, PayerName,P.LocationId FROM tblPayer P \n" + - "LEFT OUTER JOIN tblLocations L ON P.LocationId = L.LocationId\n" + - "WHERE (P.LocationId = " + DistrictId + " OR L.ParentLocationId = P.LocationId OR P.LocationId = 'null' OR P.LocationId = '') " + + String Query = "SELECT PayerId, PayerName,P.LocationId FROM tblPayer P " + + "LEFT OUTER JOIN tblLocations L ON P.LocationId = L.LocationId " + + "WHERE L.LocationId = ? OR L.LocationId = ? OR L.LocationId = 'null' OR L.LocationId = '' OR L.LocationId = 0 " + "ORDER BY L.LocationId"; /* "INNER JOIN uvwLocations L ON P.LocationId = L.LocationId\n" + "WHERE (L.RegionId = " + RegionId + " OR L.RegionId ='null' OR L.RegionId ='') AND (L.DistrictId = " + DistrictId + " OR L.DistrictId ='null' OR L.DistrictId ='') " + " ORDER BY L.LocationId";*/ - JSONArray Payers = sqlHandler.getResult(Query, null); + JSONArray Payers = sqlHandler.getResult(Query, new String[]{String.valueOf(RegionId), String.valueOf(DistrictId)}); return Payers.toString(); } @@ -2602,7 +2528,7 @@ public String OfflineRenewals(String OfficerCode) { } - public String InsertRenewals(String Result) { + public String InsertRenewalsFromApi(String Result) { String TableName = "tblRenewals"; String[] Columns = {"renewalId", "policyId", "officerId", "officerCode", "chfid", "lastName", "otherNames", "productCode", "productName", "villageName", "renewalPromptDate", "phone", "renewalUUID"}; String Where = "isDone = ?"; @@ -2617,6 +2543,21 @@ public String InsertRenewals(String Result) { return String.valueOf(1); } + public String InsertRenewalsFromExtract(String Result) { + String TableName = "tblRenewals"; + String[] Columns = {"RenewalId", "PolicyId", "OfficerId", "OfficerCode", "CHFID", "LastName", "OtherNames", "ProductCode", "ProductName", "VillageName", "RenewalPromptDate", "Phone", "RenewalUUID"}; + String Where = "isDone = ?"; + String[] WhereArg = {"N"}; + sqlHandler.deleteData(TableName, Where, WhereArg); + try { + sqlHandler.insertData(TableName, Columns, Result, ""); + } catch (JSONException e) { + e.printStackTrace(); + return String.valueOf(0); + } + return String.valueOf(1); + } + public Boolean deleteRecodedPolicy(String policyId) { String Where = "PolicyId = ?"; String[] WhereArg = {policyId}; @@ -2870,49 +2811,38 @@ public void uploadEnrolment() throws Exception { pd = ProgressDialog.show(mContext, mContext.getResources().getString(R.string.Sync), mContext.getResources().getString(R.string.SyncProcessing)); final ProgressDialog finalPd = pd; try { - new Thread() { - public void run() { - try { - enrol_result = Enrol(0, 0, 0, 0, 1); - } catch (UserException e) { - finalPd.dismiss(); - e.printStackTrace(); - } catch (JSONException e) { - finalPd.dismiss(); - e.printStackTrace(); - } catch (IOException e) { - finalPd.dismiss(); - e.printStackTrace(); - } catch (NumberFormatException e) { - finalPd.dismiss(); - e.printStackTrace(); - } + new Thread(() -> { + try { + enrol_result = Enrol(0, 0, 0, 0, 1); + } catch (UserException | JSONException | IOException | NumberFormatException e) { finalPd.dismiss(); - if (mylist.size() == 0) { - ((Activity) mContext).runOnUiThread(() -> { - if (enrol_result != 999) { - //if error is encountered - if (enrolMessages != null && enrolMessages.size() > 0) { - CharSequence[] charSequence = enrolMessages.toArray(new CharSequence[0]); - AlertDialog.Builder builder = new AlertDialog.Builder(mContext); - builder.setTitle(mContext.getResources().getString(R.string.UploadFailureReport)); - builder.setCancelable(false); - builder.setItems(charSequence, null); - builder.setPositiveButton(mContext.getResources().getString(R.string.Ok), (dialogInterface, i) -> dialogInterface.dismiss()); - AlertDialog dialog = builder.create(); - dialog.show(); - enrolMessages.clear(); + e.printStackTrace(); + } + finalPd.dismiss(); + if (mylist.size() == 0) { + ((Activity) mContext).runOnUiThread(() -> { + if (enrol_result != 999) { + //if error is encountered + if (enrolMessages != null && enrolMessages.size() > 0) { + CharSequence[] charSequence = enrolMessages.toArray(new CharSequence[0]); + AlertDialog.Builder builder = new AlertDialog.Builder(mContext); + builder.setTitle(mContext.getResources().getString(R.string.UploadFailureReport)); + builder.setCancelable(false); + builder.setItems(charSequence, null); + builder.setPositiveButton(mContext.getResources().getString(R.string.Ok), (dialogInterface, i) -> dialogInterface.dismiss()); + AlertDialog dialog = builder.create(); + dialog.show(); + enrolMessages.clear(); - } else { - ShowDialog(mContext.getResources().getString(R.string.FamilyUploaded)); - } } else { - ShowDialog(mContext.getResources().getString(R.string.NoDataAvailable)); + ShowDialog(mContext.getResources().getString(R.string.FamilyUploaded)); } - }); - } + } else { + ShowDialog(mContext.getResources().getString(R.string.NoDataAvailable)); + } + }); } - }.start(); + }).start(); } catch (Exception e) { if (finalPd.isShowing()) { finalPd.dismiss(); @@ -2923,103 +2853,91 @@ public void run() { } @JavascriptInterface - public void CreateEnrolmentXML() throws Exception { - - pd = new ProgressDialog(mContext); - pd = ProgressDialog.show(mContext, "", mContext.getResources().getString(R.string.Uploading)); - - try { - new Thread() { - public void run() { - try { - enrol_result = Enrol(0, 0, 0, 0, 2); - if (enrol_result == 0) { - //zipFile(); - zipFiles(); - deleteUnzippedFie(); - deleteUnzippedPhotos(); - + public void CreateEnrolmentXML() { + new Thread(() -> { + try { + enrol_result = Enrol(0, 0, 0, 0, 2); + if (enrol_result == 0) { + storageManager.requestCreateFile(MainActivity.REQUEST_CREATE_ENROL_EXPORT, + "application/octet-stream", getEnrolmentExportFilename()); + } + } catch (Exception e) { + Log.e("ENROL XML", "Error while creating enrolment xml", e); + } + if (mylist.size() == 0) { + ((Activity) mContext).runOnUiThread(() -> { + if (enrol_result != 999) { + //if error is encountered + if (enrolMessages.size() > 0 && enrolMessages != null) { + CharSequence[] charSequences = enrolMessages.toArray(new CharSequence[(enrolMessages.size())]); + AlertDialog.Builder builder = new AlertDialog.Builder(mContext); + builder.setTitle(mContext.getResources().getString(R.string.UploadFailureReport)); + builder.setCancelable(false); + builder.setItems(charSequences, null); + builder.setPositiveButton(mContext.getResources().getString(R.string.Ok), (dialogInterface, i) -> dialogInterface.dismiss()); + AlertDialog dialog = builder.create(); + dialog.show(); + enrolMessages.clear(); + } else { + //deleteImage(); + ShowDialog(mContext.getResources().getString(R.string.XmlCreated)); } - } catch (UserException e) { - e.printStackTrace(); - } catch (JSONException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (NumberFormatException e) { - e.printStackTrace(); - } - if (mylist.size() == 0) { - ((Activity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - if (enrol_result != 999) { - //if error is encountered - if (enrolMessages.size() > 0 && enrolMessages != null) { - CharSequence[] charSequence = enrolMessages.toArray(new CharSequence[(enrolMessages.size())]); - AlertDialog.Builder builder = new AlertDialog.Builder(mContext); - builder.setTitle(mContext.getResources().getString(R.string.UploadFailureReport)); - builder.setCancelable(false); - builder.setItems(charSequence, null); - builder.setPositiveButton(mContext.getResources().getString(R.string.Ok), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { - dialogInterface.dismiss(); - } - }); - AlertDialog dialog = builder.create(); - dialog.show(); - enrolMessages.clear(); - - } else { - //deleteImage(); - ShowDialog(mContext.getResources().getString(R.string.XmlCreated)); - } - } else { - ShowDialog(mContext.getResources().getString(R.string.NoDataAvailable)); - } - - //ShowDialog(mContext.getResources().getString(R.string.FamilyUploaded)); - } - - }); } else { - ((Activity) mContext).runOnUiThread( - new Runnable() { - @Override - public void run() { - ShowDialog(mylist.toString()); - } - }); + AndroidUtils.showToast(mContext, R.string.NoDataAvailable); } + //ShowDialog(mContext.getResources().getString(R.string.FamilyUploaded)); + }); + } else { + ((Activity) mContext).runOnUiThread( + () -> ShowDialog(mylist.toString())); + } + }).start(); + } - - pd.dismiss(); - } - }.start(); - } catch (Exception e) { - e.printStackTrace(); - throw new Exception(e.getMessage()); + @JavascriptInterface + public void CreateRenewalExport() { + if (FileUtils.getFileCount(new File(global.getSubdirectory("Renewal"))) > 0) { + new Thread(() -> storageManager.requestCreateFile(MainActivity.REQUEST_CREATE_RENEWAL_EXPORT, + "application/octet-stream", getRenewalExportFilename())).start(); + } else { + AndroidUtils.showToast(mContext, R.string.NoDataAvailable); } + } + @JavascriptInterface + public void CreateFeedbackExport() { + if (FileUtils.getFileCount(new File(global.getSubdirectory("Feedback"))) > 0) { + new Thread(() -> storageManager.requestCreateFile(MainActivity.REQUEST_CREATE_FEEDBACK_EXPORT, + "application/octet-stream", getFeedbackExportFilename())).start(); + } else { + AndroidUtils.showToast(mContext, R.string.NoDataAvailable); + } + } + + public boolean isPolicyRequired() { + return !getRule("AllowFamilyWithoutPolicy", false); } - /* private void deleteImage() { - File fdelete = new File(PhotoPath.trim()); - if (fdelete.exists()) { - if (fdelete.delete()) { - System.out.println("file Deleted :" + file_dj_path); - } else { - System.out.println("file not Deleted :" + file_dj_path); - } - } - }*/ public boolean isContributionRequired() { return !getRule("AllowPolicyWithoutPremium") && getRule("ShowPaymentOption", true); } + public String getFamilyValidationError(String chfid, int errorMessageId) { + return String.format("Family %s %s", + chfid, + mContext.getResources().getString(errorMessageId) + ); + } + + public String getInsureeValidationError(String chfid, String lastname, String othername, int errorMessageId) { + return String.format("Insuree %s %s %s %s", + chfid, lastname, othername, + mContext.getResources().getString(errorMessageId) + ); + } + public ArrayList VerifyFamily() throws JSONException { ArrayList FamilyIDs = new ArrayList(); boolean result = true; @@ -3070,11 +2988,9 @@ public ArrayList VerifyFamily() throws JSONException { Query += " WHERE FamilyId = " + FamilyId + ""; JSONArray policiesArray = sqlHandler.getResult(Query, null); - if (IsOffline == 1) { - - if (policiesArray.length() == 0) { - result = false; - } + if (IsOffline == 1 && isPolicyRequired() && policiesArray.length() == 0) { //Family offline without a policy + mylist.add(getFamilyValidationError(familyArray.getJSONObject(0).getString("HOFCHFID"), R.string.WithoutPolicy)); + result = false; } //get Premiums @@ -3083,25 +2999,10 @@ public ArrayList VerifyFamily() throws JSONException { "INNER JOIN tblPolicy PL ON PL.PolicyId = PR.PolicyId"; Query += " WHERE FamilyId = " + FamilyId; JSONArray premiumsArray = sqlHandler.getResult(Query, null); - if (IsOffline == 1) { - if (isContributionRequired()) { - if (premiumsArray.length() == 0) { - JSONObject family = familyArray.getJSONObject(0); - String chfid = family.getString("HOFCHFID"); - mylist.add("Family " + chfid + " " + mContext.getResources().getString(R.string.WithoutPolicyPremium)); - result = false; - } - } - } else { - if (policiesArray.length() != 0) { - if (isContributionRequired()) { - if (premiumsArray.length() == 0) { - JSONObject family = familyArray.getJSONObject(0); - String chfid = family.getString("HOFCHFID"); - mylist.add("Family " + chfid + " " + mContext.getResources().getString(R.string.WithoutPolicyPremium)); - result = false; - } - } + if (IsOffline == 1 || policiesArray.length() != 0) { //Family offline or policy added to online family + if (isContributionRequired() && premiumsArray.length() == 0) { + mylist.add(getFamilyValidationError(familyArray.getJSONObject(0).getString("HOFCHFID"), R.string.WithoutPremium)); + result = false; } } @@ -3117,7 +3018,7 @@ public ArrayList VerifyFamily() throws JSONException { } if (mylist.size() != 0) { - addCategoryBox(); + ShowErrorMessages(); mylist.clear(); } return FamilyIDs; @@ -3141,10 +3042,12 @@ public boolean VerifyPhoto(JSONArray insurees) throws JSONException { if (IsOffline == 1) { if (!getRule("AllowInsureeWithoutPhoto")) { if (PhotoPath == null || PhotoPath.length() == 0 || PhotoPath.equals("null")) { - String chfid = (Insureeobject.getString("CHFID")); - String lastname = (Insureeobject.getString("LastName")); - String othername = (Insureeobject.getString("OtherNames")); - mylist.add("Insuree " + chfid + " " + " " + lastname + " " + " " + othername + " " + mContext.getResources().getString(R.string.WithoutPhoto)); + mylist.add(getInsureeValidationError( + Insureeobject.getString("CHFID"), + Insureeobject.getString("LastName"), + Insureeobject.getString("OtherNames"), + R.string.WithoutPhoto + )); result = false; } } @@ -3277,18 +3180,19 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, if (CallerId != 2) { Query += " I.FamilyId = " + FamilyId + " \n"; if (Integer.parseInt(Offline) == 0) { - if (CallerId == 1 || CallerId == 2) { + if (CallerId == 1) { Query += " AND I.InsureeId < 0" + ""; } } } else { - Query += "I.InsureeId < 0 AND ("; + Query += "("; for (int j = 0; j < verifiedId.size(); j++) { + if (getFamilyStatus(Integer.parseInt(verifiedId.get(j))) == 0) { if ((verifiedId.size() - j) == 1) { - Query += " I.FamilyId == " + verifiedId.get(j) + ""; + Query += "I.InsureeId < 0 AND I.FamilyId == " + verifiedId.get(j) + ""; } else { - Query += " I.FamilyId == " + verifiedId.get(j) + " OR "; + Query += "I.InsureeId < 0 AND I.FamilyId == " + verifiedId.get(j) + " OR "; } } else { if ((verifiedId.size() - j) == 1) { @@ -3304,7 +3208,6 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, Query += ")"; } - if (CallerId == 0) Query += " AND I.InsureeId = " + oInsureeId; JSONArray insureesArray = sqlHandler.getResult(Query, null); @@ -3323,12 +3226,10 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, JSONObject ob = insureesArray.getJSONObject(j); String typeofId = ob.getString("TypeOfId"); - if (typeofId == "0") { + if (typeofId.equals("0")) { ob.put("TypeOfId", ""); - newInsureesArray.put(ob); - } else { - newInsureesArray.put(ob); } + newInsureesArray.put(ob); } insureesArray = newInsureesArray; @@ -3355,11 +3256,18 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, if (CallerId == 0) Query += " AND PolicyId = " + oPolicyId; JSONArray policiesArray = sqlHandler.getResult(Query, null); - QueryPL = Query; + if (CallerId == 1 || CallerId == 2) { + if (IsOffline == 1 && isPolicyRequired() && policiesArray.length() == 0) { + mylist.add(getFamilyValidationError( + insureesArray.getJSONObject(0).getString("CHFID"), + R.string.WithoutPolicy + )); + } + } - if (insureesArray.length() > 0 || policiesArray.length() != 0 || familyArray.length() > 0) { + if (insureesArray.length() > 0 || policiesArray.length() > 0 || familyArray.length() > 0) { //get Premiums Query = "SELECT PR.PremiumId, PR.PolicyId, NULLIF(PR.PayerId,'null') PayerId, PR.Amount, PR.Receipt, PR.PayDate, PR.PayType, PR.isPhotoFee,PR.isOffline\n" + @@ -3384,56 +3292,17 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, if (CallerId == 0) { Query += " AND PR.PremiumId = " + oPremiumId; } - JSONArray premiumsArray = sqlHandler.getResult(Query, null); + JSONArray premiumsArray = sqlHandler.getResult(Query, null); QueryPR = Query; if (CallerId == 1 || CallerId == 2) { - if (IsOffline == 1) { - if (premiumsArray.length() == 0) { - if (isContributionRequired()) { - String chfid = null; - String lastname = null; - String othername = null; - try { - JSONObject insuree = insureesArray.getJSONObject(0); - chfid = insuree.getString("CHFID"); - lastname = insuree.getString("LastName"); - othername = insuree.getString("OtherNames"); - } catch (JSONException e) { - e.printStackTrace(); - } - mylist.add("Family " + chfid + " " + " " + lastname + " " + " " + othername + " " + mContext.getResources().getString(R.string.WithoutPolicyPremium)); - } - } - } else { - if (policiesArray.length() != 0) { - - JSONArray newpoliciesArray = new JSONArray(); - JSONObject ob = null; - for (int j = 0; j < policiesArray.length(); j++) { - ob = policiesArray.getJSONObject(j); - newpoliciesArray.put(ob); - } - policiesArray = newpoliciesArray; - - if (premiumsArray.length() == 0) { - if (isContributionRequired()) { - String chfid = null; - String lastname = null; - String othername = null; - try { - JSONObject insuree = insureesArray.getJSONObject(0); - chfid = insuree.getString("CHFID"); - lastname = insuree.getString("LastName"); - othername = insuree.getString("OtherNames"); - } catch (JSONException e) { - e.printStackTrace(); - } - mylist.add("Family " + chfid + " " + " " + lastname + " " + " " + othername + " " + mContext.getResources().getString(R.string.WithoutPolicyPremium)); - - } - } + if (IsOffline == 1 || policiesArray.length() != 0) { //Family offline or policy added to online family + if (isContributionRequired() && premiumsArray.length() == 0) { + mylist.add(getFamilyValidationError( + insureesArray.getJSONObject(0).getString("CHFID"), + R.string.WithoutPremium + )); } } } @@ -3447,8 +3316,8 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, if (CallerId != 2) { Query += " WHERE PL.FamilyId = " + FamilyId; } - JSONArray InsureePolicyArray = sqlHandler.getResult(Query, null); + JSONArray InsureePolicyArray = sqlHandler.getResult(Query, null); QueryIP = Query; JSONObject objEnrol = new JSONObject(); @@ -3477,9 +3346,9 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, objEnrol.put("InsureePolicy", InsureePolicyArray); String InsureePolicy = objEnrol.toString(); - global = (Global) mContext.getApplicationContext(); - if (CallerId != 2) { + InsureeImages[] InsureeImages = FamilyPictures(insureesArray, CallerId); + if (mylist.size() == 0) { JSONObject resultObj = new JSONObject(); JSONArray familyArr = new JSONArray(); @@ -3489,8 +3358,6 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, // Insuree + picture JSONArray tempInsureesArray = new JSONArray(); - InsureeImages[] InsureeImages = FamilyPictures(insureesArray, CallerId); - for (int j = 0; j < insureesArray.length(); j++) { tempInsureesArray = insureesArray; JSONObject imgObj = new JSONObject(); @@ -3519,59 +3386,54 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, } familyObj.put("policies", policiesArray); - - if (mylist.size() != 0) { - addCategoryBox(); - break; - } - // InsureePolicy familyObj.put("insureePolicy", InsureePolicyArray); - - familyArr.put(familyObj); resultObj.put("family", familyArr); - if (mylist.size() != 0) { - addCategoryBox(); - break; - } - ToRestApi rest = new ToRestApi(); HttpResponse response = rest.postToRestApiToken(resultObj, "family"); - - HttpEntity entity = response.getEntity(); - String responseString = EntityUtils.toString(entity); - - boolean parsingErrorOccured = false; - try { - JSONObject responseObject = new JSONObject(responseString); - if (responseObject.has("error_occured") && responseObject.getBoolean("error_occured")) { + String responseString = rest.getContent(response); + if (response.getStatusLine().getStatusCode() == HttpURLConnection.HTTP_OK + || response.getStatusLine().getStatusCode() == HttpURLConnection.HTTP_CREATED) { + boolean parsingErrorOccured = false; + try { + JSONObject responseObject = new JSONObject(responseString); + if (responseObject.has("error_occured") && responseObject.getBoolean("error_occured")) { + EnrolResult = -400; + enrolMessages.add(responseObject.getString("error_message")); + } else if (responseObject.has("response")) { + EnrolResult = responseObject.getInt("response"); + } else { + throw new JSONException("Response does not have required information"); + } + } catch (JSONException e) { EnrolResult = -400; - enrolMessages.add(responseObject.getString("error_message")); - } else if (responseObject.has("response")) { - EnrolResult = responseObject.getInt("response"); - } else { - throw new JSONException("Response does not have required information"); + parsingErrorOccured = true; } - } catch (JSONException e) { + + if (parsingErrorOccured) { + try { + EnrolResult = Integer.parseInt(responseString); + } catch (NumberFormatException e) { + Log.e("ENROLL", "Sync response is not a valid json or int"); + } + } + } else { + enrolMessages.add(mContext.getResources().getString(R.string.HttpResponse, response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase())); EnrolResult = -400; - parsingErrorOccured = true; } - if (parsingErrorOccured) { - try { - EnrolResult = Integer.parseInt(responseString); - } catch (NumberFormatException e) { - Log.e("ENROLL", "Sync response is not a valid json or int"); - } + if (EnrolResult != 0) { + Log.d("ENROL", "API RESPONSE: " + mContext.getResources().getString(R.string.HttpResponse, response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase()) + "\n" + responseString); } + } else { - addCategoryBox(); + ShowErrorMessages(); break; } } else { if (!"".equals(QueryF)) { - fname = sqlHandler.getResultXML2(QueryF, QueryI, QueryPL, QueryPR, QueryIP, global.getOfficerCode(), global.getOfficerId()); + fname = sqlHandler.getExportAsXML(QueryF, QueryI, QueryPL, QueryPR, QueryIP, global.getOfficerCode(), global.getOfficerId()); FamilyPictures(insureesArray, 2); } EnrolResult = 0; @@ -3609,16 +3471,17 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, } if (mylist.size() == 0) { - if (CallerId == 1 || CallerId == 2) { + if (CallerId == 1) { DeleteImages(insureesArray, verifiedId, CallerId); - DeleteUploadedData(Integer.parseInt(FamilyId), verifiedId, CallerId); - DeleteFamily(Integer.parseInt(FamilyId)); } + + DeleteUploadedData(Integer.parseInt(FamilyId), verifiedId, CallerId); + DeleteFamily(Integer.parseInt(FamilyId)); } } else { - String ErrMsg = null; + String ErrMsg; switch (EnrolResult) { case -1: ErrMsg = "[" + CHFNumber + "] " + mContext.getString(R.string.MissingHOF); @@ -3650,15 +3513,12 @@ private int Enrol(int oFamilyId, int oInsureeId, int oPolicyId, int oPremiumId, } else { EnrolResult = 0; - if (CallerId == 1 || CallerId == 2) { + if (CallerId == 1) { DeleteImages(insureesArray, verifiedId, CallerId); - DeleteUploadedData(Integer.parseInt(FamilyId), verifiedId, CallerId); } - if (CallerId == 1 || CallerId != 0) { - DeleteImages(insureesArray, verifiedId, CallerId); - if (IsOffline == 0 || IsOffline == 0) { - DeleteFamily(Integer.parseInt(FamilyId)); - } + DeleteUploadedData(Integer.parseInt(FamilyId), verifiedId, CallerId); + if (IsOffline == 0) { + DeleteFamily(Integer.parseInt(FamilyId)); } } @@ -3694,33 +3554,14 @@ public void updatePolicyRecords(String policy) throws JSONException { } } - private void deleteUnzippedFie() { - /* global = (Global) mContext.getApplicationContext(); - @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy-HH"); - Calendar cal = Calendar.getInstance(); - String d = format.format(cal.getTime());*/ - - String targetPath = global.getSubdirectory("Family"); - File file = new File(targetPath, fname); - file.delete(); - } - - public void deleteUnzippedPhotos() { - String targetPath = global.getSubdirectory("Photos"); - File folder = new File(targetPath); - for (int i = 0; i < folder.listFiles().length; i++) { - if (folder.listFiles()[i].isFile()) { - folder.listFiles()[i].delete(); - } + public void clearDirectory(String directory) { + File[] files = new File(global.getSubdirectory(directory)).listFiles(); + if (files != null) { + FileUtils.deleteFiles(files); } } - public InsureeImages[] FamilyPictures(JSONArray insurees, int CallerId) throws IOException { - - String Path = global.getSubdirectory("Photos"); - //Here we are creating a directory - InsureeImages[] images = new InsureeImages[insurees.length()]; String PhotoPath = null; @@ -3784,8 +3625,11 @@ public InsureeImages[] FamilyPictures(JSONArray insurees, int CallerId) throws I InsureeImages img = new InsureeImages("", empty); images[j] = img; } else { - mylist.add("Insuree " + chfid + " " + " " + lastname + " " + " " + othername + " " + mContext.getResources().getString(R.string.WithoutPhoto)); - addCategoryBox(); + mylist.add(getInsureeValidationError( + chfid, lastname, othername, + R.string.WithoutPhoto + )); + ShowErrorMessages(); break; } } else { @@ -3830,86 +3674,49 @@ public static void copy(String name, byte[] data) throws IOException { out.close(); } - public void xmlWriter(String ImgName, byte[] imgcontent) throws IOException { - File Dir = new File(global.getSubdirectory("EnrolmentXML")); - - //Here we are giving name to the XML file - String FileName = "EnrolmentXml.xml"; - - //Here we are creating file in that directory - File EnrollmentXML = new File(Dir, FileName); - //Here we are creating outputstream - FileOutputStream fos = new FileOutputStream(EnrollmentXML, true); - - - XmlSerializer serializer = Xml.newSerializer(); - - serializer.setOutput(fos, "UTF-8"); - serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); - serializer.startTag(null, "Pictures"); - - serializer.startTag(null, "ImageName"); - serializer.text(ImgName); - serializer.endTag(null, "ImageName"); + public String getEnrolmentExportFilename() { + return getExportFileName("Enrolment"); + } - serializer.startTag(null, "ImageContent"); - serializer.text(String.valueOf(imgcontent)); - serializer.endTag(null, "ImageContent"); + public String getRenewalExportFilename() { + return getExportFileName("Renewal"); + } - serializer.endTag(null, "Pictures"); - serializer.endDocument(); - serializer.flush(); - fos.close(); + public String getFeedbackExportFilename() { + return getExportFileName("Feedback"); } - public void zipFile() { - global = (Global) mContext.getApplicationContext(); - //@SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); - @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy-HH-mm"); - @SuppressLint("SimpleDateFormat") SimpleDateFormat formatZip = new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss"); + public String getExportFileName(String type) { + SimpleDateFormat formatZip = new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss", Locale.US); Calendar cal = Calendar.getInstance(); - String d = format.format(cal.getTime()); String dzip = formatZip.format(cal.getTime()); + return type + "_" + global.getOfficerCode() + "_" + dzip + ".rar"; + } - String targetPath = global.getSubdirectory("Enrolment") + File.separator + "Enrolment_" + global.getOfficerCode() + "_" + d + ".xml"; - String zipFilePath = global.getSubdirectory("Enrolment") + File.separator + "Enrolment_" + global.getOfficerCode() + "_" + dzip + ".rar"; - //String unzippedFolderPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/IMIS/Enrolment/Enrolment_"+global.getOfficerCode()+"_"+d+".xml"; + + public File zipEnrolmentFiles() { + File zipFile = FileUtils.createTempFile(mContext, "exports/" + getEnrolmentExportFilename(), true); String password = getRarPwd(); + File imageDir = new File(global.getImageFolder()); + File familyDir = new File(global.getSubdirectory("Family")); - Compressor.zip(targetPath, zipFilePath, password); - //Compressor.unzip(zipFilePath, unzippedFolderPath, password); + return ZipUtils.zipDirectories(zipFile, password, familyDir, imageDir); } - public void zipFiles() { - global = (Global) mContext.getApplicationContext(); - @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy-HH"); - @SuppressLint("SimpleDateFormat") SimpleDateFormat formatZip = new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss"); - Calendar cal = Calendar.getInstance(); - String d = format.format(cal.getTime()); - String dzip = formatZip.format(cal.getTime()); - - String targetPath = global.getSubdirectory("Photos"); - String targetPathFamily = global.getSubdirectory("Family"); - String zipFilePath = global.getSubdirectory("Enrolment") + File.separator + "Enrolment_" + global.getOfficerCode() + "_" + dzip + ".rar"; - //String unzippedFolderPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/IMIS/Photos_"+global.getOfficerCode()+"_"+d+""; + public File zipRenewalFiles() { + File zipFile = FileUtils.createTempFile(mContext, "exports/" + getRenewalExportFilename(), true); String password = getRarPwd(); + File familyDir = new File(global.getSubdirectory("Renewal")); - ArrayList FilesToAdd = new ArrayList(); - File folder = new File(targetPath); - File Family = new File(targetPathFamily); - for (int i = 0; i < folder.listFiles().length; i++) { - if (folder.listFiles()[i].isFile()) { - FilesToAdd.add(new File(folder.listFiles()[i].getPath())); - } - } - for (int i = 0; i < Family.listFiles().length; i++) { - if (Family.listFiles()[i].isFile()) { - FilesToAdd.add(new File(Family.listFiles()[i].getPath())); - } - } + return ZipUtils.zipDirectories(zipFile, password, familyDir); + } - Compressor.zip(FilesToAdd, zipFilePath, password); - //Compressor.unzip(zipFilePath, unzippedFolderPath, password); + public File zipFeedbackFiles() { + File zipFile = FileUtils.createTempFile(mContext, "exports/" + getFeedbackExportFilename(), true); + String password = getRarPwd(); + File familyDir = new File(global.getSubdirectory("Feedback")); + + return ZipUtils.zipDirectories(zipFile, password, familyDir); } public boolean unZipWithPassword(String fileName, String password) { @@ -3918,7 +3725,7 @@ public boolean unZipWithPassword(String fileName, String password) { //String unzippedFolderPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/IMIS/Enrolment/Enrolment_"+global.getOfficerCode()+"_"+d+".xml"; //here we not don't have password set yet so we pass password from Edit Text rar input try { - Compressor.unzip(targetPath, unzippedFolderPath, password); + ZipUtils.unzipPath(targetPath, unzippedFolderPath, password); } catch (Exception e) { return false; } @@ -3932,126 +3739,23 @@ public boolean unZip(String FileName) { String password = getRarPwd(); try { - Compressor.unzip(targetPath, unzippedFolderPath, password); + ZipUtils.unzipPath(targetPath, unzippedFolderPath, password); } catch (Exception e) { return false; } return true; } - public boolean unZipFeedbacksRenewals(String FileName) { - String targetPath = global.getSubdirectory("Database") + File.separator + FileName; - String unzippedFolderPath = global.getSubdirectory("Database"); - //String unzippedFolderPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/IMIS/Enrolment/Enrolment_"+global.getOfficerCode()+"_"+d+".xml"; - + public boolean unZipFeedbacksRenewals(File file) { String password = getRarPwd(); try { - Compressor.unzip(targetPath, unzippedFolderPath, password); + ZipUtils.unzipFile(file, file.getParentFile(), password); } catch (Exception e) { return false; } return true; } - - @JavascriptInterface - public void zipFeedBackRenewal(final String FileType) { - global = (Global) mContext.getApplicationContext(); - //@SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); - @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy-HH-mm-ss"); - Calendar cal = Calendar.getInstance(); - String d = format.format(cal.getTime()); - - - String targetPath = global.getMainDirectory(); - String zipFilePath = global.getMainDirectory() + File.separator + "Master" + FileType + ".rar"; - //String unzippedFolderPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + "/IMIS/Photos_"+global.getOfficerCode()+"_"+d+""; - - String password = getRarPwd(); - - ArrayList FilesToAdd = new ArrayList(); - File folder = new File(targetPath); - for (int i = 0; i < folder.listFiles().length; i++) { - final int[] status = {0}; - if (folder.listFiles()[i].isFile()) { - String fname = folder.listFiles()[i].getName(); - if (FileType.equals("Feedback")) { - String str = fname.substring(0, 9); - if (str.equals("feedback_")) { - FilesToAdd.add(new File(folder.listFiles()[i].getPath())); - } - } else { - String str = fname.substring(0, 7); - if (str.equals("RenPol_")) { - FilesToAdd.add(new File(folder.listFiles()[i].getPath())); - } - } - } - - } - - - Compressor.zip(FilesToAdd, zipFilePath, password); - if (FilesToAdd.size() > 0) { - ShowDialog(mContext.getResources().getString(R.string.XmlCreated) + " with " + FilesToAdd.size() + " Files"); - } else { - ShowDialog(mContext.getResources().getString(R.string.NoDataAvailable)); - } - - //Compressor.unzip(zipFilePath, unzippedFolderPath, password); - } - -/* @JavascriptInterface - public void UploadImages(final String Filename) { - - files = GetListOfImages(global.getImageFolder(), Filename); - UploadFile uf = new UploadFile(); - if(files.length > 0){ - if (uf.isValidFTPCredentials()) { - for (int i = 0; i < files.length; i++) { - UploadCounter = i + 1; - if (uf.uploadFileToServer(mContext, files[i], "org.openimis.imispolicies")) { - files[i].delete(); - } - } - } - } -*//* new Thread() { - public void run() { - files = GetListOfImages(global.getImageFolder(), Filename); - UploadFile uf = new UploadFile(); - if(files.length > 0){ - if (uf.isValidFTPCredentials()) { - - for (int i = 0; i < files.length; i++) { - UploadCounter = i + 1; - if (uf.uploadFileToServer(mContext, files[i], "org.openimis.imispolicies")) { - files[i].delete(); - } - } - } - } - - } - }.start();*//* - - }*/ - - public void createZipImage() { -/* OutputStream out; - String root = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS)+"/"; - File createDir = new File(root+"Folder Name"+File.separator); - if(!createDir.exists()) { - createDir.mkdir(); - } - File file = new File(root + "Folder Name" + File.separator +"Name of File"); - file.createNewFile(); - out = new FileOutputStream(file); - - out.write(data); - out.close();*/ - } - public String getRarPwd() { global = (Global) mContext.getApplicationContext(); String password = ""; @@ -4125,47 +3829,34 @@ public void DeleteImages(JSONArray insurees, ArrayList FamilyIDs, int Ca } - public void addCategoryBox() { - - ((Activity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - // get prompts.xml view - LayoutInflater li = LayoutInflater.from(mContext); - View promptsView = li.inflate(R.layout.error_message, null); - - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(mContext); + public void ShowErrorMessages() { - // set prompts.xml to alertdialog builder - alertDialogBuilder.setView(promptsView); + ((Activity) mContext).runOnUiThread(() -> { + // get prompts.xml view + LayoutInflater li = LayoutInflater.from(mContext); + View promptsView = li.inflate(R.layout.error_message, null); - final TextView textView1 = (TextView) promptsView.findViewById(R.id.textView1); - final RecyclerView error_message = (RecyclerView) promptsView.findViewById(R.id.error_message); + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(mContext); - enrollmentReport = new EnrollmentReport(mContext, mylist); + // set prompts.xml to alertdialog builder + alertDialogBuilder.setView(promptsView); - error_message.setLayoutManager(new LinearLayoutManager(mContext)); - error_message.addItemDecoration(new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL)); - error_message.setAdapter(enrollmentReport); + final TextView textView1 = (TextView) promptsView.findViewById(R.id.textView1); + final RecyclerView error_message = (RecyclerView) promptsView.findViewById(R.id.error_message); - String title = mContext.getString(R.string.failedToUpload); - textView1.setText(title.toUpperCase()); - // set dialog message - alertDialogBuilder - .setCancelable(false) - .setPositiveButton("Ok", - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); + enrollmentReport = new EnrollmentReport(mContext, mylist); - // create alert dialog - AlertDialog alertDialog = alertDialogBuilder.create(); + error_message.setLayoutManager(new LinearLayoutManager(mContext)); + error_message.addItemDecoration(new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL)); + error_message.setAdapter(enrollmentReport); - // show it - alertDialog.show(); - } + String title = mContext.getString(R.string.failedToUpload); + textView1.setText(title.toUpperCase()); + // set dialog message + alertDialogBuilder + .setCancelable(false) + .setPositiveButton("Ok", (dialog, id) -> dialog.cancel()) + .show(); }); } @@ -4259,8 +3950,7 @@ public boolean LoginToken(final String Username, final String Password) { } catch (JSONException e) { e.printStackTrace(); } - - global.getJWTToken().saveTokenText(jwt, validTo); + global.getJWTToken().saveTokenText(jwt, validTo, global.getOfficerCode()); ((Activity) mContext).runOnUiThread( () -> MainActivity.SetLoggedIn(mContext.getResources().getString(R.string.Login), mContext.getResources().getString(R.string.Logout)) @@ -4278,12 +3968,7 @@ public int isValidLogin(final String Username, final String Password) throws Int cs.setFunctionName("isValidLogin"); UserId = cs.isUserLoggedIn(Username, Password); global.setUserId(UserId); - ((Activity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - MainActivity.SetLoggedIn(mContext.getResources().getString(R.string.Login), mContext.getResources().getString(R.string.Logout)); - } - }); + ((Activity) mContext).runOnUiThread(() -> MainActivity.SetLoggedIn(mContext.getResources().getString(R.string.Login), mContext.getResources().getString(R.string.Logout))); return UserId; } @@ -4315,7 +4000,7 @@ public String GetSnapshotIndicators() { private void DeleteUploadedData(final int FamilyId, ArrayList FamilyIDs, int CallerId) { if (FamilyIDs.size() == 0) { - FamilyIDs = new ArrayList() {{ + FamilyIDs = new ArrayList<>() {{ add(String.valueOf(FamilyId)); }}; } @@ -4366,63 +4051,49 @@ private void deleteUploadedTableData(String tableName, String where) { } @JavascriptInterface - public Boolean UploadOfflineFeedbackRenewal(final String ActivityName) { - final File[] files, jsonFiles; - final String functionName, jsonPropertyName, path; + public void uploadFeedbacks() { final int totalFiles; final ProgressDialog pd; - result = ToRestApi.UploadStatus.NO_RESPONSE; + if (!global.isNetworkAvailable()) { + ShowDialog(mContext.getResources().getString(R.string.NoInternet)); + return; + } - path = global.getMainDirectory(); + File feedbackDir = new File(global.getSubdirectory("Feedback")); + File[] xmlFiles = feedbackDir.listFiles((file) -> file.getName().endsWith(".xml")); + File[] jsonFiles = feedbackDir.listFiles((file) -> file.getName().endsWith(".json")); - if (ActivityName.equals("renewal")) { - files = GetListOfFiles(path, "Renewal", null); - jsonFiles = GetListOfJSONFiles(path, "Renewal", null); - functionName = "policy/renew"; - jsonPropertyName = "Policy"; - } else { - files = GetListOfFiles(Path, "Feedback", null); - jsonFiles = GetListOfJSONFiles(Path, "Feedback", null); - functionName = "feedback"; - jsonPropertyName = "feedback"; + if (xmlFiles == null || jsonFiles == null) { + ShowDialog(mContext.getResources().getString(R.string.NoFiles)); + DeleteFeedBacks(); + return; } - totalFiles = files.length; + totalFiles = jsonFiles.length; if (totalFiles == 0) { ShowDialog(mContext.getResources().getString(R.string.NoDataAvailable)); - //Clean tables in database as well - if (ActivityName.equals("renewal")) { - DeleteRenewals(); - } else { - DeleteFeedBacks(); - } - - return false; - } - - if (!global.isNetworkAvailable()) { - ShowDialog(mContext.getResources().getString(R.string.NoInternet)); - return false; + DeleteFeedBacks(); + return; } - pd = ProgressDialog.show(mContext, mContext.getResources().getString(R.string.Sync), mContext.getResources().getString(R.string.SyncProcessing)); + pd = AndroidUtils.showProgressDialog(mContext, R.string.Sync, R.string.SyncProcessing); new Thread(() -> { ToRestApi rest = new ToRestApi(); JSONObject obj; int uploadsAccepted = 0, uploadsRejected = 0, uploadFailed = 0; for (int i = 0; i < jsonFiles.length; i++) { - String jsonText = global.getFileText(jsonFiles[i].getPath()); + String jsonText = FileUtils.readFileAsUTF8String(jsonFiles[i]); HttpResponse response = null; int responseCode = -1; int uploadStatus = -1; try { - obj = new JSONObject(jsonText).getJSONObject(jsonPropertyName); - response = rest.postToRestApiToken(obj, functionName); + obj = new JSONObject(jsonText).getJSONObject("feedback"); + response = rest.postToRestApiToken(obj, "feedback"); if (response != null) { responseCode = response.getStatusLine().getStatusCode(); if (responseCode == HttpURLConnection.HTTP_OK) { @@ -4438,11 +4109,11 @@ public Boolean UploadOfflineFeedbackRenewal(final String ActivityName) { } else if (responseCode == HttpURLConnection.HTTP_OK) { if (uploadStatus == ToRestApi.UploadStatus.ACCEPTED) { uploadsAccepted += 1; - MoveFile(files[i], 1); + MoveFile(xmlFiles[i], 1); MoveFile(jsonFiles[i], 1); } else { uploadsRejected += 1; - MoveFile(files[i], 2); + MoveFile(xmlFiles[i], 2); MoveFile(jsonFiles[i], 2); } } @@ -4473,18 +4144,27 @@ public Boolean UploadOfflineFeedbackRenewal(final String ActivityName) { }); pd.dismiss(); }).start(); - return true; } @JavascriptInterface public void uploadRenewals() { - final String path; final int totalFiles; final ProgressDialog pd; - path = global.getMainDirectory(); - File[] files = GetListOfFiles(path, "Renewal", null); - File[] jsonFiles = GetListOfJSONFiles(path, "Renewal", null); + if (!global.isNetworkAvailable()) { + ShowDialog(mContext.getResources().getString(R.string.NoInternet)); + return; + } + + File renewalDir = new File(global.getSubdirectory("Renewal")); + File[] xmlFiles = renewalDir.listFiles((file) -> file.getName().endsWith(".xml")); + File[] jsonFiles = renewalDir.listFiles((file) -> file.getName().endsWith(".json")); + + if (xmlFiles == null || jsonFiles == null) { + ShowDialog(mContext.getResources().getString(R.string.NoFiles)); + DeleteRenewals(); + return; + } totalFiles = jsonFiles.length; @@ -4494,12 +4174,7 @@ public void uploadRenewals() { return; } - if (!global.isNetworkAvailable()) { - ShowDialog(mContext.getResources().getString(R.string.NoInternet)); - return; - } - - pd = AndroidUtil.showProgressDialog(mContext, R.string.Sync, R.string.SyncProcessing); + pd = AndroidUtils.showProgressDialog(mContext, R.string.Sync, R.string.SyncProcessing); new Thread(() -> { StringBuilder messageBuilder = new StringBuilder(); @@ -4518,7 +4193,7 @@ public void uploadRenewals() { int acceptedRenewals = 0; for (int i = 0; i < jsonFiles.length; i++) { - String jsonText = global.getFileText(jsonFiles[i].getPath()); + String jsonText = FileUtils.readFileAsUTF8String(jsonFiles[i]); String renewalInsureeNo = ""; HttpResponse response; @@ -4562,11 +4237,11 @@ public void uploadRenewals() { if (messages.containsKey(uploadStatus)) { if (uploadStatus == ToRestApi.RenewalStatus.ACCEPTED || uploadStatus == ToRestApi.RenewalStatus.ALREADY_ACCEPTED) { - MoveFile(files[i], 1); + MoveFile(xmlFiles[i], 1); MoveFile(jsonFiles[i], 1); acceptedRenewals++; } else { - MoveFile(files[i], 2); + MoveFile(xmlFiles[i], 2); MoveFile(jsonFiles[i], 2); messageBuilder.append(String.format(messageFormat, renewalInsureeNo, messages.get(uploadStatus))); } @@ -4574,15 +4249,17 @@ public void uploadRenewals() { } String successMessage = mContext.getResources().getString(R.string.BulkUpload); - + String failMessage = mContext.getResources().getString(R.string.RenewalRejected); String resultMessage; - if (acceptedRenewals != jsonFiles.length) { + if (acceptedRenewals == 0) { + resultMessage = failMessage; + } else if (acceptedRenewals != jsonFiles.length) { resultMessage = successMessage + "\n" + messageBuilder.toString(); } else { resultMessage = successMessage; } - ((Activity) mContext).runOnUiThread(() -> AndroidUtil.showDialog(mContext, resultMessage)); + ((Activity) mContext).runOnUiThread(() -> AndroidUtils.showDialog(mContext, resultMessage)); pd.dismiss(); }).start(); @@ -4626,14 +4303,7 @@ public boolean accept(File dir, String filename) { private File[] GetListOfImages(String DirectoryPath, final String FileName) { File Directory = new File(DirectoryPath); - FilenameFilter filter = new FilenameFilter() { - - @Override - public boolean accept(File dir, String filename) { - return filename.equalsIgnoreCase(FileName); - } - }; - return Directory.listFiles(filter); + return Directory.listFiles((dir, filename) -> filename.equalsIgnoreCase(FileName)); } @JavascriptInterface @@ -4645,7 +4315,7 @@ public String GetListOfImagesContain(final String FileName) { Photos = Directory.listFiles((dir, filename) -> filename.startsWith(FileName + "_")); if (Photos != null && Photos.length > 0) { - Arrays.sort(Photos, (f1, f2) -> f1.getName().compareTo(f2.getName())); + Arrays.sort(Photos, (f1, f2) -> Long.compare(f1.lastModified(), f2.lastModified())); newFileName = Photos[Photos.length - 1].toString(); } return newFileName; @@ -4653,7 +4323,7 @@ public String GetListOfImagesContain(final String FileName) { private void MoveFile(File file, int res) { String Accepted = "", Rejected = ""; - if (file.getName().contains("RenPol_") || file.getName().contains("RenPolJSON_")) { + if (file.getName().contains("Renewal_") || file.getName().contains("RenewalJSON_")) { Accepted = "AcceptedRenewal"; Rejected = "RejectedRenewal"; } else if (file.getName().contains("feedback_") || file.getName().contains("feedbackJSON_")) { @@ -4736,43 +4406,30 @@ public void popUpOfficerDialog() { @JavascriptInterface public void downloadMasterData() throws InterruptedException { - ProgressDialog pd = null; - pd = ProgressDialog.show(mContext, mContext.getResources().getString(R.string.Sync), mContext.getResources().getString(R.string.DownloadingMasterData)); - final ProgressDialog finalPd = pd; - Thread t = new Thread() { - public void run() { - try { - startDownloading(); - finalPd.dismiss(); - - ((Activity) mContext).runOnUiThread(() -> { - ShowDialog(mContext.getResources().getString(R.string.DataDownloadedSuccess)); - Global global = Global.getGlobal(); - global.setOfficerCode(""); -// Intent refresh = new Intent(mContext, MainActivity.class); -// ((MainActivity)mContext).startActivity(refresh); -// ((MainActivity)mContext).finish(); - ((MainActivity) mContext).ShowEnrolmentOfficerDialog(); - }); + ProgressDialog pd = ProgressDialog.show(mContext, mContext.getResources().getString(R.string.Sync), mContext.getResources().getString(R.string.DownloadingMasterData)); + new Thread(() -> { + try { + startDownloading(); - } catch (JSONException e) { - //e.printStackTrace(); - finalPd.dismiss(); - } catch (UserException e) { - //e.printStackTrace(); - finalPd.dismiss(); - } + ((Activity) mContext).runOnUiThread(() -> { + ShowDialog(mContext.getResources().getString(R.string.DataDownloadedSuccess)); + Global global = Global.getGlobal(); + global.setOfficerCode(""); + ((MainActivity) mContext).ShowEnrolmentOfficerDialog(); + }); + } catch (JSONException e) { + Log.e("MASTERDATA", "Error while parsing master data", e); + } catch (UserException e) { + Log.e("MASTERDATA", "Error while downloading master data", e); + ((Activity) mContext).runOnUiThread(() -> { + AndroidUtils.showDialog(mContext, + mContext.getResources().getString(R.string.DataDownloadedFailed), + e.getMessage()); + }); + } finally { + pd.dismiss(); } - }; - t.start(); - - - //return true; - // finally { -// pd.dismiss(); -// } - - + }).start(); } public void importMasterData(String data) throws JSONException, UserException { @@ -4789,17 +4446,19 @@ public void importMasterData(String data) throws JSONException, UserException { } } - @SuppressWarnings("ConstantConditions") + public void startDownloading() throws JSONException, UserException { ToRestApi rest = new ToRestApi(); - String MD = rest.getObjectFromRestApi("master"); - - JSONObject masterData = new JSONObject(MD); - - if (masterData.length() == 0) - throw new UserException(mContext.getResources().getString(R.string.DownloadMasterDataFailed)); + HttpResponse response = rest.getFromRestApi("master"); + String error = rest.getHttpError(mContext, response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase()); + if (error == null) { + String MD = rest.getContent(response); + JSONObject masterData = new JSONObject(MD); - processNewFormat(masterData); + processNewFormat(masterData); + } else { + throw new UserException(error); + } } private void processOldFormat(JSONArray masterData) throws UserException { @@ -5204,22 +4863,14 @@ public static void setInsuranceNo(String insuranceNo) { } @JavascriptInterface - public String getScannedNumber() { - //clearInsuranceNo(); - //clearXml(); + public void getScannedNumber() { Intent intent = new Intent("com.google.zxing.client.android.SCAN"); intent.putExtra("SCAN_MODE", "QR_CODE_MODE"); try { - ((Activity) mContext).startActivityForResult(intent, 100); - ((MainActivity) mContext).InsureeNumber = ""; - while (((MainActivity) mContext).InsureeNumber == "") { - - } + ((Activity) mContext).startActivityForResult(intent, RESULT_SCAN); } catch (Exception e) { - e.printStackTrace(); + Log.e("ENROL", "Error while trying to initiate QR scan", e); } - - return ((MainActivity) mContext).InsureeNumber; } @JavascriptInterface @@ -5515,12 +5166,7 @@ public void UpdateInsureePolicy(int PolicyId) {//herman new public File[] getPhotos() { String path = mContext.getApplicationInfo().dataDir + "/Images/"; File Directory = new File(path); - FilenameFilter filter = new FilenameFilter() { - @Override - public boolean accept(File dir, String filename) { - return filename.contains("0"); - } - }; + FilenameFilter filter = (dir, filename) -> filename.contains("0"); File[] newFiles = Directory.listFiles(filter); return Directory.listFiles(filter); } @@ -5531,63 +5177,53 @@ public void UploadPhotos() throws JSONException { pd = new ProgressDialog(mContext); pd = ProgressDialog.show(mContext, "", mContext.getResources().getString(R.string.Uploading)); - new Thread() { - public void run() { + new Thread(() -> { // try { // Thread.sleep(10000); // } catch (InterruptedException e) { // e.printStackTrace(); // } - File[] Photo = getPhotos(); - - if (Photo.length > 0) { - UploadFile uf = new UploadFile(); - if (uf.isValidFTPCredentials()) { - for (int i = 0; i < Photo.length; i++) { - UploadCounter = i + 1; - String FileName = Photo[i].toString().substring(Photo[i].toString().lastIndexOf("/") + 1); - String PhotoQuery = "SELECT PhotoPath FROM tblInsuree WHERE isOffline = 1 AND REPLACE(PhotoPath, RTRIM(PhotoPath, REPLACE(PhotoPath, '/', '')), '') = '" + FileName + "'"; - JSONArray jsonArray = sqlHandler.getResult(PhotoQuery, null); - JSONObject jsonObject = null; - String PhotoPath = ""; - if (jsonArray.length() > 0) { - try { - jsonObject = jsonArray.getJSONObject(0); - PhotoPath = jsonObject.getString("PhotoPath"); - } catch (JSONException e) { - e.printStackTrace(); - } + File[] Photo = getPhotos(); + + if (Photo.length > 0) { + UploadFile uf = new UploadFile(); + if (uf.isValidFTPCredentials()) { + for (int i = 0; i < Photo.length; i++) { + String FileName = Photo[i].toString().substring(Photo[i].toString().lastIndexOf("/") + 1); + String PhotoQuery = "SELECT PhotoPath FROM tblInsuree WHERE isOffline = 1 AND REPLACE(PhotoPath, RTRIM(PhotoPath, REPLACE(PhotoPath, '/', '')), '') = '" + FileName + "'"; + JSONArray jsonArray = sqlHandler.getResult(PhotoQuery, null); + JSONObject jsonObject = null; + String PhotoPath = ""; + if (jsonArray.length() > 0) { + try { + jsonObject = jsonArray.getJSONObject(0); + PhotoPath = jsonObject.getString("PhotoPath"); + } catch (JSONException e) { + e.printStackTrace(); } - if (PhotoPath.trim().length() == 0) { - if (uf.uploadFileToServer(mContext, Photo[i], "com.imispolicies.imis.enrollment")) { - RegisterUploadDetails(FileName); - Uploaded = 1; - Photo[i].delete(); - } + } + if (PhotoPath.trim().length() == 0) { + if (uf.uploadFileToServer(mContext, Photo[i], "com.imispolicies.imis.enrollment")) { + RegisterUploadDetails(FileName); + Uploaded = 1; + Photo[i].delete(); } } } - - } else { - Uploaded = 0; } - ((Activity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - if (Uploaded == 1) { - ShowDialog(mContext.getResources().getString(R.string.PhotosUploaded)); - } else { - ShowDialog(mContext.getResources().getString(R.string.NoPhoto)); - } - } - - }); - - pd.dismiss(); - + } else { + Uploaded = 0; } - }.start(); + ((Activity) mContext).runOnUiThread(() -> { + if (Uploaded == 1) { + ShowDialog(mContext.getResources().getString(R.string.PhotosUploaded)); + } else { + ShowDialog(mContext.getResources().getString(R.string.NoPhoto)); + } + }); + pd.dismiss(); + }).start(); } private SecretKeySpec generateKey(String encPassword) throws Exception { @@ -5667,58 +5303,54 @@ public void BackToDefaultRarPassword() { public int ModifyFamily(final String InsuranceNumber) { IsFamilyAvailable = 0; inProgress = true; - String Query = "SELECT * FROM tblInsuree WHERE Trim(CHFID) = '" + InsuranceNumber + "'"; - JSONArray JsonInsNo = sqlHandler.getResult(Query, null); - if (JsonInsNo.length() > 0) { - IsFamilyAvailable = 2; - inProgress = false; + int insureeCount = sqlHandler.getCount("tblInsuree", "Trim(CHFID) = ?", new String[]{InsuranceNumber}); + if (insureeCount > 0) { + ShowDialog(mContext.getResources().getString(R.string.FamilyExists)); } else { try { ToRestApi rest = new ToRestApi(); - String MD = rest.getObjectFromRestApiToken("family/" + InsuranceNumber.trim()); - if (!isEmpty(MD)) { - JSONObject FamilyData = new JSONObject(MD); - if (FamilyData.length() == 0) { - IsFamilyAvailable = 0; - } else { - DownloadFamilyData(FamilyData); + HttpResponse response = rest.getFromRestApiToken("family/" + InsuranceNumber.trim()); + String error = rest.getHttpError(mContext, response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase()); + String content = rest.getContent(response); + + if (response.getStatusLine().getStatusCode() == HttpURLConnection.HTTP_NOT_FOUND) { + ShowDialog(mContext.getResources().getString(R.string.InsuranceNumberNotFound)); + } else if (!StringUtils.isEmpty(error)) { + ShowDialog(error); + } else if (StringUtils.isEmpty(content)) { + ShowDialog(mContext.getResources().getString(R.string.SomethingWrongServer)); + } else { + JSONObject FamilyData = new JSONObject(content); + if (FamilyData.length() != 0) { + parseFamilyData(FamilyData); IsFamilyAvailable = 1; + } else { + ShowDialog(mContext.getResources().getString(R.string.InsuranceNumberNotFound)); } } - inProgress = false; - } catch (JSONException e) { - inProgress = false; - e.printStackTrace(); - } catch (UserException e) { - inProgress = false; - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - while (inProgress) { + } catch (JSONException | UserException | IOException e) { + Log.e("MODIFYFAMILY", "Error while downloading a family", e); } } - inProgress = false; return IsFamilyAvailable; } - private void DownloadFamilyData(JSONObject FamilyData) throws JSONException, UserException, IOException { + private void parseFamilyData(JSONObject familyData) throws JSONException, UserException, IOException { JSONArray newFamilyArr = new JSONArray(); JSONArray newInsureeArr = new JSONArray(); - FamilyData.put("familyId", "-" + FamilyData.getString("familyId")); - FamilyData.put("insureeId", "-" + FamilyData.getString("insureeId")); + familyData.put("familyId", "-" + familyData.getString("familyId")); + familyData.put("insureeId", "-" + familyData.getString("insureeId")); // Copy oryginal object - JSONObject cloneFamilyData = new JSONObject(FamilyData.toString()); + JSONObject cloneFamilyData = new JSONObject(familyData.toString()); JSONArray Insuree = (JSONArray) cloneFamilyData.get("insurees"); - String familyUUID = FamilyData.getString("familyUUID"); - String familyId = FamilyData.getString("familyId"); + String familyUUID = familyData.getString("familyUUID"); + String familyId = familyData.getString("familyId"); // Add familyUUID to Insuree for (int i = 0; i < Insuree.length(); i++) { @@ -5763,24 +5395,27 @@ private void DownloadFamilyData(JSONObject FamilyData) throws JSONException, Use for (int i = 0; i < newInsureeArr.length(); i++) { JSONObject insureeObj = newInsureeArr.getJSONObject(i); - if (!isStringEmpty(insureeObj, "photoPath", true)) { - String photoName = insureeObj.getString("photoPath"); - String imagePath = global.getImageFolder() + photoName; - insureeObj.put("photoPath", imagePath); - OutputStream imageOutputStream = new FileOutputStream(imagePath); - if (!isStringEmpty(insureeObj, "photoBase64", true)) { - try { - byte[] imageBytes = Base64.decode(insureeObj.getString("photoBase64").getBytes(), Base64.DEFAULT); - Bitmap image = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length); - image.compress(Bitmap.CompressFormat.JPEG, 100, imageOutputStream); - } catch (Exception e) { - Log.e("MODIFYFAMILY", "Error while processing Base64 image", e); - } - } else { - if (photoName.length() > 0) { - String photoUrl = String.format("%sImages/Updated/%s", AppInformation.DomainInfo.getDomain(), photoName); - imageTarget = new OutputStreamImageTarget(imageOutputStream, 100); - ((Activity) mContext).runOnUiThread(() -> picassoInstance.load(photoUrl).into(imageTarget)); + if (!JsonUtils.isStringEmpty(insureeObj, "photoPath", true)) { + String[] photoPathSegments = insureeObj.getString("photoPath").split("[\\\\/]"); + String photoName = photoPathSegments[photoPathSegments.length - 1]; + if (!StringUtils.isEmpty(photoName)) { + String imagePath = global.getImageFolder() + photoName; + insureeObj.put("photoPath", imagePath); + OutputStream imageOutputStream = new FileOutputStream(imagePath); + if (!JsonUtils.isStringEmpty(insureeObj, "photoBase64", true)) { + try { + byte[] imageBytes = Base64.decode(insureeObj.getString("photoBase64").getBytes(), Base64.DEFAULT); + Bitmap image = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length); + image.compress(Bitmap.CompressFormat.JPEG, 100, imageOutputStream); + } catch (Exception e) { + Log.e("MODIFYFAMILY", "Error while processing Base64 image", e); + } + } else { + if (photoName.length() > 0) { + String photoUrl = String.format("%sImages/Updated/%s", AppInformation.DomainInfo.getDomain(), photoName); + imageTarget = new OutputStreamImageTarget(imageOutputStream, 100); + ((Activity) mContext).runOnUiThread(() -> picassoInstance.load(photoUrl).into(imageTarget)); + } } } } @@ -5801,7 +5436,7 @@ private boolean InsertFamilyDataFromOnline(JSONArray jsonArray) throws JSONExcep "familyAddress", "ethnicity", "confirmationNo", "confirmationType"}; sqlHandler.insertData("tblFamilies", Columns, jsonArray.toString(), ""); - if (object.has("familySMS")) { + if (!JsonUtils.isStringEmpty(object, "familySMS", true)) { JSONObject smsData = object.getJSONObject("familySMS"); try { addOrUpdateFamilySms(object.getInt("familyId"), @@ -6206,71 +5841,66 @@ public boolean CheckInternetAvailable() { public void LoginDialogBox(final String page) { - ((Activity) mContext).runOnUiThread(new Runnable() { - @Override - public void run() { - // check internet connection - if (!CheckInternetAvailable()) - return; - // get prompts.xml view - LayoutInflater li = LayoutInflater.from(mContext); - View promptsView = li.inflate(R.layout.login_dialog, null); - - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(mContext); - - // set prompts.xml to alertdialog builder - alertDialogBuilder.setView(promptsView); - - final TextView username = (TextView) promptsView.findViewById(R.id.UserName); - final TextView password = (TextView) promptsView.findViewById(R.id.Password); - - // set dialog message - alertDialogBuilder - .setCancelable(false) - .setPositiveButton("OK", - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - if (!username.getText().toString().equals("") || !password.getText().toString().equals("")) { - boolean isUserLogged = false; - isUserLogged = LoginToken(username.getText().toString(), password.getText().toString()); - - if (isUserLogged) { - if (page.equals("Enquire")) { - ((Enquire) mContext).finish(); - Intent intent = new Intent(mContext, Enquire.class); - mContext.startActivity(intent); - } - if (page.equals("Renewals")) { - ((RenewList) mContext).finish(); - Intent intent = new Intent(mContext, RenewList.class); - mContext.startActivity(intent); - } - if (page.equals("Feedbacks")) { - ((FeedbackList) mContext).finish(); - Intent intent = new Intent(mContext, FeedbackList.class); - mContext.startActivity(intent); - } - if (page.equals("Reports")) { - ((FeedbackList) mContext).finish(); - Intent intent = new Intent(mContext, Reports.class); - mContext.startActivity(intent); - } - - } else { - ShowDialog(mContext.getResources().getString(R.string.LoginFail)); - } - } else { - Toast.makeText(mContext, "Please enter user name and password", Toast.LENGTH_LONG).show(); + ((Activity) mContext).runOnUiThread(() -> { + // check internet connection + if (!CheckInternetAvailable()) + return; + // get prompts.xml view + LayoutInflater li = LayoutInflater.from(mContext); + View promptsView = li.inflate(R.layout.login_dialog, null); + + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(mContext); + + // set prompts.xml to alertdialog builder + alertDialogBuilder.setView(promptsView); + + final TextView username = promptsView.findViewById(R.id.UserName); + final TextView password = promptsView.findViewById(R.id.Password); + + // set dialog message + alertDialogBuilder + .setCancelable(false) + .setPositiveButton("OK", + (dialog, id) -> { + if (!username.getText().toString().equals("") || !password.getText().toString().equals("")) { + boolean isUserLogged = false; + isUserLogged = LoginToken(username.getText().toString(), password.getText().toString()); + + if (isUserLogged) { + if (page.equals("Enquire")) { + ((Enquire) mContext).finish(); + Intent intent = new Intent(mContext, Enquire.class); + mContext.startActivity(intent); + } + if (page.equals("Renewals")) { + ((RenewList) mContext).finish(); + Intent intent = new Intent(mContext, RenewList.class); + mContext.startActivity(intent); } + if (page.equals("Feedbacks")) { + ((FeedbackList) mContext).finish(); + Intent intent = new Intent(mContext, FeedbackList.class); + mContext.startActivity(intent); + } + if (page.equals("Reports")) { + ((FeedbackList) mContext).finish(); + Intent intent = new Intent(mContext, Reports.class); + mContext.startActivity(intent); + } + + } else { + ShowDialog(mContext.getResources().getString(R.string.LoginFail)); } - }); + } else { + Toast.makeText(mContext, "Please enter user name and password", Toast.LENGTH_LONG).show(); + } + }); - // create alert dialog - AlertDialog alertDialog = alertDialogBuilder.create(); + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); - // show it - alertDialog.show(); - } + // show it + alertDialog.show(); }); } @@ -6379,4 +6009,27 @@ private int getMaxIdFromTable(String idFieldName, String tableName) { " for table " + tableName); } } + + @JavascriptInterface + public boolean isLoggingEnabled() { + return Log.isLoggingEnabled; + } + + @JavascriptInterface + public void clearLogs() { + AndroidUtils.showConfirmDialog( + mContext, + R.string.ConfirmClearLogs, + (d, i) -> new Thread(Log::deleteLogFiles).start() + ); + } + + @JavascriptInterface + public void exportLogs() { + AndroidUtils.showConfirmDialog( + mContext, + R.string.ConfirmExportLogs, + (d, i) -> new Thread(() -> Log.zipLogFiles(mContext)).start() + ); + } } diff --git a/app/src/main/java/org/openimis/imispolicies/Compressor.java b/app/src/main/java/org/openimis/imispolicies/Compressor.java deleted file mode 100644 index 9362e870..00000000 --- a/app/src/main/java/org/openimis/imispolicies/Compressor.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.openimis.imispolicies; - -import net.lingala.zip4j.core.ZipFile; -import net.lingala.zip4j.model.ZipParameters; -import net.lingala.zip4j.util.Zip4jConstants; - -import java.io.File; -import java.util.ArrayList; - -public class Compressor { - public static void zip(ArrayList targetPath, String destinationFilePath, String password) { - try { - ZipParameters parameters = new ZipParameters(); - parameters.setCompressionMethod(Zip4jConstants.COMP_DEFLATE); - parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL); - - if (password.length() > 0) { - parameters.setEncryptFiles(true); - parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_AES); - parameters.setAesKeyStrength(Zip4jConstants.AES_STRENGTH_256); - parameters.setPassword(password); - } - - ZipFile zipFile = new ZipFile(destinationFilePath); - -/* File targetFile = new File(targetPath); - if (targetFile.isFile()) { - zipFile.addFile(targetFile, parameters); - } else if (targetFile.isDirectory()) { - zipFile.addFolder(targetFile, parameters); - }*/ - zipFile.addFiles(targetPath, parameters); - - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void zip(String targetPath, String destinationFilePath, String password) { - try { - ZipParameters parameters = new ZipParameters(); - parameters.setCompressionMethod(Zip4jConstants.COMP_DEFLATE); - parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL); - - if (password.length() > 0) { - parameters.setEncryptFiles(true); - parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_AES); - parameters.setAesKeyStrength(Zip4jConstants.AES_STRENGTH_256); - parameters.setPassword(password); - } - - ZipFile zipFile = new ZipFile(destinationFilePath); - - File targetFile = new File(targetPath); - if (targetFile.exists()) { - zipFile.addFile(targetFile, parameters); - } else if (targetFile.isDirectory()) { - zipFile.addFolder(targetFile, parameters); - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void unzip(String targetZipFilePath, String destinationFolderPath, String password) { - try { - ZipFile zipFile = new ZipFile(targetZipFilePath); - if (zipFile.isEncrypted()) { - zipFile.setPassword(password); - } - zipFile.extractAll(destinationFolderPath); - - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/app/src/main/java/org/openimis/imispolicies/ControlNumberService.java b/app/src/main/java/org/openimis/imispolicies/ControlNumberService.java index 3ecf3a95..b80dc323 100644 --- a/app/src/main/java/org/openimis/imispolicies/ControlNumberService.java +++ b/app/src/main/java/org/openimis/imispolicies/ControlNumberService.java @@ -4,18 +4,22 @@ import android.content.ContentValues; import android.content.Intent; import android.content.Context; -import android.util.Log; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import org.openimis.imispolicies.tools.Log; + +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.openimis.imispolicies.util.StringUtils; import java.io.IOException; import java.net.HttpURLConnection; +import java.util.HashMap; +import java.util.Map; public class ControlNumberService extends IntentService { private static final String LOG_TAG = "CNSERVICE"; @@ -33,6 +37,23 @@ public class ControlNumberService extends IntentService { public static final String FIELD_ERROR_MESSAGE = "FIELD_ERROR_MESSAGE"; + private static class ControlNumberStatus { + public static final int SUCCESS = 4001; + public static final int NO_CN_AVAILABLE = 4002; + public static final int THRESHOLD_REACHED = 4003; + public static final int ERROR = 4999; + } + + public static Map ControlNumberStatusMapping; + + static { + ControlNumberStatusMapping = new HashMap<>(); + ControlNumberStatusMapping.put(ControlNumberStatus.NO_CN_AVAILABLE, R.string.NoCNReceived); + ControlNumberStatusMapping.put(ControlNumberStatus.THRESHOLD_REACHED, R.string.CNThresholdReached); + ControlNumberStatusMapping.put(ControlNumberStatus.ERROR, R.string.SomethingWrongServer); + } + + private Global global; private ToRestApi toRestApi; private ClientAndroidInterface ca; private SQLHandler sqlHandler; @@ -68,6 +89,7 @@ protected void onHandleIntent(Intent intent) { toRestApi = new ToRestApi(); ca = new ClientAndroidInterface(this); sqlHandler = new SQLHandler(this); + global = (Global) getApplicationContext(); if (intent != null) { final String action = intent.getAction(); @@ -90,17 +112,18 @@ private void handleActionFetchBulkCN(String productCode) { try { JSONObject object = new JSONObject(); object.put("productCode", productCode); + object.put("availableControlNumbers", sqlHandler.getFreeCNCount(global.getOfficerCode(), productCode)); - HttpEntity respEntity; HttpResponse response = toRestApi.postToRestApiToken(object, "GetControlNumbersForEO"); int responseCode = response.getStatusLine().getStatusCode(); - respEntity = response.getEntity(); + HttpEntity respEntity = response.getEntity(); String content = EntityUtils.toString(respEntity); - JSONArray responseContent = new JSONArray(content); + JSONObject responseContent = new JSONObject(content); - errorMessage = getErrorMessage(responseCode, null); - if ("".equals(errorMessage)) { - insertBulkControlNumbers(responseContent); + errorMessage = getErrorMessage(responseCode, responseContent); + if (StringUtils.isEmpty(errorMessage)) { + JSONArray controlNumbers = responseContent.getJSONArray("controlNumbers"); + insertBulkControlNumbers(controlNumbers); broadcastSuccess(); } else { broadcastError(errorMessage); @@ -158,7 +181,6 @@ private void handleActionGetAssignedCN(final String order) { if (StringUtils.isEmpty(errorMessage)) { String assignedControlNumbers = responseContent.getString("assigned_control_numbers"); updateAssignedControlNumbers(assignedControlNumbers); - broadcastSuccess(); } else { broadcastError(errorMessage); @@ -185,9 +207,19 @@ private void broadcastError(String errorMessage) { private String getErrorMessage(int responseCode, JSONObject responseContent) throws JSONException { String errorMessage = ""; - if (responseContent != null && responseContent.has("error_occured")) { - if (responseContent.getBoolean("error_occured")) { - errorMessage = responseContent.getString("error_message"); + if (responseContent != null) { + if (responseContent.has("header")) { + JSONObject responseHeader = responseContent.getJSONObject("header"); + int status = responseHeader.getInt("error"); + if (status != ControlNumberStatus.SUCCESS) { + errorMessage = getBulkCnErrorMessage(status); + } else if (responseContent.getJSONArray("controlNumbers").length() == 0) { + errorMessage = getResources().getString(R.string.NoCNReceived); + } + } else if (responseContent.has("error_occured")) { + if (responseContent.getBoolean("error_occured")) { + errorMessage = responseContent.getString("error_message"); + } } } else if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) { errorMessage = getResources().getString(R.string.has_no_rights); @@ -200,6 +232,16 @@ private String getErrorMessage(int responseCode, JSONObject responseContent) thr return errorMessage; } + private String getBulkCnErrorMessage(int status) { + Integer errorMessageId = ControlNumberStatusMapping.get(status); + if (errorMessageId != null) { + return getResources().getString(errorMessageId); + } else { + Log.e(LOG_TAG, String.format("Unknown response code from the server: %d", status)); + return getResources().getString(R.string.SomethingWrongServer); + } + } + private int insertControlNumber(JSONObject order, String controlNumber, String internalIdentifier) throws JSONException { return ca.insertControlNumber( order.getString("amount_to_be_paid"), diff --git a/app/src/main/java/org/openimis/imispolicies/CumulativeIndicators.java b/app/src/main/java/org/openimis/imispolicies/CumulativeIndicators.java index bfdfaca0..888f73af 100644 --- a/app/src/main/java/org/openimis/imispolicies/CumulativeIndicators.java +++ b/app/src/main/java/org/openimis/imispolicies/CumulativeIndicators.java @@ -13,9 +13,10 @@ import android.widget.TextView; import android.widget.Toast; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/org/openimis/imispolicies/CustomOnItemSelectedListener.java b/app/src/main/java/org/openimis/imispolicies/CustomOnItemSelectedListener.java index 034a1f23..2122b938 100644 --- a/app/src/main/java/org/openimis/imispolicies/CustomOnItemSelectedListener.java +++ b/app/src/main/java/org/openimis/imispolicies/CustomOnItemSelectedListener.java @@ -9,13 +9,9 @@ import android.widget.AdapterView.OnItemSelectedListener; public class CustomOnItemSelectedListener implements OnItemSelectedListener { - - OverViewPolicies overViewPolicies = new OverViewPolicies(); - SearchOverViewControlNumber searchOverViewControlNumber = new SearchOverViewControlNumber(); - public void onItemSelected(AdapterView parent, View view, int pos, long id) { - overViewPolicies.PayType = parent.getItemAtPosition(pos).toString(); - searchOverViewControlNumber.PayType = parent.getItemAtPosition(pos).toString(); + OverViewPolicies.PayType = parent.getItemAtPosition(pos).toString(); + SearchOverViewControlNumber.PayType = parent.getItemAtPosition(pos).toString(); /* Toast.makeText(parent.getContext(), "OnItemSelectedListener : " + parent.getItemAtPosition(pos).toString(), Toast.LENGTH_SHORT).show();*/ diff --git a/app/src/main/java/org/openimis/imispolicies/Enquire.java b/app/src/main/java/org/openimis/imispolicies/Enquire.java index b11a906d..9c22215b 100644 --- a/app/src/main/java/org/openimis/imispolicies/Enquire.java +++ b/app/src/main/java/org/openimis/imispolicies/Enquire.java @@ -34,7 +34,9 @@ import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; -import android.util.Log; + +import org.openimis.imispolicies.tools.Log; + import android.view.MenuItem; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -51,27 +53,30 @@ import com.squareup.picasso.Picasso; +import cz.msebera.android.httpclient.HttpResponse; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.openimis.imispolicies.util.JsonUtils; import java.io.ByteArrayInputStream; +import java.net.HttpURLConnection; import java.util.ArrayList; import java.util.HashMap; -import static org.openimis.imispolicies.Util.JsonUtil.isStringEmpty; - public class Enquire extends AppCompatActivity { private static final String LOG_TAG = "ENQUIRE"; private static final int REQUEST_SCAN_QR_CODE = 1; private Global global; private Escape escape; + private Picasso picasso; private ClientAndroidInterface ca; private EditText etCHFID; private TextView tvCHFID; private TextView tvName; private TextView tvGender; private TextView tvDOB; + private TextView tvPolicyStatus; private ListView lv; private ImageView iv; private LinearLayout ll; @@ -95,6 +100,7 @@ protected void onCreate(Bundle savedInstanceState) { global = (Global) getApplicationContext(); ca = new ClientAndroidInterface(this); escape = new Escape(); + picasso = new Picasso.Builder(this).build(); isSDCardAvailable(); @@ -102,6 +108,7 @@ protected void onCreate(Bundle savedInstanceState) { tvCHFID = findViewById(R.id.tvCHFID); tvName = findViewById(R.id.tvName); tvDOB = findViewById(R.id.tvDOB); + tvPolicyStatus = findViewById(R.id.tvPolicyStatus); tvGender = findViewById(R.id.tvGender); iv = findViewById(R.id.imageView); ImageButton btnGo = findViewById(R.id.btnGo); @@ -182,6 +189,7 @@ private void ClearForm() { tvCHFID.setText(getResources().getString(R.string.InsuranceNumber)); tvName.setText(getResources().getString(R.string.InsureeName)); tvDOB.setText(getResources().getString(R.string.BirthDate)); + tvPolicyStatus.setText(getResources().getString(R.string.EnquirePolicyLabel)); tvGender.setText(getResources().getString(R.string.Gender)); iv.setImageResource(R.drawable.person); ll.setVisibility(View.INVISIBLE); @@ -194,20 +202,28 @@ private void getInsureeInfo() { result = ""; if (global.isNetworkAvailable()) { - ToRestApi rest = new ToRestApi(); - String res = rest.getObjectFromRestApiToken("insuree/" + chfid + "/enquire"); - - JSONObject jobj = new JSONObject(); try { - jobj = new JSONObject(res); - } catch (JSONException e) { - Log.e(LOG_TAG, "Response is not a proper JSON", e); - } - - JSONArray arr = new JSONArray(); - arr.put(jobj); + ToRestApi rest = new ToRestApi(); + HttpResponse response = rest.getFromRestApiToken("insuree/" + chfid + "/enquire"); + int responseCode = response.getStatusLine().getStatusCode(); + if (responseCode == HttpURLConnection.HTTP_OK) { + JSONObject obj = new JSONObject(rest.getContent(response)); + JSONArray arr = new JSONArray(); + arr.put(obj); + result = arr.toString(); + } + else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) { + // No insuree found + result="[{}]"; + } else { + result="NETWORK_ERROR"; + } - result = arr.toString(); + } + catch(Exception e){ + Log.e(LOG_TAG, "Fetching online enquire failed", e); + result="UNKNOWN_ERROR"; + } } else { //TODO: yet to be done result = getDataFromDb(etCHFID.getText().toString()); @@ -217,10 +233,18 @@ private void getInsureeInfo() { try { JSONArray jsonArray = new JSONArray(result); - if (jsonArray.length() == 0) { + if (jsonArray.getJSONObject(0).length()==0) { ca.ShowDialog(getResources().getString(R.string.RecordNotFound)); return; } + else if (jsonArray.getJSONObject(0).equals("NETWORK_ERROR")) { + ca.ShowDialog(getResources().getString(R.string.NoInternet)); + return; + } + else if (jsonArray.getJSONObject(0).equals("UNKNOWN_ERROR")) { + ca.ShowDialog(getResources().getString(R.string.UnknownError)); + return; + } ll.setVisibility(View.VISIBLE); @@ -232,12 +256,13 @@ private void getInsureeInfo() { tvCHFID.setText(jsonObject.getString("chfid")); tvName.setText(jsonObject.getString("insureeName")); tvDOB.setText(jsonObject.getString("dob")); + tvPolicyStatus.setText(getResources().getString(R.string.EnquirePolicyLabel)); tvGender.setText(jsonObject.getString("gender")); if (global.isNetworkAvailable()) { String photo_url_str = ""; try { - if (!isStringEmpty(jsonObject, "photoBase64", true)) { + if (!JsonUtils.isStringEmpty(jsonObject, "photoBase64", true)) { try { byte[] imageBytes = Base64.decode(jsonObject.getString("photoBase64").getBytes(), Base64.DEFAULT); Bitmap image = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length); @@ -246,13 +271,13 @@ private void getInsureeInfo() { Log.e(LOG_TAG, "Error while processing Base64 image", e); iv.setImageDrawable(getResources().getDrawable(R.drawable.person)); } - } else if (!isStringEmpty(jsonObject, "photoPath", true)) { + } else if (!JsonUtils.isStringEmpty(jsonObject, "photoPath", true)) { photo_url_str = AppInformation.DomainInfo.getDomain() + jsonObject.getString("photoPath"); iv.setImageResource(R.drawable.person); - Picasso.with(this) - .load(photo_url_str) + picasso.load(photo_url_str) .placeholder(R.drawable.person) - .error(R.drawable.person).into(iv); + .error(R.drawable.person) + .into(iv); } else { iv.setImageDrawable(getResources().getDrawable(R.drawable.person)); } @@ -272,31 +297,26 @@ private void getInsureeInfo() { jsonArray = jsonObject.getJSONArray("details"); - for (i = 0; i < jsonArray.length(); i++) { - jsonObject = jsonArray.getJSONObject(i); - + if (jsonArray.length() == 1 && jsonArray.getJSONObject(0).getString("expiryDate").equals("null")) { + tvPolicyStatus.setText(getResources().getString(R.string.EnquirePolicyNotCovered)); + } else { + tvPolicyStatus.setText(getResources().getString(R.string.EnquirePolicyCovered)); + } + for (i = 0; i < jsonArray.length(); i++) { HashMap Policy = new HashMap<>(); jsonObject = jsonArray.getJSONObject(i); - double iDedType = 0; - if (!jsonObject.getString("dedType").equalsIgnoreCase("null")) - iDedType = Double.parseDouble(jsonObject.getString("dedType")); + double iDedType = Double.parseDouble(JsonUtils.getStringOrDefault(jsonObject, "dedType", "0", true)); String Ded = "", Ded1 = "", Ded2 = ""; String Ceiling = "", Ceiling1 = "", Ceiling2 = ""; - String jDed1 = "", jDed2 = "", jCeiling1 = "", jCeiling2 = ""; + String jDed1, jDed2, jCeiling1, jCeiling2; - if (jsonObject.getString("ded1").equalsIgnoreCase("null")) jDed1 = ""; - else jDed1 = jsonObject.getString("ded1"); - if (jsonObject.getString("ded2").equalsIgnoreCase("null")) jDed2 = ""; - else jDed2 = jsonObject.getString("ded2"); - if (jsonObject.getString("ceiling1").equalsIgnoreCase("null")) - jCeiling1 = ""; - else jCeiling1 = jsonObject.getString("ceiling1"); - if (jsonObject.getString("ceiling2").equalsIgnoreCase("null")) - jCeiling2 = ""; - else jCeiling2 = jsonObject.getString("ceiling2"); + jDed1 = JsonUtils.getStringOrDefault(jsonObject, "ded1", "", true); + jDed2 = JsonUtils.getStringOrDefault(jsonObject, "ded2", "", true); + jCeiling1 = JsonUtils.getStringOrDefault(jsonObject, "ceiling1", "", true); + jCeiling2 = JsonUtils.getStringOrDefault(jsonObject, "ceiling2", "", true); //Get the type @@ -322,12 +342,15 @@ private void getInsureeInfo() { } - - Policy.put("Heading", jsonObject.getString("productCode")); - Policy.put("Heading1", jsonObject.getString("expiryDate") + " " + jsonObject.getString("status")); - Policy.put("SubItem1", jsonObject.getString("productName")); - Policy.put("SubItem2", Ded); - Policy.put("SubItem3", Ceiling); + if (JsonUtils.isStringEmpty(jsonObject, "expiryDate", true)) { + Policy.put("Heading", getResources().getString(R.string.EnquireNoPolicies)); + } else { + Policy.put("Heading", jsonObject.getString("productCode")); + Policy.put("Heading1", JsonUtils.getStringOrDefault(jsonObject, "expiryDate", "", true) + " " + jsonObject.getString("status")); + Policy.put("SubItem1", jsonObject.getString("productName")); + Policy.put("SubItem2", Ded); + Policy.put("SubItem3", Ceiling); + } String TotalAdmissionsLeft = buildEnquireValue(jsonObject, "totalAdmissionsLeft", R.string.totalAdmissionsLeft); String TotalVisitsLeft = buildEnquireValue(jsonObject, "totalVisitsLeft", R.string.totalVisitsLeft); @@ -397,7 +420,6 @@ private void getInsureeInfo() { result = ""; } }); - } protected String buildEnquireValue(JSONObject jsonObject, String jsonKey, int labelId) throws JSONException { diff --git a/app/src/main/java/org/openimis/imispolicies/Feedback.java b/app/src/main/java/org/openimis/imispolicies/Feedback.java index f063224d..851cd48c 100644 --- a/app/src/main/java/org/openimis/imispolicies/Feedback.java +++ b/app/src/main/java/org/openimis/imispolicies/Feedback.java @@ -38,7 +38,9 @@ import org.json.JSONException; import org.json.JSONObject; +import org.openimis.imispolicies.tools.Log; import org.xmlpull.v1.XmlSerializer; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -47,6 +49,7 @@ import java.util.Calendar; public class Feedback extends AppCompatActivity { + private static final String LOG_TAG = "FEEDBACK"; private Global global; private EditText etOfficer; @@ -107,53 +110,47 @@ protected void onCreate(Bundle savedInstanceState) { pd = ProgressDialog.show(Feedback.this, "", getResources().getString(R.string.UploadingFeedback)); final String[] feed = {null}; - new Thread() { - public void run() { - String Answers = Answers(); - try { - feed[0] = WriteJSON(String.valueOf(etOfficer.getText()), ClaimUUID, etCHFID.getText().toString(), Answers); - WriteXML(String.valueOf(etOfficer.getText()), ClaimUUID, etCHFID.getText().toString(), Answers); - } catch (IllegalArgumentException | IllegalStateException e) { - e.printStackTrace(); - return; - } catch (IOException e) { - e.printStackTrace(); - return; - } - - msgType = 3; - - runOnUiThread(() -> { - switch (msgType) { - case 1: - DeleteRow(ClaimUUID); - //ca.ShowDialog(getResources().getString(R.string.UploadedSuccessfully)); - Toast.makeText(getApplicationContext(), getResources().getString(R.string.UploadedSuccessfully), Toast.LENGTH_LONG).show(); - break; - case 2: - DeleteRow(ClaimUUID); - //ca. ShowDialog(getResources().getString(R.string.ServerRejected)); - Toast.makeText(getApplicationContext(), getResources().getString(R.string.ServerRejected), Toast.LENGTH_LONG).show(); - break; - case 3: - UpdateRow(ClaimUUID); - //ca. ShowDialog(getResources().getString(R.string.SavedOnSDCard)); - Toast.makeText(getApplicationContext(), getResources().getString(R.string.SavedOnSDCard), Toast.LENGTH_LONG).show(); - break; - case -1: - //ca. ShowDialog(getResources().getString(R.string.FeedBackNotUploaded)); - Toast.makeText(getApplicationContext(), getResources().getString(R.string.FeedBackNotUploaded), Toast.LENGTH_LONG).show(); - break; - } - finish(); - }); - pd.dismiss(); + new Thread(() -> { + String Answers = Answers(); + try { + feed[0] = WriteJSON(String.valueOf(etOfficer.getText()), ClaimUUID, etCHFID.getText().toString(), Answers); + WriteXML(String.valueOf(etOfficer.getText()), ClaimUUID, etCHFID.getText().toString(), Answers); + } catch (IllegalArgumentException | IllegalStateException | IOException e) { + e.printStackTrace(); + return; } - }.start(); + + msgType = 3; + + runOnUiThread(() -> { + switch (msgType) { + case 1: + DeleteRow(ClaimUUID); + //ca.ShowDialog(getResources().getString(R.string.UploadedSuccessfully)); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.UploadedSuccessfully), Toast.LENGTH_LONG).show(); + break; + case 2: + DeleteRow(ClaimUUID); + //ca. ShowDialog(getResources().getString(R.string.ServerRejected)); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.ServerRejected), Toast.LENGTH_LONG).show(); + break; + case 3: + UpdateRow(ClaimUUID); + //ca. ShowDialog(getResources().getString(R.string.SavedOnSDCard)); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.SavedOnSDCard), Toast.LENGTH_LONG).show(); + break; + case -1: + //ca. ShowDialog(getResources().getString(R.string.FeedBackNotUploaded)); + Toast.makeText(getApplicationContext(), getResources().getString(R.string.FeedBackNotUploaded), Toast.LENGTH_LONG).show(); + break; + } + finish(); + }); + pd.dismiss(); + }).start(); }); } - private void DeleteRow(String ClaimUUID) { ca.CleanFeedBackTable(ClaimUUID); } @@ -162,10 +159,9 @@ private void UpdateRow(String ClaimUUID) { ca.UpdateFeedBack(ClaimUUID); } - private void WriteXML(String Officer, String ClaimUUID, String CHFID, String Answers) throws IllegalArgumentException, IllegalStateException, IOException { - File MyDir = new File(global.getMainDirectory()); - FileName = "feedback_" + etClaimCode.getText() + ".xml"; + File MyDir = new File(global.getSubdirectory("Feedback")); + FileName = "Feedback_" + etClaimCode.getText() + ".xml"; FeedbackXML = new File(MyDir, FileName); FileOutputStream fos = new FileOutputStream(FeedbackXML); @@ -203,16 +199,14 @@ private void WriteXML(String Officer, String ClaimUUID, String CHFID, String Ans serializer.endDocument(); serializer.flush(); fos.close(); - - } private String WriteJSON(String Officer, String ClaimUUID, String CHFID, String Answers) { - File MyDir = new File(global.getMainDirectory()); + File MyDir = new File(global.getSubdirectory("Feedback")); SimpleDateFormat format = AppInformation.DateTimeInfo.getDefaultDateFormatter(); Calendar cal = Calendar.getInstance(); String d = format.format(cal.getTime()); - FileName = "feedbackJSON_" + etClaimCode.getText() + ".txt"; + FileName = "FeedbackJSON_" + etClaimCode.getText() + ".json"; FeedbackJSON = new File(MyDir, FileName); JSONObject FullObject = new JSONObject(); @@ -238,27 +232,13 @@ private String WriteJSON(String Officer, String ClaimUUID, String CHFID, String e.printStackTrace(); } - } catch (IllegalStateException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (JSONException e) { - e.printStackTrace(); + } catch (IllegalStateException | JSONException e) { + Log.e(LOG_TAG, "Error while writing feedback file", e); } return FullObject.toString(); } - private void MoveFile(File file) { - switch (msgType) { - case 1: - file.renameTo(new File(global.getSubdirectory("AcceptedFeedback"), file.getName())); - break; - case 2: - file.renameTo(new File(global.getSubdirectory("RejectedFeedback"), file.getName())); - break; - } - } - private String Answers() { String Ans = ""; rg1 = findViewById(R.id.radioGroup1); diff --git a/app/src/main/java/org/openimis/imispolicies/FeedbackList.java b/app/src/main/java/org/openimis/imispolicies/FeedbackList.java index ac813bae..1ce1ec8f 100644 --- a/app/src/main/java/org/openimis/imispolicies/FeedbackList.java +++ b/app/src/main/java/org/openimis/imispolicies/FeedbackList.java @@ -131,25 +131,20 @@ protected void onCreate(Bundle savedInstanceState) { etFeedbackSearch.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - ((SimpleAdapter) adapter).getFilter().filter(s); - } @Override public void afterTextChanged(Editable s) { - } }); lv.setOnScrollListener(new AbsListView.OnScrollListener() { @Override public void onScrollStateChanged(AbsListView view, int scrollState) { - } @Override @@ -218,7 +213,7 @@ private void fillFeedbacks() { } public String getMasterDataText(String filename) { - ca.unZipFeedbacksRenewals(filename); + //ca.unZipFeedbacksRenewals(filename); String fname = filename.substring(0, filename.indexOf(".")); try { String dir = global.getSubdirectory("Database"); @@ -333,40 +328,33 @@ public void openDialogForFeedbackRenewal() { private void RefreshFeedbacks() throws IOException, XmlPullParserException { if (ca.CheckInternetAvailable()) { // pd = ProgressDialog.show(this, "", getResources().getString(R.string.Loading)); - new Thread() { - public void run() { - String result = null; + new Thread(() -> { + String result = null; - try { - ToRestApi rest = new ToRestApi(); - result = rest.getObjectFromRestApiToken("feedback"); + try { + ToRestApi rest = new ToRestApi(); + result = rest.getObjectFromRestApiToken("feedback"); - if (result.equalsIgnoreCase("[]") || result == null) { - FeedbackList.clear(); - return; - } - } catch (Exception e) { - e.printStackTrace(); + if (result.equalsIgnoreCase("[]") || result == null) { + FeedbackList.clear(); + return; } + } catch (Exception e) { + e.printStackTrace(); + } - Boolean IsInserted = ca.InsertFeedbacks(result); + Boolean IsInserted = ca.InsertFeedbacks(result); - if (!IsInserted) { - ca.ShowDialog(getResources().getString(R.string.ErrorOccurred)); - } - - runOnUiThread(() -> fillFeedbacks()); + if (!IsInserted) { + ca.ShowDialog(getResources().getString(R.string.ErrorOccurred)); + } - // pd.dismiss(); - // swipe.setRefreshing(false); + runOnUiThread(() -> fillFeedbacks()); - } - }.start(); - //fillFeedbacks(); + }).start(); } else { openDialogForFeedbackRenewal(); - //Toast.makeText(this, getResources().getString(R.string.NoInternet), Toast.LENGTH_LONG).show(); } } diff --git a/app/src/main/java/org/openimis/imispolicies/Global.java b/app/src/main/java/org/openimis/imispolicies/Global.java index 76307639..c2cc9763 100644 --- a/app/src/main/java/org/openimis/imispolicies/Global.java +++ b/app/src/main/java/org/openimis/imispolicies/Global.java @@ -28,37 +28,37 @@ import android.Manifest; import android.app.Application; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.os.Build; +import android.net.Uri; import android.os.Environment; -import android.util.DisplayMetrics; -import android.util.Log; +import org.openimis.imispolicies.tools.LanguageManager; +import org.openimis.imispolicies.tools.Log; + +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.openimis.imispolicies.util.StreamUtils; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; -import java.util.Locale; import java.util.Map; -import static org.openimis.imispolicies.BuildConfig.APP_DIR; - public class Global extends Application { private static Global GlobalContext; public static final String PREF_NAME = "CMPref"; + public static final String PREF_LANGUAGE_KEY = "Language"; public static final String PREF_LOG_TAG = "PREFS"; public static final String FILE_IO_LOG_TAG = "FILEIO"; @@ -75,7 +75,6 @@ public class Global extends Application { private String MainDirectory; private String AppDirectory; private Map SubDirectories; - private List ProtectedDirectories; public static Global getGlobal() { return GlobalContext; @@ -90,29 +89,26 @@ public void onCreate() { super.onCreate(); GlobalContext = this; SubDirectories = new HashMap<>(); - ProtectedDirectories = Arrays.asList("Authentications", "Database", "Images"); initSharedPrefsInts(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - permissions = new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.VIBRATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.INTERNET, Manifest.permission.CAMERA, Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CHANGE_WIFI_STATE, Manifest.permission.MANAGE_EXTERNAL_STORAGE}; - } else { - permissions = new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.VIBRATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.INTERNET, Manifest.permission.CAMERA, Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CHANGE_WIFI_STATE}; - } - + permissions = new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.VIBRATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.INTERNET, Manifest.permission.CAMERA, Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CHANGE_WIFI_STATE}; } private void initSharedPrefsInts() { SharedPreferences sp = getSharedPreferences(PREF_NAME, MODE_PRIVATE); SharedPreferences.Editor editor = sp.edit(); try { - String text = getInputStreamText(getAssets().open("JSON/default_ints.json")); - JSONObject intDefaults = new JSONObject(text); + String text = StreamUtils.readInputStreamAsUTF8String(getAssets().open("JSON/default_ints.json")); + + if (text != null) { + JSONObject intDefaults = new JSONObject(text); - for (Iterator it = intDefaults.keys(); it.hasNext(); ) { - String key = it.next(); + for (Iterator it = intDefaults.keys(); it.hasNext(); ) { + String key = it.next(); - if (!sp.contains(key)) { - editor.putInt(key, intDefaults.getInt(key)); + if (!sp.contains(key)) { + editor.putInt(key, intDefaults.getInt(key)); + } } } } catch (IOException e) { @@ -208,12 +204,13 @@ public int isSDCardAvailable() { } } - public void changeLanguage(Context ctx, String Language) { - Resources res = ctx.getResources(); - DisplayMetrics dm = res.getDisplayMetrics(); - Configuration config = res.getConfiguration(); - config.locale = new Locale(Language.toLowerCase()); - res.updateConfiguration(config, dm); + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); +// Locale locale = LocaleUtil.getLocaleFromTag(getStoredLanguage()); +// newConfig.locale = locale; +// Locale.setDefault(locale); +// getResources().updateConfiguration(newConfig, getResources().getDisplayMetrics()); } private String createOrCheckDirectory(String path) { @@ -226,21 +223,9 @@ private String createOrCheckDirectory(String path) { } } - public String getMainDirectory() { - if (MainDirectory == null || "".equals(MainDirectory)) { - String documentsDir = createOrCheckDirectory(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS).toString()); - MainDirectory = createOrCheckDirectory(documentsDir + File.separator + APP_DIR); - - if ("".equals(documentsDir) || "".equals(MainDirectory)) { - Log.w(FILE_IO_LOG_TAG, "Main directory could not be created"); - } - } - return MainDirectory; - } - public String getAppDirectory() { if (AppDirectory == null || "".equals(AppDirectory)) { - AppDirectory = createOrCheckDirectory(getApplicationInfo().dataDir); + AppDirectory = createOrCheckDirectory(getApplicationInfo().dataDir + File.separator); if ("".equals(AppDirectory)) { Log.w(FILE_IO_LOG_TAG, "App directory could not be created"); @@ -251,15 +236,8 @@ public String getAppDirectory() { public String getSubdirectory(String subdirectory) { if (!SubDirectories.containsKey(subdirectory) || "".equals(SubDirectories.get(subdirectory))) { - String directory; - - if (ProtectedDirectories.contains(subdirectory)) { - directory = getAppDirectory(); - } else { - directory = getMainDirectory(); - } - - String subDirPath = createOrCheckDirectory(directory + File.separator + subdirectory); + String directory = getAppDirectory(); + String subDirPath = createOrCheckDirectory(directory + subdirectory + File.separator); if ("".equals(subDirPath)) { Log.w(FILE_IO_LOG_TAG, String.format("%s directory could not be created", subdirectory)); @@ -271,42 +249,33 @@ public String getSubdirectory(String subdirectory) { return SubDirectories.get(subdirectory); } - public String getFileText(String path) { - String result = ""; + public int getIntKey(String key, int defaultValue) { try { - InputStream inputStream = new FileInputStream(path); - result = getInputStreamText(inputStream); - } catch (IOException e) { - Log.e(FILE_IO_LOG_TAG, String.format("Creating input stream for path: %s failed", path), e); + return getSharedPreferences(PREF_NAME, MODE_PRIVATE).getInt(key, defaultValue); + } catch (ClassCastException e) { + Log.e(PREF_LOG_TAG, String.format("%s key is not an int", key), e); } - return result; + return defaultValue; } - public String getInputStreamText(InputStream inputStream) { - String line; - StringBuilder stringBuilder = new StringBuilder(); - try { - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); - while ((line = reader.readLine()) != null) { - stringBuilder.append(line); - stringBuilder.append("\n"); - } - } catch (IOException e) { - Log.e(FILE_IO_LOG_TAG, "Reading text from input stream failed", e); - } - return stringBuilder.toString(); + public void setIntKey(String key, int value) { + getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit().putInt(key, value).apply(); } - public int getIntSetting(String key, int defaultValue) { + public long getLongKey(String key, long defaultValue) { try { - return getSharedPreferences(PREF_NAME, MODE_PRIVATE).getInt(key, defaultValue); + return getSharedPreferences(PREF_NAME, MODE_PRIVATE).getLong(key, defaultValue); } catch (ClassCastException e) { - Log.e(PREF_LOG_TAG, String.format("%s key is not an int", key), e); + Log.e(PREF_LOG_TAG, String.format("%s key is not a long", key), e); } return defaultValue; } - public String getStringSetting(String key, String defaultValue) { + public void setLongKey(String key, long value) { + getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit().putLong(key, value).apply(); + } + + public String getStringKey(String key, String defaultValue) { try { return getSharedPreferences(PREF_NAME, MODE_PRIVATE).getString(key, defaultValue); } catch (ClassCastException e) { @@ -314,4 +283,60 @@ public String getStringSetting(String key, String defaultValue) { } return defaultValue; } + + public void setStringKey(String key, String value) { + getSharedPreferences(PREF_NAME, MODE_PRIVATE).edit().putString(key, value).apply(); + } + + public LinkedHashMap getHFLevels() { + LinkedHashMap levels = new LinkedHashMap<>(); + try { + String text = StreamUtils.readInputStreamAsUTF8String(getAssets().open("JSON/hflevels.json")); + JSONArray root = new JSONArray(text); + + for (int i = 0; i < root.length(); i++) { + JSONObject item = root.getJSONObject(i); + String stringName = item.getString("string"); + int stringId = getResources().getIdentifier(stringName, "string", + getPackageName()); + String str; + if (stringId == 0) { + str = stringName; + } else { + try { + str = getResources().getString(stringId); + } catch (Resources.NotFoundException e) { + Log.e(PREF_LOG_TAG, "Resource not found for HFLevels " + stringName + + "(" + stringId + ")"); + str = stringName; + } + } + levels.put(item.getString("code"), str); + } + } catch (IOException e) { + Log.e(FILE_IO_LOG_TAG, "Reading int defaults failed", e); + } catch (JSONException e) { + Log.e(FILE_IO_LOG_TAG, "Parsing int defaults failed", e); + } + return levels; + } + + public void grantUriPermissions(Context context, Uri uri, Intent intent, int permissionFlags) { + intent.addFlags(permissionFlags); + List resInfoList = context.getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY); + for (ResolveInfo resolveInfo : resInfoList) { + String packageName = resolveInfo.activityInfo.packageName; + context.grantUriPermission(packageName, uri, permissionFlags); + } + } + + public void sendFile(Context context, Uri uri, String mimeType) { + Intent shareExportIntent = new Intent(Intent.ACTION_SEND); + shareExportIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + shareExportIntent.putExtra(Intent.EXTRA_STREAM, uri); + shareExportIntent.setType(mimeType); + Intent chooserIntent = Intent.createChooser(shareExportIntent, null); + grantUriPermissions(this, uri, chooserIntent, Intent.FLAG_GRANT_READ_URI_PERMISSION); + context.startActivity(chooserIntent); + } } diff --git a/app/src/main/java/org/openimis/imispolicies/MainActivity.java b/app/src/main/java/org/openimis/imispolicies/MainActivity.java index 0edb6b0c..cf19aa96 100644 --- a/app/src/main/java/org/openimis/imispolicies/MainActivity.java +++ b/app/src/main/java/org/openimis/imispolicies/MainActivity.java @@ -33,19 +33,20 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; -import android.os.Environment; +import android.provider.MediaStore; import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v4.app.ActivityCompat; import android.text.TextUtils; -import android.util.Log; + +import org.openimis.imispolicies.tools.LanguageManager; +import org.openimis.imispolicies.tools.Log; + import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -64,10 +65,15 @@ import android.widget.TextView; import android.widget.Toast; +import com.google.zxing.client.android.Intents; + import org.apache.commons.io.IOUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.openimis.imispolicies.util.AndroidUtils; +import org.openimis.imispolicies.util.StringUtils; +import org.openimis.imispolicies.util.UriUtils; import java.io.BufferedReader; import java.io.File; @@ -78,15 +84,15 @@ import java.io.InputStreamReader; import java.io.OutputStream; -import static android.provider.Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION; - public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { - private static final int REQUEST_ALL_FILES_ACCESS_CODE = 7; + public static final String LOG_TAG = "MAIN_ACTIVITY"; private static final int REQUEST_PERMISSIONS_CODE = 1; - private static final int REQUEST_PICK_MD_FILE = 4; - private static final String PREFS_NAME = "CMPref"; + private static final int REQUEST_PICK_MD_FILE = 2; + public static final int REQUEST_CREATE_ENROL_EXPORT = 3; + public static final int REQUEST_CREATE_FEEDBACK_EXPORT = 4; + public static final int REQUEST_CREATE_RENEWAL_EXPORT = 5; private NavigationView navigationView; private SQLHandler sqlHandler; @@ -95,6 +101,7 @@ public class MainActivity extends AppCompatActivity static Global global; private static final int MENU_LANGUAGE_1 = Menu.FIRST; private static final int MENU_LANGUAGE_2 = Menu.FIRST + 1; + private static final int MENU_LANGUAGE_3 = Menu.FIRST + 2; private String Language1 = ""; private String Language2 = ""; private String LanguageCode1 = ""; @@ -109,16 +116,32 @@ public class MainActivity extends AppCompatActivity String calledFrom = "java"; public File f; public String etRarPassword = ""; + private AlertDialog enrolmentOfficerDialog; + private AlertDialog masterDataDialog; + private AlertDialog permissionDialog; @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == ClientAndroidInterface.RESULT_LOAD_IMG && resultCode == RESULT_OK && data != null) { - Uri selectedImage = data.getData(); + if (requestCode == ClientAndroidInterface.RESULT_LOAD_IMG && resultCode == RESULT_OK) { + Uri selectedImage; + if (data == null || data.getData() == null || + (data.getData() != null + && data.getAction() != null + && data.getAction().equals(MediaStore.ACTION_IMAGE_CAPTURE))) { + Log.d("Main", "RESULT_LOAD_IMG got a camera result, in the predefined location"); + selectedImage = ClientAndroidInterface.tempPhotoUri; + } else { + // File selection + selectedImage = data.getData(); + } wv.evaluateJavascript(String.format("selectImageCallback(\"%s\");", selectedImage), null); } else if (requestCode == ClientAndroidInterface.RESULT_SCAN && resultCode == RESULT_OK && data != null) { - this.InsureeNumber = data.getStringExtra("SCAN_RESULT"); + String insureeNumber = data.getStringExtra(Intents.Scan.RESULT); + if(!StringUtils.isEmpty(insureeNumber)) { + wv.evaluateJavascript(String.format("scanQrCallback(\"%s\");", insureeNumber), null); + } } else if (requestCode == REQUEST_PICK_MD_FILE) { if (resultCode == RESULT_OK && data != null) { Uri uri = data.getData(); @@ -137,10 +160,47 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } else { finish(); } - } else if (requestCode == REQUEST_ALL_FILES_ACCESS_CODE) { - if (checkRequirements()) { - onAllRequirementsMet(); + } else if (requestCode == REQUEST_CREATE_ENROL_EXPORT && resultCode == RESULT_OK && data != null) { + Uri fileUri = data.getData(); + + File exportFile = ca.zipEnrolmentFiles(); + if (exportFile != null) { + ca.clearDirectory("Family"); + ca.clearDirectory("Images"); + + UriUtils.copyFileToUri(this, exportFile, fileUri); + if (!exportFile.delete()) { + Log.w("EXPORT", "Deleting enrol export cache failed"); + } + AndroidUtils.showToast(this, R.string.XmlCreated); } + } else if (requestCode == REQUEST_CREATE_RENEWAL_EXPORT && resultCode == RESULT_OK && data != null) { + Uri fileUri = data.getData(); + + File exportFile = ca.zipRenewalFiles(); + if (exportFile != null) { + ca.clearDirectory("Renewal"); + + UriUtils.copyFileToUri(this, exportFile, fileUri); + if (!exportFile.delete()) { + Log.w("EXPORT", "Deleting renewal export cache failed"); + } + AndroidUtils.showToast(this, R.string.XmlCreated); + } + } else if (requestCode == REQUEST_CREATE_FEEDBACK_EXPORT && resultCode == RESULT_OK && data != null) { + Uri fileUri = data.getData(); + + File exportFile = ca.zipFeedbackFiles(); + if (exportFile != null) { + ca.clearDirectory("Feedback"); + + UriUtils.copyFileToUri(this, exportFile, fileUri); + if (!exportFile.delete()) { + Log.w("EXPORT", "Deleting feedback export cache failed"); + } + AndroidUtils.showToast(this, R.string.XmlCreated); + } + } else { //if user cancels ClientAndroidInterface.inProgress = false; @@ -160,17 +220,12 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis @Override protected void onCreate(Bundle savedInstanceState) { global = (Global) getApplicationContext(); - //Check if user has language set - SharedPreferences spHF = getSharedPreferences(PREFS_NAME, MODE_PRIVATE); - selectedLanguage = spHF.getString("Language", "en"); - changeLanguage(selectedLanguage, false); super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); sqlHandler = new SQLHandler(this); sqlHandler.isPrivate = true; //Set the Image folder path - global.setImageFolder(global.getApplicationInfo().dataDir + "/Images/"); - CreateFolders(); + global.setImageFolder(global.getSubdirectory("Images")); //Check if database exists File database = global.getDatabasePath(SQLHandler.DBNAME); if (!database.exists()) { @@ -211,7 +266,6 @@ protected void onCreate(Bundle savedInstanceState) { //noinspection deprecation settings.setRenderPriority(WebSettings.RenderPriority.HIGH); settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); - settings.setAppCacheEnabled(true); settings.setDomStorageEnabled(true); settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN); settings.setUseWideViewPort(true); @@ -244,8 +298,7 @@ public void onReceivedTitle(WebView view, String title) { Login.setOnClickListener(v -> { wv.loadUrl("file:///android_asset/pages/Login.html?s=3"); - DrawerLayout drawer1 = findViewById(R.id.drawer_layout); - drawer1.closeDrawer(GravityCompat.START); + drawer.closeDrawer(GravityCompat.START); SetLoggedIn(getApplication().getResources().getString(R.string.Login), getApplication().getResources().getString(R.string.Logout)); }); ca = new ClientAndroidInterface(context); @@ -253,7 +306,6 @@ public void onReceivedTitle(WebView view, String title) { loadLanguages(); } - SetLoggedIn(getResources().getString(R.string.Login), getResources().getString(R.string.Logout)); navigationView.setCheckedItem(R.id.nav_home); @@ -277,23 +329,11 @@ protected void onResume() { OfficerName.setText(global.getOfficerName()); } - public static void SetLoggedIn(String Lg, String Lo) { + public static void SetLoggedIn(String LogInText, String LogOutText) { if (global.isLoggedIn()) { - Login.setText(Lo); + Login.setText(LogOutText); } else { - Login.setText(Lg); - } - } - - public void CreateFolders() { - boolean dirsCreated = !"".equals(global.getMainDirectory()); - String[] subdirectories = {"Enrolment", "Photos", "Database", "Authentications", "AcceptedFeedback", "RejectedFeedback", "AcceptedRenewal", "RejectedRenewal", "Family", "EnrolmentXML"}; - for (String dir : subdirectories) { - dirsCreated &= !"".equals(global.getSubdirectory(dir)); - } - - if (!dirsCreated) { - Toast.makeText(getApplicationContext(), getResources().getString(R.string.ImisDirNotCreated), Toast.LENGTH_SHORT).show(); + Login.setText(LogInText); } } @@ -358,9 +398,7 @@ public void PickMasterDataFileDialogFromPage() { } // Write your code here to execute after dialog }).setNegativeButton(getResources().getString(R.string.No), - (dialog, id) -> dialog.cancel()); - - alertDialog2.show(); + (dialog, id) -> dialog.cancel()).show(); } public void ConfirmMasterDataDialog(String filename) { @@ -379,9 +417,7 @@ public void ConfirmMasterDataDialog(String filename) { (dialog, id) -> { dialog.cancel(); finish(); - }); - - alertDialog2.show(); + }).show(); } public void ConfirmDialogPage(String filename) { @@ -397,28 +433,23 @@ public void ConfirmDialogPage(String filename) { MasterDataLocalAsync masterDataLocalAsync = new MasterDataLocalAsync(); masterDataLocalAsync.execute(); }).setNegativeButton(getResources().getString(R.string.Quit), - (dialog, id) -> dialog.cancel()); - - alertDialog2.show(); + (dialog, id) -> dialog.cancel()).show(); } public void ShowEnrolmentOfficerDialog() { final ClientAndroidInterface ca = new ClientAndroidInterface(context); final int MasterData = ca.isMasterDataAvailable(); -// OfficerCode= ca.ShowDialogText() ; LayoutInflater li = LayoutInflater.from(context); @SuppressLint("InflateParams") View promptsView = li.inflate(R.layout.dialog, null); - android.support.v7.app.AlertDialog alertDialog = null; - - final android.support.v7.app.AlertDialog.Builder alertDialogBuilder = new android.support.v7.app.AlertDialog.Builder( + final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( context); alertDialogBuilder.setView(promptsView); - final EditText userInput = (EditText) promptsView.findViewById(R.id.txtOfficerCode); - final TextView tVDialogTile = (TextView) promptsView.findViewById(R.id.tvDialogTitle); + final EditText userInput = promptsView.findViewById(R.id.txtOfficerCode); + final TextView tVDialogTile = promptsView.findViewById(R.id.tvDialogTitle); if (MasterData == 0) { tVDialogTile.setText(getResources().getString(R.string.MasterDataNotFound)); @@ -435,7 +466,7 @@ public void ShowEnrolmentOfficerDialog() { negativeButton = R.string.No; } - alertDialogBuilder + enrolmentOfficerDialog = alertDialogBuilder .setCancelable(false) .setPositiveButton(getResources().getString(positiveButton), (dialog, id) -> { @@ -444,6 +475,8 @@ public void ShowEnrolmentOfficerDialog() { if (ca.isOfficerCodeValid(userInput.getText().toString())) { global.setOfficerCode(userInput.getText().toString()); OfficerName.setText(global.getOfficerName()); + SetLoggedIn(getResources().getString(R.string.Login), getResources().getString(R.string.Logout)); + // Officer villages are currently turned off // if(_General.isNetworkAvailable(MainActivity.this)){ // ca.getOfficerVillages(userInput.getText().toString()); // } @@ -470,13 +503,11 @@ public void ShowEnrolmentOfficerDialog() { (dialog, id) -> { dialog.cancel(); finish(); - }); - - alertDialog = alertDialogBuilder.show(); + }).show(); } public void ShowMasterDataDialog() { - new AlertDialog.Builder(context) + masterDataDialog = new AlertDialog.Builder(context) .setTitle(R.string.MasterData) .setMessage(R.string.MasterDataNotFound) .setCancelable(false) @@ -512,7 +543,7 @@ public void ShowDialogTex2() { alertDialogBuilder.setView(promptsView); - final EditText userInput = (EditText) promptsView.findViewById(R.id.etRarPass); + final EditText userInput = promptsView.findViewById(R.id.etRarPass); alertDialogBuilder .setCancelable(false) @@ -586,7 +617,7 @@ private boolean copyDatabase(Context context) { outputStream.flush(); outputStream.close(); - Log.w("MainActivity", "DB Copied"); + Log.w(LOG_TAG, "DB Copied"); return true; } catch (Exception e) { @@ -603,7 +634,7 @@ private void createImageFolder() { @Override public void onBackPressed() { - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + DrawerLayout drawer = findViewById(R.id.drawer_layout); if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); } else { @@ -626,43 +657,26 @@ public boolean onCreateOptionsMenu(Menu menu) { if (!Language2.equals("")) { menu.add(0, MENU_LANGUAGE_2, 0, Language2); } + menu.add(0, MENU_LANGUAGE_3, 0, getResources().getString(R.string.LanguageSettings)); return true; } - private void changeLanguage(String LanguageCode, boolean withRefresh) { - - //General gen = new General(); - global.changeLanguage(this, LanguageCode); - - if (withRefresh) { - //Restart the activity for change to be affected - Intent refresh = new Intent(MainActivity.this, MainActivity.class); - startActivity(refresh); - finish(); - } - setPreferences(); - //OfficerName.setText(global.getOfficerName()); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - switch (item.getItemId()) { case MENU_LANGUAGE_1: selectedLanguage = LanguageCode1; - changeLanguage(selectedLanguage, true); - + new LanguageManager(this).setLanguage(selectedLanguage); return true; case MENU_LANGUAGE_2: selectedLanguage = LanguageCode2; - changeLanguage(selectedLanguage, true); + new LanguageManager(this).setLanguage(selectedLanguage); + return true; + case MENU_LANGUAGE_3: + new LanguageManager(this).openLanguageSettings(); return true; } - return super.onOptionsItemSelected(item); } @@ -785,7 +799,6 @@ protected void onPostExecute(Void aVoid) { Intent refresh = new Intent(MainActivity.this, MainActivity.class); startActivity(refresh); finish(); - setPreferences(); } } @@ -816,22 +829,12 @@ protected void onPostExecute(Void aVoid) { Intent refresh = new Intent(MainActivity.this, MainActivity.class); startActivity(refresh); finish(); - setPreferences(); } } - - private void setPreferences() { - SharedPreferences Lang = getSharedPreferences(PREFS_NAME, MODE_PRIVATE); - SharedPreferences.Editor editor = Lang.edit(); - editor.putString("Language", selectedLanguage); - editor.apply(); - } - @Override protected void onStop() { super.onStop(); - setPreferences(); } // private void CheckForUpdates() { @@ -878,27 +881,6 @@ public static boolean hasPermissions(Context context, String... permissions) { return true; } - public void externalStorageAccessDialog() { - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context) - .setTitle(R.string.ExternalStorageAccess) - .setMessage(getResources().getString(R.string.ExternalStorageAccessInfo, getResources().getString(R.string.app_name_policies))) - .setCancelable(false) - .setPositiveButton(R.string.Ok, - (dialog, id) -> { - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { - Intent intent = new Intent(ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION); - startActivityForResult(intent, REQUEST_ALL_FILES_ACCESS_CODE); - } - }) - .setNegativeButton(R.string.ForceClose, - (dialog, id) -> { - dialog.cancel(); - finish(); - }); - - alertDialogBuilder.show(); - } - public void PermissionsDialog() { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context) .setTitle(R.string.Permissions) @@ -912,17 +894,10 @@ public void PermissionsDialog() { finish(); }); - alertDialogBuilder.show(); + permissionDialog = alertDialogBuilder.show(); } public boolean checkRequirements() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - if (!Environment.isExternalStorageManager()) { - externalStorageAccessDialog(); - return false; - } - } - if (!hasPermissions(this, global.getPermissions())) { PermissionsDialog(); return false; @@ -941,9 +916,21 @@ public void onAllRequirementsMet() { ShowEnrolmentOfficerDialog(); } global.isSDCardAvailable(); + new LanguageManager(this).checkSystemLanguage(); } public String getSelectedLanguage() { return selectedLanguage; } + + @Override + public void recreate() { + for (AlertDialog dialog : new AlertDialog[]{masterDataDialog, enrolmentOfficerDialog, permissionDialog}) { + if(dialog != null && dialog.isShowing()) { + dialog.dismiss(); + } + } + + super.recreate(); + } } diff --git a/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java b/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java index b4eca735..2630213a 100644 --- a/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java +++ b/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java @@ -24,9 +24,10 @@ import android.widget.Spinner; import android.widget.TextView; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -470,7 +471,7 @@ public void run() { e.printStackTrace(); } - tokenl.saveTokenText(token, validTo); + tokenl.saveTokenText(token, validTo, global.getOfficerCode()); final String finalToken = token; runOnUiThread(() -> { @@ -513,8 +514,7 @@ private void getControlNumber(final JSONObject order) { private void handleRequestResult(Intent intent) { if (intent.getAction().equals(ControlNumberService.ACTION_REQUEST_SUCCESS)) { policyDeleteDialogReport(getResources().getString(R.string.requestSent)); - } - else if (intent.getAction().equals(ControlNumberService.ACTION_REQUEST_ERROR)) { + } else if (intent.getAction().equals(ControlNumberService.ACTION_REQUEST_ERROR)) { String errorMessage = intent.getStringExtra(ControlNumberService.FIELD_ERROR_MESSAGE); showSnackbar(errorMessage); } @@ -527,8 +527,7 @@ public void showSnackbar(String message) { .setAction("Action", null).show(); } - public void refresh() - { + public void refresh() { finish(); startActivity(getIntent()); } diff --git a/app/src/main/java/org/openimis/imispolicies/OutputStreamImageTarget.java b/app/src/main/java/org/openimis/imispolicies/OutputStreamImageTarget.java index 798139db..932a311a 100644 --- a/app/src/main/java/org/openimis/imispolicies/OutputStreamImageTarget.java +++ b/app/src/main/java/org/openimis/imispolicies/OutputStreamImageTarget.java @@ -2,7 +2,8 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import android.util.Log; + +import org.openimis.imispolicies.tools.Log; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; @@ -13,20 +14,33 @@ public class OutputStreamImageTarget implements Target { private static final String LOG_TAG = "OSIMAGETARGET"; private final OutputStream outputStream; private final int imageQuality; + private final Runnable onSuccess; public OutputStreamImageTarget(OutputStream outputStream, int imageQuality) { this.outputStream = outputStream; this.imageQuality = imageQuality; + this.onSuccess = () -> { + }; + } + + public OutputStreamImageTarget(OutputStream outputStream, int imageQuality, Runnable onSuccess) { + this.outputStream = outputStream; + this.imageQuality = imageQuality; + this.onSuccess = onSuccess; } @Override public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) { - bitmap.compress(Bitmap.CompressFormat.JPEG, imageQuality, outputStream); + if (bitmap.compress(Bitmap.CompressFormat.JPEG, imageQuality, outputStream)) { + onSuccess.run(); + } else { + Log.e(LOG_TAG, "Compressing image failed"); + } } @Override - public void onBitmapFailed(Drawable errorDrawable) { - Log.e(LOG_TAG, "Loading image failed"); + public void onBitmapFailed(Exception exception, Drawable errorDrawable) { + Log.e(LOG_TAG, "Loading image failed", exception); } @Override diff --git a/app/src/main/java/org/openimis/imispolicies/OverViewControlNumbers.java b/app/src/main/java/org/openimis/imispolicies/OverViewControlNumbers.java index f57969b4..c75b7a69 100644 --- a/app/src/main/java/org/openimis/imispolicies/OverViewControlNumbers.java +++ b/app/src/main/java/org/openimis/imispolicies/OverViewControlNumbers.java @@ -19,9 +19,10 @@ import android.widget.TextView; import android.widget.Toast; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -399,7 +400,7 @@ public void LoginDialogBox() { e.printStackTrace(); } - tokenl.saveTokenText(token, validTo); + tokenl.saveTokenText(token, validTo, global.getOfficerCode()); final String finalToken = token; runOnUiThread(() -> { diff --git a/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java b/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java index 9b6fe7f3..5788939e 100644 --- a/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java +++ b/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java @@ -23,9 +23,10 @@ import android.widget.Spinner; import android.widget.TextView; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -41,8 +42,8 @@ import android.widget.Toast; public class OverViewPolicies extends AppCompatActivity { - private Global global; - private JSONArray policy; + private Global global; + private JSONArray policy; private ClientAndroidInterface clientAndroidInterface; private RecyclerView PolicyRecyclerView; private OverViewPoliciesAdapter overViewPoliciesAdapter; @@ -465,7 +466,7 @@ public void LoginDialogBox() { e.printStackTrace(); } - tokenl.saveTokenText(token, validTo); + tokenl.saveTokenText(token, validTo, global.getOfficerCode()); final String finalToken = token; runOnUiThread(() -> { diff --git a/app/src/main/java/org/openimis/imispolicies/RenewList.java b/app/src/main/java/org/openimis/imispolicies/RenewList.java index 87501534..12b983d5 100644 --- a/app/src/main/java/org/openimis/imispolicies/RenewList.java +++ b/app/src/main/java/org/openimis/imispolicies/RenewList.java @@ -36,6 +36,10 @@ import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextWatcher; + +import org.openimis.imispolicies.tools.LanguageManager; +import org.openimis.imispolicies.tools.Log; + import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -49,16 +53,15 @@ import android.widget.TextView; import android.widget.Toast; -import org.apache.http.HttpResponse; +import cz.msebera.android.httpclient.HttpResponse; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.openimis.imispolicies.util.FileUtils; +import org.openimis.imispolicies.util.UriUtils; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -66,17 +69,16 @@ import java.util.HashMap; public class RenewList extends AppCompatActivity { - private static final int REQUEST_OPEN_DOCUMENT_CODE = 1; + private static final String LOG_TAG = "RENEWAL"; + private static final int REQUEST_IMPORT_RENEWAL_FILE = 1; private Global global; - private String aBuffer = ""; private ListView lv; private SwipeRefreshLayout swipe; - private ArrayList> RenewalList = new ArrayList<>(); + private ArrayList> renewalList = new ArrayList<>(); private String OfficerCode; private ClientAndroidInterface ca; private ListAdapter adapter; public String UnlistedRenPolicy; - boolean isUserLogged = false; @Override @@ -104,27 +106,19 @@ protected void onCreate(Bundle savedInstanceState) { swipe.setEnabled(false); swipe.setOnRefreshListener(() -> { swipe.setRefreshing(true); - (new Handler()).postDelayed(() -> { - Token token = null; - - try { - token = global.getJWTToken(); - } catch (Exception e) { - } - + new Handler().postDelayed(() -> { if (global.isNetworkAvailable()) { - if (token != null) { - RefreshRenewals(); + if (global.isLoggedIn()) { + refreshRenewals(); } else { - LoginDialogBox("Renewals"); + loginDialogBox(this::refreshRenewals); } } else { - openDialogForFeedbackRenewal(); + requestImportRenewal(); } - // FetchPayers(); swipe.setRefreshing(false); - }, 3000); + }, 1000); }); etRenewalSearch.addTextChangedListener(new TextWatcher() { @@ -142,7 +136,6 @@ public void afterTextChanged(Editable s) { } }); - lv.setOnScrollListener(new AbsListView.OnScrollListener() { @Override public void onScrollStateChanged(AbsListView view, int scrollState) { @@ -168,9 +161,7 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun intent.putExtra("PolicyValue", oItem.get("PolicyValue")); intent.putExtra("RenewalUUID", oItem.get("RenewalUUID")); startActivity(intent); - }); - } @Override @@ -179,105 +170,101 @@ protected void onResume() { fillRenewals(); } - public void ConfirmDialogFeedbackRenewal(String filename) { - AlertDialog.Builder alertDialog2 = new AlertDialog.Builder( - RenewList.this); - -// Setting Dialog Title - alertDialog2.setTitle("Load file:"); - alertDialog2.setMessage(filename); - -// Setting Icon to Dialog - // alertDialog2.setIcon(R.drawable.delete); - -// Setting Positive "Yes" Btn - alertDialog2.setPositiveButton("OK", - (dialog, which) -> { - if (ca.InsertRenewals(aBuffer).equals("1")) { - fillRenewals(); - } - }).setNegativeButton("Quit", - (dialog, id) -> { - dialog.cancel(); - finish(); - }); - -// Showing Alert Dialog - alertDialog2.show(); + public void confirmImportRenewal(String filename, Uri uri) { + new AlertDialog.Builder(this) + .setTitle(R.string.LoadFile) + .setMessage(filename) + .setPositiveButton(R.string.Yes, + (dialog, which) -> new Thread(() -> { + File renewalFile = copyRenewalFile(uri); + if (renewalFile != null) { + ca.unZipFeedbacksRenewals(renewalFile); + File[] unzippedFiles = null; + File renewalDir = renewalFile.getParentFile(); + if (renewalDir != null) { + unzippedFiles = renewalDir.listFiles((file) -> file.isFile() && !file.equals(renewalFile)); + } + if (unzippedFiles != null) { + if (unzippedFiles.length == 0) { + Log.w(LOG_TAG, "No renewal files after unpacking"); + } + for (File f : unzippedFiles) { + String renewals = loadRenewalFile(f); + if (renewals != null) { + ca.InsertRenewalsFromExtract(renewals); + } + } + runOnUiThread(this::fillRenewals); + FileUtils.deleteFiles(unzippedFiles); + } + FileUtils.deleteFile(renewalFile); + } + }).start()) + .setNegativeButton(R.string.No, + (dialog, id) -> dialog.cancel()) + .show(); } - public String getMasterDataText(String filename) { - ca.unZipFeedbacksRenewals(filename); - String fname = filename.substring(0, filename.indexOf(".")); - try { - String dir = global.getSubdirectory("Database"); - File myFile = new File(dir, fname);//"/"+dir+"/MasterData.txt" -// BufferedReader myReader = new BufferedReader( -// new InputStreamReader( -// new FileInputStream(myFile), "UTF32")); - FileInputStream fIn = new FileInputStream(myFile); - BufferedReader myReader = new BufferedReader(new InputStreamReader(fIn)); - aBuffer = myReader.readLine(); - - myReader.close(); -/* Scanner in = new Scanner(new FileReader("/"+dir+"/MasterData.txt")); - StringBuilder sb = new StringBuilder(); - while(in.hasNext()) { - sb.append(in.next()); - } - in.close(); - aBuffer = sb.toString();*/ - } catch (IOException e) { - e.printStackTrace(); + private String loadRenewalFile(File file) { + if (file.exists()) { + return FileUtils.readFileAsUTF8String(file); + } else { + Log.e(LOG_TAG, "Unpacked renewal file does not exists"); + return null; } - return aBuffer; } - public void openDialogForFeedbackRenewal() { + public void NoRenewalsFoundDialog() { AlertDialog.Builder alertDialog2 = new AlertDialog.Builder( RenewList.this); -// Setting Dialog Title - alertDialog2.setTitle("NO INTERNET CONNECTION"); - alertDialog2.setMessage("Do you want to import .txt file from your IMIS folder?"); - -// Setting Icon to Dialog - // alertDialog2.setIcon(R.drawable.delete); + alertDialog2.setTitle("Alert") + .setMessage(getResources().getString(R.string.NoRenewalFound)) + .setPositiveButton("OK", null) + .create() + .show(); + } -// Setting Positive "Yes" Btn - alertDialog2.setPositiveButton("Yes", - (dialog, which) -> { + private File copyRenewalFile(Uri uri) { + File copiedFile = UriUtils.copyUriContentToCache(this, uri, "imports/renewal/renewal.rar"); + if (copiedFile != null) { + return copiedFile; + } else { + Log.e(LOG_TAG, "Copying renewal file failed, uri: " + uri); + return null; + } + } - Intent intent = new Intent(Intent.ACTION_GET_CONTENT); - intent.addCategory(Intent.CATEGORY_OPENABLE); - intent.setType("*/*"); - try { - startActivityForResult(intent, REQUEST_OPEN_DOCUMENT_CODE); - } catch (ActivityNotFoundException e) { - Toast.makeText(getApplicationContext(), "There are no file explorer clients installed.", Toast.LENGTH_SHORT).show(); - } - // Write your code here to execute after dialog - }).setNegativeButton("No", - (dialog, id) -> { - dialog.cancel(); - finish(); - }); - -// Showing Alert Dialog - alertDialog2.show(); + public void requestImportRenewal() { + new AlertDialog.Builder(this) + .setTitle(R.string.NoInternetTitle) + .setMessage(R.string.ImportRenewalFile) + .setPositiveButton(R.string.Yes, + (dialog, which) -> { + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.addCategory(Intent.CATEGORY_OPENABLE); + intent.setType("*/*"); + try { + startActivityForResult(intent, REQUEST_IMPORT_RENEWAL_FILE); + } catch (ActivityNotFoundException e) { + Toast.makeText(getApplicationContext(), getResources().getString(R.string.NoFileExporerInstalled), Toast.LENGTH_SHORT).show(); + } + }) + .setNegativeButton(R.string.No, + (dialog, id) -> dialog.cancel()) + .show(); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == REQUEST_OPEN_DOCUMENT_CODE && resultCode == RESULT_OK) { + if (requestCode == REQUEST_IMPORT_RENEWAL_FILE && resultCode == RESULT_OK && data != null) { Uri uri = data.getData(); - String path = uri.getPath(); - File f = new File(path); + String filename = UriUtils.getDisplayName(this, uri); + String expectedFilename = String.format("renewal_%s.rar", global.getOfficerCode().toLowerCase()); - if (f.getName().toLowerCase().equals("renewal_" + global.getOfficerCode().toLowerCase() + ".rar")) { - getMasterDataText((f.getName())); - ConfirmDialogFeedbackRenewal((f.getName())); + if (filename != null && filename.toLowerCase().equals(expectedFilename)) { + confirmImportRenewal(filename, uri); } else { Toast.makeText(this, getResources().getString(R.string.FileDoesntBelongHere), Toast.LENGTH_LONG).show(); } @@ -286,73 +273,56 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } private void fillRenewals() { - RenewalList.clear(); + renewalList.clear(); SimpleDateFormat format = AppInformation.DateTimeInfo.getDefaultDateFormatter(); Calendar cal = Calendar.getInstance(); String d = format.format(cal.getTime()); ClientAndroidInterface ca = new ClientAndroidInterface(this); String result = ca.OfflineRenewals(OfficerCode); - JSONArray jsonArray; JSONObject object; try { - RenewalList.clear(); - jsonArray = new JSONArray(result); - HashMap Renewal; - Renewal = new HashMap<>(); - Renewal.put("RenewalId", "0"); - Renewal.put("CHFID", UnlistedRenPolicy); - Renewal.put("FullName", getResources().getString(R.string.RenewYourPolicy)); - Renewal.put("Product", getResources().getString(R.string.Product)); - Renewal.put("VillageName", ""); - Renewal.put("PolicyValue", ""); - Renewal.put("PolicyId", ""); - Renewal.put("ProductCode", ""); - Renewal.put("LocationId", String.valueOf(ca.getLocationId(OfficerCode))); - Renewal.put("RenewalPromptDate", d); - Renewal.put("RenewalUUID", ""); - RenewalList.add(Renewal); - if (jsonArray.length() == 0) { - //RenewalList.clear(); - //Toast.makeText(this, getResources().getString(R.string.NoRenewalFound), Toast.LENGTH_LONG).show(); - } else { - RenewalList.clear(); - Renewal = new HashMap<>(); - Renewal.put("RenewalId", "0"); - Renewal.put("CHFID", UnlistedRenPolicy); - Renewal.put("FullName", getResources().getString(R.string.RenewYourPolicy)); - Renewal.put("Product", getResources().getString(R.string.Product)); - Renewal.put("VillageName", ""); - Renewal.put("PolicyValue", ""); - Renewal.put("PolicyId", ""); - Renewal.put("ProductCode", ""); - Renewal.put("LocationId", String.valueOf(ca.getLocationId(OfficerCode))); - Renewal.put("RenewalPromptDate", d); - Renewal.put("RenewalUUID", ""); - RenewalList.add(Renewal); - for (int i = 0; i < jsonArray.length(); i++) { - - object = jsonArray.getJSONObject(i); - - Renewal = new HashMap<>(); - Renewal.put("RenewalId", object.getString("RenewalId")); - Renewal.put("CHFID", object.getString("CHFID")); - Renewal.put("FullName", object.getString("LastName") + " " + object.getString("OtherNames")); - Renewal.put("Product", object.getString("ProductCode") + " : " + object.getString("ProductName")); - Renewal.put("VillageName", object.getString("VillageName")); - Renewal.put("RenewalPromptDate", object.getString("RenewalPromptDate")); - Renewal.put("PolicyId", object.getString("PolicyId")); - Renewal.put("ProductCode", object.getString("ProductCode")); - Renewal.put("LocationId", object.getString("LocationId")); - Renewal.put("PolicyValue", object.getString("PolicyValue")); - Renewal.put("RenewalUUID", object.getString("RenewalUUID")); - RenewalList.add(Renewal); - } + HashMap renewal; + JSONArray jsonArray = new JSONArray(result); + + renewalList.clear(); + renewal = new HashMap<>(); + renewal.put("RenewalId", "0"); + renewal.put("CHFID", UnlistedRenPolicy); + renewal.put("FullName", getResources().getString(R.string.RenewYourPolicy)); + renewal.put("Product", getResources().getString(R.string.Product)); + renewal.put("VillageName", ""); + renewal.put("PolicyValue", ""); + renewal.put("PolicyId", ""); + renewal.put("ProductCode", ""); + renewal.put("LocationId", String.valueOf(ca.getLocationId(OfficerCode))); + renewal.put("RenewalPromptDate", d); + renewal.put("RenewalUUID", ""); + renewalList.add(renewal); + + if (jsonArray.length()==0) { + this.NoRenewalsFoundDialog(); + } + for (int i = 0; i < jsonArray.length(); i++) { + + object = jsonArray.getJSONObject(i); + renewal = new HashMap<>(); + renewal.put("RenewalId", object.getString("RenewalId")); + renewal.put("CHFID", object.getString("CHFID")); + renewal.put("FullName", object.getString("LastName") + " " + object.getString("OtherNames")); + renewal.put("Product", object.getString("ProductCode") + " : " + object.getString("ProductName")); + renewal.put("VillageName", object.getString("VillageName")); + renewal.put("RenewalPromptDate", object.getString("RenewalPromptDate")); + renewal.put("PolicyId", object.getString("PolicyId")); + renewal.put("ProductCode", object.getString("ProductCode")); + renewal.put("LocationId", object.getString("LocationId")); + renewal.put("PolicyValue", object.getString("PolicyValue")); + renewal.put("RenewalUUID", object.getString("RenewalUUID")); + renewalList.add(renewal); } - - adapter = new SimpleAdapter(this, RenewalList, R.layout.renewallist, + adapter = new SimpleAdapter(this, renewalList, R.layout.renewallist, new String[]{"CHFID", "FullName", "Product", "VillageName", "RenewalPromptDate"}, new int[]{R.id.tvCHFID, R.id.tvFullName, R.id.tvProduct, R.id.tvVillage, R.id.tvTime}); @@ -366,7 +336,7 @@ private void fillRenewals() { } - private void RefreshRenewals() { + private void refreshRenewals() { if (global.isNetworkAvailable()) { if (global.isLoggedIn()) { new Thread(() -> { @@ -382,7 +352,7 @@ private void RefreshRenewals() { } if (responseCode == HttpURLConnection.HTTP_OK && result != null) { - ca.InsertRenewals(result); + ca.InsertRenewalsFromApi(result); runOnUiThread(this::fillRenewals); } else if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) { Toast.makeText(this, getResources().getString(R.string.LogInToDownloadRenewals), Toast.LENGTH_LONG).show(); @@ -395,8 +365,7 @@ private void RefreshRenewals() { Toast.makeText(this, getResources().getString(R.string.LogInToDownloadRenewals), Toast.LENGTH_LONG).show(); } } else { - openDialogForFeedbackRenewal(); - //Toast.makeText(this, getResources().getString(R.string.NoInternet), Toast.LENGTH_LONG).show(); + requestImportRenewal(); } } @@ -409,36 +378,18 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - case R.id.mnuStatistics: - if (!ca.CheckInternetAvailable()) { - return false; - } - Intent stats = new Intent(this, Statistics.class); - stats.putExtra("Title", "Renewal Statistics"); - stats.putExtra("Caller", "R"); - startActivity(stats); - return true; - default: - return super.onOptionsItemSelected(item); - } + onBackPressed(); + return true; } - public void LoginDialogBox(final String page) { - if (!ca.CheckInternetAvailable()) + public void loginDialogBox(Runnable onLoggedIn) { + if (!global.isNetworkAvailable()) return; - Global global = (Global) RenewList.this.getApplicationContext(); - // get prompts.xml view LayoutInflater li = LayoutInflater.from(this); View promptsView = li.inflate(R.layout.login_dialog, null); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this); - - // set prompts.xml to alertdialog builder alertDialogBuilder.setView(promptsView); final TextView username = promptsView.findViewById(R.id.UserName); @@ -446,44 +397,28 @@ public void LoginDialogBox(final String page) { username.setText(global.getOfficerCode()); - // set dialog message alertDialogBuilder .setCancelable(false) .setPositiveButton(R.string.Ok, (dialog, id) -> { if (!username.getText().toString().equals("") && !password.getText().toString().equals("")) { - new Thread(() -> { - isUserLogged = ca.LoginToken(username.getText().toString(), password.getText().toString()); - runOnUiThread(() -> { if (isUserLogged) { - if (page.equals("Renewals")) { - finish(); - Intent intent = new Intent(RenewList.this, RenewList.class); - startActivity(intent); - Toast.makeText(RenewList.this, RenewList.this.getResources().getString(R.string.Login_Successful), Toast.LENGTH_LONG).show(); - } - + onLoggedIn.run(); } else { Toast.makeText(RenewList.this, RenewList.this.getResources().getString(R.string.LoginFail), Toast.LENGTH_LONG).show(); - LoginDialogBox(page); - //ca.ShowDialog(RenewList.this.getResources().getString(R.string.LoginFail)); + loginDialogBox(onLoggedIn); } }); }).start(); } else { Toast.makeText(RenewList.this, RenewList.this.getResources().getString(R.string.Enter_Credentials), Toast.LENGTH_LONG).show(); - LoginDialogBox(page); + loginDialogBox(onLoggedIn); } }) - .setNegativeButton(R.string.Cancel, (dialog, id) -> dialog.cancel()); - - // create alert dialog - AlertDialog alertDialog = alertDialogBuilder.create(); - - // show it - alertDialog.show(); + .setNegativeButton(R.string.Cancel, (dialog, id) -> dialog.cancel()) + .show(); } } diff --git a/app/src/main/java/org/openimis/imispolicies/Renewal.java b/app/src/main/java/org/openimis/imispolicies/Renewal.java index 7ac7fa72..53a7d72a 100644 --- a/app/src/main/java/org/openimis/imispolicies/Renewal.java +++ b/app/src/main/java/org/openimis/imispolicies/Renewal.java @@ -27,7 +27,9 @@ import android.app.AlertDialog; import android.app.ProgressDialog; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextUtils; @@ -38,18 +40,24 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ListAdapter; import android.widget.SimpleAdapter; import android.widget.Spinner; import android.widget.SpinnerAdapter; import android.widget.Toast; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import com.google.zxing.client.android.Intents; + +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.openimis.imispolicies.Util.StringUtil; +import org.openimis.imispolicies.tools.LanguageManager; +import org.openimis.imispolicies.tools.Log; +import org.openimis.imispolicies.util.StringUtils; import org.xmlpull.v1.XmlSerializer; import java.io.File; @@ -65,6 +73,7 @@ import static android.widget.AdapterView.INVALID_POSITION; public class Renewal extends AppCompatActivity { + private static final String LOG_TAG = "RENEWAL"; private Global global; private SQLHandler sqlHandler; @@ -75,6 +84,7 @@ public class Renewal extends AppCompatActivity { private EditText etProductCode; private EditText etAmount; private Button btnSubmit; + private ImageButton btnScan; private ProgressDialog pd; private CheckBox chkDiscontinue; private Spinner spPayer; @@ -85,7 +95,6 @@ public class Renewal extends AppCompatActivity { private int LocationId; private int RenewalId; private String RenewalUUID; - private int result; private EditText PolicyValue; private ListAdapter adapter; @@ -93,6 +102,7 @@ public class Renewal extends AppCompatActivity { private final ArrayList> PayersList = new ArrayList<>(); private final ArrayList> ProductList = new ArrayList<>(); + private static final int INTENT_ACTIVITY_SCAN_CODE = 554; @Override protected void onCreate(Bundle savedInstanceState) { @@ -114,6 +124,7 @@ protected void onCreate(Bundle savedInstanceState) { spPayer = findViewById(R.id.spPayer); spProduct = findViewById(R.id.spProduct); etControlNumber = findViewById(R.id.etControlNumber); + btnScan = findViewById(R.id.btnScan); if (!ca.getRule("ShowPaymentOption", true)) { etReceiptNo.setVisibility(View.GONE); @@ -157,7 +168,11 @@ protected void onCreate(Bundle savedInstanceState) { BindSpinnerProduct(); } else { spProduct.setVisibility(View.GONE); - assignNextFreeCn(etProductCode.getText().toString()); + + if (ca.IsBulkCNUsed()) { + assignNextFreeCn(etProductCode.getText().toString()); + } + BindSpinnerPayers(); } @@ -178,7 +193,6 @@ protected void onCreate(Bundle savedInstanceState) { } if (!isValidate()) { - pd.dismiss(); return; } @@ -203,6 +217,17 @@ protected void onCreate(Bundle savedInstanceState) { } }); + btnScan.setOnClickListener(v -> { + Intent intent = new Intent("com.google.zxing.client.android.SCAN"); + intent.putExtra("SCAN_MODE", "QR_CODE_MODE"); + try { + startActivityForResult(intent, INTENT_ACTIVITY_SCAN_CODE); + } catch (Exception e) { + Log.e(LOG_TAG, "Error while trying to initiate QR scan", e); + } + } + ); + etOfficer.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -247,17 +272,15 @@ private String GetSelectedProduct() { private void WriteXML() { try { - //Create All directories - File MyDir = new File(global.getMainDirectory()); //Create File name Date date = Calendar.getInstance().getTime(); String d = AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(date); - FileName = "RenPol_" + d + "_" + etCHFID.getText().toString() + "_" + etReceiptNo.getText().toString() + ".xml"; + FileName = "Renewal_" + d + "_" + etCHFID.getText().toString() + "_" + etReceiptNo.getText().toString() + ".xml"; d = AppInformation.DateTimeInfo.getDefaultDateFormatter().format(date); String PayerId = GetSelectedPayer(); //Create XML file - File policyXML = new File(MyDir, FileName); + File policyXML = new File(global.getSubdirectory("Renewal"), FileName); FileOutputStream fos = new FileOutputStream(policyXML); @@ -317,23 +340,21 @@ private void WriteXML() { fos.close(); } catch (Exception e) { - e.printStackTrace(); + Log.e(LOG_TAG, "Error while saving renewal file", e); } - } public String WriteJSON() { - File MyDir = new File(global.getMainDirectory()); Date date = Calendar.getInstance().getTime(); String d = AppInformation.DateTimeInfo.getDefaultFileDatetimeFormatter().format(date); - FileName = "RenPolJSON_" + d + "_" + etCHFID.getText().toString() + "_" + etReceiptNo.getText().toString() + ".txt"; + FileName = "RenewalJSON_" + d + "_" + etCHFID.getText().toString() + "_" + etReceiptNo.getText().toString() + ".json"; String PayerId = GetSelectedPayer(); String ProductCode = GetSelectedProduct(); d = AppInformation.DateTimeInfo.getDefaultDateFormatter().format(date); //Create XML file - File policyJSON = new File(MyDir, FileName); + File policyJSON = new File(global.getSubdirectory("Renewal"), FileName); JSONObject FullObject = new JSONObject(); @@ -363,13 +384,13 @@ public String WriteJSON() { myOutWriter.close(); fOut.close(); } catch (IOException e) { - e.printStackTrace(); + Log.e(LOG_TAG, "IO error while saving renewal file", e); } } catch (IllegalStateException e) { - e.printStackTrace(); + Log.e(LOG_TAG, "Illegal state error while saving renewal file", e); } catch (JSONException e) { - e.printStackTrace(); + Log.e(LOG_TAG, "Json error while saving renewal file", e); } return FullObject.toString(); @@ -421,6 +442,14 @@ private void ConfirmControlNumber(Runnable onConfirmed) { }).show(); } + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == INTENT_ACTIVITY_SCAN_CODE && data != null) { + etCHFID.setText(data.getStringExtra(Intents.Scan.RESULT)); + } + } + private void UpdateRow(int RenewalId) { if (RenewalId != 0) { ca.UpdateRenewTable(RenewalId); @@ -467,7 +496,7 @@ private void BindSpinnerPayers(int LocationId) { spPayer.setAdapter((SpinnerAdapter) adapter); } } catch (JSONException e) { - e.printStackTrace(); + Log.e(LOG_TAG, "Error while binding payers", e); } } @@ -513,7 +542,7 @@ private void BindSpinnerProduct() { spProduct.setAdapter(adapter); } } catch (JSONException e) { - e.printStackTrace(); + Log.e(LOG_TAG, "Error while binding products", e); } } @@ -595,7 +624,7 @@ private boolean isValidate() { ToRestApi rest = new ToRestApi(); response = rest.postToRestApiToken(receiptObj, "premium/receipt"); } catch (Exception e) { - e.printStackTrace(); + Log.e(LOG_TAG, "Error while checking receipt no", e); } if (response != null) { @@ -637,7 +666,7 @@ private void showInfoDialog(int resId) { } private void assignNextFreeCn(String productCode) { - if (!StringUtil.equals(productCode, "0")) { + if (!StringUtils.equals(productCode, "0")) { String controlNumber = sqlHandler.getNextFreeCn(etOfficer.getText().toString(), productCode); if (controlNumber != null) { etControlNumber.setText(controlNumber); diff --git a/app/src/main/java/org/openimis/imispolicies/SQLHandler.java b/app/src/main/java/org/openimis/imispolicies/SQLHandler.java index d7fab34b..7927849f 100644 --- a/app/src/main/java/org/openimis/imispolicies/SQLHandler.java +++ b/app/src/main/java/org/openimis/imispolicies/SQLHandler.java @@ -31,10 +31,10 @@ import android.database.Cursor; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteOpenHelper; +import android.support.annotation.NonNull; import android.text.TextUtils; -import android.util.Log; +import org.openimis.imispolicies.tools.Log; import android.util.Xml; import org.json.JSONArray; @@ -47,7 +47,6 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Calendar; -import java.util.Locale; public class SQLHandler extends SQLiteOpenHelper { @@ -476,7 +475,7 @@ public void onOpen(SQLiteDatabase db) { private void openDatabase() { String dbPath = mContext.getDatabasePath(DBNAME).getPath(); - String dbOfflinePath = global.getMainDirectory() + File.separator + OFFLINEDBNAME; + String dbOfflinePath = global.getAppDirectory() + File.separator + OFFLINEDBNAME; if (mDatabase != null && mDatabase.isOpen()) { return; } @@ -561,7 +560,7 @@ public JSONArray getResult(String Query, String[] args) { return getResult(Query, args, "0"); } - public String getResultXML2(String QueryF, String QueryI, String QueryPL, String QueryPR, String QueryIP, String OfficerCode, int OfficerId) throws IOException { + public String getExportAsXML(String QueryF, String QueryI, String QueryPL, String QueryPR, String QueryIP, String OfficerCode, int OfficerId) throws IOException { String Query = null; String label = null; String sublabel = null; @@ -571,8 +570,6 @@ public String getResultXML2(String QueryF, String QueryI, String QueryPL, String String d = format.format(cal.getTime()); File Dir = new File(global.getSubdirectory("Family")); - Dir.mkdir(); - //Here we are giving name to the XML file String FileName = "Enrolment_" + OfficerCode + "_" + d + ".xml"; @@ -677,7 +674,6 @@ public String getResultXML2(String QueryF, String QueryI, String QueryPL, String } } if (sublabel.equals("Family")) { - serializer = addFamilySmsTag(serializer, cursor.getString(0)); } serializer.endTag(null, sublabel); @@ -691,7 +687,7 @@ public String getResultXML2(String QueryF, String QueryI, String QueryPL, String e.printStackTrace(); } - + serializer.endTag(null, "Enrolment"); serializer.endDocument(); serializer.flush(); fos.close(); @@ -734,7 +730,7 @@ public void insertData(String TableName, String[] Columns, String data, String P String dbPath = ClientAndroidInterface.filePath; mDatabase = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READWRITE); try { - JSONArray array = null; + JSONArray array; JSONObject object; array = new JSONArray(data); @@ -742,7 +738,6 @@ public void insertData(String TableName, String[] Columns, String data, String P if (array.length() == 0) return; - if (!mDatabase.isOpen()) { openDatabase(); } @@ -792,13 +787,13 @@ public int insertData(String tableName, ContentValues contentValues) { } } - public int updateData(String tableName, ContentValues contentValues, String whereClause, String[] whereArgs) throws UserException { + public int updateData(String tableName, ContentValues contentValues, String whereClause, String[] whereArgs, boolean throwOnNoRowsUpdated) throws UserException { openDatabase(); int rowsUpdated = 0; try { openDatabase(); rowsUpdated = mDatabase.update(tableName, contentValues, whereClause, whereArgs); - if (rowsUpdated <= 0) { + if (throwOnNoRowsUpdated && rowsUpdated <= 0) { throw new UserException(mContext.getResources().getString(R.string.ErrorUpdate)); } } catch (Exception e) { @@ -809,6 +804,9 @@ public int updateData(String tableName, ContentValues contentValues, String wher return rowsUpdated; } + public int updateData(String tableName, ContentValues contentValues, String whereClause, String[] whereArgs) throws UserException { + return updateData(tableName, contentValues, whereClause, whereArgs, true); + } public void deleteData(String tableName, String whereClause, String[] whereArgs) { try { @@ -821,14 +819,6 @@ public void deleteData(String tableName, String whereClause, String[] whereArgs) } } - public String getDatabasePath(Context context) { - SQLHandler helper = new SQLHandler(this.mContext); - SQLiteDatabase database = helper.getReadableDatabase(); - String path = database.getPath(); - database.close(); - return path; - } - public int getCount(String table, String selection, String[] selectionArgs) { openDatabase(); int result = 0; @@ -1057,4 +1047,36 @@ public int getRegionId(int districtId) { } return result; } + + /** + * @return Default Language as specified by SortOrder in tblLanguages, return DEFAULT_LANGUAGE_CODE before initialization + */ + @NonNull + public String getDefaultLanguage() { + openDatabase(); + String result = BuildConfig.DEFAULT_LANGUAGE_CODE; + try (Cursor c = mDatabase.query(tblLanguages, + new String[]{"LanguageCode"}, + null, + null, + null, + null, + "SortOrder ASC", + "1")) { + c.moveToFirst(); + if (!c.isAfterLast()) { + result = c.getString(0); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeDatabase(); + } + return result; + } + + @NonNull + public JSONArray getSupportedLanguages() { + return getResult(tblLanguages, new String[]{"LanguageCode"}, null, null); + } } diff --git a/app/src/main/java/org/openimis/imispolicies/SnapshotIndicators.java b/app/src/main/java/org/openimis/imispolicies/SnapshotIndicators.java index 19a63013..3507aad0 100644 --- a/app/src/main/java/org/openimis/imispolicies/SnapshotIndicators.java +++ b/app/src/main/java/org/openimis/imispolicies/SnapshotIndicators.java @@ -42,9 +42,10 @@ import android.widget.TextView; import android.widget.Toast; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/org/openimis/imispolicies/Statistics.java b/app/src/main/java/org/openimis/imispolicies/Statistics.java index 6570bffa..ab5ab6a3 100644 --- a/app/src/main/java/org/openimis/imispolicies/Statistics.java +++ b/app/src/main/java/org/openimis/imispolicies/Statistics.java @@ -44,13 +44,15 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.SimpleAdapter; + import java.text.DateFormat; import com.exact.CallSoap.CallSoap; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.util.EntityUtils; +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -76,7 +78,7 @@ public class Statistics extends AppCompatActivity { private static final int ToDate_Dialog_ID = 1; private final Calendar cal = Calendar.getInstance(); private ArrayList> FeedbackStats = new ArrayList<>(); - ArrayList> EnrolmentStats = new ArrayList>(); + ArrayList> EnrolmentStats = new ArrayList>(); private String OfficerCode; private String Caller; private Global global; @@ -215,8 +217,8 @@ public boolean onOptionsItemSelected(MenuItem item) { new Thread() { public void run() { - if(!IsEnrolment) - GetStatistics(); + if (!IsEnrolment) + GetStatistics(); else GetEnrolmentStats(); pd.dismiss(); @@ -260,16 +262,18 @@ private void GetStatistics() { ToRestApi rest = new ToRestApi(); if (Caller.equals("F")) { - HttpResponse response = rest.postToRestApiToken(objStats,"report/feedback"); + HttpResponse response = rest.postToRestApiToken(objStats, "report/feedback"); try { stats = EntityUtils.toString(response.getEntity()); - } catch (Exception e) {} + } catch (Exception e) { + } } else if (Caller.equals("R")) { - HttpResponse response = rest.postToRestApiToken(objStats,"report/renewal"); + HttpResponse response = rest.postToRestApiToken(objStats, "report/renewal"); try { stats = EntityUtils.toString(response.getEntity()); - } catch (Exception e) {} + } catch (Exception e) { + } } final String finalStats = stats; @@ -320,7 +324,8 @@ else if (Caller.equals("R")) } - private void GetEnrolmentStats(){ + + private void GetEnrolmentStats() { EnrolmentStats = new ArrayList<>(); Date FromDate, ToDate; @@ -346,7 +351,7 @@ private void GetEnrolmentStats(){ } ToRestApi rest = new ToRestApi(); - HttpResponse response = rest.postToRestApiToken(objEnrolment,"report/enrolment"); + HttpResponse response = rest.postToRestApiToken(objEnrolment, "report/enrolment"); HttpEntity entity = response.getEntity(); String entityString = ""; @@ -355,7 +360,8 @@ private void GetEnrolmentStats(){ try { entityString = EntityUtils.toString(entity); enrolmentStatsObj = new JSONObject(entityString); - } catch (Exception e) {} + } catch (Exception e) { + } final JSONObject finalEnrolmentStatsObj = enrolmentStatsObj; @@ -363,10 +369,10 @@ private void GetEnrolmentStats(){ @Override public void run() { try { - if(finalEnrolmentStatsObj.length() == 0){ + if (finalEnrolmentStatsObj.length() == 0) { ShowDialog(getResources().getString(R.string.NoStatFound)); - }else{ - HashMap data = new HashMap(); + } else { + HashMap data = new HashMap(); data.put("Label", "Total Submitted"); data.put("Value", String.valueOf(finalEnrolmentStatsObj.get("totalSubmitted"))); EnrolmentStats.add(data); @@ -379,19 +385,19 @@ public void run() { ListAdapter adapter = new SimpleAdapter(Statistics.this, EnrolmentStats, R.layout.lvstats, - new String[]{"Label","Value"}, - new int[]{R.id.tvStatsLabel,R.id.tvStats} + new String[]{"Label", "Value"}, + new int[]{R.id.tvStatsLabel, R.id.tvStats} ); lvStats.setAdapter(adapter); } - } - catch (JSONException e) { + } catch (JSONException e) { e.printStackTrace(); } } }); } + private AlertDialog ShowDialog(String msg) { return new AlertDialog.Builder(this) .setMessage(msg) diff --git a/app/src/main/java/org/openimis/imispolicies/ToRestApi.java b/app/src/main/java/org/openimis/imispolicies/ToRestApi.java index e744e3e5..fb57d89f 100644 --- a/app/src/main/java/org/openimis/imispolicies/ToRestApi.java +++ b/app/src/main/java/org/openimis/imispolicies/ToRestApi.java @@ -1,21 +1,22 @@ package org.openimis.imispolicies; -import android.util.Log; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.util.EntityUtils; +import android.content.Context; + +import cz.msebera.android.httpclient.HttpEntity; +import cz.msebera.android.httpclient.HttpResponse; +import cz.msebera.android.httpclient.client.HttpClient; +import cz.msebera.android.httpclient.client.methods.HttpDelete; +import cz.msebera.android.httpclient.client.methods.HttpGet; +import cz.msebera.android.httpclient.client.methods.HttpPost; +import cz.msebera.android.httpclient.entity.StringEntity; +import cz.msebera.android.httpclient.impl.client.DefaultHttpClient; +import cz.msebera.android.httpclient.util.EntityUtils; + import org.json.JSONObject; +import org.openimis.imispolicies.tools.Log; import java.io.IOException; import java.net.HttpURLConnection; -import java.util.HashMap; public class ToRestApi { public static class UploadStatus { @@ -106,10 +107,10 @@ public HttpResponse postToRestApi(JSONObject object, String functionName, boolea int responseCode = response.getStatusLine().getStatusCode(); Log.i("HTTP_POST", uri + functionName + " - " + responseCode); - if (object != null && responseCode >= 400) { + if (object != null && responseCode >= 400 && !functionName.equals("login")) { String body = object.toString(); if (body.length() > 1000) { - body = body.substring(0,1000); + body = body.substring(0, 1000); } Log.e("HTTP_POST", "Body: " + body); } @@ -144,6 +145,10 @@ public HttpResponse getFromRestApiToken(final String functionName) { return getFromRestApi(functionName, true); } + public HttpResponse getFromRestApi(final String functionName) { + return getFromRestApi(functionName, false); + } + public HttpResponse deleteFromRestApiToken(final String functionName) { HttpClient httpClient = new DefaultHttpClient(); HttpDelete httpDelete = new HttpDelete(uri + functionName); @@ -177,7 +182,7 @@ public String getContent(HttpResponse response) { content = EntityUtils.toString(respEntity); if (content != null && content.length() > 0 && response.getStatusLine().getStatusCode() >= 400) { - Log.e("HTTP", "Error response: " + content); + Log.e("HTTP", "Error " + response.getStatusLine().getStatusCode() + ", response: " + content); } } catch (IOException e) { e.printStackTrace(); @@ -200,4 +205,18 @@ private String buildTokenHeader() { } return ""; } + + public String getHttpError(Context context, int httpResponseCode, String httpReason) { + if (httpResponseCode == HttpURLConnection.HTTP_OK || httpResponseCode == HttpURLConnection.HTTP_CREATED) { + return null; + } else if (httpResponseCode == HttpURLConnection.HTTP_NOT_FOUND) { + return context.getResources().getString(R.string.NotFound); + } else if (httpResponseCode == HttpURLConnection.HTTP_UNAUTHORIZED) { + return context.getResources().getString(R.string.Unauthorized); + } else if (httpResponseCode == HttpURLConnection.HTTP_FORBIDDEN) { + return context.getResources().getString(R.string.Forbidden); + } else { + return context.getResources().getString(R.string.HttpResponse, httpResponseCode, httpReason); + } + } } diff --git a/app/src/main/java/org/openimis/imispolicies/Token.java b/app/src/main/java/org/openimis/imispolicies/Token.java index 8d23381d..d4401297 100644 --- a/app/src/main/java/org/openimis/imispolicies/Token.java +++ b/app/src/main/java/org/openimis/imispolicies/Token.java @@ -22,12 +22,13 @@ */ public class Token { - public void saveTokenText(String token, String validTo) { + public void saveTokenText(String token, String validTo, String eoCode) { Global global = Global.getGlobal(); String dir = global.getSubdirectory("Authentications"); File tokenFile = new File(dir, "token.txt"); File validToFile = new File(dir, "validTo.txt"); + File eoCodeFile = new File(dir, "eoCode.txt"); try { if (tokenFile.exists()) { @@ -51,6 +52,16 @@ public void saveTokenText(String token, String validTo) { myOutWriter.close(); fOut.close(); } + if (eoCodeFile.exists()) { + eoCodeFile.delete(); + } + if (eoCodeFile.createNewFile()) { + FileOutputStream fOut = new FileOutputStream(eoCodeFile); + OutputStreamWriter myOutWriter = new OutputStreamWriter(fOut); + myOutWriter.write(eoCode); + myOutWriter.close(); + fOut.close(); + } } catch (Exception e) { e.printStackTrace(); } @@ -59,10 +70,19 @@ public void saveTokenText(String token, String validTo) { public String getTokenText() { String token = null; String validTo = null; + String eoCode = null; try { Global global = Global.getGlobal(); String dir = global.getSubdirectory("Authentications"); + File eoCodeFile = new File(dir, "eoCode.txt"); + if (eoCodeFile.exists()) { + FileInputStream fIn = new FileInputStream(eoCodeFile); + BufferedReader myReader = new BufferedReader(new InputStreamReader(fIn)); + eoCode = myReader.readLine(); + myReader.close(); + } + File validToFile = new File(dir, "validTo.txt"); if (validToFile.exists()) { FileInputStream fIn = new FileInputStream(validToFile); @@ -80,6 +100,10 @@ public String getTokenText() { } SimpleDateFormat format = AppInformation.DateTimeInfo.getDefaultIsoDatetimeFormatter(); + if(!Global.getGlobal().getOfficerCode().equals(eoCode)) { + clearToken(); + token = null; + } if (validTo != null) try { @@ -105,7 +129,7 @@ public String getTokenText() { } public void clearToken() { - saveTokenText("", ""); + saveTokenText("", "", ""); } //How to validate JWT: diff --git a/app/src/main/java/org/openimis/imispolicies/Util.java b/app/src/main/java/org/openimis/imispolicies/Util.java deleted file mode 100644 index b0909045..00000000 --- a/app/src/main/java/org/openimis/imispolicies/Util.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.openimis.imispolicies; - -import android.app.AlertDialog; -import android.app.ProgressDialog; -import android.content.Context; -import android.support.annotation.NonNull; -import android.text.TextUtils; -import android.widget.Toast; - -import org.json.JSONException; -import org.json.JSONObject; - -public class Util { - public static class StringUtil { - /** - * @param string String to be checked - * @return is string null or empty - */ - public static boolean isEmpty(CharSequence string) { - return isEmpty(string, false); - } - - /** - * @param string String to be checked - * @param checkNullString Should "null" string be considered empty - * @return is string null or empty - */ - public static boolean isEmpty(CharSequence string, boolean checkNullString) { - return string == null - || string.equals("") - || (string.equals("null") && checkNullString); - } - - public static boolean equals(CharSequence s1, CharSequence s2) { - return TextUtils.equals(s1, s2); - } - } - - public static class JsonUtil { - /** - * @param object Json object - * @param field field to be checked - * @return if the field does not exists, is null or empty - */ - public static boolean isStringEmpty(JSONObject object, @NonNull String field) { - return isStringEmpty(object, field, false); - } - - /** - * @param object Json object - * @param field field to be checked - * @param checkNullString Should "null" string be considered empty - * @return if the field does not exists, is null or empty - */ - public static boolean isStringEmpty(JSONObject object, @NonNull String field, boolean checkNullString) { - try { - return object == null - || !object.has(field) - || StringUtil.isEmpty(object.getString(field), checkNullString); - } catch (JSONException e) { - return true; - } - } - } - - public static class AndroidUtil { - public static ProgressDialog showProgressDialog(Context context, int titleResId, int messageResId) { - return ProgressDialog.show( - context, - context.getResources().getString(titleResId), - context.getResources().getString(messageResId) - ); - } - - public static void showToast(Context context, int messageResId) { - Toast.makeText(context, messageResId, Toast.LENGTH_SHORT).show(); - } - - public static void showToast(Context context, CharSequence message) { - Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); - } - - public static AlertDialog showDialog(Context context, int messageResId) { - return new AlertDialog.Builder(context) - .setMessage(messageResId) - .setCancelable(false) - .setPositiveButton(R.string.Ok, (dialogInterface, i) -> { - }).show(); - } - - public static AlertDialog showDialog(Context context, CharSequence message) { - return new AlertDialog.Builder(context) - .setMessage(message) - .setCancelable(false) - .setPositiveButton(R.string.Ok, (dialogInterface, i) -> { - }).show(); - } - } -} diff --git a/app/src/main/java/org/openimis/imispolicies/tools/ImageManager.java b/app/src/main/java/org/openimis/imispolicies/tools/ImageManager.java new file mode 100644 index 00000000..4c7820c8 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/tools/ImageManager.java @@ -0,0 +1,39 @@ +package org.openimis.imispolicies.tools; + +import android.content.ContentResolver; +import android.content.Context; + +import org.openimis.imispolicies.Global; +import org.openimis.imispolicies.util.FileUtils; + +import java.io.File; + +public class ImageManager { + protected static final String LOG_TAG = "IMAGEMANAGER"; + + protected final Context context; + protected final ContentResolver contentResolver; + + public static ImageManager of(Context context) { + return new ImageManager(context); + } + + protected ImageManager(Context context) { + this.context = context; + this.contentResolver = this.context.getContentResolver(); + } + + public File getNewestInsureeImage(String insureeNumber) { + return FileUtils.getNewestFileStartingWith( + new File(Global.getGlobal().getImageFolder()), + insureeNumber + "_" + ); + } + + public File[] getInsureeImages(String insureeNumber) { + return FileUtils.getFilesStartingWith( + new File(Global.getGlobal().getImageFolder()), + insureeNumber + "_" + ); + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/tools/LanguageManager.java b/app/src/main/java/org/openimis/imispolicies/tools/LanguageManager.java new file mode 100644 index 00000000..53a08db6 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/tools/LanguageManager.java @@ -0,0 +1,244 @@ +package org.openimis.imispolicies.tools; + +import android.app.Activity; +import android.content.Context; +import android.content.ContextWrapper; +import android.content.Intent; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.icu.text.LocaleDisplayNames; +import android.os.Build; +import android.os.LocaleList; +import android.support.annotation.NonNull; +import android.support.annotation.RequiresApi; +import android.util.DisplayMetrics; + +import org.json.JSONArray; +import org.json.JSONException; +import org.openimis.imispolicies.BuildConfig; +import org.openimis.imispolicies.Global; +import org.openimis.imispolicies.R; +import org.openimis.imispolicies.SQLHandler; +import org.openimis.imispolicies.util.AndroidUtils; +import org.openimis.imispolicies.util.LocaleUtils; +import org.openimis.imispolicies.util.StringUtils; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.function.Predicate; + +public class LanguageManager { + + private static class LanguageContextWrapper extends ContextWrapper { + public LanguageContextWrapper(Context base) { + super(base); + } + } + + private static final String LOG_TAG = "LANGUAGEMANAGER"; + private final Global global; + private final Context context; + + public LanguageManager(@NonNull Context context) { + this.context = context; + global = (Global) context.getApplicationContext(); + } + + /** + * Check if current system language is supported as denoted in Master Data (tblLanguages) + * If the current system language does not match to any of the supported languages then this method + * will show a dialog telling the user what languages are supported + */ + public void checkSystemLanguage() { + List supportedLocales = getSupportedLocales(); + if (!isSystemLanguageSupported(supportedLocales)) { + showNotSupportedLanguagePrompt(supportedLocales); + } + } + + /** + * Check if stored language is the current language. If not, then set stored language as current. + */ + public void restoreLanguage() { + restoreLanguage(true); + } + + /** + * Check if stored language is the current language. If not, then set stored language as current. + * + * @param withRestart should the current context be restarted (if it's Activity). + */ + public void restoreLanguage(boolean withRestart) { + String language = getStoredLanguage(); + setLanguage(language, withRestart); + } + + /** + * Set specified language as stored and current language. + * + * @param language The language tag to be used. + * @param withRestart should the current context be restarted (if it's Activity). + */ + public void setLanguage(@NonNull String language, boolean withRestart) { + if (!isCurrentLanguage(language)) { + setStoredLanguage(language); + setCurrentLanguage(language); + if (withRestart && context instanceof Activity) { + ((Activity) context).recreate(); + } + } + } + + /** + * Set specified language as stored and current language. + * The current context will be restarted (if it's Activity). + * + * @param language The language tag to be used. + */ + public void setLanguage(@NonNull String language) { + setLanguage(language, true); + } + + public ContextWrapper getWrappedContext() { + restoreLanguage(false); + return new LanguageContextWrapper(context); + } + + /** + * Opens system language settings. This is a preferred method to change language + */ + public void openLanguageSettings() { + Intent intent = new Intent(Intent.ACTION_MAIN); + intent.setClassName("com.android.settings", "com.android.settings.LanguageSettings"); + context.startActivity(intent); + } + + /** + * Check if given language is current default language (as in Locale.getDefault()). + * + * @param language language tag to check + * @return is the specified language tag current default + */ + private boolean isCurrentLanguage(@NonNull String language) { + String currentLanguage = LocaleUtils.getLanguageTag(getCurrentLocale()); + return language.toLowerCase(Locale.ROOT).equals(currentLanguage.toLowerCase()); + } + + /** + * @return current system Locale object + */ + private Locale getCurrentLocale() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + return getSystemLocales().get(0); + } else { + //noinspection deprecation + return context.getResources().getConfiguration().locale; + } + } + + /** + * @return LocaleList of all current system languages (sorted) + */ + @RequiresApi(api = Build.VERSION_CODES.N) + private LocaleList getSystemLocales() { + return context.getResources().getConfiguration().getLocales(); + } + + /** + * Returns current resource language Locale object. The Locale is created from language tag stored + * in "LanguageCode" resource key. + * + * @return current resource Locale object + */ + private Locale getCurrentResourceLocale() { + return LocaleUtils.getLocaleFromTag(context.getResources().getString(R.string.LanguageCode)); + } + + /** + * Update locale of resources in current context to the selected language + * + * @param newLanguage language tag to use + */ + private void setCurrentLanguage(@NonNull String newLanguage) { + Resources resources = context.getResources(); + DisplayMetrics displayMetrics = resources.getDisplayMetrics(); + Configuration config = resources.getConfiguration(); + config.locale = LocaleUtils.getLocaleFromTag(newLanguage); + resources.updateConfiguration(config, displayMetrics); + Locale.setDefault(config.locale); + } + + private void setStoredLanguage(String locale) { + global.setStringKey(Global.PREF_LANGUAGE_KEY, locale); + } + + private String getStoredLanguage() { + String defaultLanguage = null; + File database = global.getDatabasePath(SQLHandler.DBNAME); + if (database.exists()) { + defaultLanguage = new SQLHandler(context).getDefaultLanguage(); + } else { + defaultLanguage = BuildConfig.DEFAULT_LANGUAGE_CODE; + } + return global.getStringKey(Global.PREF_LANGUAGE_KEY, defaultLanguage); + } + + /** + * @return List of supported languages from tblLanguages + */ + private List getSupportedLocales() { + JSONArray languagesArray = new SQLHandler(context).getSupportedLanguages(); + List supportedLocales = new ArrayList<>(languagesArray.length()); + + try { + for (int i = 0; i < languagesArray.length(); i++) { + supportedLocales.add(LocaleUtils.getLocaleFromTag(languagesArray.getJSONObject(i).getString("LanguageCode"))); + } + } catch (JSONException e) { + Log.e(LOG_TAG, "Error while parsing supported languages", e); + } + + return supportedLocales; + } + + /** + * This method check if system language (or any of the system languages on Android 7+) matches any of the supported languages + * @param supportedLocales List of supported languages + * @return does system language match any supported language + */ + private boolean isSystemLanguageSupported(List supportedLocales) { + boolean isLocaleSupported = false; + + //System locale matches one of the supported locales if it is equal (language and country, or the supported locale is language only and system locale matches the language) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // Android 7 new language matching system + List systemLocales = LocaleUtils.toList(getSystemLocales()); + isLocaleSupported = systemLocales.stream().anyMatch(systemLocale -> supportedLocales.stream().anyMatch(locale -> locale.getCountry().equals("") && locale.getLanguage().equals(systemLocale.getLanguage()) || systemLocale.equals(locale))); + } else { // Legacy language matching + Locale systemLocale = getCurrentLocale(); + for (Locale locale : supportedLocales) { + if (locale.getCountry().equals("") && locale.getLanguage().equals(systemLocale.getLanguage()) || systemLocale.equals(locale)) { + isLocaleSupported = true; + break; + } + } + } + + return isLocaleSupported; + } + + private void showNotSupportedLanguagePrompt(List supportedLocales) { + String message = context.getResources().getString(R.string.SystemLanguageNotSupported); + message += "\n\n" + context.getResources().getString(R.string.SupportedLanguages, StringUtils.join("\n", supportedLocales, this::getLanguageDisplayName)); + AndroidUtils.showDialog(context, message, context.getResources().getString(R.string.menu_settings), (d, i) -> openLanguageSettings()); + } + + private String getLanguageDisplayName(Locale locale) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + return LocaleDisplayNames.getInstance(Locale.getDefault()).localeDisplayName(locale); + } else { + return locale.getDisplayName(); + } + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/tools/StorageManager.java b/app/src/main/java/org/openimis/imispolicies/tools/StorageManager.java new file mode 100644 index 00000000..475b70f3 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/tools/StorageManager.java @@ -0,0 +1,84 @@ +package org.openimis.imispolicies.tools; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.provider.DocumentsContract; +import android.support.annotation.NonNull; +import android.util.Log; + +public class StorageManager { + protected static final String LOG_TAG = "STORAGEMANAGER"; + + protected final Context context; + + public static StorageManager of(Context context) { + return new StorageManager(context); + } + + protected StorageManager(Context context) { + this.context = context; + } + + public void requestOpenDirectory(int requestCode, Uri initialUri) { + if (!(this.context instanceof Activity)) { + Log.e(LOG_TAG, "Provided context in not an Activity. Activity is required to start a request."); + return; + } + + Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE); + intent.addCategory(Intent.CATEGORY_OPENABLE); + if (initialUri != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, initialUri); + } + + ((Activity) context).startActivityForResult(intent, requestCode); + } + + public void requestOpenFile(int requestCode, @NonNull String mimeType, Uri initialUri) { + if (!(this.context instanceof Activity)) { + Log.e(LOG_TAG, "Provided context in not an Activity. Activity is required to start a request."); + return; + } + + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.setType(mimeType); + if (initialUri != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, initialUri); + } + + ((Activity) context).startActivityForResult(intent, requestCode); + } + + public void requestOpenFile(int requestCode, @NonNull String mimeType) { + requestOpenFile(requestCode, mimeType, null); + } + + public void requestOpenFile(int requestCode) { + requestOpenFile(requestCode, "*/*", null); + } + + public void requestCreateFile(int requestCode, @NonNull String mimeType, String initialFileName, Uri initialUri) { + if (!(this.context instanceof Activity)) { + Log.e(LOG_TAG, "Provided context in not an Activity. Activity is required to start a request."); + return; + } + + Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT); + intent.setType(mimeType); + if (initialUri != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, initialUri); + } + if (initialFileName != null) { + intent.putExtra(Intent.EXTRA_TITLE, initialFileName); + } + + ((Activity) context).startActivityForResult(intent, requestCode); + } + + public void requestCreateFile(int requestCode, @NonNull String mimeType, String initialFileName) { + requestCreateFile(requestCode, mimeType, initialFileName, null); + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/AndroidUtils.java b/app/src/main/java/org/openimis/imispolicies/util/AndroidUtils.java new file mode 100644 index 00000000..1ebd2ff0 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/AndroidUtils.java @@ -0,0 +1,58 @@ +package org.openimis.imispolicies.util; + +import android.app.AlertDialog; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.widget.Toast; + +import org.openimis.imispolicies.R; + +public class AndroidUtils { + public static ProgressDialog showProgressDialog(Context context, int titleResId, int messageResId) { + return ProgressDialog.show( + context, + context.getResources().getString(titleResId), + context.getResources().getString(messageResId) + ); + } + + public static void showToast(Context context, int messageResId) { + Toast.makeText(context, messageResId, Toast.LENGTH_SHORT).show(); + } + + public static void showToast(Context context, CharSequence message) { + Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); + } + + public static AlertDialog showDialog(Context context, CharSequence title, CharSequence message, boolean isCancelable, CharSequence positiveLabel, DialogInterface.OnClickListener onPositive, CharSequence neutralLabel, DialogInterface.OnClickListener onNeutral, CharSequence negativeLabel, DialogInterface.OnClickListener onNegative) { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + if (title != null) builder.setTitle(title); + if (message != null) builder.setMessage(message); + builder.setCancelable(isCancelable); + if (positiveLabel != null) builder.setPositiveButton(positiveLabel, onPositive); + if (neutralLabel != null) builder.setPositiveButton(neutralLabel, onNeutral); + if (negativeLabel != null) builder.setNegativeButton(negativeLabel, onNegative); + return builder.show(); + } + + public static AlertDialog showDialog(Context context, int messageResId) { + return showDialog(context, null, context.getResources().getString(messageResId), false, context.getResources().getString(R.string.Ok), null, null, null, null, null); + } + + public static AlertDialog showDialog(Context context, CharSequence message) { + return showDialog(context, null, message, false, context.getResources().getString(R.string.Ok), null, null, null, null, null); + } + + public static AlertDialog showDialog(Context context, CharSequence title, CharSequence message) { + return showDialog(context, title, message, false, context.getResources().getString(R.string.Ok), null, null, null, null, null); + } + + public static AlertDialog showConfirmDialog(Context context, int messageResId, DialogInterface.OnClickListener onPositive) { + return showDialog(context, null, context.getResources().getString(messageResId), false, context.getResources().getString(R.string.Ok), onPositive, null, null, context.getResources().getString(R.string.Cancel), null); + } + + public static AlertDialog showDialog(Context context, String message, String positiveLabel, DialogInterface.OnClickListener onPositive) { + return showDialog(context, null, message, false, positiveLabel, onPositive, null, null, context.getResources().getString(R.string.Cancel), null); + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/FileUtils.java b/app/src/main/java/org/openimis/imispolicies/util/FileUtils.java new file mode 100644 index 00000000..b9d5f832 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/FileUtils.java @@ -0,0 +1,196 @@ +package org.openimis.imispolicies.util; + +import android.content.Context; +import android.support.annotation.NonNull; + +import org.openimis.imispolicies.tools.Log; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Arrays; + +public class FileUtils { + private static final String LOG_TAG = "FileUtil"; + + /** + * Replaces the extension of the file + * + * @param filename filename ending with extension + * @param targetExtension target extension, including a dot (to protect from replacing + * a substring inside filename that match current extension) + * @return filename with replaced extension, or null if the filename does not end with + * extension + */ + public static String replaceFilenameExtension(@NonNull String filename, @NonNull String targetExtension) { + try { + String currentExtension = filename.substring(filename.lastIndexOf('.')); + return filename.replace(currentExtension, targetExtension); + } catch (IndexOutOfBoundsException e) { + Log.e(LOG_TAG, "Filename does not have an extension at the end", e); + } + return null; + } + + public static boolean createFileWithSubdirectories(@NonNull File file) { + try { + File parent = file.getParentFile(); + + if (parent != null && !parent.exists() && !parent.mkdirs()) { + Log.e(LOG_TAG, "Creating parent directories failed for path: " + file.getAbsolutePath()); + } + + if (!file.createNewFile()) { + Log.e(LOG_TAG, "File already exists: " + file.getAbsolutePath()); + } + + return true; + } catch (Exception e) { + Log.e(LOG_TAG, "Error while creating file: " + file.getAbsolutePath(), e); + } + + return false; + } + + public static boolean createDirectoryWithSubdirectories(@NonNull File directory) { + try { + if (!directory.exists() && !directory.mkdirs()) { + Log.e(LOG_TAG, "Creating directory failed for path: " + directory.getAbsolutePath()); + } + return true; + } catch (Exception e) { + Log.e(LOG_TAG, "Error while creating directory: " + directory.getAbsolutePath(), e); + } + + return false; + } + + public static void deleteFiles(File[] files) { + for (File file : files) { + deleteFile(file); + } + } + + public static void deleteFile(File file) { + if (file.exists()) { + if (!file.delete()) { + Log.w(LOG_TAG, "Delete file failed: " + file.getAbsolutePath()); + } + } else { + Log.w(LOG_TAG, "File does not exists: " + file.getAbsolutePath()); + } + } + + public static void writeToFile(@NonNull File file, @NonNull InputStream is) { + try (OutputStream os = new FileOutputStream(file)) { + StreamUtils.bufferedStreamCopy(is, os); + } catch (IOException e) { + Log.e(LOG_TAG, "Error while writing to file: " + file.getAbsolutePath(), e); + } + } + + public static File[] getFilesStartingWith(@NonNull File directory, @NonNull String filenamePrefix) { + if (!directory.exists()) { + android.util.Log.e(LOG_TAG, "Directory does not exists: " + directory); + return null; + } + + if (!directory.isDirectory()) { + android.util.Log.e(LOG_TAG, "Provided path is not a directory: " + directory); + return null; + } + + return directory.listFiles((dir, filename) -> filename.startsWith(filenamePrefix)); + } + + public static File getNewestFileStartingWith(@NonNull File directory, @NonNull String filenamePrefix) { + File[] files = getFilesStartingWith(directory, filenamePrefix); + if (files == null || files.length == 0) { + return null; + } + Arrays.sort(files, (f1, f2) -> Long.compare(f1.lastModified(), f2.lastModified())); + return files[files.length - 1]; + } + + public static String readFileAsUTF8String(@NonNull File file) { + try { + InputStream is = new FileInputStream(file); + return StreamUtils.readInputStreamAsUTF8String(is); + } catch (IOException e) { + Log.e(LOG_TAG, "Opening input stream failed for file: " + file.getAbsolutePath(), e); + } + return null; + } + + public static int getFileCount(File directory) { + if (!directory.exists() || !directory.isDirectory()) { + Log.e(LOG_TAG, "Not a directory: " + directory.getAbsolutePath()); + return -1; + } + + File[] files = directory.listFiles(File::isFile); + if (files != null) { + return files.length; + } else { + Log.e(LOG_TAG, "Counting files failed: " + directory.getAbsolutePath()); + return -1; + } + } + + /** + * Create a temporary file inside app's cache directory under specified path. This file should be + * manually deleted, but the cache directory can be emptied by the user or by the Android to save + * storage space. If the file exists, it will be deleted and recreated. + * + * @param targetPath Path to the temporary file inside cache, the cache root will be appended + * @return Created temp file + */ + public static File createTempFile(@NonNull Context context, @NonNull String targetPath) { + return createTempFile(context, targetPath, false); + } + + /** + * Create a temporary file inside app's cache directory under specified path. This file should be + * manually deleted, but the cache directory can be emptied by the user or by the Android to save + * storage space. If the file exists, it will be deleted and recreated. + * + * @param targetPath Path to the temporary file inside cache, the cache root will be appended + * @param preparePathOly Set to true if the abstract path should point to non-existing file + * (i.e. to forward the file object to a library to create the file) + * @return Created temp file + */ + public static File createTempFile(@NonNull Context context, @NonNull String targetPath, boolean preparePathOly) { + File tempFile = new File(context.getCacheDir(), targetPath); + + if (tempFile.exists() && tempFile.delete()) { + org.openimis.imispolicies.tools.Log.i(LOG_TAG, "Leftover temp file deleted: " + tempFile.getAbsolutePath()); + } + + if (preparePathOly) { + File parentFile = tempFile.getParentFile(); + if (parentFile != null) { + return FileUtils.createDirectoryWithSubdirectories(parentFile) ? tempFile : null; + } else { + return null; + } + } else { + return FileUtils.createFileWithSubdirectories(tempFile) ? tempFile : null; + } + } + + /** + * Convenience method for removing a temp file form specified path inside cache directory created + * by createTempFile(String). The file can also be safely deleted with returned File object. + * + * @param targetPath Path to the temporary file inside cache, the cache root will be appended + * @return true if file under targetPath does not exist or was successfully deleted, false if file + * exists and delete failed + */ + public static boolean removeTempFile(@NonNull Context context, @NonNull String targetPath) { + File tempFile = new File(context.getCacheDir(), targetPath); + return !tempFile.exists() || tempFile.delete(); + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/JsonUtils.java b/app/src/main/java/org/openimis/imispolicies/util/JsonUtils.java new file mode 100644 index 00000000..38ef09ab --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/JsonUtils.java @@ -0,0 +1,52 @@ +package org.openimis.imispolicies.util; + +import android.support.annotation.NonNull; + +import org.json.JSONException; +import org.json.JSONObject; + +public class JsonUtils { + /** + * @param object Json object + * @param field field to be checked + * @return if the field does not exists, is null or empty + */ + public static boolean isStringEmpty(JSONObject object, @NonNull String field) { + return isStringEmpty(object, field, false); + } + + /** + * @param object Json object + * @param field field to be checked + * @param checkNullString Should "null" string be considered empty + * @return if the field does not exists, is null or empty + */ + public static boolean isStringEmpty(JSONObject object, @NonNull String field, boolean checkNullString) { + try { + return object == null + || !object.has(field) + || StringUtils.isEmpty(object.getString(field), checkNullString); + } catch (JSONException e) { + return true; + } + } + + /** + * @param object Json object + * @param field field to be checked + * @param defaultValue default value to be used if requested value does not exists + * @param checkNullString Should "null" string be considered empty + * @return value of the specified field if exists, default value otherwise + */ + public static String getStringOrDefault(@NonNull JSONObject object, @NonNull String field, String defaultValue, boolean checkNullString) { + try { + if (!isStringEmpty(object, field, checkNullString)) { + return object.getString(field); + } else { + return defaultValue; + } + } catch (JSONException e) { + return defaultValue; + } + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/LocaleUtils.java b/app/src/main/java/org/openimis/imispolicies/util/LocaleUtils.java new file mode 100644 index 00000000..417aa469 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/LocaleUtils.java @@ -0,0 +1,63 @@ +package org.openimis.imispolicies.util; + +import android.os.Build; +import android.os.LocaleList; +import android.support.annotation.NonNull; +import android.support.annotation.RequiresApi; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +public class LocaleUtils { + /** + * @param locale Locale to parse + * @return language tag for provided Locale object + */ + @NonNull + public static String getLanguageTag(@NonNull Locale locale) { + String languageTag; + String language = locale.getLanguage(); + String country = locale.getCountry(); + if (language.contains("-") || StringUtils.isEmpty(country)) { + languageTag = language; + } else { + languageTag = String.format("%s-%s", language, country); + } + return languageTag; + } + + /** + * Parse given language tag to Locale object. This method will parse "en" to Locale("en") and "en-US" + * into Locale("en", "US"). Locale("en-US") in an incorrect declaration. + * + * @param languageTag language tag to parse + * @return Locale object for given language tag + */ + @NonNull + public static Locale getLocaleFromTag(@NonNull String languageTag) { + String[] segments = languageTag.split("-"); + if (segments.length == 1) { + return new Locale(segments[0]); + } else { + return new Locale(segments[0], segments[1]); + } + } + + /** + * This method helps convert LocaleList object into java collection of Locale objects. This allows to use + * generic collection tools to be used with the LocaleList object. + * + * @param localeList System LocaleList object + * @return List of Locale objects accessible in LocaleList object + */ + @RequiresApi(api = Build.VERSION_CODES.N) + @NonNull + public static List toList(@NonNull LocaleList localeList) { + List result = new ArrayList<>(localeList.size()); + for (int i = 0; i < localeList.size(); i++) { + result.add(localeList.get(i)); + } + return result; + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/StreamUtils.java b/app/src/main/java/org/openimis/imispolicies/util/StreamUtils.java new file mode 100644 index 00000000..623b3b48 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/StreamUtils.java @@ -0,0 +1,60 @@ +package org.openimis.imispolicies.util; + +import android.support.annotation.NonNull; + +import org.openimis.imispolicies.tools.Log; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; + +public class StreamUtils { + private static final int buffSize = 8192; + private static final String LOG_TAG = "STREAMUTIL"; + + /** + * Only use this method if you can be sure the content of the input stream + * can be read, is a UTF-8 text and will fit in memory (as String). + * + * @param is input stream to be read + * @return content of the input stream or null if IO exception occurs + */ + public static String readInputStreamAsUTF8String(@NonNull InputStream is) { + try (BufferedReader streamReader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { + StringBuilder stringBuilder = null; + String inputStr; + while ((inputStr = streamReader.readLine()) != null) { + if (stringBuilder != null) { + stringBuilder.append("\n"); + stringBuilder.append(inputStr); + } else { + stringBuilder = new StringBuilder(inputStr); + } + } + return stringBuilder != null ? stringBuilder.toString() : null; + } catch (IOException e) { + Log.e(LOG_TAG, "Error while reading input stream", e); + } + + return null; + } + + /** + * Copy input stream to output stream using a byte buffer (8kb by default) + * + * @param is source stream + * @param os target stream + * @throws IOException thrown on read/write error + */ + public static void bufferedStreamCopy(@NonNull InputStream is, @NonNull OutputStream os) throws IOException { + byte[] buffer = new byte[buffSize]; + + int read; + while ((read = is.read(buffer)) >= 0) { + os.write(buffer, 0, read); + } + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/StringUtils.java b/app/src/main/java/org/openimis/imispolicies/util/StringUtils.java new file mode 100644 index 00000000..6114e2b5 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/StringUtils.java @@ -0,0 +1,56 @@ +package org.openimis.imispolicies.util; + +import android.text.TextUtils; + +import java.util.List; +import java.util.function.Function; + +public class StringUtils { + public interface StringAccessor { + /** + * Return any string accessed from object. That can any String field, any String representation of + * a field or toString() of a whole object + * + * @return string accessed from object of type T + */ + String apply(T object); + } + + /** + * @param string String to be checked + * @return is string null or empty + */ + public static boolean isEmpty(CharSequence string) { + return isEmpty(string, false); + } + + /** + * @param string String to be checked + * @param checkNullString Should "null" string be considered empty (case insensitive) + * @return is string null or empty + */ + public static boolean isEmpty(CharSequence string, boolean checkNullString) { + return string == null + || string.equals("") + || (string.toString().equalsIgnoreCase("null") && checkNullString); + } + + /** + * Null-safe equality check (true if both are null) + */ + public static boolean equals(CharSequence s1, CharSequence s2) { + return TextUtils.equals(s1, s2); + } + + public static String join(String delimiter, Iterable collection, StringAccessor accessor) { + StringBuilder builder = new StringBuilder(); + for (T item : collection) { + if (builder.length() == 0) { + builder.append(accessor.apply(item)); + } else { + builder.append(delimiter).append(accessor.apply(item)); + } + } + return builder.toString(); + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/UriUtils.java b/app/src/main/java/org/openimis/imispolicies/util/UriUtils.java new file mode 100644 index 00000000..6f138fb7 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/UriUtils.java @@ -0,0 +1,127 @@ +package org.openimis.imispolicies.util; + +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.provider.OpenableColumns; +import android.support.annotation.NonNull; +import android.support.v4.content.FileProvider; + +import org.openimis.imispolicies.BuildConfig; +import org.openimis.imispolicies.tools.Log; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +public class UriUtils { + private static final String LOG_TAG = "URIUTIL"; + public static final String FILE_PROVIDER_NAME = String.format("%s.fileprovider", BuildConfig.APPLICATION_ID); + + public static String getDisplayName(@NonNull Context context, @NonNull Uri uri) { + try (Cursor c = context.getContentResolver().query(uri, new String[]{OpenableColumns.DISPLAY_NAME}, null, null, null)) { + c.moveToFirst(); + c.moveToFirst(); + return c.getString(c.getColumnIndex(OpenableColumns.DISPLAY_NAME)); + } catch (Exception e) { + Log.e(LOG_TAG, "Reading file name from URI failed", e); + } + return null; + } + + + public static void writeToUri(@NonNull Context context, @NonNull Uri uri, @NonNull InputStream is) { + try (OutputStream os = context.getContentResolver().openOutputStream(uri, "w")) { + StreamUtils.bufferedStreamCopy(is, os); + } catch (IOException e) { + Log.e(LOG_TAG, "Writing to uri failed: " + uri, e); + } + } + + /** + * Copy byte content of the file to location described by the uri. The uri must be openable and + * allow writing. The file must be openable and readable. + * + * @param file File to be read + * @param uri Uri pointing to writable location + */ + public static void copyFileToUri(@NonNull Context context, @NonNull File file, @NonNull Uri uri) { + try (InputStream is = new FileInputStream(file)) { + writeToUri(context, uri, is); + } catch (IOException e) { + android.util.Log.e(LOG_TAG, "Error while opening streams", e); + } + } + + /** + * Copy byte content of the file to location described by the uri. The uri must be openable and + * allow writing. The file must be openable and readable. + * + * @param filePath Path to file to be read + * @param uri Uri pointing to writable location + */ + public static void copyFileToUri(@NonNull Context context, @NonNull String filePath, @NonNull Uri uri) { + copyFileToUri(context, new File(filePath), uri); + } + + /** + * Copy the content of the provided uri to provided file. The file location must allow creating + * a file and writing to a file. + * + * @param uri Uri of the file to copy. The Uri should allow read and should be openable + * @param targetFile File to be used as output stream + * @return File object pointing to created file + */ + public static File copyUriContentToFile(@NonNull Context context, @NonNull Uri uri, @NonNull File targetFile) { + if (!targetFile.exists()) { + FileUtils.createFileWithSubdirectories(targetFile); + } + try (InputStream is = context.getContentResolver().openInputStream(uri)) { + FileUtils.writeToFile(targetFile, is); + } catch (IOException e) { + android.util.Log.e(LOG_TAG, "Error while opening streams", e); + } + + return targetFile; + } + + + /** + * Create a content URI for a file owned by the app. The directory path have to be specified in + * res/xml/paths.xml to be eligible to provide content. Uri returned by this method can be shared + * with other apps with intents. + * + * @param file File to be specified by generated content URI + * @return Content URI for a given file + */ + public static Uri createUriForFile(@NonNull Context context, @NonNull File file) { + Uri uri = FileProvider.getUriForFile(context, FILE_PROVIDER_NAME, file); + if (uri == null) { + org.openimis.imispolicies.tools.Log.w(LOG_TAG, "Failed to create temp photo URI"); + } + return uri; + } + + /** + * Copy the content of the provided uri to cache directory under provided path. The caller is + * responsible to delete the file after use. The file can be deleted by Android or the user + * without notifying the app. + * + * @param uri Uri of the file to copy. The Uri should allow read and should be openable + * @param targetPath Path inside cache directory to save the file (cache location will be appended) + * @return File object pointing to created file + */ + public static File copyUriContentToCache(@NonNull Context context, @NonNull Uri uri, @NonNull String targetPath) { + File outputFile = FileUtils.createTempFile(context, targetPath, false); + if (outputFile != null) { + return copyUriContentToFile(context, uri, outputFile); + } else { + Log.e(LOG_TAG, "Creating temp file failed for: " + targetPath); + return null; + } + + + } +} diff --git a/app/src/main/java/org/openimis/imispolicies/util/ZipUtils.java b/app/src/main/java/org/openimis/imispolicies/util/ZipUtils.java new file mode 100644 index 00000000..2619b343 --- /dev/null +++ b/app/src/main/java/org/openimis/imispolicies/util/ZipUtils.java @@ -0,0 +1,109 @@ +package org.openimis.imispolicies.util; + +import net.lingala.zip4j.core.ZipFile; +import net.lingala.zip4j.model.ZipParameters; +import net.lingala.zip4j.util.Zip4jConstants; + +import org.openimis.imispolicies.tools.Log; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; + +public class ZipUtils { + private static final String LOG_TAG = "ZIPUTILS"; + + public static File zipDirectories(File outputFile, String zipPassword, File... directories) { + ArrayList filesToAdd = new ArrayList<>(); + for (File directory : directories) { + if (!directory.exists() || !directory.isDirectory()) { + Log.w(LOG_TAG, "Provided file is not a directory: " + directory); + continue; + } + + File[] files = directory.listFiles(); + if (files == null) { + Log.w(LOG_TAG, "Reading a directory filed: " + directory); + continue; + } + + Collections.addAll(filesToAdd, files); + } + + return zipFiles(filesToAdd, outputFile, zipPassword); + } + + public static File zipFiles(ArrayList filesToAdd, File destinationFile, String password) { + try { + ZipParameters parameters = new ZipParameters(); + parameters.setCompressionMethod(Zip4jConstants.COMP_DEFLATE); + parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL); + + if (password.length() > 0) { + parameters.setEncryptFiles(true); + parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_AES); + parameters.setAesKeyStrength(Zip4jConstants.AES_STRENGTH_256); + parameters.setPassword(password); + } + + ZipFile zipFile = new ZipFile(destinationFile); + zipFile.addFiles(filesToAdd, parameters); + return zipFile.getFile(); + } catch (Exception e) { + Log.e(LOG_TAG, "Error while compressing", e); + } + return null; + } + + public static void zipPath(String targetPath, String destinationFilePath, String password) { + try { + ZipParameters parameters = new ZipParameters(); + parameters.setCompressionMethod(Zip4jConstants.COMP_DEFLATE); + parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL); + + if (password.length() > 0) { + parameters.setEncryptFiles(true); + parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_AES); + parameters.setAesKeyStrength(Zip4jConstants.AES_STRENGTH_256); + parameters.setPassword(password); + } + + ZipFile zipFile = new ZipFile(destinationFilePath); + + File targetFile = new File(targetPath); + if (targetFile.exists()) { + zipFile.addFile(targetFile, parameters); + } else if (targetFile.isDirectory()) { + zipFile.addFolder(targetFile, parameters); + } + } catch (Exception e) { + Log.e(LOG_TAG, "Error while compressing", e); + } + } + + public static void unzipFile(File targetZipFile, File destinationFolder, String password) { + try { + ZipFile zipFile = new ZipFile(targetZipFile); + if (zipFile.isEncrypted()) { + zipFile.setPassword(password); + } + zipFile.extractAll(destinationFolder.getPath()); + + } catch (Exception e) { + Log.e(LOG_TAG, "Error while decompressing", e); + } + } + + public static void unzipPath(String targetZipFilePath, String destinationFolderPath, String password) { + try { + ZipFile zipFile = new ZipFile(targetZipFilePath); + if (zipFile.isEncrypted()) { + zipFile.setPassword(password); + } + zipFile.extractAll(destinationFolderPath); + + } catch (Exception e) { + Log.e(LOG_TAG, "Error while decompressing", e); + } + } +} diff --git a/app/src/main/res/layout-v21/renewal.xml b/app/src/main/res/layout-v21/renewal.xml index 9ef07c23..9c95f4c1 100644 --- a/app/src/main/res/layout-v21/renewal.xml +++ b/app/src/main/res/layout-v21/renewal.xml @@ -40,37 +40,36 @@ - - - - - - - - + + android:orientation="vertical"> + + diff --git a/app/src/main/res/layout/renewal.xml b/app/src/main/res/layout/renewal.xml index ed7a65fe..ee39ef45 100644 --- a/app/src/main/res/layout/renewal.xml +++ b/app/src/main/res/layout/renewal.xml @@ -39,37 +39,36 @@ - - - - - - - - + android:orientation="horizontal"> + + + + + + + + android:title="@string/menu_settings" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0d2d354f..1d08e87e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -436,4 +436,46 @@ Unexpected exception Invalid renewal file Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. + Do you want to select renewal file to import? + RAR Password + Save RAR Password + Set the default RAR password + Default RAR Password + Wait %1$s seconds + Control number request finished. If the available CN amount does not increase, please try again in %1$s seconds. + CN limit reached + No control numbers received from the server + You cannot receive more control numbers for this product + Export all logs: + Export logs + Do you want to export logs? + Export canceled. Export file can be found in external cache directory. + Clear all logs: + Clear logs + Do you want to clear logs? + Wait + Suspend + Enforce + without a policy + without a premium + HTTP response: %1$d — %2$s + No policies registered. + This cheque number already used + This cheque number was aborted + Could not download cheque numbers data + Policy Status: Covered + Policy Status: Not Covered + Policy Status + This cheque number not exist + Please add a picture + Entry does not exist. + Authorization failed. + Unknown Error. + You are not allowed to take this action. + en + Language settings + Current resource language: %1$s + Current system language is not supported. The app will use the default language. + Supported languages:\n%1$s + Data download failed diff --git a/app/src/main/res/xml/paths.xml b/app/src/main/res/xml/paths.xml index 38cd4c0d..f6e484ca 100644 --- a/app/src/main/res/xml/paths.xml +++ b/app/src/main/res/xml/paths.xml @@ -1,3 +1,5 @@ + + diff --git a/app/src/master/res/values-fr/strings.xml b/app/src/master/res/values-fr/strings.xml deleted file mode 100644 index 86f850f1..00000000 --- a/app/src/master/res/values-fr/strings.xml +++ /dev/null @@ -1,425 +0,0 @@ - - - Ouvrir le menu de navigation - Fermer le menu de navigation - Réglages - Veuillez patienter... - La page se charge... - Polices openIMIS - admin@imis.com - Accueil - Adhésion - Renouvellement - Retour d\'information - Synchroniser - A propos - Quitter - Région - District - Section - Village/GO - Situation de pauvreté - Type de confirmation - No. de confirmation - Type de groupe - Ethnicité - Adresse permanente - Suivant - Choisir une Région - Choisir un district - Choisir une section - Choisir un village/GO - Oui - Non - Sélectionner le statut de pauvreté - Sélectionner le type de confirmation - Sélectionner le type de groupe - OK - Veuillez vérifier tous les champs obligatoires marqués en rouge. - Numéro d\'assurance - Autres noms - Nom de famille - Date de naissance - Genre - État matrimonial - Carte de bénéficiaire - District actuel - Municipalité actuelle - Village actuel - Adresse actuelle - Profession - Éducation - Numéro de téléphone - Email - Type d\'identification - Numéro d\'identification - District de PPS - Niveau de PPS - Premier point de service - Sél. genre - Masculin - Féminin - Autre - Sélectionner l\'état civil - Marié - Célibataire - Divorcé - Veuf - Non spécifié - Sélectionner la carte de bénéficiaire - Choisir un métier - Choisir une éducation - Sélectionner le type d\'identification - Sélectionner le niveau FOSA - Dispensaire - Centre de santé - Hôpital - Choisir une FOSA - Sauvegarder - Relation - Sélectionner une relation - Famille enregistrée avec succès - Une erreur s\'est produite lors du traitement des données. - Erreur lors de l\'insertion de données - Erreur lors de la mise à jour des données - Le membre avec ce numéro d\'assurance existe déjà. - Ajouter - Nouveau - Sél. agent - Sél. un Paquet de bénéfice - Sél. Mois - Date d\'adhésion - Paquet de bénéfice - Date d\'entrée en vigueur - Date de début - Date d\'expiration - Agent - Statut du contrat : - Valeur du contrat : - Solde : - Contribution : - Recherche - Payeur - Date de paiement - Catégorie de contribution - Numéro du reçu - Contribution payée - Type de paiement - Sélectionnez Payeur - Sélectionner le niveau - Contribution et autres - Frais de photo - Sélectionnez le type de paiement - Argent liquide - Téléphone mobile - Virement bancaire - Numéro de reçu : - Expiré - Actif - En attente - Suspendu - Le numéro de reçu doit être unique. - Le contrat a une contribution. Veuillez d\'abord supprimer les contributions - Contrat avec succès - Contribution supprimée avec succès - Assuré supprimé avec succès - Vous ne pouvez pas supprimer le chef de famille. - La famille a un contrat, veuillez d\'abord supprimer le contrat. - Assuré non supprimé - Famille supprimée - Scanner - Nom de l\'assuré - La carte SD est en mode lecture seule. Veuillez régler le mode de lecture/écriture et redémarrer l\'application. - openIMIS a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application. - Fermeture forcée - Veuillez entrer le numéro d\'assurance - Invalid Insurance number - Obtenir des informations sur l\'assurance... - Obtention d\'un aperçu général... - Obtention d\'un rapport cumulatif... - Le membre avec ce numéro d\'assurance n\'existe pas. - Aucun renouvellement trouvé - Veuillez vérifier votre connexion Internet. - !Le process a échoué: mauvais fichier ou mauvais code agent. - Soumettre - Annuler le contrat - Voulez-vous mettre fin à ce contrat ? - Code de Paquet de bénéfice - Chargement… - Données téléversées sur le serveur avec succès. - Données sont rejetées par le serveur. Les données sont déplacées dans le dossier rejeté du téléphone. - Les données ont été téléversées avec succès. Veuillez vérifier vos dossiers rejetés/acceptés pour vérifier la réponse du serveur. - Veuillez entrer le code de l\'agent - Le fichier est enregistré sur un support de stockage externe. - Téléversement ... - Aucun retour d\'information trouvé - Une connexion Internet est nécessaire pour visualiser les statistiques. - Aperçu - Aucune donnée trouvée - Statistiques - Code de réclamation - Avez-vous été traité à l\'établissement à cette date ? - Vous a-t-on demandé un paiement à l\'établissement par le personnel ? - Vous a-t-on prescrit des médicaments ? - Avez-vous obtenu des médicaments de l\'établissement ? - Dans quelle mesure êtes-vous satisfait des soins que vous avez reçus à l\'établissement de santé ? Taux sur une échelle de 1 à 5 (1 = non satisfait ; 5 = très satisfait) - Téléversement des retours... - Téléverser tous les retours - Veuillez entrer le code de l\'agent - Veuillez entrer le numéro de la prestation - Veuillez entrer le numéro d\'assurance - Il faut répondre à toutes les questions. - Date de fin - Veuillez entrer la date de fin - En cours... - Veuillez entrer la date de début - Veuillez entrer le numéro de reçu. - Veuillez entrer le code du Paquet de bénéfice - Veuillez entrer le montant - Ce numéro de reçu est déjà utilisé. - Aucun fichier trouvé. - De - Nom d\'utilisateur - Échec de connexion - Mot de passe - Entrez le mot de passe Rar - Code de l\'agent: - Code de l\'agent incorrect - Se connecter - Impossible de connecter le serveur. Opération annulée. - Il y a eu un problème sur le serveur. - Famille ne peut pas être insérée, s\'il vous plaît contacter l\'administrateur du système. - Famille téléversée avec succès - Chef de famille manquant - Une famille avec ce numéro d\'assurance existe déjà. - Numéro d\'assurance en double trouvé - Numéro de reçu en double trouvé - Impossible de télécharger les données de base. - Téléchargement des données de base - Données téléchargées avec succès - Supprimer - Modifier - Paiement - Données de base non trouvées, souhaitez-vous télécharger.... ? - Application d\'adhésions - Version : - Nom : - Date de sortie - Total de familles : - Total des assurés : - Total des contrats : - Total des contributions : - Téléverser les adhésions - Créer un XML d\'adhésions - Téléverser les renouvellements - Téléverser les retours - Télécharger les données de base - Un instant s\'il vous plait - Langue - Familles - Ajouter une nouvelle famille - Famille et assurés - Famille et contrats - Ajouter/Modifier assuré - Ajouter/Modifier le contrat - Contributions - Ajouter/Modifier la contribution - Voulez-vous quitter openIMIS ? - Téléverser le rapport - OK - Assuré - Date jusqu\'au - Nom - Nom FOSA - Date du et jusqu\'au - Temps mis à jour - Annuler - Les retours d\'information n\'ont pas pu être téléchargés, veuillez réessayer plus tard. - Le renouvellement n\'a pas pu être téléversé, veuillez réessayer plus tard. - Région de PPS - Région actuelle - Téléversé avec succès. S\'il vous plaît vérifier les dossiers acceptés / rejetés. - Suppression échouée - Cette famille a été supprimée seulement hors ligne parce qu\'elle a un contrat en ligne. - Contrat avec date d\'adhésion : - \" Modifié \" - Voulez-vous activer cet assuré ?]]> - Les contrats avec les dates d\'adhésion suivantes ont atteint leur nombre maximum de membres et, par conséquent, cette assurance ne sera pas couverte par ces polices, mais l\'assuré est ajouté à la famille : - Acquérir - Les données ont été sauvegardées sur la carte mémoire externe. - Les données n\'ont pas pu être téléversées sur le serveur. Enregistré sur les carte mémoire externe. - Photo téléversée avec succès. - La photo a été enregistrée avec succès. - Aucune image trouvée. - Veuillez capturer une image - Téléverser toutes les images - Photos téléversées avec succès - Aucune photo trouvée - Téléverser les photos - \"Recherche \" - Modifier la famille - Télécharger la famille - Familles éditées - Assurés édités - Contrats révisés - Contributions éditées - Numéro d\'assurance introuvable - Numéro d\'assurance requis - Suppression... - Une connexion Internet est nécessaire pour supprimer des données en ligne. - Veuillez d\'abord vous connecter pour supprimer les données en ligne. - La suppression d\'un contrat supprimera également les contributions qui s\'y trouvent. - La suppression de la famille supprimera également tous les assurés, les polices et les cotisations de cette famille. - Confirmer - Déconnexion - La famille existe déjà dans le téléphone - La nouvelle version du IMIS est maintenant disponible. - Cliquez ici pour télécharger. - Enregistrement... - Le processus a été interrompu. Veuillez vérifier votre connexion Internet. - Aucune famille n\'a été téléversée - Pas de donné disponible - XML a été créé - Échec de la création de XML - Aucune donnée n\'a été créée - S\'il vous plaît entrer le numéro d\'assuré - sans contrat/contribution - sans photo - Échec du téléversement - Supprimé avec succès - Email invalide ! - Échec sur le serveur, la mise à jour des données a échouée ! - Le prix du contrat est couvert. Voulez-vous toujours ajouter une contribution ? - La contribution dépasse le prix du contrat. - Le prix du contrat n\'est pas encore couvert, veuillez sélectionner l\'action à effectuer. - - Rapports - Indicateurs d\'aperçu général - Indicateurs cumulatifs - Nombre de familles ayant des contrats actifs - Nombre de familles dont le contrat est expiré - Nombre de familles ayant des contrats en attente - Nombre de familles dont les contrats ont été suspendus - Nombre de nouveaux contrats - Nombre de contrats renouvelés - Nombre de contrats expirés - Nombre de familles avec contrats suspendus - Montant de la contribution collectée - Statistiques actuelles - Créer le XML des retours - Créer des renouvellements XML - Double chef de famille trouvé sur le serveur, veuillez contacter votre responsable informatique. - Polices renouvelées non listées - Renouveler votre police - Nom de l\'utilisateur - Code de la prestation - Encoder ici - Entrer le nom d\'utilisateur et du mot de passe - Login a été entré avec succès - Entrée non valide - Montant total - Numéros de contrôle - aperçu des polices d\'assurance - Aperçu des numéros de contrôle - Numéros de contrôle - Aperçu des polices - Aperçu des numéros de contrôle - Nom du Paquet de bénéfice: - Date téléversement: - Date demandée: - Code du Paquet de bénéfice: - Noms: - Renouvellement: - N° d\'assuré - Demandé au - Demandé du - Téléversé au - au - Téléversé du - Paquet de bénéfice - Effacer - Demandé - Nombre de polices trouvé - Montant de la contribution - Processus Complet - Veuillez sélectionner un police - Succès - Vous n\'avez pas les droits pour cette fonctionnalité - OK - Pas de donné sélectionnée pour la suppression - Obtenir le numéro de contrôle - Les polices n\'ont pas été supprimées car elles ne sont pas encore téléversées - sur - Requête envoyée avec succès - Cette police ne peut pas être supprimées car elle n\'est pas encore téléversées. - Type de paiement - Requête - PAS DE CONNECTION INTERNET - Voulez-vous importer le ficher .txt dans la base de donnée ? - Il n\'y a pas d\'application de gestion des fichiers d\'installé. - Chargement fichier: - Incomplet! - Contrôler la commission - Année - Payée - Vérifiée - obtenir les commissions - Rapport de Commissions - Montant - commissions - Recherche Polices - Recherche des n° de contrôle - Vue d\'ensemble - Polices - Pas de donnée - Entrer l\'année - Suppression de la famille supprimera également tous les assurés, les polices et les cotisations de la famille. - Dernier versement - Polices enregistrées - Polices non enregistrées - Demande pour polices non enregistrées - Numéro de téléphone non fourni - Les produits d\'assurance des polices sélectionnées ne sont pas uniques - Montant de la contribution - Choisir la date - Obtenir - Date du - Date à - Envoyer un SMS - SMS demandé - - - - - - - - - - - - Veuillez d\'abord vous connecter pour vérifier le numéro de reçu. - Le répertoire IMIS n\'a pas pu être créé. - Indicateurs cumulatifs - Langue des SMS - Approbation de SMS - Aperçu des paiements - Obtenez le paiement CN pour les polices en ligne - Obtenez le paiement CN pour les politiques hors ligne - Aperçu paiement CN - Veuillez d\'abord vous connecter pour télécharger les renouvellements. - Tout sélectionner - Tout déselectionner - Traitement de synchronisation - Vulnérabilité - Sélectionnez la vulnérabilité - Numéros de contrôle en masse - Numéros de contrôle attribués : - Numéros de contrôle disponibles : - Récupérer les numéros de contrôle en masse - Chercher - Veuillez d\'abord vous connecter pour récupérer les numéros de contrôle. - Il ne reste aucun numéro de contrôle pour ce produit. Veuillez récupérer les numéros de contrôle ou fournir le numéro de contrôle d\'une autre source. - Numéro de contrôle : - Aucun numéro de contrôle attribué à cette politique. Veuillez récupérer les numéros de contrôle ou fournir le numéro de contrôle d\'une autre source. - diff --git a/app/src/niger/assets/JSON/hflevels.json b/app/src/niger/assets/JSON/hflevels.json new file mode 100644 index 00000000..49d82aee --- /dev/null +++ b/app/src/niger/assets/JSON/hflevels.json @@ -0,0 +1,4 @@ +[ + {"code":"C", "string": "HealthCentre"}, + {"code":"H", "string": "Hospital"} +] \ No newline at end of file diff --git a/app/src/niger/java/org/openimis/imispolicies/Escape.java b/app/src/niger/java/org/openimis/imispolicies/Escape.java index 9f2a909a..d5c5a558 100644 --- a/app/src/niger/java/org/openimis/imispolicies/Escape.java +++ b/app/src/niger/java/org/openimis/imispolicies/Escape.java @@ -25,6 +25,8 @@ package org.openimis.imispolicies; +import org.openimis.imispolicies.tools.Log; + public class Escape { public int CheckInsuranceNumber(String InsuranceNumber){ @@ -46,7 +48,8 @@ private boolean isValidInsuranceNumber(String InsuranceNumber){ expectedControlNumber = Integer.parseInt(InsuranceNumber.substring(9)); actualControlNumber = Integer.parseInt(InsuranceNumber.substring(0, 9)) % 7; - + Log.d("Escape", "Invalid checksum on insuree, expected " + expectedControlNumber + + " got " + actualControlNumber); return expectedControlNumber == actualControlNumber; } diff --git a/app/src/release/java/org/openimis/imispolicies/tools/Log.java b/app/src/release/java/org/openimis/imispolicies/tools/Log.java new file mode 100644 index 00000000..485413fe --- /dev/null +++ b/app/src/release/java/org/openimis/imispolicies/tools/Log.java @@ -0,0 +1,50 @@ +package org.openimis.imispolicies.tools; + +import android.content.Context; + +import org.openimis.imispolicies.BuildConfig; + +/** + * This class is a wrapper for the default android Log class, adding additional functionality while + * keeping the android.util.Log api + * Release version should not allow any logging + */ +public class Log { + public static final boolean isLoggingEnabled = BuildConfig.LOGGING_ENABLED; + + public static void v(String tag, String msg) { + } + + public static void v(String tag, String msg, Throwable thr) { + } + + public static void d(String tag, String msg) { + } + + public static void d(String tag, String msg, Throwable thr) { + } + + public static void i(String tag, String msg) { + } + + public static void i(String tag, String msg, Throwable thr) { + } + + public static void w(String tag, String msg) { + } + + public static void w(String tag, String msg, Throwable thr) { + } + + public static void e(String tag, String msg) { + } + + public static void e(String tag, String msg, Throwable thr) { + } + + public static void zipLogFiles(Context context) { + } + + public static void deleteLogFiles() { + } +} diff --git a/app/src/tchad/res/values-fr/strings.xml b/app/src/tchad/res/values-fr/strings.xml deleted file mode 100644 index 35b70ae8..00000000 --- a/app/src/tchad/res/values-fr/strings.xml +++ /dev/null @@ -1,439 +0,0 @@ - - - Ouvrir le menu de navigation - Fermer le menu de navigation - Réglages - Veuillez patienter... - La page se charge... - IMIS - admin@imis.com - Accueil - Adhesion - Renouvellement - Retour d\'information - Synchroniser - A propos - Quitter - Promoteur - Mutuelle - Section - Village/GO - Situation de pauvreté - Type de confirmation - No. de confirmation - Type de groupe - Ethnicité - Adresse permanente - Suivant - Choisir un promoteur - Choisir une mutuelle - Choisir une section - Choisir un village/GO - Oui - Non - Sélectionner le statut de pauvreté - Sélectionner le type de confirmation - Sélectionner le type de groupe - OK - Veuillez vérifier tous les champs obligatoires marqués en rouge. - Numéro d\'assurance - Autres noms - Nom de famille - Date de naissance - Sexe - État matrimonial - Carte de bénéficiaire - District actuel - Municipalité actuelle - Village actuel - Adresse actuelle - Profession - Education - Numéro de téléphone - Email - Type d\'identification - Numéro d\'identification - District de PPS - Niveau de PPS - Premier point de service - Choisir le sexe - Masculin - Féminin - Autre - Sélectionner l\'état civil - Marié - Célibataire - Divorcé - Veuf - Non spécifié - Sélectionner la carte de bénéficiaire - Choisir un métier - Choisir une éducation - Sélectionner le type d\'identification - Sélectionner le niveau FOSA - Dispensaire - Centre de santé - Hôpital - Choisir une FOSA - Sauvegarder - Relation - Sélectionner une relation - Famille enregistrée avec succès - Une erreur s\'est produite lors du traitement des données. - Erreur lors de l\'insertion de données - Erreur lors de la mise à jour des données - Le membre avec ce numéro d\'assurance existe déjà. - Ajouter - Nouveau - Choisir un agent - Sélectionner un produit - Sél. Mois - Date d\'adhésion - Produit - Date d\'entrée en vigueur - Date de début - Date d\'expiration - Agent - Statut du contrat : - Valeur du contrat : - Solde : - Contribution : - Recherche - Payeur - Date de paiement - Catégorie de contribution - Numéro du reçu - Contribution payée - Type de paiement - Sélectionnez Payeur - Sélectionner le niveau - Contribution et autres - Frais de photo - Sélectionnez le type de paiement - Argent liquide - Téléphone mobile - Virement bancaire - Numéro de reçu : - Expiré - Actif - En attente - Suspendu - Le numéro de reçu doit être unique. - Le contrat a une contribution. Veuillez d\'abord supprimer les contributions - Contrat avec succès - Contribution supprimée avec succès - Assuré supprimé avec succès - Vous ne pouvez pas supprimer le chef de famille. - La famille a un contrat, veuillez d\'abord supprimer le contrat. - Assuré non supprimé - Famille supprimée - Scanner - Nom d\'assuré - La carte SD est en mode lecture seule. Veuillez régler le mode de lecture/écriture et redémarrer l\'application. - IMIS a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application. - Fermeture forcée - Veuillez entrer le numéro d\'assurance - Invalid Insurance number - Obtenir des informations sur l\'assurance... - Obtention d\'un aperçu général... - Obtention d\'un rapport cumulatif... - Le membre avec ce numéro d\'assurance n\'existe pas. - Aucun renouvellement trouvé - Veuillez vérifier votre connexion Internet. - !Process Failed, Wrong File or Officer code. - Submit - Annuler le contrat - Voulez-vous mettre fin à ce contrat ? - Code de produit - Chargement… - Données téléversées sur le serveur avec succès. - Données sont rejetées par le serveur. Les données sont déplacées dans le dossier rejeté du téléphone. - Les données ont été téléversées avec succès. Veuillez vérifier vos dossiers rejetés/acceptés pour vérifier la réponse du serveur. - Veuillez entrer le code de l\'agent - Le fichier est enregistré sur un support de stockage externe. - Téléversement ... - Aucun commentaire trouvé - Une connexion Internet est nécessaire pour visualiser les statistiques. - Aperçu - Aucune donnée trouvée - Statistiques - Code de réclamation - Avez-vous été traité à l\'établissement à cette date ? - Vous a-t-on demandé un paiement à l\'établissement par le personnel ? - Vous a-t-on prescrit des médicaments ? - Avez-vous obtenu des médicaments de l\'établissement ? - Dans quelle mesure êtes-vous satisfait des soins que vous avez reçus à l\'établissement de santé ? Taux sur une échelle de 1 à 5 (1 = non satisfait ; 5 = très satisfait) - Chargement des commentaires... - Téléverser tous les commentaires - Veuillez entrer le code de l\'agent - Veuillez entrer le numéro de la demande de remboursement - Veuillez entrer le numéro d\'assurance - Il faut répondre à toutes les questions. - Date de fin - Veuillez entrer la date de fin - En cours... - Veuillez entrer la date de début - Veuillez entrer le numéro de reçu. - Veuillez entrer le code du produit - Veuillez entrer le montant - Ce numéro de reçu est déjà utilisé. - Aucun fichier trouvé. - De - Nom d\'utilisateur - Échec de connexion - Mot de passe - Entrez le mot de passe Rar - Code de l\'agent: - Code de l\'agent incorrect - Se connecter - Impossible de connecter le serveur. Opération annulée. - Il y a eu un problème sur le serveur. - Famille ne peut pas être insérée, s\'il vous plaît contacter l\'administrateur du système. - Famille téléversée avec succès - Chef de famille manquant - Une famille avec ce numéro d\'assurance existe déjà. - Numéro d\'assurance en double trouvé - Numéro de reçu en double trouvé - Impossible de télécharger les données de base. - Téléchargement des données de base - Données téléchargées avec succès - Supprimer - Modifier - Paiement - Données de base non trouvées, souhaitez-vous télécharger.... ? - Application d\'adhésions - Version : - Nom : - Date de sortie - Total de familles : - Total des assurés : - Total des contrats : - Total des contributions : - Téléverser les adhésions - Créer un XML d\'adhésions - Téléverser les renouvellements - Téléverser les commentaires - Télécharger les données de base - Un instant s\'il vous plait - Langue - Familles - Ajouter une nouvelle famille - Famille et assurés - Famille et contrats - Ajouter/Modifier assuré - Ajouter/Modifier le contrat - Contributions - Ajouter/Modifier la contribution - Voulez-vous quitter IMIS ? - Téléverser le rapport - OK - Assuré - Date jusqu\'au - Nom - Nom FOSA - Date du et jusqu\'au - Temps mis à jour - Annuler - Les commentaires n\'ont pas pu être téléversés, veuillez réessayer plus tard. - Le renouvellement n\'a pas pu être téléversé, veuillez réessayer plus tard. - Région de PPS - Promoteur actuel - Téléversé avec succès. S\'il vous plaît vérifier les dossiers acceptés / rejetés. - Suppression échouée - Cette famille a été supprimée seulement hors ligne parce qu\'elle a un contrat en ligne. - Contrat avec date d\'adhésion : - \" Modifié \" - Voulez-vous activer cet assuré ?]]> - Les contrats avec les dates d\'adhésion suivantes ont atteint leur nombre maximum de membres et, par conséquent, cette assurance ne sera pas couverte par ces polices, mais l\'assuré est ajouté à la famille : - Acquérir - Les données ont été sauvegardées sur la carte mémoire externe. - Les données n\'ont pas pu être téléversées sur le serveur. Enregistré sur les carte mémoire externe. - Photo téléversée avec succès. - La photo a été enregistrée avec succès. - Aucune image trouvée. - Veuillez capturer une image - Téléverser toutes les images - Photos téléversées avec succès - Aucune photo trouvée - Téléverser les photos - \"Recherche \" - Modifier la famille - Télécharger la famille - Familles éditées - Assurés édités - Contrats révisés - Contributions éditées - Numéro d\'assurance introuvable - Numéro d\'assurance requis - Suppression... - Une connexion Internet est nécessaire pour supprimer des données en ligne. - Veuillez d\'abord vous connecter pour supprimer les données en ligne. - La suppression d\'un contrat supprimera également les contributions qui s\'y trouvent. - La suppression de la famille supprimera également tous les assurés, les polices et les cotisations de cette famille. - Confirmer - Déconnexion - La famille existe déjà dans le téléphone - La nouvelle version du IMIS est maintenant disponible. - Cliquez ici pour télécharger. - Enregistrement... - Le processus a été interrompu. Veuillez vérifier votre connexion Internet. - Aucune famille n\'a été téléchargée - Pas de donné disponible - XML a été créé - Échec de la création de XML - Aucune donnée n\'a été créée - S\'il vous plaît entrer le numéro d\'assuré - sans contrat/contribution - sans photo - Échec du téléversement - Supprimé avec succès - Email invalide ! - Échec sur le serveur, la mise à jour des données a échouée ! - Le prix du contrat est couvert. Voulez-vous toujours ajouter une contribution ? - La contribution dépasse le prix du contrat. - Le prix du contrat n\'est pas encore couvert, veuillez sélectionner l\'action à effectuer. - - Rapports - Indicateurs d\'aperçu général - Indicateurs cumulatifs - Nombre de familles ayant des contrats actifs - Nombre de familles dont le contrat est expiré - Nombre de familles ayant des contrats en attente - Nombre de familles dont les services du contrat ont été suspendus - Nombre de nouveaux contrats - Nombre de contrats renouvelés - Nombre de contrats expirés - Nombre de familles avec contrats suspendus - Montant de la contribution collectée - Statistiques actuelles - Créer des commentaires XML - Créer des renouvellements XML - Double chef de famille trouvé sur le serveur, veuillez contacter votre responsable informatique. - Unlisted Renewal Policies - Renew Your Policy - Nom de l\'utilisateur - Code de la prestation - Encoder ici - Entrer le nom d\'utilisateur et du mot de passe - Login a été entré avec succès - Entrée non valide - Montant total - Numéros de contrôle - aperçu des polices d\'assurance - Aperçu des numéros de contrôle - Numéros de contrôle - Aperçu des polices - Aperçu des numéros de contrôle - Nom du Paquet de bénéfice: - Date téléversement: - Date demandée: - Code du Paquet de bénéfice: - Noms: - Renouvellement: - N° d\'assuré - Demandé au - Demandé du - Téléversé au - au - Téléversé du - Paquet de bénéfice - Effacer - Demandé - Nombre de polices trouvé - Montant de la contribution - Processus Complet - Veuillez sélectionner un police - Succès - Vous n\'avez pas les droits pour cette fonctionnalité - OK - Pas de donné sélectionnée pour la suppression - Obtenir le numéro de contrôle - Les polices n\'ont pas été supprimées car elles ne sont pas encore téléversées - sur - Requête envoyée avec succès - Cette police ne peut pas être supprimées car elle n\'est pas encore téléversées. - Type de paiement - Requête - PAS DE CONNECTION INTERNET - Voulez-vous importer le ficher .txt dans la base de donnée ? - Il n\'y a pas d\'application de gestion des fichiers d\'installé. - Chargement fichier: - Incomplet! - Contrôler la commission - Année - Payée - Vérifiée - obtenir les commissions - Rapport de Commissions - Montant - commissions - Rechercher les politiques inscrites - Recherche des n° de contrôle - Vue d\'ensemble - Polices - Pas de donnée - Entrer l\'année - Suppression de la famille supprimera également tous les assurés, les polices et les cotisations de la famille. - Dernier versement - Polices enregistrées - Polices non enregistrées - Demande pour polices non enregistrées - Numéro de téléphone non fourni - Les produits d\'assurance des polices sélectionnées ne sont pas uniques - Montant de la contribution - Choisir la date - Obtenir - Date du - Date à - Envoyer un SMS - SMS demandé - TotalAdmissionsLeft - TotalVisitsLeft - TotalConsultationsLeft - TotalSurgeriesLeft - TotalDeliveriesLeft - TotalAntenatalLeft - ConsultationAmountLeft - SurgeryAmountLeft - HospitalizationAmountLeft - AntenatalAmountLeft - DeliveryAmountLeft - Veuillez d\'abord vous connecter pour vérifier le numéro de reçu. - Le répertoire IMIS n\'a pas pu être créé. - Indicateurs cumulatifs - Langue des SMS - Approbation de SMS - Aperçu des paiements - Obtenir le CN de paiement pour les polices inscrites - Obtenir le CN de paiement pour les polices non inscrites - Aperçu paiement CN - Veuillez d\'abord vous connecter pour télécharger les renouvellements. - Tout sélectionner - Tout déselectionner - Traitement de synchronisation - Vulnérabilité - Sélectionnez la vulnérabilité - Numéros de contrôle en masse - Numéros de contrôle attribués : - Numéros de contrôle disponibles : - Récupérer les numéros de contrôle en masse - Chercher - Veuillez d\'abord vous connecter pour récupérer les numéros de contrôle. - Il ne reste aucun numéro de contrôle pour ce produit. Veuillez récupérer les numéros de contrôle ou fournir le numéro de contrôle d\'une autre source. - Numéro de contrôle : - Aucun numéro de contrôle attribué à cette politique. Veuillez récupérer les numéros de contrôle ou fournir le numéro de contrôle d\'une autre source. - Données de base - Accès au stockage externe - Pour fonctionner correctement, %1$s nécessite un accès au stockage externe. Veuillez l\'autoriser pour %1$s dans l\'écran suivant afin d\'utiliser l\'application. - Autorisations - Pour fonctionner correctement, %1$s nécessite plusieurs autorisations. Veuillez les autoriser dans l\'écran suivant afin d\'utiliser l\'application. - Veuillez remplir le mois - Renewal accepted - Renewal already accepted - Renewal rejected - Grace period expired - Control number error - Unexpected exception - Invalid renewal file - Control number \"%1$s\" is not present in phone memory. Please confirm that this control number is correct. - diff --git a/build.gradle b/build.gradle index 8a40bd5b..3f272a79 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,22 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { - jcenter() google() + mavenCentral() + maven { + name = 'ajoberstar-backup' + url = 'https://ajoberstar.org/bintray-backup/' + } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:7.2.2' + classpath "org.ajoberstar.grgit:grgit-gradle:4.1.1" } } allprojects { repositories { - jcenter() google() - maven { - url "https://maven.google.com" - } + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dccc0f79..3e92091e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/script-git-version.gradle b/script-git-version.gradle index bd673f8c..5787a30d 100644 --- a/script-git-version.gradle +++ b/script-git-version.gradle @@ -1,28 +1,23 @@ buildscript { repositories { - jcenter() + google() + mavenCentral() + maven { + name = 'ajoberstar-backup' + url = 'https://ajoberstar.org/bintray-backup/' + } } dependencies { - classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.0' + classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.1' } } import org.ajoberstar.grgit.Grgit -/** - * git.describe() - * - * Find the most recent tag that is reachable from HEAD. If the tag points to the commit, - * then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional - * commits on top of the tagged object and the abbreviated object name of the most recent commit. - * - * More info: https://git-scm.com/docs/git-describe - */ - ext { git = Grgit.open(currentDir: projectDir) gitVersionName = git.describe(tags:true) - gitVersionCode = git.tag.list().size() + 5 // first Google Play release has the code 8 + gitVersionCode = git.tag.list().size() + 6 // Manual increment for between tagged versions gitVersionCodeTime = git.head().time }