diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index a1ad5b4..5c53e95 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
@@ -34,7 +34,7 @@
android:theme="@style/AppTheme.NoActionBar" />
-
@@ -78,6 +77,7 @@
@@ -120,26 +120,34 @@
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
+
-
+ android:theme="@style/AppTheme.NoActionBar"/>
+ android:theme="@style/AppTheme.NoActionBar"/>
+ android:screenOrientation="portrait" />
+
diff --git a/GSKMTOrange/src/main/assets/fonts/fontawesome-webfont.ttf b/GSKMTOrange/src/main/assets/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..35acda2
Binary files /dev/null and b/GSKMTOrange/src/main/assets/fonts/fontawesome-webfont.ttf differ
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 0dc7fb6..55cd05d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -15,7 +15,10 @@ import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
+import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
+
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -32,9 +35,11 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
@@ -46,8 +51,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE";
public static final int DATABASE_VERSION = 13;
- private SQLiteDatabase db;
TableBean tableBean;
+ private SQLiteDatabase db;
public GSKOrangeDB(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -81,6 +86,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getMappingDisplayChecklist());
db.execSQL(TableBean.getMappingAdditionalPromotion());
db.execSQL(TableBean.getMappingPromotion());
+
db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER);
@@ -90,7 +96,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE);
db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU);
+ db.execSQL(TableBean.getStorePerformance());
+
//Gagan End
+
+ db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING);
+ db.execSQL(CommonString.CREATE_TABLE_COVERAGE_DATA);
+
+ db.execSQL(TableBean.getDisplayChecklistMaster());
+ db.execSQL(TableBean.getMappingDisplayChecklist());
+
+ db.execSQL(TableBean.getNonWorkingReason());
+
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_T2P_COMPLIANCE);
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_T2P_GAPS);
+ db.execSQL(CommonString.CREATE_TABLE_INSERT_T2P_SKU);
+
+ db.execSQL(TableBean.getMappingPlanogram());
}
@Override
@@ -100,7 +122,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void deleteTableWithStoreID(String storeid) {
- db.delete( CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+ db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
}
@@ -145,7 +167,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i));
values.put("GEO_TAG", data.getGEO_TAG().get(i));
- values.put("CHANNEL_ID", data.getCHANNEL_ID().get(i));
+
db.insert("JOURNEY_PLAN", null, values);
@@ -256,7 +278,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
- dbcursor = db.rawQuery("SELECT * FROM(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 + "') As Brand", null);
+
+ dbcursor = db.rawQuery("SELECT * FROM(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 + "' AND BR.COMPANY_ID ='1' ORDER BY SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE) As Brand", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -335,7 +358,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " + "where VISIT_DATE ='" + date + "'", null);
+ dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
+ "where VISIT_DATE ='" + date + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -899,7 +923,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
- cd.setToggleValue("0");
+ cd.setToggleValue("1");
list.add(cd);
dbcursor.moveToNext();
@@ -996,11 +1020,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
dbcursor.close();
- if (list.size() > 0) {
- return true;
- } else {
- return false;
- }
+ return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1042,7 +1062,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND " +
+ dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " +
"from MAPPING_STOCK M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -1053,13 +1073,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' " +
- "order by SB.SUB_CATEGORY,BR.BRAND", null);
+ "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
@@ -1137,6 +1158,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values1.put("Store_Id", storeId);
values1.put("Category_Id", categoryId);
+ values1.put("COMPANY_ID", data1.getCompany_id());
values1.put("SUB_CATEGORY_ID", data1.getSub_category_id());
values1.put("SUB_CATEGORY", data1.getSub_category());
values1.put("BRAND_ID", data1.getBrand_id());
@@ -1183,6 +1205,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
while (!dbcursor.isAfterLast()) {
Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
+ cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
@@ -1291,11 +1314,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
dbcursor.close();
- if (list.size() > 0) {
- return true;
- } else {
- return false;
- }
+ return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1457,9 +1476,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void InsertAdditionalPromoData(Promo_Compliance_DataGetterSetter data, String category_id) {
+ ContentValues values = new ContentValues();
try {
- ContentValues values = new ContentValues();
-
values.put("STORE_ID", Integer.parseInt(data.getStore_id()));
values.put("CATEGORY_ID", Integer.parseInt(category_id));
values.put("SKU_ID", Integer.parseInt(data.getSku_id()));
@@ -1514,7 +1532,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
ContentValues values = new ContentValues();
try {
db.beginTransaction();
-
for (int i = 0; i < promoSkuListData.size(); i++) {
Promo_Compliance_DataGetterSetter data = promoSkuListData.get(i);
@@ -1557,11 +1574,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
dbcursor.close();
- if (list.size() > 0) {
- return true;
- } else {
- return false;
- }
+ return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1574,7 +1587,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//Gagan End Method
- //Non Working data
+//Non Working data
public void insertNonWorkingData(NonWorkingReasonGetterSetter data) {
db.delete("NON_WORKING_REASON", null, null);
@@ -1657,9 +1670,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
+
dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
"where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null);
+
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -1985,9 +2000,112 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
return list;
}
+
+ //Store wise Performance
+ public void InsertSTORE_PERFORMANCE(STORE_PERFORMANCE_MasterGetterSetter data) {
+ db.delete("STORE_PERFORMANCE", 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("CATEGORY_ID", data.getCATEGORY_ID().get(i));
+ values.put("PERIOD", data.getPERIOD().get(i));
+ values.put("MSL_AVAILABILITY", data.getMSL_AVAILABILITY().get(i));
+ values.put("SOS", data.getSOS().get(i));
+ values.put("T2P", data.getT2P().get(i));
+ values.put("PROMO", data.getPROMO().get(i));
+ values.put("OSS", data.getOSS().get(i));
+ values.put("ORDERID", data.getORDERID().get(i));
+
+ db.insert("STORE_PERFORMANCE", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " STORE_PERFORMANCE " + ex.toString());
+ }
+ }
+
+ //Category wise Performance
+ public ArrayList getCategoryWisePerformance(String store_id, String category_id) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select * from STORE_PERFORMANCE " +
+ "where STORE_ID='" + store_id + "' and CATEGORY_ID='" + category_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ CategoryWisePerformaceGetterSetter cd = new CategoryWisePerformaceGetterSetter();
+
+ cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+ cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD")));
+ cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL_AVAILABILITY")));
+ cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS")));
+ cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P")));
+ cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
+ cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS")));
+ cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID")));
+
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
+ public ArrayList getStoreWisePerformance(String store_id) {
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL_AVAILABILITY),1) as MSL_AVAILABILITY,ROUND(avg(sos),1) as SOS ," +
+ " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO,ROUND(SUM(oss),1) AS OSS " +
+ "from STORE_PERFORMANCE " +
+ "where STORE_ID='" + store_id + "' " +
+ "GROUP BY PERIOD " +
+ "ORDER BY ORDERID ", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ StoreWisePerformaceGetterSetter cd = new StoreWisePerformaceGetterSetter();
+
+/* cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+ cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));*/
+ cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD")));
+ cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL_AVAILABILITY")));
+ cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS")));
+ cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P")));
+ cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
+ cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS")));
+ // cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID")));
+
+ list.add(cd);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString());
+ return list;
+ }
+ return list;
+ }
+
//Gagan end new code 1
-
- public void InsertStockDialog(AdditionalDialogGetterSetter data) {
+
+ public void InsertStockDialog(AdditionalDialogGetterSetter data) {
ContentValues values = new ContentValues();
try {
@@ -1997,16 +2115,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_BRAND, data.getBrand());
values.put(CommonString.KEY_BRAND_ID, data.getBrand_id());
- // values.put(CommonString.KEY_DISPLAY_ID, data.getDisplay_id());
+ // values.put(CommonString.KEY_DISPLAY_ID, data.getDisplay_id());
values.put(CommonString.KEY_QUANTITY, data.getQuantity());
values.put(CommonString.KEY_SKU_ID, data.getSku_id());
values.put(CommonString.KEY_SKUNAME, data.getSku_name());
- // values.put(CommonString.UNIQUE_KEY_ID, data.getUnique_id());
+ // values.put(CommonString.UNIQUE_KEY_ID, data.getUnique_id());
- // values.put(CommonString.KEY_CATEGORY_ID, data.getCategory_id());
+ // values.put(CommonString.KEY_CATEGORY_ID, data.getCategory_id());
- // values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id());
+ // values.put(CommonString.KEY_PROCESS_ID, data.getProcess_id());
db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG, null, values);
@@ -2024,7 +2142,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
- cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", null);
+ cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '" + keyid + "'", null);
if (cursordata != null) {
cursordata.moveToFirst();
@@ -2050,7 +2168,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setSku_id(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_SKU_ID)));
- sb.setSku_name(cursordata.getString(cursordata
+ sb.setSku_name(cursordata.getString(cursordata
.getColumnIndexOrThrow(CommonString.KEY_SKUNAME)));
@@ -2098,8 +2216,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
-
-
public ArrayList getBrandMasterData(String store_id) {
Cursor cursordata = null;
ArrayList Data = new ArrayList();
@@ -2117,8 +2233,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND")));
+
/*sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+ sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+
sb.setCOMPANY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("COMPANY_ID")));
sb.setBRAND_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_SEQUENCE")));*/
@@ -2139,7 +2258,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
-
public ArrayList getSKUMasterData(String store_id) {
Cursor cursordata = null;
ArrayList Data = new ArrayList();
@@ -2160,7 +2278,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
-
sb.setMRP(cursordata.getString(cursordata.getColumnIndexOrThrow("MRP")));
sb.setSKU_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("SKU_SEQUENCE")));
@@ -2180,7 +2297,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
+
public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog,String categoryId) {
+
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
try {
@@ -2193,11 +2312,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("sku_name", data.getSku());
values.put("toggle_value", data.getBtn_toogle());
+ long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values);
- long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values);
-
- for(int i=0;i data, String store_id, String category_id) {
+ db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null);
+
+ long l = 0;
+
+ ContentValues values = new ContentValues();
+ ContentValues values1 = new ContentValues();
+ ContentValues values2 = new ContentValues();
+ try {
+ for (int i = 0; i < data.size(); i++) {
+
+ values.put(CommonString.KEY_STORE_ID, store_id);
+ values.put(CommonString.KEY_CATEGORY_ID, category_id);
+ values.put(CommonString.KEY_DISPLAY_ID, data.get(i).getDisplay_id());
+ values.put(CommonString.KEY_BRAND_ID, data.get(i).getBrand_id());
+ values.put(CommonString.KEY_BRAND, data.get(i).getBrand());
+ values.put(CommonString.KEY_DISPLAY, data.get(i).getDisplay());
+ values.put(CommonString.KEY_IMAGE, data.get(i).getImage());
+ values.put(CommonString.KEY_REMARK, data.get(i).getRemark());
+ values.put(CommonString.KEY_PRESENT, data.get(i).isPresent());
+
+ l = db.insert(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, values);
+
+ ArrayList gaps = data.get(i).getGapsChecklist();
+
+ for (int j = 0; j < gaps.size(); j++) {
+
+ values1.put(CommonString.KEY_COMMON_ID, l);
+ values1.put(CommonString.KEY_CHECKLIST_ID, gaps.get(j).getChecklist_id());
+ values1.put(CommonString.KEY_DISPLAY_ID, gaps.get(j).getDisplay_id());
+ values1.put(CommonString.KEY_CHECKLIST, gaps.get(j).getChecklist());
+ values1.put(CommonString.KEY_PRESENT, gaps.get(j).isPresent());
+
+ db.insert(CommonString.TABLE_INSERT_T2P_GAPS, null, values1);
+
+ }
+
+ ArrayList sku = data.get(i).getSkulist();
+
+ for (int k = 0; k < sku.size(); k++) {
+
+ values2.put(CommonString.KEY_COMMON_ID, l);
+ values2.put(CommonString.KEY_SKU_ID, sku.get(k).getSKU_ID());
+ values2.put(CommonString.KEY_BRAND_ID, sku.get(k).getBRAND_ID());
+ values2.put(CommonString.KEY_STOCK, sku.get(k).getSTOCK());
+ values2.put(CommonString.KEY_BRAND, sku.get(k).getBRAND());
+ values2.put(CommonString.KEY_SKU, sku.get(k).getSKU());
+
+ db.insert(CommonString.TABLE_INSERT_T2P_SKU, null, values2);
+
+ }
+
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " in T2P_COMPLIANCE " + ex.toString());
}
}
@@ -2375,4 +2553,136 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return productData;
}
+
+ // get T2P Compliance data
+ public ArrayList getT2pComplianceData(String store_id, String category_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+
+ if(category_id == null){
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
+ CommonString.KEY_STORE_ID + "='" + store_id + "'", null);
+ }
+ else{
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
+ CommonString.KEY_STORE_ID + "='" + store_id + "' AND " +
+ CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null);
+ }
+
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ T2PGetterSetter tp = new T2PGetterSetter();
+
+ tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID)));
+ tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));
+ tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+ tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+ tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY)));
+ tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE)));
+ tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK)));
+ tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
+ tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1")));
+
+ list.add(tp);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ return list;
+ }
+ return list;
+ }
+
+ // get Gaps T2P data
+ public ArrayList getGapsData(String common_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_GAPS + " where " +
+ CommonString.KEY_COMMON_ID + "='" + common_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ GapsChecklistGetterSetter gp = new GapsChecklistGetterSetter();
+
+ gp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));
+ gp.setChecklist_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKLIST_ID)));
+ gp.setChecklist(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKLIST)));
+ gp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1")));
+
+ list.add(gp);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ return list;
+ }
+ return list;
+ }
+
+ // get T2P SKU data
+ public ArrayList getT2PSKUData(String common_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_SKU + " where " +
+ CommonString.KEY_COMMON_ID + "='" + common_id + "'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ SkuGetterSetter gp = new SkuGetterSetter();
+
+ gp.setSKU_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU_ID)));
+ gp.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+ gp.setSTOCK(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STOCK)));
+ gp.setBRAND(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+ gp.setSKU(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU)));
+
+ list.add(gp);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+ return list;
+ }
+ return list;
+ }
+
+ //Gagan start new code 2
+
+ public void InsertMAPPING_PLANOGRAM(MAPPING_PLANOGRAM_MasterGetterSetter data) {
+ db.delete("MAPPING_PLANOGRAM", 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("PLANOGRAM_IMAGE", data.getPLANOGRAM_IMAGE().get(i));
+ values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i));
+
+ db.insert("MAPPING_PLANOGRAM", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " MAPPING_PLANOGRAM " + ex.toString());
+ }
+ }
+ //Gagan end new code 2
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
index 8daca52..57e813b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -10,6 +10,8 @@ import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
@@ -67,6 +69,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+import java.util.Locale;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -130,6 +133,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
username = preferences.getString(CommonString.KEY_USERNAME, null);
storeid = preferences.getString(CommonString.KEY_STORE_ID, null);
storename = preferences.getString(CommonString.KEY_STORE_NAME, null);
@@ -384,6 +390,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
protected void onResume() {
super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
/* checkPlayServices();
// Resuming the periodic location updates
@@ -993,4 +1000,32 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
}
+
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
index ea12923..f551e30 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
@@ -3,6 +3,8 @@ package cpm.com.gskmtorange.GeoTag;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -23,6 +25,7 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.MainActivity;
@@ -68,6 +71,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
date = preferences.getString(CommonString.KEY_DATE, null);
visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
@@ -133,9 +139,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
@Override
public void onBackPressed() {
// TODO Auto-generated method stub
- Intent intent = new Intent(GeoTagStoreList.this, MainActivity.class);
+ /* Intent intent = new Intent(GeoTagStoreList.this, MainActivity.class);
- startActivity(intent);
+ startActivity(intent);*/
GeoTagStoreList.this.finish();
}
@@ -291,13 +297,37 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+ private static boolean updateResources(Context context, String language) {
+ String lang ;
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+ Resources resources = context.getResources();
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+ return true;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
index 088e5ff..51dde72 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
@@ -115,6 +115,19 @@ public class LoginActivity extends AppCompatActivity {
setContentView(R.layout.activity_login);
+ TextView tv_version = (TextView) findViewById(R.id.tv_version_code);
+
+ try {
+ app_ver =String.valueOf(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
+
+ // login_version.setText("Parinaam Version " + app_ver);
+ } catch (PackageManager.NameNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ tv_version.setText("Version/Versiyon - " + app_ver);
+
preferences = PreferenceManager.getDefaultSharedPreferences(this);
editor = preferences.edit();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 5ca8744..edfe64b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -5,6 +5,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
@@ -33,6 +35,7 @@ import java.io.FileOutputStream;
import java.nio.channels.FileChannel;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
@@ -68,7 +71,11 @@ public class MainActivity extends AppCompatActivity
setContentView(R.layout.activity_main);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
+
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
date = preferences.getString(CommonString.KEY_DATE, null);
imageView = (ImageView) findViewById(R.id.img_main);
@@ -122,6 +129,13 @@ public class MainActivity extends AppCompatActivity
navigationView.setNavigationItemSelectedListener(this);
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
@Override
public void onBackPressed() {
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -266,9 +280,9 @@ public class MainActivity extends AppCompatActivity
} 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) {
+ } /*else if (id == R.id.nav_export) {
AlertDialog.Builder builder1 = new AlertDialog.Builder(MainActivity.this);
builder1.setMessage("Are you sure you want to take the backup of your data")
@@ -277,12 +291,12 @@ public class MainActivity extends AppCompatActivity
@SuppressWarnings("resource")
public void onClick(DialogInterface dialog, int id) {
try {
- /*File file = new File(Environment
+ *//*File file = new File(Environment
.getExternalStorageDirectory(),
"capital_backup");
if (!file.isDirectory()) {
file.mkdir();
- }*/
+ }*//*
File sd = Environment.getExternalStorageDirectory();
File data = Environment.getDataDirectory();
@@ -325,7 +339,7 @@ public class MainActivity extends AppCompatActivity
});
AlertDialog alert1 = builder1.create();
alert1.show();
- }
+ }*/
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
drawer.closeDrawer(GravityCompat.START);
@@ -409,4 +423,31 @@ public class MainActivity extends AppCompatActivity
return flag;
}
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
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 86ec3db..29a13b3 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -53,6 +53,16 @@ public class CommonString {
public static final String KEY_ID = "Id";
public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID";
+ //KEYS RELATED TO T2P COMPLIANCE
+
+ public static final String KEY_DISPLAY = "DISPLAY";
+ public static final String KEY_REMARK = "REMARK";
+ public static final String KEY_PRESENT = "PRESENT";
+ public static final String KEY_COMMON_ID = "COMMON_ID";
+ public static final String KEY_CHECKLIST_ID = "CHECKLIST_ID";
+ public static final String KEY_CHECKLIST = "CHECKLIST";
+ public static final String KEY_SKU = "SKU";
+ public static final String KEY_STOCK = "STOCK";
public static final String KEY_BRAND = "BRAND";
public static final String KEY_BRAND_ID = "BRAND_ID";
public static final String KEY_DISPLAY_ID = "DISPLAY_ID";
@@ -225,6 +235,9 @@ public class CommonString {
+ "Category_Id"
+ " VARCHAR,"
+ + "COMPANY_ID"
+ + " VARCHAR,"
+
+ "SUB_CATEGORY_ID"
+ " VARCHAR,"
@@ -332,6 +345,7 @@ public class CommonString {
+ ")";
+
public static final String TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE = "Additional_Promo_Compliance_Data";
public static final String CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE = "CREATE TABLE IF NOT EXISTS "
@@ -343,14 +357,11 @@ public class CommonString {
+ "STORE_ID"
+ " INTEGER,"
- + "CATEGORY_ID"
- + " INTEGER,"
-
- + "SKU_ID"
+ /*+ "SKU_ID"
+ " INTEGER,"
+ "SKU"
- + " VARCHAR,"
+ + " VARCHAR,"*/
+ "PROMO_ID"
+ " INTEGER,"
@@ -418,4 +429,53 @@ public class CommonString {
+ KEY_IMAGE + " VARCHAR)";
+
+ //Tables related to T2p Compliance
+
+ public static final String TABLE_INSERT_T2P_COMPLIANCE = "T2P_COMPLIANCE";
+
+ public static final String CREATE_TABLE_INSERT_T2P_COMPLIANCE = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_T2P_COMPLIANCE
+ + "("
+ + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + KEY_STORE_ID + " INTEGER,"
+ + KEY_CATEGORY_ID + " INTEGER,"
+ + KEY_BRAND_ID + " INTEGER,"
+ + KEY_DISPLAY_ID + " INTEGER,"
+ + KEY_BRAND + " VARCHAR,"
+ + KEY_DISPLAY + " VARCHAR,"
+ + KEY_IMAGE + " VARCHAR,"
+ + KEY_REMARK + " VARCHAR,"
+ + KEY_PRESENT + " VARCHAR"
+
+ + ")";
+
+
+ public static final String TABLE_INSERT_T2P_GAPS = "T2P_GAPS";
+
+ public static final String CREATE_TABLE_INSERT_T2P_GAPS = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_T2P_GAPS
+ + "("
+ + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + KEY_COMMON_ID + " INTEGER,"
+ + KEY_CHECKLIST_ID + " INTEGER,"
+ + KEY_DISPLAY_ID + " INTEGER,"
+ + KEY_CHECKLIST + " VARCHAR,"
+ + KEY_PRESENT + " VARCHAR"
+ + ")";
+
+
+ public static final String TABLE_INSERT_T2P_SKU = "T2P_SKU";
+
+ public static final String CREATE_TABLE_INSERT_T2P_SKU = "CREATE TABLE IF NOT EXISTS "
+ + TABLE_INSERT_T2P_SKU
+ + "("
+ + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ + KEY_COMMON_ID + " INTEGER,"
+ + KEY_SKU_ID + " INTEGER,"
+ + KEY_BRAND_ID + " INTEGER,"
+ + KEY_STOCK + " INTEGER,"
+ + KEY_BRAND+ " VARCHAR,"
+ + KEY_SKU + " VARCHAR"
+ + ")";
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
index e5a5e76..78ec684 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -9,6 +9,8 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
@@ -47,6 +49,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
@@ -114,6 +117,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -1247,5 +1251,38 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
return flag;
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
}
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index f944979..38bbf25 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -1,11 +1,14 @@
package cpm.com.gskmtorange.dailyentry;
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.content.res.Configuration;
+import android.content.res.Resources;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -32,6 +35,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
@@ -90,6 +94,9 @@ public class NonWorkingReason extends AppCompatActivity implements
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
_UserId = preferences.getString(CommonString.KEY_USERNAME, "");
visit_date = preferences.getString(CommonString.KEY_DATE, null);
store_id = preferences.getString(CommonString.KEY_STORE_ID, "");
@@ -108,7 +115,7 @@ public class NonWorkingReason extends AppCompatActivity implements
reason_adapter = new ArrayAdapter(this,
android.R.layout.simple_spinner_item);
- reason_adapter.add("Select Reason");
+ reason_adapter.add(getResources().getString(R.string.select_reason));
for (int i = 0; i < reasondata.size(); i++) {
reason_adapter.add(reasondata.get(i).getREASON().get(0));
@@ -463,4 +470,37 @@ public class NonWorkingReason extends AppCompatActivity implements
return super.onOptionsItemSelected(item);
}
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
index 540cffa..944444a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -6,6 +6,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -33,6 +35,7 @@ import android.widget.Toast;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GeoTag.GeoTagActivity;
@@ -72,6 +75,9 @@ public class StoreListActivity extends AppCompatActivity {
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
date = preferences.getString(CommonString.KEY_DATE, null);
visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
db = new GSKOrangeDB(StoreListActivity.this);
@@ -90,8 +96,6 @@ public class StoreListActivity extends AppCompatActivity {
startActivity(in);
finish();
-
-
}
});
@@ -102,6 +106,8 @@ public class StoreListActivity extends AppCompatActivity {
// TODO Auto-generated method stub
super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
storelist = db.getStoreData(date);
coverage=db.getCoverageData(date);
@@ -457,6 +463,34 @@ public class StoreListActivity extends AppCompatActivity {
return result_flag;
}
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+}
+
public void UpdateStore(String storeid) {
db.open();
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 147164f..0364bbc 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
@@ -2,11 +2,14 @@ package cpm.com.gskmtorange.dailyentry;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
+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.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.location.Location;
@@ -34,12 +37,14 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+import java.util.Locale;
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;
+import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
/**
* Created by ashishc on 31-05-2016.
@@ -81,6 +86,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -198,7 +205,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
editor.commit();*/
- Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class);
+ //Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class);
+ Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class);
startActivity(in);
finish();
}
@@ -268,8 +276,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
intent.setPackage(defaultCameraPackage);
startActivityForResult(intent, 0);
- }
- catch (ActivityNotFoundException e) {
+ } catch (ActivityNotFoundException e) {
e.printStackTrace();
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
@@ -277,8 +284,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
intent.setPackage(gallery_package);
startActivityForResult(intent, 0);
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -341,6 +347,12 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
protected void onStart() {
mGoogleApiClient.connect();
super.onStart();
@@ -351,4 +363,31 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
super.onStop();
}
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index 5652d8c..00f3cfb 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -4,12 +4,15 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
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.Color;
+import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -17,6 +20,7 @@ import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
+import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -47,8 +51,11 @@ import java.util.Calendar;
import java.util.List;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.LoginActivity;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.fonts.FontManager;
+import cpm.com.gskmtorange.fonts.TextDrawable;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
@@ -64,29 +71,28 @@ public class T2PComplianceActivity extends AppCompatActivity {
T2PAdapter t2PAdapter;
RecyclerView rec_t2p;
- String categoryName, categoryId, storeId;
-
- private SharedPreferences preferences;
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
-
+ String categoryName, categoryId;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = "";
int child_position = -1;
- /**
- * ATTENTION: This was auto-generated to implement the App Indexing API.
- * See https://g.co/AppIndexing/AndroidStudio for more information.
- */
- private GoogleApiClient client;
+ String error_msg;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_t2_pcompliance);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+ // toolbar.setTitle(R.string.title_activity_t2_pcompliance + " - " + categoryName);
+
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
db = new GSKOrangeDB(T2PComplianceActivity.this);
db.open();
@@ -100,7 +106,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
-
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p);
@@ -108,24 +114,47 @@ public class T2PComplianceActivity extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show();
- finish();
+
+ if (isValid()) {
+
+ db.InsertT2PData(t2PGetterSetters, store_id, categoryId);
+
+ Snackbar.make(view, "Data Saved", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+
+ finish();
+ } else {
+ Snackbar.make(view, error_msg, Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+
}
});
- t2PGetterSetters = db.getT2PDefaultData(store_id);
+ t2PGetterSetters = db.getT2pComplianceData(store_id, categoryId);
+
+ if (t2PGetterSetters.size() == 0) {
+ t2PGetterSetters = db.getT2PDefaultData(store_id);
+ } else {
+ for (int i = 0; i < t2PGetterSetters.size(); i++) {
+ ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
+ ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
+
+ t2PGetterSetters.get(i).setGapsChecklist(gapsList);
+ t2PGetterSetters.get(i).setSkulist(skuList);
+ }
+
+ }
if (t2PGetterSetters.size() > 0) {
- for (int i = 0; i < t2PGetterSetters.size(); i++) {
+ /* for (int i = 0; i < t2PGetterSetters.size(); i++) {
ArrayList gapsChecklist = db.getGapsDefaultData(t2PGetterSetters.get(i).getDisplay_id());
t2PGetterSetters.get(i).setGapsChecklist(gapsChecklist);
- }
-
+ }*/
rec_t2p.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
t2PAdapter = new T2PAdapter(t2PGetterSetters);
@@ -133,9 +162,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
- // ATTENTION: This was auto-generated to implement the App Indexing API.
- // See https://g.co/AppIndexing/AndroidStudio for more information.
- client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build();
}
@Override
@@ -168,11 +194,16 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.tv_brand.setText(mItem.getBrand());
holder.tv_display.setText(mItem.getDisplay().trim());
+ //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME));
+
+ /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME);
+ FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont);
+*/
holder.btn_gaps.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- showGapsDialog(mItem.getGapsChecklist());
+ showGapsDialog(mItem);
}
});
@@ -181,26 +212,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
- if (((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")) {
- mItem.setPresent(true);
- } else {
- mItem.setPresent(false);
- }
+ mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes)));
t2PAdapter.notifyDataSetChanged();
}
});
- holder.img_cam.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
- child_position = position;
- path = str + _pathforcheck;
-
- startCameraActivity();
- }
- });
holder.btn_sku.setOnClickListener(new View.OnClickListener() {
@Override
@@ -216,14 +233,43 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
}
- if (mItem.getImage().equals("")) {
- holder.img_cam.setBackgroundResource(R.drawable.cam_deactive);
- } else {
- holder.img_cam.setBackgroundResource(R.drawable.cam_active);
+ if(camera_allow.equals("1")){
+
+ holder.img_cam.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ child_position = position;
+ path = str + _pathforcheck;
+
+ startCameraActivity();
+ }
+ });
+
+ if (mItem.getImage().equals("")) {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+ }
}
+ else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
+ }
+
holder.toggle_btn.setChecked(mItem.isPresent());
+ if (mItem.getGapsChecklist().size() > 0) {
+ holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green));
+ } else {
+ holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ }
+
+ if (mItem.getSkulist().size() > 0) {
+ holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green));
+ } else {
+ holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ }
}
@@ -261,8 +307,17 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
}
- public void showGapsDialog(ArrayList gapsChecklist) {
- //ArrayList gapsChecklist = db.getGapsDefaultData(display_id);
+
+ public void showGapsDialog(final T2PGetterSetter t2p) {
+
+ final ArrayList gapsChecklist;
+
+ if (t2p.getGapsChecklist().size() > 0) {
+
+ gapsChecklist = t2p.getGapsChecklist();
+ } else {
+ gapsChecklist = db.getGapsDefaultData(t2p.getDisplay_id());
+ }
final Dialog dialog = new Dialog(T2PComplianceActivity.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -279,8 +334,9 @@ public class T2PComplianceActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
+ t2p.setGapsChecklist(gapsChecklist);
dialog.cancel();
-
+ t2PAdapter.notifyDataSetChanged();
}
});
@@ -315,7 +371,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
final ArrayList sku_list = new ArrayList<>();
- if(skuAddedList.size()>0){
+ if (skuAddedList.size() > 0) {
rec_sku.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
SkuAddedAdapter skuAdapter = new SkuAddedAdapter(skuAddedList);
@@ -327,11 +383,10 @@ public class T2PComplianceActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
- if(brand_selected[0] ==null || sku_selected[0]==null || et_stock.getText().toString().equals("")){
+ if (brand_selected[0] == null || sku_selected[0] == null || et_stock.getText().toString().equals("")) {
- Snackbar.make(v, getResources().getString(R.string.enter_the_values),Snackbar.LENGTH_SHORT).show();
- }
- else{
+ Snackbar.make(v, getResources().getString(R.string.enter_the_values), Snackbar.LENGTH_SHORT).show();
+ } else {
SkuGetterSetter sku = new SkuGetterSetter();
sku.setBRAND_ID(brand_selected[0].getBRAND_ID().get(0));
sku.setBRAND(brand_selected[0].getBRAND().get(0));
@@ -349,7 +404,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
spinner_brand.setSelection(0);
SkuGetterSetter select = new SkuGetterSetter();
- select.setSKU("Select");
+ select.setSKU(getString(R.string.select));
sku_list.clear();
sku_list.add(select);
CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list);
@@ -360,7 +415,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
brand_selected[0] = null;
sku_selected[0] = null;
-
}
}
@@ -369,7 +423,9 @@ public class T2PComplianceActivity extends AppCompatActivity {
btn_cancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
dialog.cancel();
+ t2PAdapter.notifyDataSetChanged();
}
});
@@ -380,7 +436,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
SkuGetterSetter select = new SkuGetterSetter();
- select.setSKU("Select");
+ select.setSKU(getString(R.string.select));
sku_list.add(select);
CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list);
spinner_sku.setAdapter(skuadapter);
@@ -394,18 +450,18 @@ public class T2PComplianceActivity extends AppCompatActivity {
sku_list.clear();
- brand_selected[0] = brandList.get(position);
+ brand_selected[0] = brandList.get(position);
String brand_id = brandList.get(position).getBRAND_ID().get(0);
ArrayList temp_list = db.getSkuT2PData(storeType_id, class_id, keyAccount_id, brand_id);
- for (int k=0;k parent, View view, int position, long id) {
- if(position!=0){
+ if (position != 0) {
sku_selected[0] = sku_list.get(position);
}
@@ -446,191 +502,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
- public class GapsAdapter extends RecyclerView.Adapter {
-
- private ArrayList list;
-
- public GapsAdapter(ArrayList gapsPList) {
- list = gapsPList;
- }
-
- @Override
- public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.gap_checklist_item, parent, false);
- return new ViewHolder(view);
- }
-
- @Override
- public void onBindViewHolder(final ViewHolder holder, int position) {
-
- final GapsChecklistGetterSetter mItem = list.get(position);
- holder.tv_checklist.setText(mItem.getChecklist());
-
- holder.tb_present.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes")) {
- mItem.setPresent(true);
- }
- }
- });
-
- holder.tb_present.setChecked(mItem.isPresent());
-
- }
-
- @Override
- public int getItemCount() {
- return list.size();
- }
-
- public class ViewHolder extends RecyclerView.ViewHolder {
- public final View mView;
- public final LinearLayout parentLayout;
- public final TextView tv_checklist;
- public final ToggleButton tb_present;
-
-
- public ViewHolder(View view) {
- super(view);
-
- mView = view;
-
- tv_checklist = (TextView) mView.findViewById(R.id.tv_checklist);
- tb_present = (ToggleButton) mView.findViewById(R.id.btn_is_present);
- parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout);
-
- }
-
- }
- }
-
-
- public class CustomAdapter extends ArrayAdapter {
-
- private Activity activity;
- private ArrayList data;
- BrandMasterGetterSetter tempValues = null;
- LayoutInflater inflater;
-
- /*************
- * CustomAdapter Constructor
- *****************/
- public CustomAdapter(
- T2PComplianceActivity activitySpinner,
- int textViewResourceId,
- ArrayList objects
-
- ) {
- super(activitySpinner, textViewResourceId, objects);
-
- /********** Take passed values **********/
- activity = activitySpinner;
- data = objects;
- /*********** Layout inflator to call external xml layout () **********************/
- inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
- }
-
- @Override
- public View getDropDownView(int position, View convertView, ViewGroup parent) {
- return getCustomView(position, convertView, parent);
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- return getCustomView(position, convertView, parent);
- }
-
- // This funtion called for each row ( Called data.size() times )
- public View getCustomView(int position, View convertView, ViewGroup parent) {
-
- /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
- View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
-
- /***** Get each Model object from Arraylist ********/
- tempValues = null;
- tempValues = (BrandMasterGetterSetter) data.get(position);
-
- TextView label = (TextView) row.findViewById(R.id.tv_text);
-
- if (position == 0) {
-
- // Default selected Spinner item
- label.setText("Select");
- //sub.setText("");
- } else {
- // Set values for spinner each row
- label.setText(tempValues.getBRAND().get(0));
- }
-
- return row;
- }
- }
-
- public class CustomSkuAdapter extends ArrayAdapter {
-
- private Activity activity;
- private ArrayList data;
- SkuGetterSetter tempValues = null;
- LayoutInflater inflater;
-
- /*************
- * CustomAdapter Constructor
- *****************/
- public CustomSkuAdapter(
- T2PComplianceActivity activitySpinner,
- int textViewResourceId,
- ArrayList objects
-
- ) {
- super(activitySpinner, textViewResourceId, objects);
-
- /********** Take passed values **********/
- activity = activitySpinner;
- data = objects;
- /*********** Layout inflator to call external xml layout () **********************/
- inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
- }
-
- @Override
- public View getDropDownView(int position, View convertView, ViewGroup parent) {
- return getCustomView(position, convertView, parent);
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- return getCustomView(position, convertView, parent);
- }
-
- // This funtion called for each row ( Called data.size() times )
- public View getCustomView(int position, View convertView, ViewGroup parent) {
-
- /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
- View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
-
- /***** Get each Model object from Arraylist ********/
- tempValues = null;
- tempValues = (SkuGetterSetter) data.get(position);
-
- TextView label = (TextView) row.findViewById(R.id.tv_text);
-
- if (position == 0) {
-
- // Default selected Spinner item
- label.setText("Select");
- //sub.setText("");
- } else {
- // Set values for spinner each row
- label.setText(tempValues.getSKU());
- }
-
- return row;
- }
- }
-
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
@@ -736,6 +607,371 @@ public class T2PComplianceActivity extends AppCompatActivity {
super.onActivityResult(requestCode, resultCode, data);
}
+ public boolean isValid() {
+ boolean flag = true;
+
+ for (int i = 0; i < t2PGetterSetters.size(); i++) {
+
+ if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
+ flag = false;
+ error_msg = getResources().getString(R.string.click_image);
+ break;
+ } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) {
+ flag = false;
+ error_msg = getResources().getString(R.string.fill_gaps_data);
+ break;
+ } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
+ flag = false;
+ error_msg = getResources().getString(R.string.fill_sku_data);
+ break;
+ }
+ }
+
+ return flag;
+ }
+
+ @Override
+ public void onBackPressed() {
+ //super.onBackPressed();
+
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(T2PComplianceActivity.this);
+ builder.setTitle("Parinaam");
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+
+ finish();
+ }
+ })
+ .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ }
+
+ public class T2PAdapter extends RecyclerView.Adapter {
+
+ private ArrayList list;
+
+ public T2PAdapter(ArrayList t2PList) {
+ list = t2PList;
+ }
+
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext())
+ .inflate(R.layout.t2p_item_layout, parent, false);
+ return new ViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(final ViewHolder holder, final int position) {
+
+ final T2PGetterSetter mItem = list.get(position);
+ holder.tv_brand.setText(mItem.getBrand());
+ holder.tv_display.setText(mItem.getDisplay().trim());
+
+ //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME));
+
+ /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME);
+ FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont);
+*/
+ holder.btn_gaps.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ showGapsDialog(mItem);
+
+ }
+ });
+
+ holder.toggle_btn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes"));
+
+ t2PAdapter.notifyDataSetChanged();
+ }
+ });
+
+
+ holder.btn_sku.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showSkuDialog(mItem.getSkulist());
+ }
+ });
+
+ if (!img.equalsIgnoreCase("")) {
+ if (position == child_position) {
+ mItem.setImage(img);
+ img = "";
+ }
+ }
+
+ if(camera_allow.equals("1")){
+
+ holder.img_cam.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ child_position = position;
+ path = str + _pathforcheck;
+
+ startCameraActivity();
+ }
+ });
+
+ if (mItem.getImage().equals("")) {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+ }
+ }
+ else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
+ }
+
+
+ holder.toggle_btn.setChecked(mItem.isPresent());
+
+ if (mItem.getGapsChecklist().size() > 0) {
+ holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green));
+ } else {
+ holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ }
+
+ if (mItem.getSkulist().size() > 0) {
+ holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green));
+ } else {
+ holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ }
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return list.size();
+ }
+
+ public class ViewHolder extends RecyclerView.ViewHolder {
+ public final View mView;
+ public final LinearLayout parentLayout;
+ public final TextView tv_brand, tv_display;
+ public final ImageView img_cam, img_remark;
+ public final Button btn_gaps, btn_sku, btn_ref_img;
+ public final ToggleButton toggle_btn;
+
+
+ public ViewHolder(View view) {
+ super(view);
+
+ mView = view;
+
+ tv_brand = (TextView) mView.findViewById(R.id.tv_brand);
+ tv_display = (TextView) mView.findViewById(R.id.tv_display);
+ img_cam = (ImageView) mView.findViewById(R.id.img_cam);
+ img_remark = (ImageView) mView.findViewById(R.id.img_remark);
+ btn_gaps = (Button) mView.findViewById(R.id.btn_gaps);
+ btn_sku = (Button) mView.findViewById(R.id.btn_sku);
+ btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image);
+ parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout);
+ toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn);
+
+ }
+
+ }
+ }
+
+ public class GapsAdapter extends RecyclerView.Adapter {
+
+ private ArrayList list;
+
+ public GapsAdapter(ArrayList gapsPList) {
+ list = gapsPList;
+ }
+
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext())
+ .inflate(R.layout.gap_checklist_item, parent, false);
+ return new ViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(final ViewHolder holder, int position) {
+
+ final GapsChecklistGetterSetter mItem = list.get(position);
+ holder.tv_checklist.setText(mItem.getChecklist());
+
+ holder.tb_present.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase("Yes"));
+
+ }
+ });
+
+ holder.tb_present.setChecked(mItem.isPresent());
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return list.size();
+ }
+
+ public class ViewHolder extends RecyclerView.ViewHolder {
+ public final View mView;
+ public final LinearLayout parentLayout;
+ public final TextView tv_checklist;
+ public final ToggleButton tb_present;
+
+
+ public ViewHolder(View view) {
+ super(view);
+
+ mView = view;
+
+ tv_checklist = (TextView) mView.findViewById(R.id.tv_checklist);
+ tb_present = (ToggleButton) mView.findViewById(R.id.btn_is_present);
+ parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout);
+
+ }
+
+ }
+ }
+
+ public class CustomAdapter extends ArrayAdapter {
+
+ BrandMasterGetterSetter tempValues = null;
+ LayoutInflater inflater;
+ private Activity activity;
+ private ArrayList data;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomAdapter(
+ T2PComplianceActivity activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (BrandMasterGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText("Select");
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getBRAND().get(0));
+ }
+
+ return row;
+ }
+ }
+
+ public class CustomSkuAdapter extends ArrayAdapter {
+
+ SkuGetterSetter tempValues = null;
+ LayoutInflater inflater;
+ private Activity activity;
+ private ArrayList data;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomSkuAdapter(
+ T2PComplianceActivity activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (SkuGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText("Select");
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getSKU());
+ }
+
+ return row;
+ }
+ }
+
public class SkuAddedAdapter extends RecyclerView.Adapter {
private ArrayList list;
@@ -785,5 +1021,4 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
}
-
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index c6a0484..0950f14 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -5,6 +5,8 @@ import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -24,6 +26,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -35,10 +38,12 @@ import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
@@ -46,15 +51,10 @@ import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
public class DownloadActivity extends AppCompatActivity {
- private Dialog dialog;
- private ProgressBar pb;
- private TextView percentage, message;
Data data;
int eventType;
GSKOrangeDB db;
- private SharedPreferences preferences = null;
String userId, culture_id;
-
JourneyPlanGetterSetter jcpgettersetter;
SkuMasterGetterSetter skumastergettersetter;
BrandMasterGetterSetter brandMasterGetterSetter;
@@ -68,6 +68,12 @@ public class DownloadActivity extends AppCompatActivity {
NonWorkingReasonGetterSetter nonWorkingReasonGetterSetter;
MappingPromotionGetterSetter mappingPromotionGetterSetter;
MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter mapping_additional_promotion_masterGetterSetter;
+ STORE_PERFORMANCE_MasterGetterSetter store_performance_masterGetterSetter;
+ MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter;
+ private Dialog dialog;
+ private ProgressBar pb;
+ private TextView percentage, message;
+ private SharedPreferences preferences = null;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -77,11 +83,32 @@ public class DownloadActivity extends AppCompatActivity {
db = new GSKOrangeDB(this);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
userId = preferences.getString(CommonString.KEY_USERNAME, null);
culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
new UploadTask(DownloadActivity.this).execute();
}
+ public void showAlert(String str) {
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this);
+ builder.setTitle("Parinaam");
+ builder.setMessage(str).setCancelable(false)
+ .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+
+ /* Intent i = new Intent(activity, StorelistActivity.class);
+ activity.startActivity(i);
+ activity.finish();*/
+
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+
class Data {
int value;
String name;
@@ -116,7 +143,7 @@ public class DownloadActivity extends AppCompatActivity {
data = new Data();
data.value = 10;
- data.name = "JCP Data Downloading";
+ data.name = "JCP "+getResources().getString(R.string.download_data);
publishProgress(data);
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
@@ -135,7 +162,7 @@ public class DownloadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- Object result = (Object) envelope.getResponse();
+ Object result = envelope.getResponse();
if (result.toString() != null) {
//InputStream stream = new ByteArrayInputStream(result.toString().getBytes("UTF-8"));
@@ -157,7 +184,7 @@ public class DownloadActivity extends AppCompatActivity {
}
data.value = 10;
- data.name = "JCP Data Downloading";
+ data.name = "JCP "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -175,7 +202,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -193,7 +220,7 @@ public class DownloadActivity extends AppCompatActivity {
}
data.value = 20;
- data.name = "SKU_MASTER Data Download";
+ data.name = "SKU_MASTER "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -211,7 +238,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -229,7 +256,7 @@ public class DownloadActivity extends AppCompatActivity {
}
data.value = 30;
- data.name = "BRAND_MASTER Data Download";
+ data.name = "BRAND_MASTER "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -247,7 +274,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -264,7 +291,7 @@ public class DownloadActivity extends AppCompatActivity {
return "SUB_CATEGORY_MASTER";
}
data.value = 40;
- data.name = "SUB_CATEGORY_MASTER Data Download";
+ data.name = "SUB_CATEGORY_MASTER "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -282,7 +309,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -299,7 +326,7 @@ public class DownloadActivity extends AppCompatActivity {
return "CATEGORY_MASTER";
}
data.value = 50;
- data.name = "CATEGORY_MASTER Data Download";
+ data.name = "CATEGORY_MASTER "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -317,7 +344,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -334,7 +361,7 @@ public class DownloadActivity extends AppCompatActivity {
return "DISPLAY_MASTER";
}
data.value = 60;
- data.name = "DISPLAY_MASTER Data Download";
+ data.name = "DISPLAY_MASTER "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -352,7 +379,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -369,7 +396,7 @@ public class DownloadActivity extends AppCompatActivity {
return "MAPPING_STOCK";
}
data.value = 80;
- data.name = "MAPPING_STOCK Data Download";
+ data.name = "MAPPING_STOCK "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -387,7 +414,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -404,7 +431,7 @@ public class DownloadActivity extends AppCompatActivity {
//return "MAPPING_T2P";
}
data.value = 100;
- data.name = "MAPPING_T2P Data Download";
+ data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -421,7 +448,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -438,7 +465,7 @@ public class DownloadActivity extends AppCompatActivity {
return "DISPLAY_CHECKLIST_MASTER";
}
data.value = 100;
- data.name = "DISPLAY_CHECKLIST_MASTER Data Download";
+ data.name = "DISPLAY_CHECKLIST_MASTER "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -455,7 +482,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -472,7 +499,7 @@ public class DownloadActivity extends AppCompatActivity {
//return "MAPPING_DISPLAY_CHECKLIST";
}
data.value = 100;
- data.name = "MAPPING_DISPLAY_CHECKLIST Data Download";
+ data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -490,7 +517,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -507,7 +534,7 @@ public class DownloadActivity extends AppCompatActivity {
return "NON_WORKING_REASON";
}
data.value = 100;
- data.name = "NON_WORKING_REASON Data Download";
+ data.name = "NON_WORKING_REASON "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -525,7 +552,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -542,7 +569,7 @@ public class DownloadActivity extends AppCompatActivity {
//return "MAPPING_PROMOTION";
}*/
data.value = 100;
- data.name = "MAPPING_PROMOTION Data Download";
+ data.name = "MAPPING_PROMOTION "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -562,7 +589,7 @@ public class DownloadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
@@ -580,10 +607,83 @@ public class DownloadActivity extends AppCompatActivity {
//return "MAPPING_ADDITIONAL_PROMOTION";
}*/
data.value = 100;
- data.name = "MAPPING_ADDITIONAL_PROMOTION Data Download";
+ data.name = "MAPPING_ADDITIONAL_PROMOTION "+getResources().getString(R.string.download_data);
}
publishProgress(data);
+
+ //STORE_PERFORMANCE
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "STORE_PERFORMANCE");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+ store_performance_masterGetterSetter = XMLHandlers.STORE_PERFORMANCEXMLHandler(xpp, eventType);
+
+ if (store_performance_masterGetterSetter.getSTORE_ID().size() > 0) {
+ String table_store_performace = store_performance_masterGetterSetter.getTable_STORE_PERFORMANCE();
+ if (table_store_performace != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setStorePerformance(table_store_performace);
+ }
+ } else {
+ //return "STORE_PERFORMANCE";
+ }
+ data.value = 100;
+ data.name = "STORE_PERFORMANCE Data Download";
+ }
+ publishProgress(data);
+
+
+ //MAPPING_PLANOGRAM
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "MAPPING_PLANOGRAM");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+ mapping_planogram_masterGetterSetter = XMLHandlers.MAPPING_PLANOGRAM_XMLHandler(xpp, eventType);
+
+ if (mapping_planogram_masterGetterSetter.getKEYACCOUNT_ID().size() > 0) {
+ String table_mapping_planogram = mapping_planogram_masterGetterSetter.getTable_MAPPING_PLANOGRAM();
+ if (table_mapping_planogram != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setMappingPlanogram(table_mapping_planogram);
+ }
+ } else {
+ //return "MAPPING_PLANOGRAM";
+ }
+ data.value = 100;
+ data.name = "MAPPING_PLANOGRAM Data Download";
+ }
+ publishProgress(data);
+
+
//Gagan end code
@@ -605,6 +705,9 @@ public class DownloadActivity extends AppCompatActivity {
db.insertNonWorkingData(nonWorkingReasonGetterSetter);
+ db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter);
+ db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter);
+
} catch (MalformedURLException e) {
/*final AlertMessage message = new AlertMessage(
CompleteDownloadActivity.this,
@@ -681,4 +784,39 @@ public class DownloadActivity extends AppCompatActivity {
AlertDialog alert = builder.create();
alert.show();
}
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java
new file mode 100644
index 0000000..b53fdce
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/FontManager.java
@@ -0,0 +1,18 @@
+package cpm.com.gskmtorange.fonts;
+
+import android.content.Context;
+import android.graphics.Typeface;
+
+/**
+ * Created by yadavendras on 11-01-2017.
+ */
+
+public class FontManager {
+
+ public static final String ROOT = "fonts/",
+ FONTAWESOME = ROOT + "fontawesome-webfont.ttf";
+
+ public static Typeface getTypeface(Context context, String font) {
+ return Typeface.createFromAsset(context.getAssets(), font);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java
new file mode 100644
index 0000000..b7024a0
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fonts/TextDrawable.java
@@ -0,0 +1,52 @@
+package cpm.com.gskmtorange.fonts;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+/**
+ * Created by yadavendras on 11-01-2017.
+ */
+
+public class TextDrawable extends Drawable {
+
+ private final String text;
+ private final Paint paint;
+
+ public TextDrawable(String text) {
+
+ this.text = text;
+
+ this.paint = new Paint();
+ paint.setColor(Color.WHITE);
+ paint.setTextSize(22f);
+ paint.setAntiAlias(true);
+ paint.setFakeBoldText(true);
+ paint.setShadowLayer(6f, 0, 0, Color.BLACK);
+ paint.setStyle(Paint.Style.FILL);
+ paint.setTextAlign(Paint.Align.LEFT);
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ canvas.drawText(text, 0, 0, paint);
+ }
+
+ @Override
+ public void setAlpha(int alpha) {
+ paint.setAlpha(alpha);
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter cf) {
+ paint.setColorFilter(cf);
+ }
+
+ @Override
+ public int getOpacity() {
+ return PixelFormat.TRANSLUCENT;
+ }
+}
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 0b6a11d..bcb19e5 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
@@ -3,6 +3,8 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -23,6 +25,7 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -37,9 +40,8 @@ public class CategoryListActivity extends AppCompatActivity {
CategoryListAdapter adapter;
GSKOrangeDB db;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +54,9 @@ public class CategoryListActivity extends AppCompatActivity {
db.open();
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -83,6 +88,8 @@ public class CategoryListActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
categoryList = new ArrayList<>();
@@ -93,10 +100,36 @@ public class CategoryListActivity extends AppCompatActivity {
recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2));
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.main, menu);
+ return true;
+ }
+
+ @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.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
public class CategoryListAdapter extends RecyclerView.Adapter {
- private LayoutInflater inflator;
List list = Collections.emptyList();
Context context;
+ private LayoutInflater inflator;
public CategoryListAdapter(CategoryListActivity context, List list) {
inflator = LayoutInflater.from(context);
@@ -123,19 +156,19 @@ public class CategoryListActivity extends AppCompatActivity {
&& db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
&& db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
- holder.categoryIcon.setImageResource(R.drawable.ohc_done);
+ holder.categoryIcon.setImageResource(R.mipmap.oralcare_tick);
} else {
- holder.categoryIcon.setImageResource(R.drawable.ohc);
+ holder.categoryIcon.setImageResource(R.mipmap.oral_care);
}
} else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) {
if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
&& db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
&& db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
- holder.categoryIcon.setImageResource(R.drawable.pdr_done);
+ holder.categoryIcon.setImageResource(R.mipmap.wellness_tick);
} else {
- holder.categoryIcon.setImageResource(R.drawable.pdr);
+ holder.categoryIcon.setImageResource(R.mipmap.wellness);
}
} else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) {
@@ -143,9 +176,9 @@ public class CategoryListActivity extends AppCompatActivity {
&& db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
&& db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
- holder.categoryIcon.setImageResource(R.drawable.hfd_done);
+ holder.categoryIcon.setImageResource(R.mipmap.nutritionals_tick);
} else {
- holder.categoryIcon.setImageResource(R.drawable.hfd);
+ holder.categoryIcon.setImageResource(R.mipmap.nutritionals);
}
}
@@ -205,4 +238,34 @@ public class CategoryListActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
index 3553a8a..18303c1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
@@ -2,7 +2,11 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
@@ -18,22 +22,29 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
public class CategoryWisePerformanceActivity extends AppCompatActivity {
- TextView txt_categoryName;
RecyclerView recyclerView;
+ Toolbar toolbar;
String categoryName = "", categoryId;
ArrayList categoryWisePerformanceList;
CategoryWisePerformaceAdapter adapter;
+ private SharedPreferences preferences;
+ GSKOrangeDB db;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
setContentView(R.layout.activity_category_wise_performance);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -44,6 +55,10 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
//txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
setSupportActionBar(toolbar);
@@ -60,11 +75,56 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
startActivity(intent);
}
});
+
+ try {
+ setContentView(R.layout.activity_category_wise_performance);
+
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
+ recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
+
+ db = new GSKOrangeDB(this);
+ db.open();
+
+ 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");
+
+ //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
+ toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class);
+ intent.putExtra("categoryName", categoryName);
+ intent.putExtra("categoryId", categoryId);
+ startActivity(intent);
+ }
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+
}
@Override
protected void onResume() {
super.onResume();
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
categoryWisePerformanceList = new ArrayList<>();
CategoryWisePerformaceGetterSetter data = new CategoryWisePerformaceGetterSetter();
@@ -134,6 +194,17 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList);
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+
+ try {
+ categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId);
+
+ adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList);
+ recyclerView.setAdapter(adapter);
+ recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
}
public class CategoryWisePerformaceAdapter extends RecyclerView.Adapter {
@@ -158,11 +229,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
public void onBindViewHolder(CategoryWisePerformaceAdapter.MyViewHolder holder, int position) {
final CategoryWisePerformaceGetterSetter categoryData = list.get(position);
- holder.txt_period.setText(categoryData.getPeriod());
+ if (categoryData.getPeriod().equalsIgnoreCase("LTM")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_ltm));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("MTD")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_mtd));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("LSV")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_lsv));
+ }
+ //holder.txt_period.setText(categoryData.getPeriod());
+ holder.txt_msl_availability.setText(categoryData.getMsl_availability());
holder.txt_sos.setText(categoryData.getSos());
holder.txt_t2p.setText(categoryData.getT2p());
holder.txt_promo.setText(categoryData.getPromo());
- holder.txt_msl_availability.setText(categoryData.getMsl_availability());
holder.txt_oss.setText(categoryData.getOss());
}
@@ -186,7 +264,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
txt_oss = (TextView) itemView.findViewById(R.id.txt_oss);
}
}
-
}
@Override
@@ -207,4 +284,31 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
index c234e7a..fbdb067 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
@@ -3,6 +3,7 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -22,6 +23,7 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -38,9 +40,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName = "", categoryId;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +59,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -94,6 +98,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
try {
categoryList = new ArrayList<>();
@@ -111,9 +117,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//data.setCategory_name("Stock & Facing");
data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
if (db.checkStockAndFacingData(store_id, categoryId)) {
- data.setCategory_img(R.mipmap.stock_and_facing_done);
+ data.setCategory_img(R.mipmap.stock_facing_done);
} else {
- data.setCategory_img(R.mipmap.stock_and_facing);
+ data.setCategory_img(R.mipmap.stock_facing);
}
categoryList.add(data);
@@ -165,10 +171,36 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.main, menu);
+ return true;
+ }
+
+ @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.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
public class DailyDataMenuAdapter extends RecyclerView.Adapter {
- private LayoutInflater inflator;
List list = Collections.emptyList();
Context context;
+ private LayoutInflater inflator;
public DailyDataMenuAdapter(Context context, List list) {
inflator = LayoutInflater.from(context);
@@ -275,5 +307,34 @@ public class DailyDataMenuActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
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 7513fe0..b79ea7c 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
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.Bundle;
@@ -34,6 +35,7 @@ import android.widget.ToggleButton;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -54,9 +56,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName, categoryId, storeId;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -74,6 +75,9 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -248,6 +252,25 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
}
}
+ @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.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
public class ExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List _listDataHeader;
@@ -362,8 +385,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
- holder.toggle_available.setTextOff("No");
- holder.toggle_available.setTextOn("Yes");
+ /*holder.toggle_available.setTextOff("No");
+ holder.toggle_available.setTextOn("Yes");*/
convertView.setTag(holder);
} else {
@@ -437,4 +460,38 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
index 8824f9d..8614ed1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
@@ -1,8 +1,11 @@
package cpm.com.gskmtorange.gsk_dailyentry;
import android.app.AlertDialog;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -22,6 +25,7 @@ import android.widget.TextView;
import android.widget.ToggleButton;
import java.util.ArrayList;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -73,6 +77,9 @@ public class PromoComplianceActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -433,4 +440,37 @@ public class PromoComplianceActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
}
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 3d28cac..30279a3 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
@@ -1,14 +1,20 @@
package cpm.com.gskmtorange.gsk_dailyentry;
import android.app.AlertDialog;
+import android.app.Dialog;
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.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -22,12 +28,16 @@ import android.support.v7.widget.CardView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView;
import android.widget.BaseExpandableListAdapter;
+import android.widget.Button;
import android.widget.EditText;
import android.widget.ExpandableListView;
import android.widget.ImageView;
@@ -44,35 +54,32 @@ import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
public class Stock_FacingActivity extends AppCompatActivity {
+ static int child_position = -1;
ExpandableListView expandableListView;
TextView txt_stockFacingName;
-
ArrayList headerDataList;
ArrayList childDataList;
List hashMapListHeaderData;
HashMap> hashMapListChildData;
List checkHeaderArray = new ArrayList<>();
-
ExpandableListAdapter adapter;
GSKOrangeDB db;
-
String categoryName, categoryId, Error_Message = "";
-
String path = "", str = "", _pathforcheck = "", img1 = "", img2 = "";
- static int child_position = -1;
boolean isDialogOpen = true;
boolean checkflag = true;
-
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
private SharedPreferences preferences;
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -90,6 +97,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -98,6 +108,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -269,6 +280,305 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
}
+ boolean validateData(List listDataHeader,
+ HashMap> listDataChild) {
+ boolean flag = true;
+ checkHeaderArray.clear();
+
+ for (int i = 0; i < listDataHeader.size(); i++) {
+ String imagePath = listDataHeader.get(i).getImage1();
+ String imagePath1 = listDataHeader.get(i).getImage2();
+
+ for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
+ String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock();
+ String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing();
+
+ //Camera allow enable
+ if (camera_allow.equalsIgnoreCase("1")) {
+
+ if (!imagePath.equals("") || !imagePath1.equals("")) {
+ if (!stock.equals("0")) {
+ if (stock.equals("") || faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
+ } else {
+ if (stock.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
+ }
+ } else {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please click either 1 image";
+ break;
+ }
+
+ } else {
+ //Camera allow disable
+ if (!stock.equals("0")) {
+ if (stock.equals("") || faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
+ } else {
+ if (stock.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
+ }
+
+ }
+ }
+
+ if (flag == false) {
+ checkflag = false;
+ break;
+ } else {
+ checkflag = true;
+ }
+ }
+ //expListView.invalidate();
+ adapter.notifyDataSetChanged();
+
+ return checkflag;
+ }
+
+ private void startCameraActivity1(int position) {
+ try {
+ /*Log.e("Stock and Facing ", "startCameraActivity()");
+ File file = new File(path);
+ Uri outputFileUri = Uri.fromFile(file);
+
+ Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ startActivityForResult(intent, position);*/
+
+ Log.i("Stock & Facing ", "startCameraActivity()");
+ File file = new File(path);
+ Uri outputFileUri = Uri.fromFile(file);
+
+ String defaultCameraPackage = "";
+ final PackageManager packageManager = getPackageManager();
+ List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
+ for (int n = 0; n < list.size(); n++) {
+ if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
+ /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
+ Log.e("TAG", "package name : " + list.get(n).packageName);*/
+
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+ }
+
+ Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ startActivityForResult(intent, 1);
+ //startActivityForResult(intent, position);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void startCameraActivity2(int position) {
+ try {
+ /*Log.e("Stock and Facing ", "startCameraActivity()");
+ File file = new File(path);
+ Uri outputFileUri = Uri.fromFile(file);
+
+ Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ startActivityForResult(intent, position);*/
+
+ Log.i("Stock & Facing ", "startCameraActivity()");
+ File file = new File(path);
+ Uri outputFileUri = Uri.fromFile(file);
+
+ String defaultCameraPackage = "";
+ final PackageManager packageManager = getPackageManager();
+ List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
+ for (int n = 0; n < list.size(); n++) {
+ if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
+ /*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
+ Log.e("TAG", "package name : " + list.get(n).packageName);*/
+
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+ }
+
+ Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ startActivityForResult(intent, 2);
+ //startActivityForResult(intent, position);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ Log.e("Stock & Facing", "resultCode: " + resultCode);
+ /*switch (resultCode) {
+ case 0:
+ Log.e("Stock & Facing", "User cancelled");
+ break;
+ case -1:
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ img1 = _pathforcheck;
+ adapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ break;
+ }*/
+
+ switch (requestCode) {
+ case 1:
+ if (resultCode == -1) {
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ img1 = _pathforcheck;
+ adapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ } else {
+ Log.e("Stock & Facing", "User cancelled");
+ }
+ break;
+ case 2:
+ if (resultCode == -1) {
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ img2 = _pathforcheck;
+ adapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ } else {
+ Log.e("Stock & Facing", "User cancelled");
+ }
+ break;
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
+ public String getCurrentTime() {
+ Calendar m_cal = Calendar.getInstance();
+ SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+ String cdate = formatter.format(m_cal.getTime());
+ /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+
+ return cdate;
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.planogram, menu);
+ return true;
+ }
+
+ @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.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ }
+
+ //Planogram Dialog
+ if (id == R.id.action_planogram) {
+ //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+ final Dialog dialog = new Dialog(Stock_FacingActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ dialog.setContentView(R.layout.planogram_dialog_layout);
+ dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+
+ ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+
+ String planogram_image = "";
+ if (new File(str + planogram_image).exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
+ img_planogram.setImageBitmap(bmp);
+ } else {
+ img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+ }
+
+ /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg");
+ img_planogram.setImageBitmap(bmp);
+ } else {
+ img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+ }*/
+
+
+ ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel);
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ }
+ });
+
+ dialog.show();
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
public class ExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List _listDataHeader;
@@ -306,71 +616,85 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader);
+ TextView txt_sosHeader = (TextView) convertView.findViewById(R.id.txt_sosHeader);
LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader);
- ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference);
ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1);
ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2);
- ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit);
+ //ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference);
+ //ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit);
txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
- 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(':', '-');
-
- _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
- child_position = groupPosition;
- path = str + _pathforcheck;
-
- startCameraActivity1(groupPosition);
- }
- });
-
- if (!img1.equalsIgnoreCase("")) {
- if (groupPosition == child_position) {
- headerTitle.setImage1(img1);
- img1 = "";
- }
- }
-
- if (headerTitle.getImage1().equals("")) {
- img_camera1.setBackgroundResource(R.mipmap.camera);
+ if (headerTitle.getCompany_id().equals("1")) {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
- img_camera1.setBackgroundResource(R.mipmap.camera_done);
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
}
+ //Camera allow enable
+ if (camera_allow.equalsIgnoreCase("1")) {
- 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(':', '-');
+ 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(':', '-');
- _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
- child_position = groupPosition;
- path = str + _pathforcheck;
+ _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ child_position = groupPosition;
+ path = str + _pathforcheck;
- startCameraActivity2(groupPosition);
+ startCameraActivity1(groupPosition);
+ }
+ });
+
+ if (!img1.equalsIgnoreCase("")) {
+ if (groupPosition == child_position) {
+ headerTitle.setImage1(img1);
+ img1 = "";
+ }
}
- });
- if (!img2.equalsIgnoreCase("")) {
- if (groupPosition == child_position) {
- headerTitle.setImage2(img2);
- img2 = "";
+ if (headerTitle.getImage1().equals("")) {
+ img_camera1.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ img_camera1.setBackgroundResource(R.mipmap.camera_green);
}
- }
- if (headerTitle.getImage2().equals("")) {
- img_camera2.setBackgroundResource(R.mipmap.camera);
+
+ 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(':', '-');
+
+ _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ child_position = groupPosition;
+ path = str + _pathforcheck;
+
+ startCameraActivity2(groupPosition);
+ }
+ });
+
+ if (!img2.equalsIgnoreCase("")) {
+ if (groupPosition == child_position) {
+ headerTitle.setImage2(img2);
+ img2 = "";
+ }
+ }
+
+ if (headerTitle.getImage2().equals("")) {
+ img_camera2.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ img_camera2.setBackgroundResource(R.mipmap.camera_green);
+ }
} else {
- img_camera2.setBackgroundResource(R.mipmap.camera_done);
+ //Camera allow disable
+ img_camera1.setBackgroundResource(R.mipmap.camera_grey);
+ img_camera2.setBackgroundResource(R.mipmap.camera_grey);
}
-
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
@@ -787,4 +1111,38 @@ public class Stock_FacingActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
new file mode 100644
index 0000000..38ca963
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
@@ -0,0 +1,173 @@
+package cpm.com.gskmtorange.gsk_dailyentry;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+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.CategoryWisePerformaceGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
+
+public class StoreWisePerformanceActivity extends AppCompatActivity {
+ RecyclerView recyclerView;
+ Toolbar toolbar;
+
+ ArrayList storeWisePerformanceList;
+ StoreWisePerformaceAdapter adapter;
+
+ GSKOrangeDB db;
+ 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);
+ try {
+ setContentView(R.layout.activity_store_wise_performance);
+
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
+ recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
+
+ 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, "");
+
+ toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance));
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class);
+ startActivity(intent);
+ }
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ try {
+ storeWisePerformanceList = db.getStoreWisePerformance(store_id);
+
+ adapter = new StoreWisePerformaceAdapter(StoreWisePerformanceActivity.this, storeWisePerformanceList);
+ recyclerView.setAdapter(adapter);
+ recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public class StoreWisePerformaceAdapter extends RecyclerView.Adapter {
+ Context context;
+ private LayoutInflater inflator;
+ List list = Collections.emptyList();
+
+ public StoreWisePerformaceAdapter(Context context, List list) {
+ inflator = LayoutInflater.from(context);
+ this.list = list;
+ this.context = context;
+ }
+
+ @Override
+ public StoreWisePerformaceAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) {
+ View view = inflator.inflate(R.layout.item_store_wise_performance, parent, false);
+ StoreWisePerformaceAdapter.MyViewHolder holder = new StoreWisePerformaceAdapter.MyViewHolder(view);
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(StoreWisePerformaceAdapter.MyViewHolder holder, int position) {
+ final StoreWisePerformaceGetterSetter categoryData = list.get(position);
+
+ if (categoryData.getPeriod().equalsIgnoreCase("LTM")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_ltm));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("MTD")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_mtd));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("LSV")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_lsv));
+ }
+ holder.txt_msl_availability.setText(categoryData.getMsl_availability());
+ holder.txt_sos.setText(categoryData.getSos());
+ holder.txt_t2p.setText(categoryData.getT2p());
+ holder.txt_promo.setText(categoryData.getPromo());
+ holder.txt_oss.setText(categoryData.getOss());
+ }
+
+ @Override
+ public int getItemCount() {
+ return list.size();
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+ TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss;
+ LinearLayout lay_menu;
+
+ public MyViewHolder(View itemView) {
+ super(itemView);
+ lay_menu = (LinearLayout) itemView.findViewById(R.id.lay_menu);
+ txt_period = (TextView) itemView.findViewById(R.id.txt_period);
+ txt_sos = (TextView) itemView.findViewById(R.id.txt_sos);
+ txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p);
+ txt_promo = (TextView) itemView.findViewById(R.id.txt_promo);
+ txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability);
+ txt_oss = (TextView) itemView.findViewById(R.id.txt_oss);
+ }
+ }
+ }
+
+ @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.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index 9f76527..c17fe9f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -3,6 +3,8 @@ package cpm.com.gskmtorange.upload;
import android.app.Dialog;
import android.content.Context;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.AsyncTask;
@@ -26,6 +28,7 @@ import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.Locale;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -38,38 +41,38 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class UploadActivity extends AppCompatActivity {
- private Dialog dialog;
- private ProgressBar pb;
- private TextView percentage, message;
GSKOrangeDB db;
ArrayList coverageList;
-
- private FailureGetterSetter failureGetterSetter = null;
- private SharedPreferences preferences;
String date, userId, app_version;
-
StoreBean storeData;
String datacheck = "";
String[] words;
String validity;
int mid;
- private int factor, k = 0;
String errormsg = "", Path;
-
Data data;
-
ArrayList msl_availabilityList;
ArrayList stock_facingHeaderList, stock_facingChildList;
ArrayList promotionSkuList, additionalPromotionList;
+ ArrayList t2PGetterSetters;
ArrayList additionalVisibilityList;
ArrayList additionalVisibilitySkuList;
+ private Dialog dialog;
+ private ProgressBar pb;
+ private TextView percentage, message;
+ private FailureGetterSetter failureGetterSetter = null;
+ private SharedPreferences preferences;
+ private int factor, k = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -79,6 +82,9 @@ public class UploadActivity extends AppCompatActivity {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
date = preferences.getString(CommonString.KEY_DATE, null);
userId = preferences.getString(CommonString.KEY_USERNAME, null);
app_version = preferences.getString(CommonString.KEY_VERSION, null);
@@ -92,6 +98,85 @@ public class UploadActivity extends AppCompatActivity {
new UploadTask(this).execute();
}
+ public String UploadImage(String path, String folder_name) throws Exception {
+ errormsg = "";
+ BitmapFactory.Options o = new BitmapFactory.Options();
+ o.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(Path + path, o);
+
+ // The new size we want to scale to
+ final int REQUIRED_SIZE = 1639;
+
+ // Find the correct scale value. It should be the power of 2.
+ int width_tmp = o.outWidth, height_tmp = o.outHeight;
+ int scale = 1;
+
+ while (true) {
+ if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
+ break;
+ width_tmp /= 2;
+ height_tmp /= 2;
+ scale *= 2;
+ }
+
+ // Decode with inSampleSize
+ BitmapFactory.Options o2 = new BitmapFactory.Options();
+ o2.inSampleSize = scale;
+ Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2);
+
+ ByteArrayOutputStream bao = new ByteArrayOutputStream();
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao);
+ byte[] ba = bao.toByteArray();
+ String ba1 = Base64.encodeBytes(ba);
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
+
+ String[] split = path.split("/");
+ String path1 = split[split.length - 1];
+
+ request.addProperty("img", ba1);
+ request.addProperty("name", path1);
+ request.addProperty("FolderName", folder_name);
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
+
+ Object result = envelope.getResponse();
+
+ if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
+ return CommonString.KEY_FALSE;
+ }
+
+ SAXParserFactory saxPF = SAXParserFactory.newInstance();
+ SAXParser saxP = saxPF.newSAXParser();
+ XMLReader xmlR = saxP.getXMLReader();
+
+ // for failure
+ FailureXMLHandler failureXMLHandler = new FailureXMLHandler();
+ xmlR.setContentHandler(failureXMLHandler);
+
+ InputSource is = new InputSource();
+ is.setCharacterStream(new StringReader(result.toString()));
+ xmlR.parse(is);
+
+ failureGetterSetter = failureXMLHandler.getFailureGetterSetter();
+
+ if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
+ errormsg = failureGetterSetter.getErrorMsg();
+ return CommonString.KEY_FAILURE;
+ }
+ } else {
+ new File(Path + path).delete();
+ }
+
+ return result.toString();
+ }
+
class Data {
int value;
String name;
@@ -180,7 +265,7 @@ public class UploadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
- Object result = (Object) envelope.getResponse();
+ Object result = envelope.getResponse();
datacheck = result.toString();
words = datacheck.split("\\;");
@@ -212,6 +297,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]"
+ "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityList.get(j).getMbq()) + "[/MBQ]"
//+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
+ "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+ "[/MSL_AVAILABILITY_DATA]";
@@ -235,7 +321,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -304,7 +390,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -363,7 +449,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -422,7 +508,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -440,6 +526,7 @@ public class UploadActivity extends AppCompatActivity {
data.name = "Additional Promotion Data Uploading";
publishProgress(data);
+
////ashish open
//Additional Visibility Data
@@ -531,7 +618,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -545,17 +632,154 @@ public class UploadActivity extends AppCompatActivity {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
+
+
data.value = 35;
data.name = "Additional Visibility Data";
publishProgress(data);
-
-
/////ashish close
+ //T2p Upload Data
+ String t2p_data_xml = "";
+ onXML = "";
+ t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
+ if (t2PGetterSetters.size() > 0) {
+ for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
+ ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
+ ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
+
+ String gaps_xml = "";
+ String gaps_child;
+
+ for (int l = 0; l < gapsList.size(); l++) {
+
+ String present = "";
+ if (gapsList.get(l).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+
+ gaps_child = "[GAPS]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CHECK_LIST_ID]"
+ + gapsList.get(l).getChecklist_id()
+ + "[/CHECK_LIST_ID]"
+ + "[DISPLAY_ID]"
+ + gapsList.get(l).getDisplay_id()
+ + "[/DISPLAY_ID]"
+ + "[PRESENT]"
+ + present
+ + "[/PRESENT]"
+ + "[COMMON_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ + "[/COMMON_ID]"
+ + "[/GAPS]";
+ gaps_xml = gaps_xml + gaps_child;
+ }
+
+ String sku_xml = "";
+ String sku_child;
+
+ for (int k = 0; k < skuList.size(); k++) {
+
+ sku_child = "[SKU]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[SKU_ID]"
+ + skuList.get(k).getSKU_ID()
+ + "[/SKU_ID]"
+ + "[BRAND_ID]"
+ + skuList.get(k).getBRAND_ID()
+ + "[/BRAND_ID]"
+ + "[STOCK]"
+ + skuList.get(k).getSTOCK()
+ + "[/STOCK]"
+ + "[COMMON_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ + "[/COMMON_ID]"
+ + "[/SKU]";
+ sku_xml = sku_xml + sku_child;
+ }
+
+ String present = "";
+ if (t2PGetterSetters.get(i1).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+
+ onXML = "[T2P_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id())
+ + "[/CATEGORY_ID]"
+ + "[BRAND_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id())
+ + "[/BRAND_ID]"
+ + "[DISPLAY_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id())
+ + "[/DISPLAY_ID]"
+ + "[COMMON_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ + "[/COMMON_ID]"
+ + "[IMAGE]"
+ + t2PGetterSetters.get(i1).getImage()
+ + "[/IMAGE]"
+ + "[PRESENT]"
+ + present
+ + "[/PRESENT]"
+ + "[GAPS_DATA]"
+ + gaps_xml
+ + "[/GAPS_DATA]"
+ + "[SKU_DATA]"
+ + sku_xml
+ + "[/SKU_DATA]"
+ + "[/T2P_DATA]";
+
+ t2p_data_xml = t2p_data_xml + onXML;
+
+ }
+
+ final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", t2p_final_xml);
+ request.addProperty("KEYS", "T2P_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+ }
+
+ data.value = 40;
+ data.name = "T2P Data Uploading";
+ publishProgress(data);
//Image Upload
@@ -637,6 +861,31 @@ public class UploadActivity extends AppCompatActivity {
+ for(int m=0;m KEYACCOUNT_ID = new ArrayList<>();
+ ArrayList STORETYPE_ID = new ArrayList<>();
+ ArrayList CLASS_ID = new ArrayList<>();
+ ArrayList PLANOGRAM_IMAGE = new ArrayList<>();
+ ArrayList IMAGE_PATH = new ArrayList<>();
+
+ public String getTable_MAPPING_PLANOGRAM() {
+ return table_MAPPING_PLANOGRAM;
+ }
+
+ public void setTable_MAPPING_PLANOGRAM(String table_MAPPING_PLANOGRAM) {
+ this.table_MAPPING_PLANOGRAM = table_MAPPING_PLANOGRAM;
+ }
+
+ public ArrayList getKEYACCOUNT_ID() {
+ return KEYACCOUNT_ID;
+ }
+
+ public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) {
+ this.KEYACCOUNT_ID.add(KEYACCOUNT_ID);
+ }
+
+ public ArrayList getSTORETYPE_ID() {
+ return STORETYPE_ID;
+ }
+
+ public void setSTORETYPE_ID(String STORETYPE_ID) {
+ this.STORETYPE_ID.add(STORETYPE_ID);
+ }
+
+ public ArrayList getCLASS_ID() {
+ return CLASS_ID;
+ }
+
+ public void setCLASS_ID(String CLASS_ID) {
+ this.CLASS_ID.add(CLASS_ID);
+ }
+
+ public ArrayList getPLANOGRAM_IMAGE() {
+ return PLANOGRAM_IMAGE;
+ }
+
+ public void setPLANOGRAM_IMAGE(String PLANOGRAM_IMAGE) {
+ this.PLANOGRAM_IMAGE.add(PLANOGRAM_IMAGE);
+ }
+
+ public ArrayList getIMAGE_PATH() {
+ return IMAGE_PATH;
+ }
+
+ public void setIMAGE_PATH(String IMAGE_PATH) {
+ this.IMAGE_PATH.add(IMAGE_PATH);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java
new file mode 100644
index 0000000..9b546b7
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java
@@ -0,0 +1,101 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by gagang on 11-01-2017.
+ */
+
+public class STORE_PERFORMANCE_MasterGetterSetter {
+ String table_STORE_PERFORMANCE;
+
+ ArrayList STORE_ID = new ArrayList<>();
+ ArrayList CATEGORY_ID = new ArrayList<>();
+ ArrayList PERIOD = new ArrayList<>();
+ ArrayList SOS = new ArrayList<>();
+ ArrayList T2P = new ArrayList<>();
+ ArrayList PROMO = new ArrayList<>();
+ ArrayList MSL_AVAILABILITY = new ArrayList<>();
+ ArrayList OSS = new ArrayList<>();
+ ArrayList ORDERID = new ArrayList<>();
+
+ public String getTable_STORE_PERFORMANCE() {
+ return table_STORE_PERFORMANCE;
+ }
+
+ public void setTable_STORE_PERFORMANCE(String table_STORE_PERFORMANCE) {
+ this.table_STORE_PERFORMANCE = table_STORE_PERFORMANCE;
+ }
+
+ public ArrayList getSTORE_ID() {
+ return STORE_ID;
+ }
+
+ public void setSTORE_ID(String STORE_ID) {
+ this.STORE_ID.add(STORE_ID);
+ }
+
+ public ArrayList getCATEGORY_ID() {
+ return CATEGORY_ID;
+ }
+
+ public void setCATEGORY_ID(String CATEGORY_ID) {
+ this.CATEGORY_ID.add(CATEGORY_ID);
+ }
+
+ public ArrayList getPERIOD() {
+ return PERIOD;
+ }
+
+ public void setPERIOD(String PERIOD) {
+ this.PERIOD.add(PERIOD);
+ }
+
+ public ArrayList getSOS() {
+ return SOS;
+ }
+
+ public void setSOS(String SOS) {
+ this.SOS.add(SOS);
+ }
+
+ public ArrayList getT2P() {
+ return T2P;
+ }
+
+ public void setT2P(String t2P) {
+ this.T2P.add(t2P);
+ }
+
+ public ArrayList getPROMO() {
+ return PROMO;
+ }
+
+ public void setPROMO(String PROMO) {
+ this.PROMO.add(PROMO);
+ }
+
+ public ArrayList getMSL_AVAILABILITY() {
+ return MSL_AVAILABILITY;
+ }
+
+ public void setMSL_AVAILABILITY(String MSL_AVAILABILITY) {
+ this.MSL_AVAILABILITY.add(MSL_AVAILABILITY);
+ }
+
+ public ArrayList getOSS() {
+ return OSS;
+ }
+
+ public void setOSS(String OSS) {
+ this.OSS.add(OSS);
+ }
+
+ public ArrayList getORDERID() {
+ return ORDERID;
+ }
+
+ public void setORDERID(String ORDERID) {
+ this.ORDERID.add(ORDERID);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java
new file mode 100644
index 0000000..9f290d7
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java
@@ -0,0 +1,81 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+/**
+ * Created by gagang on 23-12-2016.
+ */
+
+public class StoreWisePerformaceGetterSetter {
+ String store_id, category_id, period, msl_availability, sos, t2p, promo, oss, order_id;
+
+ public String getStore_id() {
+ return store_id;
+ }
+
+ public void setStore_id(String store_id) {
+ this.store_id = store_id;
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public void setCategory_id(String category_id) {
+ this.category_id = category_id;
+ }
+
+ public String getPeriod() {
+ return period;
+ }
+
+ public void setPeriod(String period) {
+ this.period = period;
+ }
+
+ public String getMsl_availability() {
+ return msl_availability;
+ }
+
+ public void setMsl_availability(String msl_availability) {
+ this.msl_availability = msl_availability;
+ }
+
+ public String getSos() {
+ return sos;
+ }
+
+ public void setSos(String sos) {
+ this.sos = sos;
+ }
+
+ public String getT2p() {
+ return t2p;
+ }
+
+ public void setT2p(String t2p) {
+ this.t2p = t2p;
+ }
+
+ public String getPromo() {
+ return promo;
+ }
+
+ public void setPromo(String promo) {
+ this.promo = promo;
+ }
+
+ public String getOss() {
+ return oss;
+ }
+
+ public void setOss(String oss) {
+ this.oss = oss;
+ }
+
+ public String getOrder_id() {
+ return order_id;
+ }
+
+ public void setOrder_id(String order_id) {
+ this.order_id = order_id;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
index f79aec6..b040e6b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
public class T2PGetterSetter {
- String brand_id, display_id, brand, display, image, remark;
+ String brand_id, display_id, brand, display, image, remark, key_id, category_id;
boolean isPresent;
ArrayList gapsChecklist = new ArrayList<>();
@@ -85,4 +85,20 @@ public class T2PGetterSetter {
public void setSkulist(ArrayList skulist) {
this.skulist = skulist;
}
+
+ public String getKey_id() {
+ return key_id;
+ }
+
+ public void setKey_id(String key_id) {
+ this.key_id = key_id;
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public void setCategory_id(String category_id) {
+ this.category_id = category_id;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
index 28b4f06..5fb75a8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -21,6 +21,9 @@ public class TableBean {
//Gagan start code
public static String MAPPING_ADDITIONAL_PROMOTION;
+ public static String STORE_PERFORMANCE;
+ public static String MAPPING_PLANOGRAM;
+
//Gagan end code
public static String getJourneyPlan() {
@@ -129,5 +132,21 @@ public class TableBean {
MAPPING_ADDITIONAL_PROMOTION = mappingAdditionalPromotion;
}
+ public static String getStorePerformance() {
+ return STORE_PERFORMANCE;
+ }
+
+ public static void setStorePerformance(String storePerformance) {
+ STORE_PERFORMANCE = storePerformance;
+ }
+
+ public static String getMappingPlanogram() {
+ return MAPPING_PLANOGRAM;
+ }
+
+ public static void setMappingPlanogram(String mappingPlanogram) {
+ MAPPING_PLANOGRAM = mappingPlanogram;
+ }
+
//Gagan end code
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
index d152992..cffad97 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -14,10 +14,12 @@ import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
@@ -621,5 +623,89 @@ public class XMLHandlers {
return map;
}
+
+ public static STORE_PERFORMANCE_MasterGetterSetter STORE_PERFORMANCEXMLHandler(XmlPullParser xpp, int eventType) {
+ STORE_PERFORMANCE_MasterGetterSetter st = new STORE_PERFORMANCE_MasterGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_STORE_PERFORMANCE(xpp.nextText());
+ }
+ if (xpp.getName().equals("STORE_ID")) {
+ st.setSTORE_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("CATEGORY_ID")) {
+ st.setCATEGORY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("PERIOD")) {
+ st.setPERIOD(xpp.nextText());
+ }
+ if (xpp.getName().equals("SOS")) {
+ st.setSOS(xpp.nextText());
+ }
+ if (xpp.getName().equals("T2P")) {
+ st.setT2P(xpp.nextText());
+ }
+ if (xpp.getName().equals("PROMO")) {
+ st.setPROMO(xpp.nextText());
+ }
+ if (xpp.getName().equals("MSL_AVAILABILITY")) {
+ st.setMSL_AVAILABILITY(xpp.nextText());
+ }
+ if (xpp.getName().equals("OSS")) {
+ st.setOSS(xpp.nextText());
+ }
+ if (xpp.getName().equals("ORDERID")) {
+ st.setORDERID(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
+
+ public static MAPPING_PLANOGRAM_MasterGetterSetter MAPPING_PLANOGRAM_XMLHandler(XmlPullParser xpp, int eventType) {
+ MAPPING_PLANOGRAM_MasterGetterSetter st = new MAPPING_PLANOGRAM_MasterGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_MAPPING_PLANOGRAM(xpp.nextText());
+ }
+ if (xpp.getName().equals("KEYACCOUNT_ID")) {
+ st.setKEYACCOUNT_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("STORETYPE_ID")) {
+ st.setSTORETYPE_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("CLASS_ID")) {
+ st.setCLASS_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("PLANOGRAM_IMAGE")) {
+ st.setPLANOGRAM_IMAGE(xpp.nextText());
+ }
+ if (xpp.getName().equals("IMAGE_PATH")) {
+ st.setIMAGE_PATH(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
//Gagan End Code
}
diff --git a/GSKMTOrange/src/main/res/drawable/HFD.png b/GSKMTOrange/src/main/res/drawable/HFD.png
deleted file mode 100644
index 8278277..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/HFD.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/HFD_done.png b/GSKMTOrange/src/main/res/drawable/HFD_done.png
deleted file mode 100644
index 073f978..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/HFD_done.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/OHC.png b/GSKMTOrange/src/main/res/drawable/OHC.png
deleted file mode 100644
index 9ccf323..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/OHC.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/OHC_done.png b/GSKMTOrange/src/main/res/drawable/OHC_done.png
deleted file mode 100644
index 9654568..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/OHC_done.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/PDR.png b/GSKMTOrange/src/main/res/drawable/PDR.png
deleted file mode 100644
index 9190d2d..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/PDR.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/PDR_done.png b/GSKMTOrange/src/main/res/drawable/PDR_done.png
deleted file mode 100644
index 4b99cf5..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/PDR_done.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/hfd.png b/GSKMTOrange/src/main/res/drawable/hfd.png
index 8278277..f8b2211 100644
Binary files a/GSKMTOrange/src/main/res/drawable/hfd.png and b/GSKMTOrange/src/main/res/drawable/hfd.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/hfd_done.png b/GSKMTOrange/src/main/res/drawable/hfd_done.png
index 073f978..90def7b 100644
Binary files a/GSKMTOrange/src/main/res/drawable/hfd_done.png and b/GSKMTOrange/src/main/res/drawable/hfd_done.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/ohc.png b/GSKMTOrange/src/main/res/drawable/ohc.png
index 9ccf323..ba146f8 100644
Binary files a/GSKMTOrange/src/main/res/drawable/ohc.png and b/GSKMTOrange/src/main/res/drawable/ohc.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/ohc_done.png b/GSKMTOrange/src/main/res/drawable/ohc_done.png
index 9654568..7c96401 100644
Binary files a/GSKMTOrange/src/main/res/drawable/ohc_done.png and b/GSKMTOrange/src/main/res/drawable/ohc_done.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/pdr.png b/GSKMTOrange/src/main/res/drawable/pdr.png
index 9190d2d..8d4b787 100644
Binary files a/GSKMTOrange/src/main/res/drawable/pdr.png and b/GSKMTOrange/src/main/res/drawable/pdr.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/pdr_done.png b/GSKMTOrange/src/main/res/drawable/pdr_done.png
index 4b99cf5..ed70cc6 100644
Binary files a/GSKMTOrange/src/main/res/drawable/pdr_done.png and b/GSKMTOrange/src/main/res/drawable/pdr_done.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/toggle_green.png b/GSKMTOrange/src/main/res/drawable/toggle_green.png
new file mode 100644
index 0000000..f431425
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/toggle_green.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/toggle_grey.png b/GSKMTOrange/src/main/res/drawable/toggle_grey.png
new file mode 100644
index 0000000..3e650b8
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/toggle_grey.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
index 3044f98..93933bf 100644
--- a/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
+++ b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
@@ -1,5 +1,5 @@
-