From 4edb3666df162864667ff49dcb0bacf50aeb1c45 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 24 Jan 2017 11:49:43 +0530 Subject: [PATCH 1/7] //Stock_FacingActivity Changes today --- .../com/gskmtorange/Database/GSKOrangeDB.java | 79 ++++++++++++++++--- .../gsk_dailyentry/CategoryListActivity.java | 12 +-- .../gsk_dailyentry/DailyDataMenuActivity.java | 12 +-- .../PromoComplianceActivity.java | 4 +- GSKMTOrange/src/main/res/values-tr/string.xml | 2 +- 5 files changed, 82 insertions(+), 27 deletions(-) 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 080b8cb..3d196e4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1495,13 +1495,26 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } //Promo Compliance - public ArrayList getPromoComplianceSkuData(String store_id) { + public ArrayList getPromoComplianceSkuData(String store_id, String category_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from MAPPING_PROMOTION " + - "where STORE_ID='" + store_id + "'", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND", null); + + /*dbcursor = db.rawQuery("Select * from MAPPING_PROMOTION " + + "where STORE_ID='" + store_id + "'", null);*/ if (dbcursor != null) { dbcursor.moveToFirst(); @@ -1530,7 +1543,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public ArrayList getPromoSpinnerData(String store_id) { + public ArrayList getPromoSpinnerData(String store_id, String category_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; @@ -1541,8 +1554,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper { list.add(promo); - dbcursor = db.rawQuery("Select * from MAPPING_ADDITIONAL_PROMOTION " + - "where STORE_ID='" + store_id + "'", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_ADDITIONAL_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND", null); + + /*dbcursor = db.rawQuery("Select * from MAPPING_ADDITIONAL_PROMOTION " + + "where STORE_ID='" + store_id + "'", null);*/ if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3271,12 +3297,25 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingPromotionData() { + public boolean isMappingPromotionData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_PROMOTION ", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND ", null); + + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_PROMOTION ", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3319,12 +3358,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingT2PData() { + public boolean isMappingT2PData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_T2P ", null); + dbcursor = db.rawQuery("SELECT * FROM MAPPING_T2P M INNER JOIN BRAND_MASTER BR ON M.BRAND_ID = BR.BRAND_ID " + + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + + "WHERE M.STORE_ID = '"+ store_id +"' AND CA.CATEGORY_ID= '" + category_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3343,12 +3385,25 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingAdditionalPromotionData() { + public boolean isMappingAdditionalPromotionData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_ADDITIONAL_PROMOTION ", null); + dbcursor = db.rawQuery("Select M.* " + + "from MAPPING_ADDITIONAL_PROMOTION M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND ", null); + + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_ADDITIONAL_PROMOTION ", null); if (dbcursor != null) { dbcursor.moveToFirst(); 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 033eca3..f765492 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 @@ -113,16 +113,16 @@ public class CategoryListActivity extends AppCompatActivity { } if (flag) { - if (!db.isMappingPromotionData()) { - if (db.checkPromoComplianceData(store_id, category_id)) { + if (db.isMappingPromotionData(store_id, category_id)) { + if (!db.checkPromoComplianceData(store_id, category_id)) { flag = false; } } } if (flag) { - if (!db.isMappingT2PData()) { - if (db.isFilledT2P(store_id, category_id)) { + if (db.isMappingT2PData(store_id, category_id)) { + if (!db.isFilledT2P(store_id, category_id)) { flag = false; } } @@ -298,7 +298,7 @@ public class CategoryListActivity extends AppCompatActivity { } - if (!db.isMappingPromotionData()) { + if (!db.isMappingPromotionData(store_id,category_id)) { if (db.checkPromoComplianceData(store_id, category_id)) { flag_filled = false; break; @@ -306,7 +306,7 @@ public class CategoryListActivity extends AppCompatActivity { } - if (!db.isMappingT2PData()) { + if (!db.isMappingT2PData(store_id, category_id)) { if (db.isFilledT2P(store_id, category_id)) { flag_filled = false; break; 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 622d558..62fe305 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 @@ -135,7 +135,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { if (db.isFilledT2P(store_id, categoryId)) { data.setCategory_img(R.mipmap.t2p_compliance_done); } else { @@ -163,7 +163,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { //data.setCategory_name("Promo Compliance"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance)); - if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) { + if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) { if (db.checkPromoComplianceData(store_id, categoryId) || db.checkAdditionalPromoComplianceData(store_id, categoryId)) { data.setCategory_img(R.mipmap.promo_compliance_done); @@ -260,13 +260,13 @@ public class DailyDataMenuActivity extends AppCompatActivity { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) { - if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) { + if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); @@ -292,14 +292,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) { - if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) { + if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) { Intent intent = new Intent(DailyDataMenuActivity.this, PromoComplianceActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); startActivity(intent); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); 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 837a3fb..22a928a 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 @@ -317,11 +317,11 @@ public class PromoComplianceActivity extends AppCompatActivity { //Promo SKU List promoSkuListData = db.getPromoComplianceSkuAfterData(store_id, categoryId); if (!(promoSkuListData.size() > 0)) { - promoSkuListData = db.getPromoComplianceSkuData(store_id); + promoSkuListData = db.getPromoComplianceSkuData(store_id, categoryId); } //Promo Spinner List - promoSpinnerListData = db.getPromoSpinnerData(store_id); + promoSpinnerListData = db.getPromoSpinnerData(store_id, categoryId); ArrayAdapter sp_promo_adapter = new ArrayAdapter<>(PromoComplianceActivity.this, android.R.layout.simple_list_item_1); for (int i = 0; i < promoSpinnerListData.size(); i++) { diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 359ccf8..0acbfa3 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -208,7 +208,7 @@ İptal etmek Boş - Raf Payı, stoktan daha az veya eşit olmalıdır + Önyüz sayısı stoktan daha az veya eşit olmalıdır Önce stok değerini doldurun Verileri eklemek istiyor musunuz? Promosyon eklendi From 87f30fa116d982ec0586450cb7c62330a8253b50 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Tue, 24 Jan 2017 12:23:35 +0530 Subject: [PATCH 2/7] turkish --- .idea/misc.xml | 2 +- .idea/modules.xml | 2 ++ .../main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 2 +- .../gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index ad566b9..a329b11 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ + + 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 080b8cb..f6a861b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3319,7 +3319,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingT2PData() { + public boolean isMappingT2PData(String store_id, String categoryId) { boolean filled = false; Cursor dbcursor = null; 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 622d558..e5d7227 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 @@ -135,7 +135,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { if (db.isFilledT2P(store_id, categoryId)) { data.setCategory_img(R.mipmap.t2p_compliance_done); } else { @@ -266,7 +266,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); @@ -299,7 +299,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { startActivity(intent); } } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { - if (db.isMappingT2PData()) { + if (db.isMappingT2PData(store_id, categoryId)) { Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); From 01b5ff071f0b5c9e9c981c94c2cdcad5a2a56aa6 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 24 Jan 2017 12:58:25 +0530 Subject: [PATCH 3/7] //Stock_FacingActivity Changes today --- .../com/gskmtorange/Database/GSKOrangeDB.java | 56 ++++++++++++++++++- .../gsk_dailyentry/CategoryListActivity.java | 50 +++++++++++------ .../gsk_dailyentry/DailyDataMenuActivity.java | 12 ++-- 3 files changed, 93 insertions(+), 25 deletions(-) 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 3d196e4..2f4cd7c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3334,12 +3334,25 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } - public boolean isMappingStockData() { + public boolean isMappingStockDataMSL_Availability(String category_id, String keyAccount_id, String storeType_id, String class_id) { boolean filled = false; Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null); + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null); + dbcursor = db.rawQuery("Select M.* from MAPPING_STOCK M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where M.MUST_HAVE=1 AND CA.CATEGORY_ID='" + category_id + "' " + + "AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' " + + "AND M.CLASS_ID = '" + class_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3358,6 +3371,43 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } + public boolean isMappingStockDataStockFacing(String category_id, String keyAccount_id, String storeType_id, String class_id) { + boolean filled = false; + Cursor dbcursor = null; + + try { + //dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", null); + dbcursor = db.rawQuery("Select M.* from MAPPING_STOCK M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' " + + "AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' " + + "order by SB.SUB_CATEGORY,BR.BRAND ", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + int icount = dbcursor.getInt(0); + dbcursor.close(); + if (icount > 0) { + filled = true; + } else { + filled = false; + } + } + } catch (Exception e) { + Log.d("Exception ", " when fetching Records!!!!!!!!!!!!!!!!!!!!! " + e.toString()); + return filled; + } + return filled; + } + + public boolean isMappingT2PData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; @@ -3366,7 +3416,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { dbcursor = db.rawQuery("SELECT * FROM MAPPING_T2P M INNER JOIN BRAND_MASTER BR ON M.BRAND_ID = BR.BRAND_ID " + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + - "WHERE M.STORE_ID = '"+ store_id +"' AND CA.CATEGORY_ID= '" + category_id + "'", null); + "WHERE M.STORE_ID = '" + store_id + "' AND CA.CATEGORY_ID= '" + category_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); 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 f765492..7e705bb 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 @@ -102,16 +102,27 @@ public class CategoryListActivity extends AppCompatActivity { boolean flag_filled = false; String category_id = categoryList.get(i).getCategory_id(); + //Additional_Visibility if (db.additionalVisibilitydata(store_id, category_id)) { boolean flag = true; - if (db.isMappingStockData()) { - if (!db.checkMsl_AvailabilityData(store_id, category_id) - && !db.checkStockAndFacingData(store_id, category_id)) { + //MSL_Availability + if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkMsl_AvailabilityData(store_id, category_id)) { flag = false; } } + //Stock_Facing + if (flag) { + if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkStockAndFacingData(store_id, category_id)) { + flag = false; + } + } + } + + //Promo Compliance if (flag) { if (db.isMappingPromotionData(store_id, category_id)) { if (!db.checkPromoComplianceData(store_id, category_id)) { @@ -120,6 +131,7 @@ public class CategoryListActivity extends AppCompatActivity { } } + //T2P if (flag) { if (db.isMappingT2PData(store_id, category_id)) { if (!db.isFilledT2P(store_id, category_id)) { @@ -289,25 +301,31 @@ public class CategoryListActivity extends AppCompatActivity { if (db.additionalVisibilitydata(store_id, category_id)) { //boolean flag = true; - if (db.isMappingStockData()) { - if (!db.checkMsl_AvailabilityData(store_id, category_id) - && !db.checkStockAndFacingData(store_id, category_id)) { + if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkMsl_AvailabilityData(store_id, category_id)) { + flag_filled = false; + break; + } + } + + //Stock_Facing + if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) { + if (!db.checkStockAndFacingData(store_id, category_id)) { + flag_filled = false; + break; + } + } + + if (db.isMappingPromotionData(store_id, category_id)) { + if (!db.checkPromoComplianceData(store_id, category_id)) { flag_filled = false; break; } } - if (!db.isMappingPromotionData(store_id,category_id)) { - if (db.checkPromoComplianceData(store_id, category_id)) { - flag_filled = false; - break; - } - } - - - if (!db.isMappingT2PData(store_id, category_id)) { - if (db.isFilledT2P(store_id, category_id)) { + if (db.isMappingT2PData(store_id, category_id)) { + if (!db.isFilledT2P(store_id, category_id)) { flag_filled = false; break; } 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 62fe305..4b5e4cd 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 @@ -106,7 +106,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter(); //data.setCategory_name("MSL Availability"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability)); - if (db.isMappingStockData()) { + if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) { if (db.checkMsl_AvailabilityData(store_id, categoryId)) { data.setCategory_img(R.mipmap.msl_availability_done); } else { @@ -120,7 +120,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); //data.setCategory_name("Stock & Facing"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing)); - if (db.isMappingStockData()) { + if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) { if (db.checkStockAndFacingData(store_id, categoryId)) { data.setCategory_img(R.mipmap.stock_facing_done); } else { @@ -248,13 +248,13 @@ public class DailyDataMenuActivity extends AppCompatActivity { holder.categoryIcon.setImageResource(dailyData.getCategory_img()); if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) { holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); } else { holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); @@ -277,14 +277,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { @Override public void onClick(View view) { if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) { Intent intent = new Intent(DailyDataMenuActivity.this, MSL_AvailabilityActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); startActivity(intent); } } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) { - if (db.isMappingStockData()) { + if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) { Intent intent = new Intent(DailyDataMenuActivity.this, Stock_FacingActivity.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); From 423d80fd63bf574bb0cfb4b581426b3ca6157ce9 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 24 Jan 2017 16:31:34 +0530 Subject: [PATCH 4/7] //Stock_FacingActivity Changes today --- .../src/main/java/cpm/com/gskmtorange/MainActivity.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 664264c..066167d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -226,9 +226,6 @@ public class MainActivity extends AppCompatActivity if (coverageList.size() == 0) { Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - - Intent i = new Intent(getBaseContext(), UploadActivity.class); - startActivity(i); } else { if (isStoreCheckedIn() && isValid()) { From 99b7c5788fff060c12b7fd5c9c46a9f6802bf8fd Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 24 Jan 2017 16:46:05 +0530 Subject: [PATCH 5/7] //Stock_FacingActivity Changes today --- .../main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 3 +++ .../cpm/com/gskmtorange/dailyentry/NonWorkingReason.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 2f4cd7c..0da6951 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1749,6 +1749,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setENTRY_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ENTRY_ALLOW"))); + sb.setIMAGE_ALLOW(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW"))); + + list.add(sb); dbcursor.moveToNext(); } 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 a912e47..d6a0227 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -53,7 +53,7 @@ public class NonWorkingReason extends AppCompatActivity implements ArrayList reasondata = new ArrayList(); private Spinner reasonspinner; private GSKOrangeDB database; - String reasonname, reasonid, entry_allow, image, entry, reason_reamrk, intime; + String reasonname, reasonid, entry_allow, image, entry, reason_reamrk, intime,image_allow; Button save; private ArrayAdapter reason_adapter; protected String _path, str; @@ -152,7 +152,9 @@ public class NonWorkingReason extends AppCompatActivity implements reasonid = reasondata.get(position - 1).getREASON_ID().get(0); entry_allow = reasondata.get(position - 1).getENTRY_ALLOW().get(0); - if (reasonname.equalsIgnoreCase("Store closed")) { + image_allow = reasondata.get(position - 1).getIMAGE_ALLOW().get(0); + + if (image_allow.equalsIgnoreCase("1")) { rel_cam.setVisibility(View.VISIBLE); image = "true"; } else { From c5efee08d64702d0bb6654836f820e2330013a9a Mon Sep 17 00:00:00 2001 From: yadavendras Date: Tue, 24 Jan 2017 17:28:56 +0530 Subject: [PATCH 6/7] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk # Conflicts: # GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java --- GSKMTOrange/build.gradle | 4 ++-- .../dailyentry/CheckoutActivity.java | 2 +- .../gskmtorange/upload/UploadActivity.java | 22 +++++++++++-------- GSKMTOrange/src/main/res/values-tr/string.xml | 10 +++++++++ GSKMTOrange/src/main/res/values/strings.xml | 10 ++++++++- 5 files changed, 35 insertions(+), 13 deletions(-) diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 992c541..213644a 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -14,8 +14,8 @@ android { applicationId "cpm.com.gskmtorange" minSdkVersion 15 targetSdkVersion 22 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index e8909fc..9ae5d11 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -105,7 +105,7 @@ public class CheckoutActivity extends AppCompatActivity { dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Sending Checkout Data"); + dialog.setTitle(getString(R.string.title_activity_checkout)); dialog.setCancelable(false); dialog.show(); pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); 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 10871b5..270f5bf 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -13,6 +13,7 @@ import android.os.AsyncTask; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.widget.Toolbar; import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; @@ -79,10 +80,13 @@ public class UploadActivity extends AppCompatActivity { private int factor, k = 0; Object result = ""; + Toolbar toolbar; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_upload); + setContentView(R.layout.activity_main); + toolbar = (Toolbar) findViewById(R.id.toolbar); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -199,7 +203,7 @@ public class UploadActivity extends AppCompatActivity { super.onPreExecute(); dialog = new Dialog(context); dialog.setContentView(R.layout.custom); - dialog.setTitle("Uploading Data"); + dialog.setTitle(getString(R.string.uploaddata)); dialog.setCancelable(false); dialog.show(); @@ -342,7 +346,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 10; - data.name = "MSL_Availability Uploading"; + data.name = getString(R.string.availability_data_uploading); publishProgress(data); @@ -467,7 +471,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 20; - data.name = "Stock Facing Uploading"; + data.name = getString(R.string.stock_data_uploading); publishProgress(data); @@ -526,7 +530,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 30; - data.name = "Promotion Data Uploading"; + data.name = getString(R.string.promo_data_uploading); publishProgress(data); @@ -585,7 +589,7 @@ public class UploadActivity extends AppCompatActivity { } } data.value = 35; - data.name = "Additional Promotion Data Uploading"; + data.name = getString(R.string.additional_data_uploading); publishProgress(data); @@ -700,9 +704,8 @@ public class UploadActivity extends AppCompatActivity { } } - data.value = 35; - data.name = "Additional Visibility Data"; + data.name = getString(R.string.additional_data_uploading); publishProgress(data); /////ashish close @@ -845,7 +848,7 @@ public class UploadActivity extends AppCompatActivity { } data.value = 40; - data.name = "T2P Data Uploading"; + data.name = getString(R.string.t2p_data_uploading); publishProgress(data); //Image Upload @@ -1069,6 +1072,7 @@ public class UploadActivity extends AppCompatActivity { protected void onResume() { super.onResume(); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar.setTitle(getString(R.string.title_activity_upload)); } diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 0acbfa3..cd8faa3 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -216,6 +216,16 @@ Seçiniz + //text for uploading screen + + Kapsam yükleniyor + Bulunurluk verisi paylaşılıyor + Stok verisi paylaşılıyor + Kalıcı teşhir verisi paylaşılıyor + Ek teşhir verisi paylaşılıyor + Promosyon verisi paylaşılıyor + Yükleme İçin Veri Yok + Çıkış yapmak diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 20e6089..f216113 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -209,7 +209,7 @@ Hello blank fragment - CheckoutActivity + Checkout Activity Checkout Success Network Error , @@ -251,5 +251,13 @@ Select + + //text for uploading screen + Coverage Uploading + Availability Data Uploading + Stock Data Uploading + T2P Data Uploading + Additional Visibility Data Uploading + Promo Data Uploading From 16bdac6be1f57c8e8f5118732b9458c41d7f6394 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Wed, 25 Jan 2017 10:47:58 +0530 Subject: [PATCH 7/7] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk # Conflicts: # GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java --- .idea/modules.xml | 2 -- GSKMTOrange/src/main/AndroidManifest.xml | 1 + .../src/main/java/cpm/com/gskmtorange/MainActivity.java | 6 ++++-- .../com/gskmtorange/upload/PreviousDataUploadActivity.java | 3 +-- .../java/cpm/com/gskmtorange/upload/UploadActivity.java | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index a329b11..ad566b9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,6 @@ - - diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index d63a2dd..9a6bced 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -150,6 +150,7 @@ android:name=".upload.UploadActivity" android:configChanges="screenSize|orientation|keyboardHidden" android:label="@string/title_activity_upload" + android:theme="@style/AppTheme.NoActionBar" android:screenOrientation="portrait" />