YSY commit

GSKMTOrange/build.gradle

@@ -21,12 +21,12 @@ android {
         targetSdkVersion 26
 
         //For Egypt
-        versionCode 23
+        /*versionCode 23
-        versionName "3.5"
+        versionName "3.5"*/
 
         //For UAE
-        /*versionCode 19
+        versionCode 20
-        versionName "3.1"*/
+        versionName "3.2"
 
         //For Turkey
         /*versionCode 21

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java

@@ -68,7 +68,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java

@@ -129,7 +129,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java

@@ -80,7 +80,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
         multi_spinner_supervisor = (MultiSpinnerSearch) findViewById(R.id.multi_spinner_supervisor);
 
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java

@@ -138,7 +138,7 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick
     void declaration() {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         fab = (FloatingActionButton) findViewById(R.id.fab);
         //calenderBtn = (ImageButton) findViewById(R.id.iconCalender);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java

@@ -128,7 +128,7 @@ public class NonWorkingReason extends AppCompatActivity implements
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java

@@ -61,7 +61,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
 
     GSKOrangeDB db;
 
-    List<MSL_AvailabilityStockFacingGetterSetter> headerDataList;
+    List<MSL_AvailabilityStockFacingGetterSetter> headerDataList = new ArrayList<>();
     HashMap<MSL_AvailabilityStockFacingGetterSetter, List<POGGetterSetter>> hashMapListChildData = new HashMap<>();
 
     ExpandableListAdapter adapter;
@@ -108,7 +108,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
         //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
         toolbar.setTitle(getResources().getString(R.string.pog));
         setSupportActionBar(toolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
@@ -141,8 +141,12 @@ public class POGQuestionsActivity extends AppCompatActivity {
                     alert.show();*/
 
                 } else {
+
+                    if(adapter!=null){
                         adapter.notifyDataSetChanged();
                         expandableListView.invalidateViews();
+                    }
+
                     Snackbar.make(expandableListView, error_msg, Snackbar.LENGTH_SHORT).show();
                 }
             }
@@ -209,8 +213,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
                             AlertDialog alert = builder.create();
 
                             alert.show();
-                        }
+                        } else {
-                        else {
                             selectedPOSMTypePosition = position;
                             prepareListData(planogramTypeAdapter.getItem(position).toString(), true);
                         }
@@ -238,8 +241,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
                 }
                 changedFlag = true;
             }
-        }
+        } else {
-        else {
             prepareListData(null, false);
         }
 
@@ -274,8 +276,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
                         });
                 android.app.AlertDialog alert = builder.create();
                 alert.show();
-            }
+            } else {
-            else {
                 finish();
                 overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
             }
@@ -306,8 +307,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
                     });
             android.app.AlertDialog alert = builder.create();
             alert.show();
-        }
+        } else {
-        else {
             super.onBackPressed();
         }
 
@@ -578,6 +578,13 @@ public class POGQuestionsActivity extends AppCompatActivity {
         checkHeaderArray.clear();
 
         checkflag = true;
+        if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15"))) {
+            if (headerDataList.size() == 0) {
+                error_msg = getString(R.string.title_activity_select_dropdown);
+                return false;
+            }
+        }
+
         for (int l = 0; l < headerDataList.size(); l++) {
 
             List<POGGetterSetter> child_data = hashMapListChildData.get(headerDataList.get(l));

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java

@@ -109,7 +109,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
 
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         img_cam = (ImageView) findViewById(R.id.img_selfie);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java

@@ -220,7 +220,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
         setContentView(R.layout.storelistfablayout);
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java

@@ -129,7 +129,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         img_cam = (ImageView) findViewById(R.id.img_selfie);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java

@@ -42,7 +42,7 @@ public class CategoryListActivity extends AppCompatActivity {
     CategoryListAdapter adapter;
 
     GSKOrangeDB db;
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str, pog_type_id;
     private SharedPreferences preferences;
 
     @Override
@@ -70,13 +70,13 @@ public class CategoryListActivity extends AppCompatActivity {
         camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
         country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
         store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
-
+        pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, "");
 
         /*txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
         txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list));*/
         toolbar.setTitle(getResources().getString(R.string.title_activity_category_list));
         setSupportActionBar(toolbar);
-        getSupportActionBar().setHomeButtonEnabled(true);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
@@ -217,6 +217,14 @@ public class CategoryListActivity extends AppCompatActivity {
                         }
                     }
 
+                    if(flag){
+                        if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
+                            if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
+                                flag = false;
+                            }
+                        }
+                    }
+
                     if (flag){
 
                         //Counterfeit Product Option - Egypt
@@ -562,6 +570,13 @@ public class CategoryListActivity extends AppCompatActivity {
                     }
                 }
 
+                if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) {
+                    if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) {
+                        flag_filled = false;
+                        break;
+                    }
+                }
+
                 //Counterfeit Product Option - Egypt
                 if(country_id.equals("6")){
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java

@@ -77,7 +77,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
             //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);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java

@@ -96,7 +96,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             //txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
             toolbar.setTitle(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
             setSupportActionBar(toolbar);
-            getSupportActionBar().setHomeButtonEnabled(true);
+
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java

@@ -94,7 +94,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
             //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
             toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability));
             setSupportActionBar(toolbar);
-            getSupportActionBar().setHomeButtonEnabled(true);
+
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
             prepareList();

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java

@@ -140,7 +140,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
             //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
             toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability));
             setSupportActionBar(toolbar);
-            getSupportActionBar().setHomeButtonEnabled(true);
+
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
             str_planogram = CommonString.FILE_PATH_PLANOGRAM;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java

@@ -94,7 +94,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
             Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
             toolbar.setTitle(getResources().getString(R.string.title_activity_promo_compliance));
             setSupportActionBar(toolbar);
-            getSupportActionBar().setHomeButtonEnabled(true);
+
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
             lin_promo_sku = (LinearLayout) findViewById(R.id.lin_promo_sku);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java

@@ -93,7 +93,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
             Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
             toolbar.setTitle(getResources().getString(R.string.stock_planogram_planogram_tracker));
             setSupportActionBar(toolbar);
-            getSupportActionBar().setHomeButtonEnabled(true);
+
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
             db = new GSKOrangeDB(this);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java

@@ -152,7 +152,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
             //txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing));
             toolbar.setTitle(getResources().getString(R.string.title_activity_stock_facing));
             setSupportActionBar(toolbar);
-            getSupportActionBar().setHomeButtonEnabled(true);
+
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
             //Stock Facing List

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java

@@ -75,7 +75,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
 
             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);

library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Mar 13 18:14:05 IST 2019
+#Fri Mar 15 09:43:47 IST 2019
 D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_single.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml
 D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_multiple.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml
 D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\activity_main.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml