optimize code

Author: vaneck237

claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java

@@ -7,6 +7,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -318,8 +319,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
     private void addItem() {
         Intent addItemsIntent = new Intent(ClaimActivity.this, AddItems.class);
         addItemsIntent.putExtra(EXTRA_READONLY, isIntentReadonly());
-        JSONArray itemsArray = sqlHandler.getItems();
-        if(itemsArray.length() == 0){
+        Cursor c = sqlHandler.getMapping("I");
+        if(c != null && c.getCount() == 0){
             showDialog(getResources().getString(R.string.NoItemsPricelist));
         }else {
             ClaimActivity.this.startActivity(addItemsIntent);
@@ -329,8 +330,8 @@ private void addItem() {
     private  void addService() {
         Intent addServicesIntent = new Intent(this, AddServices.class);
         addServicesIntent.putExtra(EXTRA_READONLY, isIntentReadonly());
-        JSONArray servicesArray = sqlHandler.getServices();
-        if(servicesArray.length() == 0){
+        Cursor c = sqlHandler.getMapping("S");
+        if(c != null && c.getCount() == 0){
             showDialog(getResources().getString(R.string.NoServicesPricelist));
         }else {
             ClaimActivity.this.startActivity(addServicesIntent);

claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java

@@ -961,68 +961,4 @@ public String getHfId(String code) {
         }
         return id;
     }
-
-    public JSONArray getServices() {
-        String nullOverride="";
-        JSONArray resultSet = new JSONArray();
-        try {
-            String query = "SELECT * FROM tblServices";
-            Cursor cursor1 = db.rawQuery(query, null);
-            cursor1.moveToFirst();
-            // looping through all rows
-            while (!cursor1.isAfterLast()) {
-                int totalColumns = cursor1.getColumnCount();
-                JSONObject rowObject = new JSONObject();
-                for (int i = 0; i < totalColumns; i++) {
-                    try {
-                        if (cursor1.getString(i) != null)
-                            rowObject.put(cursor1.getColumnName(i), cursor1.getString(i));
-                        else
-                            rowObject.put(cursor1.getColumnName(i), nullOverride);
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                        Log.d("Tag Name", e.getMessage());
-                    }
-                }
-                resultSet.put(rowObject);
-                cursor1.moveToNext();
-            }
-            cursor1.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return resultSet;
-    }
-
-    public JSONArray getItems() {
-        String nullOverride="";
-        JSONArray resultSet = new JSONArray();
-        try {
-            String query = "SELECT * FROM tblItems";
-            Cursor cursor1 = db.rawQuery(query, null);
-            cursor1.moveToFirst();
-            // looping through all rows
-            while (!cursor1.isAfterLast()) {
-                int totalColumns = cursor1.getColumnCount();
-                JSONObject rowObject = new JSONObject();
-                for (int i = 0; i < totalColumns; i++) {
-                    try {
-                        if (cursor1.getString(i) != null)
-                            rowObject.put(cursor1.getColumnName(i), cursor1.getString(i));
-                        else
-                            rowObject.put(cursor1.getColumnName(i), nullOverride);
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                        Log.d("Tag Name", e.getMessage());
-                    }
-                }
-                resultSet.put(rowObject);
-                cursor1.moveToNext();
-            }
-            cursor1.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return resultSet;
-    }
 }