rename frenchVersion & englishVersion

mngoe · Nov 6, 2024 · 31e3c14 · 31e3c14
1 parent 946e07e
commit 31e3c14
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/src/main/assets/database/IMIS.db3 b/app/src/main/assets/database/IMIS.db3
diff --git a/app/src/main/assets/pages/Insuree.js b/app/src/main/assets/pages/Insuree.js
@@ -450,9 +450,9 @@ function fillPaymentMethods() {
 }
 
 function fillIncomeLevels() {
-    $textLanguage = "FrenchVersion";
+    $textLanguage = "FirstLanguage";
     if (Android.getSelectedLanguage() != "en") {
-        $textLanguage = "EnglishVersion";
+        $textLanguage = "SecondLanguage";
     }
     var $IncomeLevels = Android.getIncomeLevels();
     bindDropdown('ddlIncomeLevel', $IncomeLevels, 'IncomeLevelID', $textLanguage, null, Android.getString('SelectIncomeLevel'));

diff --git a/app/src/main/assets/pages/SubInsuree.js b/app/src/main/assets/pages/SubInsuree.js
@@ -357,9 +357,9 @@ function fillPaymentMethods(){
 }
 
 function fillIncomeLevels(){
-    $textLanguage = "FrenchVersion";
+    $textLanguage = "FirstLanguage";
     if (Android.getSelectedLanguage() != "en") {
-        $textLanguage = "EnglishVersion";
+        $textLanguage = "SecondLanguage";
     }
     var $IncomeLevels = Android.getIncomeLevels();
     bindDropdown('ddlIncomeLevel', $IncomeLevels, 'IncomeLevelID', $textLanguage, null, Android.getString('SelectIncomeLevel'));

diff --git a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java
@@ -390,8 +390,8 @@ private Integer getOfficerLocationId() {
     @JavascriptInterface
     @SuppressWarnings("unused")
     public String getRegions() {
-        Integer officerLocationId = 19;
-        //Integer officerLocationId = getOfficerLocationId();
+        //Integer officerLocationId = 19;
+        Integer officerLocationId = getOfficerLocationId();
         @Language("SQL")
         String Query = "SELECT LocationId, LocationName FROM tblLocations WHERE LocationId = (SELECT L.ParentLocationId LocationId FROM tblLocations L";
         if (officerLocationId != null) {
@@ -5616,7 +5616,7 @@ private void insertContributionPlan (JSONArray jsonArray) throws JSONException{
     @SuppressWarnings("unused")
     public String getIncomeLevels() {
         String tableName = "tblIncomeLevel";
-        String[] columns = {"IncomeLevelID", "FrenchVersion", "EnglishVersion"};
+        String[] columns = {"IncomeLevelID", "FirstLanguage", "SecondLanguage"};
 
         JSONArray incomeLevels = sqlHandler.getResult(tableName, columns, null, null);
 

diff --git a/app/src/main/java/org/openimis/imispolicies/SQLHandler.java b/app/src/main/java/org/openimis/imispolicies/SQLHandler.java
@@ -425,8 +425,8 @@ public void onCreate(SQLiteDatabase sqLiteDatabase) {
             sqLiteDatabase.execSQL(
                     "CREATE TABLE " + tblIncomeLevel + "(" +
                             "Id INTEGER," +
-                            "FrenchVersion TEXT," +
-                            "EnglishVersion TEXT" +")"
+                            "FirstLanguage TEXT," +
+                            "SecondLanguage TEXT" +")"
             );
             sqLiteDatabase.execSQL(
                     "CREATE TABLE " + tblContributionPlan + "(" +