Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

GSKMTOrange/src/main/AndroidManifest.xml

@@ -35,51 +35,31 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait"/>
+            android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".autoupdate.AutoUpdateActivity"
+        <activity
+            android:name=".autoupdate.AutoUpdateActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".SelectLanguageActivity"
             android:label="@string/title_activity_select_language"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".download.DownloadActivity"
+        <activity
+            android:name=".download.DownloadActivity"
             android:screenOrientation="portrait" />
         <activity
 
             android:name=".GeoTag.GeoTagStoreList"
             android:label="@string/title_activity_store_list_geotag"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait"/>
+            android:theme="@style/AppTheme.NoActionBar" />
 
-        <activity
-            android:name=".gsk_dailyentry.CategoryWisePerformanceActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait"/>
-        <!-- android:label="@string/title_activity_category_wise_performance" -->
 
-        <activity
-            android:name=".gsk_dailyentry.DailyDataMenuActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait"/>
-        <!-- android:label="@string/title_activity_daily_main_menu" -->
-
-        <activity
-            android:name=".gsk_dailyentry.MSL_AvailabilityActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait"/>
-        <!-- android:label="@string/title_activity_msl__availability" -->
         <activity
             android:name=".dailyentry.StoreListActivity"
             android:label="@string/title_activity_store_list_geotag"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait"/>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".dailyentry.StoreimageActivity"
             android:label="@string/title_activity_store_list_geotag"
@@ -97,18 +77,50 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
-        <activity
+
-            android:name=".gsk_dailyentry.Stock_FacingActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait"/>
         <activity
             android:name=".dailyentry.T2PComplianceActivity"
             android:label="@string/title_activity_t2_pcompliance"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
 
+        <!--Gagan Start Declaration-->
+
+        <activity
+            android:name=".gsk_dailyentry.CategoryListActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".gsk_dailyentry.CategoryWisePerformanceActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".gsk_dailyentry.DailyDataMenuActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".gsk_dailyentry.MSL_AvailabilityActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".gsk_dailyentry.Stock_FacingActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
+
+        <!--Gagan End Declaration-->
     </application>
 
 </manifest>

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -14,29 +14,24 @@ import java.util.List;
 import cpm.com.gskmtorange.GetterSetter.CoverageBean;
 import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
-
-import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
-
-import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
-import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
-
 import cpm.com.gskmtorange.constant.CommonString;
-
 import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
-
+import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
 
 /**
  * Created by ashishc on 29-12-2016.
@@ -65,7 +60,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
         db.execSQL(TableBean.getJourneyPlan());
 
-        //Gagan
+        //Gagan Start
         db.execSQL(TableBean.getBrandMaster());
         db.execSQL(TableBean.getSkuMaster());
         db.execSQL(TableBean.getCategoryMaster());
@@ -74,20 +69,19 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         db.execSQL(TableBean.getMappingStock());
         db.execSQL(TableBean.getMappingT2p());
 
-
-        db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING);
-        db.execSQL(CommonString.CREATE_TABLE_COVERAGE_DATA);
-
-
-        db.execSQL(TableBean.getDisplayChecklistMaster());
-        db.execSQL(TableBean.getMappingDisplayChecklist());
-
         db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY);
 
         db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER);
         db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD);
 
+        //Gagan End
 
+
+        db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING);
+        db.execSQL(CommonString.CREATE_TABLE_COVERAGE_DATA);
+
+        db.execSQL(TableBean.getDisplayChecklistMaster());
+        db.execSQL(TableBean.getMappingDisplayChecklist());
     }
 
     @Override
@@ -190,8 +184,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 dbcursor.close();
                 return t2PList;
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e){
 
             Log.d("Exception get T2P", e.toString());
             return t2PList;
@@ -234,8 +227,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 dbcursor.close();
                 return checkList;
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e){
 
             Log.d("Exception get T2P", e.toString());
             return checkList;
@@ -274,8 +266,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 dbcursor.close();
                 return brandList;
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e){
 
             Log.d("Exception get T2P", e.toString());
             return brandList;
@@ -316,8 +307,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 dbcursor.close();
                 return skuList;
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e){
 
             Log.d("Exception get T2P", e.toString());
             return skuList;
@@ -402,45 +392,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
-    //Gagan Goel
-    public void InsertCategory(CategoryMasterGetterSetter data) {
-        db.delete("CATEGORY_MASTER", null, null);
-
-        ContentValues values = new ContentValues();
-        try {
-            for (int i = 0; i < data.getCATEGORY_ID().size(); i++) {
-
-                values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
-                values.put("CATEGORY", data.getCATEGORY().get(i));
-                values.put("CATEGORY_SEQUENCE", data.getCATEGORY_SEQUENCE().get(i));
-
-                db.insert("CATEGORY_MASTER", null, values);
-            }
-        } catch (Exception ex) {
-            Log.d("Exception ", " in CATEGORY_MASTER " + ex.toString());
-        }
-    }
-
-    public void InsertMappingStock(MappingStockGetterSetter data) {
-        db.delete("MAPPING_STOCK", null, null);
-
-        ContentValues values = new ContentValues();
-        try {
-            for (int i = 0; i < data.getKEYACCOUNT_ID().size(); i++) {
-
-                values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
-                values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
-                values.put("CLASS_ID", data.getCLASS_ID().get(i));
-                values.put("SKU_ID", data.getSKU_ID().get(i));
-                values.put("MUST_HAVE", data.getMUST_HAVE().get(i));
-                values.put("MBQ", data.getMBQ().get(i));
-
-                db.insert("MAPPING_STOCK", null, values);
-            }
-        } catch (Exception ex) {
-            Log.d("Exception ", " in MAPPING_STOCK " + ex.toString());
-        }
-    }
 
     //insert MAPPING_DISPLAY_CHECKLIST
     public void InsertMappingDisplayChecklist(MappingDisplayChecklistGetterSetter data) {
@@ -460,64 +411,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
     }
 
-    public void InsertSubCategoryMaster(SubCategoryMasterGetterSetter data) {
-        db.delete("SUB_CATEGORY_MASTER", null, null);
-
-        ContentValues values = new ContentValues();
-        try {
-            for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
-
-                values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
-                values.put("SUB_CATEGORY", data.getSUB_CATEGORY().get(i));
-                values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
-                values.put("SUB_CATEGORY_SEQUENCE", data.getSUB_CATEGORY_SEQUENCE().get(i));
-
-                db.insert("SUB_CATEGORY_MASTER", null, values);
-            }
-        } catch (Exception ex) {
-            Log.d("Exception ", " in MAPPING_STOCK " + ex.toString());
-        }
-    }
-
-    public void InsertBrandMaster(BrandMasterGetterSetter data) {
-        db.delete("BRAND_MASTER", null, null);
-
-        ContentValues values = new ContentValues();
-        try {
-            for (int i = 0; i < data.getBRAND_ID().size(); i++) {
-
-                values.put("BRAND_ID", data.getBRAND_ID().get(i));
-                values.put("BRAND", data.getBRAND().get(i));
-                values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
-                values.put("COMPANY_ID", data.getCOMPANY_ID().get(i));
-                values.put("BRAND_SEQUENCE", data.getBRAND_SEQUENCE().get(i));
-
-                db.insert("BRAND_MASTER", null, values);
-            }
-        } catch (Exception ex) {
-            Log.d("Exception ", " in BRAND_MASTER " + ex.toString());
-        }
-    }
-
-    public void InsertSkuMaster(SkuMasterGetterSetter data) {
-        db.delete("SKU_MASTER", null, null);
-
-        ContentValues values = new ContentValues();
-        try {
-            for (int i = 0; i < data.getSKU_ID().size(); i++) {
-
-                values.put("SKU_ID", data.getSKU_ID().get(i));
-                values.put("SKU", data.getSKU().get(i));
-                values.put("BRAND_ID", data.getBRAND_ID().get(i));
-                values.put("MRP", data.getMRP().get(i));
-                values.put("SKU_SEQUENCE", data.getSKU_SEQUENCE().get(i));
-
-                db.insert("SKU_MASTER", null, values);
-            }
-        } catch (Exception ex) {
-            Log.d("Exception ", " in SKU_MASTER " + ex.toString());
-        }
-    }
 
     //insert DISPLAY_CHECKLIST_MASTER
     public void InsertDisplayChecklistMaster(DisplayChecklistMasterGetterSetter data) {
@@ -555,24 +448,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
     }
 
-    public void InsertMAPPING_T2P(MAPPINGT2PGetterSetter data) {
-        db.delete("MAPPING_T2P", null, null);
-
-        ContentValues values = new ContentValues();
-        try {
-            for (int i = 0; i < data.getSTORE_ID().size(); i++) {
-
-                values.put("STORE_ID", data.getSTORE_ID().get(i));
-                values.put("BRAND_ID", data.getBRAND_ID().get(i));
-                values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
-
-                db.insert("MAPPING_T2P", null, values);
-            }
-        } catch (Exception ex) {
-            Log.d("Exception ", " in MAPPING_T2P " + ex.toString());
-        }
-    }
-
 
     public void InsertSTOREgeotag(String storeid, double lat, double longitude, String path, String status) {
 
@@ -612,8 +487,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
-
-
     public void updateCheckoutStatus(String id, String status) {
 
         ContentValues values = new ContentValues();
@@ -664,8 +537,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
         } catch (Exception e) {
 
-        }
+        } finally {
-        finally {
             if (dbcursor != null && !dbcursor.isClosed()) {
                 dbcursor.close();
             }
@@ -765,14 +637,173 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     if (dbcursor.getString(dbcursor
                             .getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK)) == null) {
                         sb.setRemark("");
-                    }
+                    } else {
-                    else{
                         sb.setRemark((((dbcursor.getString(dbcursor
                                 .getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))))));
                     }
 
                     list.add(sb);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception get JCP!", e.toString());
+            return list;
+        }
+        return list;
+    }
 
+    public long InsertCoverageData(CoverageBean data) {
+
+        //db.delete(CommonString1.TABLE_COVERAGE_DATA, "STORE_ID" + "='" + data.getStoreId() + "'", null);
+
+        ContentValues values = new ContentValues();
+
+        try {
+
+            values.put(CommonString.KEY_STORE_ID, data.getStoreId());
+            values.put(CommonString.KEY_USER_ID, data.getUserId());
+            values.put(CommonString.KEY_IN_TIME, data.getInTime());
+            values.put(CommonString.KEY_OUT_TIME, data.getOutTime());
+            values.put(CommonString.KEY_VISIT_DATE, data.getVisitDate());
+            values.put(CommonString.KEY_LATITUDE, data.getLatitude());
+            values.put(CommonString.KEY_LONGITUDE, data.getLongitude());
+            values.put(CommonString.KEY_REASON_ID, data.getReasonid());
+            values.put(CommonString.KEY_REASON, data.getReason());
+            values.put(CommonString.KEY_COVERAGE_STATUS, data.getStatus());
+            values.put(CommonString.KEY_IMAGE, data.getImage());
+            values.put(CommonString.KEY_COVERAGE_REMARK, data.getRemark());
+            values.put(CommonString.KEY_REASON_ID, data.getReasonid());
+            values.put(CommonString.KEY_REASON, data.getReason());
+            values.put(CommonString.KEY_GEO_TAG, data.getGEO_TAG());
+
+            return db.insert(CommonString.TABLE_COVERAGE_DATA, null, values);
+
+        } catch (Exception ex) {
+            Log.d("Database Exception ", ex.toString());
+        }
+        return 0;
+    }
+
+    //Gagan Start Method
+
+    public void InsertCategory(CategoryMasterGetterSetter data) {
+        db.delete("CATEGORY_MASTER", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getCATEGORY_ID().size(); i++) {
+
+                values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
+                values.put("CATEGORY", data.getCATEGORY().get(i));
+                values.put("CATEGORY_SEQUENCE", data.getCATEGORY_SEQUENCE().get(i));
+
+                db.insert("CATEGORY_MASTER", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in CATEGORY_MASTER " + ex.toString());
+        }
+    }
+
+    public void InsertSubCategoryMaster(SubCategoryMasterGetterSetter data) {
+        db.delete("SUB_CATEGORY_MASTER", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
+
+                values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
+                values.put("SUB_CATEGORY", data.getSUB_CATEGORY().get(i));
+                values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
+                values.put("SUB_CATEGORY_SEQUENCE", data.getSUB_CATEGORY_SEQUENCE().get(i));
+
+                db.insert("SUB_CATEGORY_MASTER", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in MAPPING_STOCK " + ex.toString());
+        }
+    }
+
+    public void InsertBrandMaster(BrandMasterGetterSetter data) {
+        db.delete("BRAND_MASTER", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getBRAND_ID().size(); i++) {
+
+                values.put("BRAND_ID", data.getBRAND_ID().get(i));
+                values.put("BRAND", data.getBRAND().get(i));
+                values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
+                values.put("COMPANY_ID", data.getCOMPANY_ID().get(i));
+                values.put("BRAND_SEQUENCE", data.getBRAND_SEQUENCE().get(i));
+
+                db.insert("BRAND_MASTER", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in BRAND_MASTER " + ex.toString());
+        }
+    }
+
+    public void InsertSkuMaster(SkuMasterGetterSetter data) {
+        db.delete("SKU_MASTER", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getSKU_ID().size(); i++) {
+
+                values.put("SKU_ID", data.getSKU_ID().get(i));
+                values.put("SKU", data.getSKU().get(i));
+                values.put("BRAND_ID", data.getBRAND_ID().get(i));
+                values.put("MRP", data.getMRP().get(i));
+                values.put("SKU_SEQUENCE", data.getSKU_SEQUENCE().get(i));
+
+                db.insert("SKU_MASTER", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in SKU_MASTER " + ex.toString());
+        }
+    }
+
+    public void InsertMappingStock(MappingStockGetterSetter data) {
+        db.delete("MAPPING_STOCK", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getKEYACCOUNT_ID().size(); i++) {
+
+                values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
+                values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
+                values.put("CLASS_ID", data.getCLASS_ID().get(i));
+                values.put("SKU_ID", data.getSKU_ID().get(i));
+                values.put("MUST_HAVE", data.getMUST_HAVE().get(i));
+                values.put("MBQ", data.getMBQ().get(i));
+
+                db.insert("MAPPING_STOCK", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in MAPPING_STOCK " + ex.toString());
+        }
+    }
+
+    public void InsertMAPPING_T2P(MAPPINGT2PGetterSetter data) {
+        db.delete("MAPPING_T2P", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getSTORE_ID().size(); i++) {
+
+                values.put("STORE_ID", data.getSTORE_ID().get(i));
+                values.put("BRAND_ID", data.getBRAND_ID().get(i));
+                values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
+
+                db.insert("MAPPING_T2P", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in MAPPING_T2P " + ex.toString());
+        }
+    }
 
     //Category List
     public ArrayList<CategoryGetterSetter> getCategoryListData(String keyAccountId, String storeTypeId, String classId) {
@@ -1226,39 +1257,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
-             public long InsertCoverageData(CoverageBean data) {
-
-        //db.delete(CommonString1.TABLE_COVERAGE_DATA, "STORE_ID" + "='" + data.getStoreId() + "'", null);
-
-        ContentValues values = new ContentValues();
-
-        try {
-
-            values.put(CommonString.KEY_STORE_ID, data.getStoreId());
-            values.put(CommonString.KEY_USER_ID, data.getUserId());
-            values.put(CommonString.KEY_IN_TIME, data.getInTime());
-            values.put(CommonString.KEY_OUT_TIME, data.getOutTime());
-            values.put(CommonString.KEY_VISIT_DATE, data.getVisitDate());
-            values.put(CommonString.KEY_LATITUDE, data.getLatitude());
-            values.put(CommonString.KEY_LONGITUDE, data.getLongitude());
-            values.put(CommonString.KEY_REASON_ID, data.getReasonid());
-            values.put(CommonString.KEY_REASON, data.getReason());
-            values.put(CommonString.KEY_COVERAGE_STATUS, data.getStatus());
-            values.put(CommonString.KEY_IMAGE, data.getImage());
-            values.put(CommonString.KEY_COVERAGE_REMARK, data.getRemark());
-            values.put(CommonString.KEY_REASON_ID, data.getReasonid());
-            values.put(CommonString.KEY_REASON, data.getReason());
-            values.put(CommonString.KEY_GEO_TAG, data.getGEO_TAG());
-
-            return db.insert(CommonString.TABLE_COVERAGE_DATA, null, values);
-
-        } catch (Exception ex) {
-            Log.d("Database Exception ", ex.toString());
-        }
-        return 0;
-    }
-
-
     public boolean checkStockAndFacingData(String store_id, String category_id) {
         Log.d("Stock_Facing ", "Stock data--------------->Start<------------");
         ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
@@ -1330,4 +1328,5 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
     }
 
+    //Gagan End Method
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java

@@ -61,7 +61,6 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
         }
 
 
-
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -73,8 +72,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
 
                     intent.putExtra(CommonString.KEY_LOGIN_DATA, login_data);
                     startActivity(intent);
-                }
+                } else {
-                else {
                     Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();
                 }
@@ -84,11 +82,9 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
 
     @Override
     public void onClick(View view) {
-
         int id = view.getId();
 
         switch (id) {
-
             case R.id.btn_language_one:
 
                 selected_flag = true;
@@ -124,16 +120,13 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
     }
 
     private static boolean updateResources(Context context, String language) {
-
         String lang;
 
-        if(language.equals("English")){
+        if (language.equalsIgnoreCase("English")) {
             lang = "EN";
-        }
+        } else if (language.equalsIgnoreCase("UAE")) {
-        else if(language.equals("UAE")) {
             lang = "AR";
-        }
+        } else {
-        else {
             lang = "TR";
         }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -16,7 +16,6 @@ public class CommonString {
     public static final String KEY_PASSWORD = "password";
     public static final String KEY_DATE = "date";
     public static final String KEY_STOREVISITED_STATUS = "STOREVISITED_STATUS";
-    public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/GSK_MT_Images/";
 
     public static final String KEY_PATH = "path";
     public static final String KEY_VERSION = "APP_VERSION";
@@ -156,6 +155,8 @@ public class CommonString {
 
 
 
+    //Gagan Code Start
+
     //File Path
     public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/GSK_MT_ORANGE_IMAGES/";
 
@@ -270,4 +271,5 @@ public class CommonString {
 
             + ")";
 
+    //Gagan Code End
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java

@@ -1,4 +1,4 @@
-package cpm.com.gskmtorange.gettersetter;
+package cpm.com.gskmtorange.GetterSetter;
 
 public class CoverageBean
 {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/GeotaggingBeans.java

@@ -1,4 +1,4 @@
-package cpm.com.gskmtorange.gettersetter;
+package cpm.com.gskmtorange.GetterSetter;
 
 public class GeotaggingBeans {
 	

GSKMTOrange/src/main/res/values/strings.xml

@@ -92,7 +92,7 @@
     <string name="title_store_list_activity_store_closed">Store Closed</string>
 
 
-    <string name="save">SAVE</string>
+
 
     <string name="title_store_list_checkout_current">Please checkout from current store</string>
     <string name="title_store_list_checkout_Already_filled">Data already filled</string>