diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 079968e..218e140 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 3397efd..52edb58 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -27,7 +27,7 @@ + android:theme="@style/AppTheme.NoActionBar" /> brandList; - if (country_id.equals("7")||country_id.equals("8")) { + if (country_id.equals("7") || country_id.equals("8")) { brandList = db.getBrandAvailbilitydata(store_id, categoryId, null, null, null, CommonString.TABLE_MAPPING_STOCK_STOREWISE); - } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){ + } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); - }else { + } else { brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id, CommonString.TABLE_MAPPING_STOCK); } 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 dbea374..ada48a7 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 @@ -199,9 +199,14 @@ public class DailyDataMenuActivity extends AppCompatActivity { } categoryList.add(data);*/ - //T2p + //T2p and kenya POSm data = new DailyDataMenuGetterSetter(); - data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); + if (country_id.equals("8")){ + data.setCategory_name(getResources().getString(R.string.title_posm)); + }else { + data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p)); + } + boolean flag_t2p_mapping; if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { flag_t2p_mapping = db.isMappingT2PData(store_id, categoryId, CommonString.TABLE_MAPPING_T2P_ADHOC); @@ -546,8 +551,8 @@ 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)))||dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm)))) { - } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { boolean t2p_flag = false; boolean flag_t2p_mapping; if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { @@ -646,7 +651,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { } - } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))) { + } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_t2p)))||dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.title_posm)))) { boolean t2p_flag = false; boolean flag_t2p_mapping; if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { diff --git a/GSKMTOrange/src/main/res/navigation/nav_graph.xml b/GSKMTOrange/src/main/res/navigation/nav_graph.xml index 3de147f..ce81182 100644 --- a/GSKMTOrange/src/main/res/navigation/nav_graph.xml +++ b/GSKMTOrange/src/main/res/navigation/nav_graph.xml @@ -25,4 +25,24 @@ android:id="@+id/action_SecondFragment_to_FirstFragment" app:destination="@id/FirstFragment" /> + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values-en-rKE/string.xml b/GSKMTOrange/src/main/res/values-en-rKE/string.xml index 355f5c5..75c9d76 100644 --- a/GSKMTOrange/src/main/res/values-en-rKE/string.xml +++ b/GSKMTOrange/src/main/res/values-en-rKE/string.xml @@ -429,5 +429,5 @@ Hello first fragment Hello second fragment. Arg: %1$s - + POSM diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 355f5c5..b6fafff 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -428,6 +428,8 @@ Hello first fragment Hello second fragment. Arg: %1$s + StockAvalability + POSM diff --git a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java new file mode 100644 index 0000000..2a42394 --- /dev/null +++ b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java @@ -0,0 +1,18 @@ +/** + * Automatically generated file. DO NOT MODIFY + */ +package com.androidbuts.multispinnerfilter; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter"; + /** + * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME + */ + @Deprecated + public static final String APPLICATION_ID = "com.androidbuts.multispinnerfilter"; + public static final String BUILD_TYPE = "debug"; + public static final String FLAVOR = ""; + public static final int VERSION_CODE = 1; + public static final String VERSION_NAME = "1.0"; +}