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 806a337..12393ca 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -126,7 +126,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getAdditionalDisplay()); } catch (SQLException e) { e.printStackTrace(); - Toast.makeText(context,"Error -" +e.toString(),Toast.LENGTH_SHORT).show(); + Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show(); } } @@ -331,7 +331,7 @@ 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 + "' AND BR.COMPANY_ID ='1' AND SCM.CATEGORY_ID = '"+ category_id +"' ORDER BY SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE ) 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' AND SCM.CATEGORY_ID = '" + category_id + "' ORDER BY SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE ) As Brand", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3235,4 +3235,75 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return filled; } + public boolean isMappingPromotionData() { + boolean filled = false; + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("SELECT * FROM MAPPING_PROMOTION ", 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 isMappingStockData() { + boolean filled = false; + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("SELECT * FROM MAPPING_STOCK ", 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() { + boolean filled = false; + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("SELECT * FROM MAPPING_T2P ", 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; + } } 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 73310ec..f194d0f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -1009,7 +1009,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl public void showSkuDialog() { - final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id); + final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id,categoryId); BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); brand.setBRAND(getResources().getString(R.string.select)); @@ -1148,7 +1148,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brand_id = brandList.get(position).getBRAND_ID().get(0); brand_name = brandList.get(position).getBRAND().get(0); - sku_list = db.getSkuT2PData("1", "1", "1", brand_id); + sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id); SkuGetterSetter select = new SkuGetterSetter(); select.setSKU(getResources().getString(R.string.select)); sku_list.add(0, select); 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 5e41666..033eca3 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 @@ -55,7 +55,7 @@ public class CategoryListActivity extends AppCompatActivity { preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); @@ -88,46 +88,63 @@ public class CategoryListActivity extends AppCompatActivity { protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); categoryList = new ArrayList<>(); categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id); - if(categoryList.size()>0){ + if (categoryList.size() > 0) { - for(int i=0;i(); @@ -106,20 +106,28 @@ 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.checkMsl_AvailabilityData(store_id, categoryId)) { - data.setCategory_img(R.mipmap.msl_availability_done); + if (db.isMappingStockData()) { + if (db.checkMsl_AvailabilityData(store_id, categoryId)) { + data.setCategory_img(R.mipmap.msl_availability_done); + } else { + data.setCategory_img(R.mipmap.msl_availability); + } } else { - data.setCategory_img(R.mipmap.msl_availability); + data.setCategory_img(R.mipmap.msl_availability_grey); } categoryList.add(data); data = new DailyDataMenuGetterSetter(); //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_facing_done); + if (db.isMappingStockData()) { + if (db.checkStockAndFacingData(store_id, categoryId)) { + data.setCategory_img(R.mipmap.stock_facing_done); + } else { + data.setCategory_img(R.mipmap.stock_facing); + } } else { - data.setCategory_img(R.mipmap.stock_facing); + data.setCategory_img(R.mipmap.stockandfacing_grey); } categoryList.add(data); @@ -127,10 +135,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); - if (db.isFilledT2P(store_id, categoryId)) { - data.setCategory_img(R.mipmap.t2p_compliance_done); + if (db.isMappingT2PData()) { + if (db.isFilledT2P(store_id, categoryId)) { + data.setCategory_img(R.mipmap.t2p_compliance_done); + } else { + data.setCategory_img(R.mipmap.t2p_compliance); + } } else { - data.setCategory_img(R.mipmap.t2p_compliance); + data.setCategory_img(R.mipmap.t2pcompliance_grey); } categoryList.add(data); @@ -150,10 +162,15 @@ public class DailyDataMenuActivity extends AppCompatActivity { data = new DailyDataMenuGetterSetter(); //data.setCategory_name("Promo Compliance"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance)); - if (db.checkPromoComplianceData(store_id, categoryId)) { - data.setCategory_img(R.mipmap.promo_compliance_done); + + if (db.isMappingPromotionData()) { + if (db.checkPromoComplianceData(store_id, categoryId)) { + data.setCategory_img(R.mipmap.promo_compliance_done); + } else { + data.setCategory_img(R.mipmap.promo_compliance); + } } else { - data.setCategory_img(R.mipmap.promo_compliance); + data.setCategory_img(R.mipmap.promocompliance_grey); } categoryList.add(data); @@ -223,40 +240,72 @@ public class DailyDataMenuActivity extends AppCompatActivity { } @Override - public void onBindViewHolder(DailyDataMenuAdapter.MyViewHolder holder, int position) { + public void onBindViewHolder(final DailyDataMenuAdapter.MyViewHolder holder, int position) { final DailyDataMenuGetterSetter dailyData = list.get(position); holder.categoryName.setText(dailyData.getCategory_name()); holder.categoryIcon.setImageResource(dailyData.getCategory_img()); + if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) { + if (db.isMappingStockData()) { + 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()) { + 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_promo_compliance))) { + if (db.isMappingPromotionData()) { + 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()) { + holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else { + holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background)); + } + } + holder.lay_menu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) { - Intent intent = new Intent(DailyDataMenuActivity.this, MSL_AvailabilityActivity.class); - intent.putExtra("categoryName", dailyData.getCategory_name()); - intent.putExtra("categoryId", categoryId); - startActivity(intent); + if (db.isMappingStockData()) { + 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))) { - Intent intent = new Intent(DailyDataMenuActivity.this, Stock_FacingActivity.class); - intent.putExtra("categoryName", dailyData.getCategory_name()); - intent.putExtra("categoryId", categoryId); - startActivity(intent); + if (db.isMappingStockData()) { + Intent intent = new Intent(DailyDataMenuActivity.this, Stock_FacingActivity.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_promo_compliance))) { - Intent intent = new Intent(DailyDataMenuActivity.this, PromoComplianceActivity.class); - intent.putExtra("categoryName", dailyData.getCategory_name()); - intent.putExtra("categoryId", categoryId); - startActivity(intent); + + if (db.isMappingPromotionData()) { + 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)))) { - Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); - intent.putExtra("categoryName", dailyData.getCategory_name()); - intent.putExtra("categoryId", categoryId); - startActivity(intent); - overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - - } - - else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_activity_Additional_visibility)))) { + if (db.isMappingT2PData()) { + Intent intent = new Intent(DailyDataMenuActivity.this, T2PComplianceActivity.class); + intent.putExtra("categoryName", dailyData.getCategory_name()); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + } + } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_activity_Additional_visibility)))) { Intent intent = new Intent(DailyDataMenuActivity.this, AdditionalVisibility.class); intent.putExtra("categoryName", dailyData.getCategory_name()); intent.putExtra("categoryId", categoryId); @@ -291,15 +340,13 @@ public class DailyDataMenuActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } diff --git a/GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml b/GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml index 4abf0d1..6db17cf 100644 --- a/GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml +++ b/GSKMTOrange/src/main/res/layout/daily_main_menu_row.xml @@ -1,11 +1,12 @@ - diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/additionalvisibility_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/additionalvisibility_grey.png new file mode 100644 index 0000000..d8ab83d Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/additionalvisibility_grey.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_grey.png new file mode 100644 index 0000000..6738d33 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_grey.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/promocompliance_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/promocompliance_grey.png new file mode 100644 index 0000000..8c8b7d6 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/promocompliance_grey.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/stockandfacing_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/stockandfacing_grey.png new file mode 100644 index 0000000..dd177ed Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/stockandfacing_grey.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/t2pcompliance_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/t2pcompliance_grey.png new file mode 100644 index 0000000..bc137e6 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/t2pcompliance_grey.png differ