From bf22b21820907053dc10fe14d2550caaf1708a00 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 13:43:33 +0530 Subject: [PATCH 1/6] 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 --- .idea/misc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b15ecee..b8dc4d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + From 54072e8e9485462f427e31a9ab80f269b8842886 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 15:14:06 +0530 Subject: [PATCH 2/6] 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 | 90 ++-- .../com/gskmtorange/Database/GSKOrangeDB.java | 411 +++++++++--------- .../gskmtorange/SelectLanguageActivity.java | 29 +- .../gskmtorange/constant/CommonString.java | 4 +- .../gettersetter/CoverageBean.java | 2 +- .../gettersetter/GeotaggingBeans.java | 2 +- GSKMTOrange/src/main/res/values/strings.xml | 2 +- 7 files changed, 273 insertions(+), 267 deletions(-) diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 7fd8be3..71d7bb3 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -35,51 +35,31 @@ - + android:screenOrientation="portrait" + android:theme="@style/AppTheme.NoActionBar" /> + - + + android:screenOrientation="portrait" + android:theme="@style/AppTheme.NoActionBar" /> - - - - - - - + android:screenOrientation="portrait" + android:theme="@style/AppTheme.NoActionBar" /> - + + android:theme="@style/AppTheme.NoActionBar" /> + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 5f6b0a1..f6a95c5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/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 @@ -150,17 +144,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - public ArrayList getT2PDefaultData(String store_id){ + public ArrayList getT2PDefaultData(String store_id) { ArrayList t2PList = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '"+ store_id +"'",null); - if(dbcursor != null){ + dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null); + if (dbcursor != null) { dbcursor.moveToFirst(); - while(!dbcursor.isAfterLast()){ + while (!dbcursor.isAfterLast()) { T2PGetterSetter t2p = new T2PGetterSetter(); @@ -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; @@ -201,17 +194,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } //get Gaps data - public ArrayList getGapsDefaultData(String display_id){ + public ArrayList getGapsDefaultData(String display_id) { ArrayList checkList = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select DC.CHECKLIST_ID As CHECKLIST_ID, DC.CHECKLIST As CHECKLIST, C.DISPLAY_ID As DISPLAY_ID from MAPPING_DISPLAY_CHECKLIST C INNER JOIN DISPLAY_CHECKLIST_MASTER DC ON C.CHECKLIST_ID= DC.CHECKLIST_ID WHERE C.DISPLAY_ID = '"+ display_id +"'",null); - if(dbcursor != null){ + dbcursor = db.rawQuery("Select DC.CHECKLIST_ID As CHECKLIST_ID, DC.CHECKLIST As CHECKLIST, C.DISPLAY_ID As DISPLAY_ID from MAPPING_DISPLAY_CHECKLIST C INNER JOIN DISPLAY_CHECKLIST_MASTER DC ON C.CHECKLIST_ID= DC.CHECKLIST_ID WHERE C.DISPLAY_ID = '" + display_id + "'", null); + if (dbcursor != null) { dbcursor.moveToFirst(); - while(!dbcursor.isAfterLast()){ + while (!dbcursor.isAfterLast()) { GapsChecklistGetterSetter check = new GapsChecklistGetterSetter(); @@ -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; @@ -245,17 +237,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } //get Brand data for T2P - public ArrayList getBrandT2PData(String store_type_id, String class_id, String key_account_id ){ + public ArrayList getBrandT2PData(String store_type_id, String class_id, String key_account_id) { ArrayList brandList = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = "+ class_id +"'",null); - if(dbcursor != null){ + dbcursor = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = " + class_id + "'", null); + if (dbcursor != null) { dbcursor.moveToFirst(); - while(!dbcursor.isAfterLast()){ + while (!dbcursor.isAfterLast()) { BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); @@ -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; @@ -285,17 +276,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } //get Sku data for T2P - public ArrayList getSkuT2PData(String store_type_id, String class_id, String key_account_id , String brand_id){ + public ArrayList getSkuT2PData(String store_type_id, String class_id, String key_account_id, String brand_id) { ArrayList skuList = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = "+ class_id +"' AND SM.BRAND_ID='"+ brand_id + "'",null); - if(dbcursor != null){ + dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = " + class_id + "' AND SM.BRAND_ID='" + brand_id + "'", null); + if (dbcursor != null) { dbcursor.moveToFirst(); - while(!dbcursor.isAfterLast()){ + while (!dbcursor.isAfterLast()) { SkuGetterSetter sku = new SkuGetterSetter(); @@ -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,26 +448,8 @@ 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) { + public void InsertSTOREgeotag(String storeid, double lat, double longitude, String path, String status) { ContentValues values = new ContentValues(); @@ -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(); } @@ -677,7 +549,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void updateGeoTagData(String storeid,String status) { + public void updateGeoTagData(String storeid, String status) { try { @@ -685,7 +557,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("GEO_TAG", status); int l = db.update(CommonString.TABLE_STORE_GEOTAGGING, values, - CommonString.KEY_STORE_ID + "=?", new String[] { storeid }); + CommonString.KEY_STORE_ID + "=?", new String[]{storeid}); System.out.println("update : " + l); } catch (Exception e) { Log.d("Database Data ", e.toString()); @@ -693,7 +565,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - public void updateDataStatus(String id,String status) { + public void updateDataStatus(String id, String status) { ContentValues values = new ContentValues(); @@ -762,17 +634,176 @@ public class GSKOrangeDB extends SQLiteOpenHelper { .getColumnIndexOrThrow(CommonString.KEY_REASON_ID)))))); sb.setMID(Integer.parseInt(((dbcursor.getString(dbcursor .getColumnIndexOrThrow(CommonString.KEY_ID)))))); - if(dbcursor.getString(dbcursor - .getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))==null){ + 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 getCategoryListData(String keyAccountId, String storeTypeId, String classId) { @@ -1225,39 +1256,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<------------"); @@ -1330,4 +1328,5 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + //Gagan End Method } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index 62cb56f..7a9904e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -21,7 +21,7 @@ import java.util.Locale; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter; -public class SelectLanguageActivity extends AppCompatActivity implements View.OnClickListener{ +public class SelectLanguageActivity extends AppCompatActivity implements View.OnClickListener { Button btn_lang_1, btn_lang_2; @@ -51,7 +51,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On language = login_data.getCULTURE_NAME(); culture_id = login_data.getCULTURE_ID(); - if(language.size()>1){ + if (language.size() > 1) { btn_lang_1.setText(language.get(0)); btn_lang_2.setText(language.get(1)); @@ -61,20 +61,18 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On } - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(selected_flag){ + if (selected_flag) { Intent intent = new Intent(getBaseContext(), MainActivity.class); 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,16 +82,14 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On @Override public void onClick(View view) { - int id = view.getId(); - switch (id){ - + switch (id) { case R.id.btn_language_one: selected_flag = true; - updateResources(getApplicationContext(),language.get(0)); + updateResources(getApplicationContext(), language.get(0)); btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background)); @@ -109,7 +105,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On selected_flag = true; - updateResources(getApplicationContext(),language.get(1)); + updateResources(getApplicationContext(), language.get(1)); btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background)); btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); @@ -124,16 +120,13 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On } private static boolean updateResources(Context context, String language) { + String lang; - String lang ; - - if(language.equals("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equals("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index da5b885..4fefa34 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/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 } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java index 5023fd5..6a61582 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java +++ b/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 { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/GeotaggingBeans.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/GeotaggingBeans.java index 4470b5f..d092510 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/GeotaggingBeans.java +++ b/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 { diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 83fa2a6..22bafb8 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -92,7 +92,7 @@ Store Closed - SAVE + Please checkout from current store Data already filled From 14ade63199793632017815dbbaeadfb0484d1c10 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 15:24:31 +0530 Subject: [PATCH 3/6] 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/res/values-tr/string.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 117407d..89d61fd 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -16,6 +16,7 @@ Günlük Veri Indir Veri Paylaş Coğrafi Konum + Data Export Çıkış Ayarlar Hizmetler From 25008a1aef67f2acfa6d8e3b93f1f1b45759f753 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 15:26:15 +0530 Subject: [PATCH 4/6] 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/res/values/strings.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 22bafb8..4211cc7 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -52,9 +52,11 @@ Setting Services - Category List T2P Compliance + + + Category List Categorywise Performance Daily Data Menu Must Stock Availability @@ -78,25 +80,19 @@ Facing SOS Target + Store Uploaded Store Geo Data Uploaded Store Already Geotagged - - Store Already Uploaded Store Data Uploaded Store Already Checkout Please Store data again Uploaded Store Closed - - - Please checkout from current store Data already filled - - From ade4954f45bc31510ef69b69552a432684455038 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 16:02:09 +0530 Subject: [PATCH 5/6] 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 --- .../cpm/com/gskmtorange/MainActivity.java | 2 +- .../dailyentry/StoreimageActivity.java | 154 ++++++------------ .../gsk_dailyentry/CategoryListActivity.java | 27 ++- .../MSL_AvailabilityActivity.java | 32 +++- .../gsk_dailyentry/Stock_FacingActivity.java | 37 +++-- GSKMTOrange/src/main/res/drawable/HFD.png | Bin 0 -> 4661 bytes .../src/main/res/drawable/HFD_done.png | Bin 0 -> 8721 bytes GSKMTOrange/src/main/res/drawable/OHC.png | Bin 0 -> 4543 bytes .../src/main/res/drawable/OHC_done.png | Bin 0 -> 8595 bytes GSKMTOrange/src/main/res/drawable/PDR.png | Bin 0 -> 4770 bytes .../src/main/res/drawable/PDR_done.png | Bin 0 -> 8596 bytes 11 files changed, 132 insertions(+), 120 deletions(-) create mode 100644 GSKMTOrange/src/main/res/drawable/HFD.png create mode 100644 GSKMTOrange/src/main/res/drawable/HFD_done.png create mode 100644 GSKMTOrange/src/main/res/drawable/OHC.png create mode 100644 GSKMTOrange/src/main/res/drawable/OHC_done.png create mode 100644 GSKMTOrange/src/main/res/drawable/PDR.png create mode 100644 GSKMTOrange/src/main/res/drawable/PDR_done.png diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 1150ebc..2183ccb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -178,7 +178,7 @@ public class MainActivity extends AppCompatActivity overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } else if (id == R.id.nav_setting) { - startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); + //startActivity(new Intent(MainActivity.this, CategoryListActivity.class)); } else if (id == R.id.nav_export) { AlertDialog.Builder builder1 = new AlertDialog.Builder(MainActivity.this); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 46d34ce..7c69a6b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -23,6 +23,7 @@ import android.view.View; import android.widget.Button; import android.widget.ImageView; import android.widget.Toast; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.location.LocationServices; @@ -37,36 +38,35 @@ import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.GetterSetter.CoverageBean; +import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; /** * Created by ashishc on 31-05-2016. */ -public class StoreimageActivity extends AppCompatActivity implements View.OnClickListener,GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener { +public class StoreimageActivity extends AppCompatActivity implements View.OnClickListener, + GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener { - - ImageView img_cam,img_clicked; + ImageView img_cam, img_clicked; Button btn_save; - String _pathforcheck,_path,str; + String _pathforcheck, _path, str; - String store_id,visit_date,username,intime,date; + String store_id, visit_date, username, intime, date; private SharedPreferences preferences; AlertDialog alert; String img_str; private GSKOrangeDB database; - String lat,lon; + String lat, lon; GoogleApiClient mGoogleApiClient; ArrayList coverage_list; - protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_storeimage); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - - getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -90,8 +90,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic database = new GSKOrangeDB(this); database.open(); - - coverage_list = database.getCoverageData(date); + coverage_list = database.getCoverageData(date); img_cam.setOnClickListener(this); img_clicked.setOnClickListener(this); @@ -106,13 +105,11 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic .build(); } - if ( Build.VERSION.SDK_INT >= 23 && + if (Build.VERSION.SDK_INT >= 23 && ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { - return ; + return; } - - } @Override @@ -122,13 +119,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic // as you specify a parent activity in AndroidManifest.xml. int id = item.getItemId(); - if(id==android.R.id.home){ - + if (id == android.R.id.home) { // NavUtils.navigateUpFromSameTask(this); finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - } return super.onOptionsItemSelected(item); @@ -136,12 +130,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic @Override public void onBackPressed() { - /*Intent i = new Intent(this, DailyEntryScreen.class); - startActivity(i);*/ + /*Intent i = new Intent(this, DailyEntryScreen.class); + startActivity(i);*/ finish(); - - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } @@ -150,12 +142,12 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic int id = v.getId(); - switch (id){ + switch (id) { case R.id.img_cam_selfie: _pathforcheck = store_id + "Store" - + "Image" + visit_date.replace("/","") + getCurrentTime().replace(":","")+".jpg"; + + "Image" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; @@ -167,41 +159,34 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic case R.id.btn_save_selfie: - if (img_str !=null) { + if (img_str != null) { - AlertDialog.Builder builder = new AlertDialog.Builder( - StoreimageActivity.this); + AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this); builder.setMessage("Do you want to save the data ") .setCancelable(false) - .setPositiveButton("OK", - new DialogInterface.OnClickListener() { - public void onClick( - DialogInterface dialog, - int id) { + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { - alert.getButton( - AlertDialog.BUTTON_POSITIVE) - .setEnabled(false); + alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); - String status ="INVALID"; + String status = "INVALID"; + CoverageBean cdata = new CoverageBean(); + cdata.setStoreId(store_id); + cdata.setVisitDate(visit_date); + cdata.setUserId(username); + cdata.setInTime(intime); + cdata.setReason(""); + cdata.setReasonid("0"); + cdata.setLatitude(lat); + cdata.setLongitude(lon); + cdata.setImage(img_str); + cdata.setRemark(""); + cdata.setStatus(CommonString.KEY_CHECK_IN); - CoverageBean cdata = new CoverageBean(); - cdata.setStoreId(store_id); - cdata.setVisitDate(visit_date); - cdata.setUserId(username); - cdata.setInTime(intime); - cdata.setReason(""); - cdata.setReasonid("0"); - cdata.setLatitude(lat); - cdata.setLongitude(lon); - cdata.setImage(img_str); - cdata.setRemark(""); - cdata.setStatus(CommonString.KEY_CHECK_IN); + database.InsertCoverageData(cdata); - database.InsertCoverageData(cdata); - - database.updateCheckoutStatus(store_id, status); + database.updateCheckoutStatus(store_id, status); /* SharedPreferences.Editor editor = preferences.edit(); @@ -211,41 +196,28 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic editor.commit();*/ - /* Intent in=new Intent(StoreimageActivity.this,StoreEntry.class); - startActivity(in); - - - - finish();*/ - } - }) - .setNegativeButton("Cancel", - new DialogInterface.OnClickListener() { - public void onClick( - DialogInterface dialog, - int id) { - dialog.cancel(); - } - }); + Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class); + startActivity(in); + finish(); + } + }) + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); alert = builder.create(); alert.show(); + } else { + Toast.makeText(getApplicationContext(), "Please click the image", Toast.LENGTH_SHORT).show(); } - else { - Toast.makeText(getApplicationContext(), - "Please click the image", Toast.LENGTH_SHORT).show(); - - } - break; - } - } protected void startCameraActivity() { - try { /*Log.i("MakeMachine", "startCameraActivity()"); File file = new File(_path); @@ -261,10 +233,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic File file = new File(_path); Uri outputFileUri = Uri.fromFile(file); - String defaultCameraPackage=""; + String defaultCameraPackage = ""; final PackageManager packageManager = getPackageManager(); List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n=0;n(); - categoryList = db.getCategoryListData("1", "1", "1"); + categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id); adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList); recyclerView.setAdapter(adapter); @@ -100,6 +117,14 @@ public class CategoryListActivity extends AppCompatActivity { holder.categoryName.setText(categoryData.getCategory()); holder.categoryIcon.setImageResource(R.drawable.category); + /*if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { + holder.categoryIcon.setImageResource(R.drawable.ohc); + } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { + holder.categoryIcon.setImageResource(R.drawable.pdr); + } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { + holder.categoryIcon.setImageResource(R.drawable.hfd); + }*/ + holder.lay_menu.setOnClickListener(new View.OnClickListener() { @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index c07156a..097205e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -3,8 +3,10 @@ package cpm.com.gskmtorange.gsk_dailyentry; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; import android.graphics.Typeface; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; @@ -34,6 +36,7 @@ import java.util.List; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; public class MSL_AvailabilityActivity extends AppCompatActivity { @@ -51,6 +54,9 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { String categoryName, categoryId, storeId; + private SharedPreferences preferences; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -61,15 +67,27 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - db = new GSKOrangeDB(this); - db.open(); - expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName); + db = new GSKOrangeDB(this); + db.open(); + + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + + //Intent data categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); - storeId = ""; + //txt_mslAvailabilityName.setText(categoryName); txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability)); @@ -89,10 +107,10 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { public void onClick(DialogInterface dialog, int id) { db.open(); - if (db.checkMsl_AvailabilityData(storeId, categoryId)) { - db.updateMSL_Availability(storeId, categoryId, hashMapListHeaderData, hashMapListChildData); + if (db.checkMsl_AvailabilityData(store_id, categoryId)) { + db.updateMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); } else { - db.InsertMSL_Availability(storeId, categoryId, hashMapListHeaderData, hashMapListChildData); + db.InsertMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); } Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 85af711..ed27739 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -4,6 +4,7 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.Typeface; @@ -11,6 +12,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Environment; +import android.preference.PreferenceManager; import android.provider.MediaStore; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; @@ -61,13 +63,16 @@ public class Stock_FacingActivity extends AppCompatActivity { ExpandableListAdapter adapter; GSKOrangeDB db; - String categoryName, categoryId, storeId, Error_Message = ""; + String categoryName, categoryId, Error_Message = ""; String path = "", str = "", _pathforcheck = "", img1 = "", img2 = ""; static int child_position = -1; boolean isDialogOpen = true; boolean checkflag = true; + private SharedPreferences preferences; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -84,9 +89,19 @@ public class Stock_FacingActivity extends AppCompatActivity { expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); - storeId = ""; //txt_stockFacingName.setText(categoryName); txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing)); @@ -110,10 +125,10 @@ public class Stock_FacingActivity extends AppCompatActivity { public void onClick(DialogInterface dialog, int id) { db.open(); - if (db.checkStockAndFacingData(storeId, categoryId)) { - db.updateStockAndFacing(storeId, categoryId, hashMapListHeaderData, hashMapListChildData); + if (db.checkStockAndFacingData(store_id, categoryId)) { + db.updateStockAndFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); } else { - db.InsertStock_Facing(storeId, categoryId, hashMapListHeaderData, hashMapListChildData); + db.InsertStock_Facing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); } Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show(); @@ -292,10 +307,10 @@ public class Stock_FacingActivity extends AppCompatActivity { img_camera1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String date = new Date().toLocaleString().toString(); - String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); + //String date = new Date().toLocaleString().toString(); + //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam1_" + storeId + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam1_" + store_id + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; @@ -320,10 +335,10 @@ public class Stock_FacingActivity extends AppCompatActivity { img_camera2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String date = new Date().toLocaleString().toString(); - String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); + //String date = new Date().toLocaleString().toString(); + //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam1_" + storeId + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam2_" + store_id + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; diff --git a/GSKMTOrange/src/main/res/drawable/HFD.png b/GSKMTOrange/src/main/res/drawable/HFD.png new file mode 100644 index 0000000000000000000000000000000000000000..82782775b090ca081ca226627f0a99fa43b98f72 GIT binary patch literal 4661 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 S`}unT0LaTIOIJ%82mOCKXSQ7c literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/drawable/OHC.png b/GSKMTOrange/src/main/res/drawable/OHC.png new file mode 100644 index 0000000000000000000000000000000000000000..9ccf323b7748d55f13575bbeecf67d752a4fb871 GIT binary patch literal 4543 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 Gi1{C#`hK+l literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/drawable/OHC_done.png b/GSKMTOrange/src/main/res/drawable/OHC_done.png new file mode 100644 index 0000000000000000000000000000000000000000..96545681c87f1e90d2d972278b2715df2242924e GIT binary patch literal 8595 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 literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/drawable/PDR.png b/GSKMTOrange/src/main/res/drawable/PDR.png new file mode 100644 index 0000000000000000000000000000000000000000..9190d2dcdcd0ea7b500f7a6a840d1574d3abfb77 GIT binary patch literal 4770 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 YUFcK9fASlAP4oa=P0-V7b-Sql0$$2CcK`qY literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/drawable/PDR_done.png b/GSKMTOrange/src/main/res/drawable/PDR_done.png new file mode 100644 index 0000000000000000000000000000000000000000..4b99cf57c86591e599e3953d08da798d3c19a97b GIT binary patch literal 8596 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 literal 0 HcmV?d00001 From 6b08d5453677caee92c22a6baebdf8097b11fe6f Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 5 Jan 2017 16:08:05 +0530 Subject: [PATCH 6/6] 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/gsk_dailyentry/CategoryListActivity.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index d5bfab4..bf30822 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -116,14 +116,15 @@ public class CategoryListActivity extends AppCompatActivity { final CategoryGetterSetter categoryData = list.get(position); holder.categoryName.setText(categoryData.getCategory()); - holder.categoryIcon.setImageResource(R.drawable.category); - /*if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { + //holder.categoryIcon.setImageResource(R.drawable.category); + + if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { holder.categoryIcon.setImageResource(R.drawable.ohc); } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { holder.categoryIcon.setImageResource(R.drawable.pdr); } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { holder.categoryIcon.setImageResource(R.drawable.hfd); - }*/ + } holder.lay_menu.setOnClickListener(new View.OnClickListener() {