YSY commit

.idea/misc.xml

@@ -42,7 +42,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

GSKMTOrange/build.gradle

@@ -29,16 +29,16 @@ android {
         versionName "3.3"*/
 
         //For Turkey
-        versionCode 21
+        /*versionCode 21
-        versionName "3.3"
+        versionName "3.3"*/
 
         //For KSA
         /*versionCode 25
         versionName "3.7"*/
 
         //For SA
-        /*versionCode 25
+        versionCode 26
-        versionName "3.6"*/
+        versionName "3.7"
 
         multiDexEnabled true
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -52,6 +52,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaMSLGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramStorewiseGetterSetter;
@@ -66,6 +67,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaSOSGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.PromoComplianceSkuwiseGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.RowColumnGetterSetter;
@@ -88,7 +91,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB53";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB57";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -219,6 +222,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             db.execSQL(TableBean.getTable_MAPPING_PHARMA_QUESTION());//--Added 12.04.2019
 
             db.execSQL(CommonString.CREATE_TABLE_INSERT_STORE_PROFILE_DATA);//--Added 25.04.2019
+            db.execSQL(CommonString.CREATE_TABLE_INSERT_SOS_PHARMA_DATA);//--Added 29.04.2019
+            db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_MSL_DATA);//--Added 30.04.2019
+            db.execSQL(TableBean.getTable_MAPPING_PHARMA_MSL());//--Added 16.05.2019
 
         } catch (SQLException e) {
             e.printStackTrace();
@@ -279,6 +285,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, "STORE_ID" + "='" + storeid + "'", null);
         db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, "STORE_ID" + "='" + storeid + "'", null);
         db.delete(CommonString.TABLE_INSERT_STOCK, "Store_Id" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, "Store_Id" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, "Store_Id" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, "Store_Id" + "='" + storeid + "'", null);
 
     }
 
@@ -977,6 +986,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("SUB_CATEGORY", data.getSUB_CATEGORY().get(i));
                 values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
                 values.put("SUB_CATEGORY_SEQUENCE", data.getSUB_CATEGORY_SEQUENCE().get(i));
+                values.put("SUB_CATEGORY_SEQUENCE_SA", data.getSUB_CATEGORY_SEQUENCE_SA().get(i));
 
                 db.insert("SUB_CATEGORY_MASTER", null, values);
             }
@@ -997,6 +1007,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
                 values.put("COMPANY_ID", data.getCOMPANY_ID().get(i));
                 values.put("BRAND_SEQUENCE", data.getBRAND_SEQUENCE().get(i));
+                values.put("BRAND_SEQUENCE_SA", data.getBRAND_SEQUENCE_SA().get(i));
 
                 db.insert("BRAND_MASTER", null, values);
             }
@@ -1018,6 +1029,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("MRP", data.getMRP().get(i));
                 values.put("SKU_SEQUENCE", data.getSKU_SEQUENCE().get(i));
                 values.put("PROMO_SKU", data.getPROMO_SKU().get(i));
+                values.put("SKU_SEQUENCE_SA", data.getSKU_SEQUENCE_SA().get(i));
 
                 db.insert("SKU_MASTER", null, values);
             }
@@ -2012,6 +2024,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 table = CommonString.KEY_JOURNEY_PLAN;
             } else if (flag_from.equals(CommonString.FROM_ADDITIONAL)) {
                 table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL;
+            }else if (flag_from.equals(CommonString.FROM_PHARMA)) {
+                table = CommonString.KEY_JOURNEY_PLAN_PHARMA;
             } else {
                 table = CommonString.KEY_ADHOC_JOURNEY_PLAN;
             }
@@ -2040,7 +2054,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 table = CommonString.KEY_JOURNEY_PLAN;
             } else  if (flag_from.equals(CommonString.FROM_ADDITIONAL)) {
                 table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL;
-            } else{
+            } else  if (flag_from.equals(CommonString.FROM_PHARMA)) {
+                table = CommonString.KEY_JOURNEY_PLAN_PHARMA;
+            }else{
                 table = CommonString.KEY_ADHOC_JOURNEY_PLAN;
             }
         } else {
@@ -5127,7 +5143,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "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.COMPANY_ID,BR.BRAND_SEQUENCE", null);
+                         " order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
                          //" order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND, BR.BRAND_SEQUENCE", null);
             }
 
@@ -5210,7 +5226,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "inner join CATEGORY_MASTER CA " +
                         "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
                         "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
-                        "' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);
+                        "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA DESC", null);
+                        //"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);
             }
 
 
@@ -7959,7 +7976,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         ContentValues values = new ContentValues();
 
         try {
-            db.beginTransaction();
+            //db.beginTransaction();
             for (int i = 0; i < hashMapListHeaderData.size(); i++) {
 
                 for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
@@ -7978,10 +7995,283 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     db.insert(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, null, values);
                 }
             }
-            db.setTransactionSuccessful();
+            /*db.setTransactionSuccessful();
-            db.endTransaction();
+            db.endTransaction();*/
         } catch (Exception ex) {
             Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
         }
     }
+
+    //Get Pharma Store detail for SOS Data
+    public ArrayList<PharmaSOSGetterSetter> getStoreDetailPharmaForSOSData(String store_id, String questionId) {
+        ArrayList<PharmaSOSGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
+                    " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID +"='"+ questionId +"' AND "+
+                    CommonString.KEY_PRESENT +"='1'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    PharmaSOSGetterSetter cd = new PharmaSOSGetterSetter();
+
+                    cd.setQUESTION_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_QUESTION_ID)));
+                    cd.setBRAND(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+                    cd.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+                    cd.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY_ID)));
+                    cd.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY)));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get SOS Question Data!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    //Get Pharma Store detail Question Inserted Data
+    public ArrayList<MappingPharmaQuestionGetterSetter> getStoreDetailPharmaQuestionInsertedData(String store_id) {
+        ArrayList<MappingPharmaQuestionGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select DISTINCT QUESTION_ID, QUESTION from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
+                    " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    MappingPharmaQuestionGetterSetter cd = new MappingPharmaQuestionGetterSetter();
+
+                    cd.setQUESTION_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_QUESTION_ID)));
+                    cd.setQUESTION(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_QUESTION)));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    //Get Pharma Store detail Answer Inserted Data
+    public ArrayList<MappingPharmaQuestionGetterSetter> getStoreDetailPharmaAnswerInsertedData(String store_id, String questionId) {
+        ArrayList<MappingPharmaQuestionGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
+                    " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID +"='"+ questionId +"'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    MappingPharmaQuestionGetterSetter cd = new MappingPharmaQuestionGetterSetter();
+
+                    cd.setQUESTION_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_QUESTION_ID)));
+                    cd.setQUESTION(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_QUESTION)));
+                    cd.setBRAND(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+                    cd.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+                    cd.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY_ID)));
+                    cd.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY)));
+                    cd.setImgPath(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE)));
+                    cd.setIsChecked(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    //Insert SOS Pharma stores
+    public void InsertSOSPharma(
+            String storeId, List<PharmaSOSGetterSetter> sosListData) {
+
+        db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null);
+
+        ContentValues values = new ContentValues();
+
+        try {
+            //db.beginTransaction();
+
+                for (int j = 0; j < sosListData.size(); j++) {
+                    PharmaSOSGetterSetter data = sosListData.get(j);
+
+                    values.put(CommonString.KEY_STORE_ID, storeId);
+                    values.put(CommonString.KEY_QUESTION_ID, data.getQUESTION_ID());
+                    values.put(CommonString.KEY_QUESTION, data.getQUESTION());
+                    values.put(CommonString.KEY_SUB_CATEGORY_ID, data.getSUB_CATEGORY_ID());
+                    values.put(CommonString.KEY_SUB_CATEGORY, data.getSUB_CATEGORY());
+                    values.put(CommonString.KEY_BRAND_ID, data.getBRAND_ID());
+                    values.put(CommonString.KEY_BRAND, data.getBRAND());
+                    values.put(CommonString.KEY_GSK_FACING, data.getGskFacing());
+                    values.put(CommonString.KEY_COMPETITION_FACING, data.getCompetitorFacing());
+
+                    db.insert(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, null, values);
+                }
+
+            /*db.setTransactionSuccessful();
+            db.endTransaction();*/
+        } catch (Exception ex) {
+            Log.d("Exception ", " in Insert SOS Pharma " + ex.toString());
+        }
+    }
+
+    //Insert Pharma MSL
+    public void InsertPharmaMSL(
+            String storeId, List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData,
+            HashMap<MSL_AvailabilityStockFacingGetterSetter, List<PharmaMSLInsertedGetterSetter>> hashMapListChildData) {
+
+        db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null);
+
+        ContentValues values = new ContentValues();
+
+        try {
+            //db.beginTransaction();
+            for (int i = 0; i < hashMapListHeaderData.size(); i++) {
+
+                for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
+                    PharmaMSLInsertedGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
+
+                    values.put(CommonString.KEY_STORE_ID, storeId);
+                    values.put(CommonString.KEY_BRAND_ID, data.getBrandId());
+                    values.put(CommonString.KEY_SKU, data.getSku());
+                    values.put(CommonString.KEY_SKU_ID, data.getSkuId());
+                    values.put(CommonString.KEY_PRESENT, data.getPresent());
+
+                    db.insert(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, null, values);
+
+                }
+            }
+//            db.setTransactionSuccessful();
+//            db.endTransaction();
+        } catch (Exception ex) {
+            Log.d("Exception ", " in Insert Pharma MSL " + ex.toString());
+        }
+    }
+
+    //insert MAPPING_PHARMA_MSL
+    public void InsertMAPPING_PHARMA_MSL(MappingPharmaMSLGetterSetter data) {
+        db.delete("MAPPING_PHARMA_MSL", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getSKU_ID().size(); i++) {
+
+                values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+                values.put("SKU_ID", data.getSKU_ID().get(i));
+
+                db.insert("MAPPING_PHARMA_MSL", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in MAPPING_PHARMA_MSL " + ex.toString());
+        }
+    }
+
+    //Pharma MSL Header
+    public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getPharmaMSLHeaderData() {
+
+        ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+
+                dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " +
+                        "from MAPPING_PHARMA_MSL 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 BR.COMPANY_ID='" + 1 + "' " +
+                        "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
+
+                    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")));
+                    cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
+                    cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    //get Pharma MSL default data
+    public ArrayList<PharmaMSLInsertedGetterSetter> getPharmaMSLSKUData(String brand_id) {
+
+        ArrayList<PharmaMSLInsertedGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+
+            dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU " +
+                    "from MAPPING_PHARMA_MSL 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 BR.BRAND_ID='" + brand_id +
+                    "' order by SK.SKU_SEQUENCE ", null);
+
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    PharmaMSLInsertedGetterSetter cd = new PharmaMSLInsertedGetterSetter();
+
+                    cd.setSkuId(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+            return list;
+        }
+        return list;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -56,6 +56,7 @@ import com.google.firebase.analytics.FirebaseAnalytics;
 import com.google.firebase.perf.FirebasePerformance;
 import com.google.firebase.perf.metrics.Trace;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
@@ -68,9 +69,11 @@ import org.xmlpull.v1.XmlPullParserFactory;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.lang.reflect.Type;
 import java.net.MalformedURLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -683,7 +686,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             if (result.equals(CommonString.KEY_SUCCESS)) {
 
 //				database.open();
-                if (preferences.getString(CommonString.KEY_VERSION, "").equals(
+               /* if (preferences.getString(CommonString.KEY_VERSION, "").equals(
                         Integer.toString(versionCode))) {
 
                     if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
@@ -697,6 +700,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
                         finish();
                     } else {
 
+                        setLanguageDataFromSharedPreferences();
+
                         Intent in = new Intent(getApplicationContext(), MPinActivity.class);
                         in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
                         startActivity(in);
@@ -716,9 +721,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
                             preferences.getString(CommonString.KEY_PATH, ""));
                     startActivity(intent);
                     finish();
-                }
+                }*/
                 //For SA Only
-               /* if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
+                if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
 
                     Intent intent = new Intent(getBaseContext(),
                             SelectLanguageActivity.class);
@@ -729,6 +734,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
                     finish();
                 } else {
 
+                    setLanguageDataFromSharedPreferences();
+
                     CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
 
 
@@ -739,7 +746,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
 
 
                     //uploadPreviousImages();
-                }*/
+                }
             }
             dialog.dismiss();
         }
@@ -1208,5 +1215,39 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             });
         }
     }
+
+    ArrayList<String> language, culture_id, notice_url;
+
+    LoginGetterSetter login_data;
+
+    private void setLanguageDataFromSharedPreferences(){
+        Gson gson = new Gson();
+        login_data = new LoginGetterSetter();
+
+        String jsonPreferences = preferences.getString(CommonString.KEY_LOOGIN_PREF, "");
+
+        Type type = new TypeToken<LoginGetterSetter>() {}.getType();
+        login_data = gson.fromJson(jsonPreferences, type);
+
+        language = login_data.getCULTURE_NAME();
+        culture_id = login_data.getCULTURE_ID();
+        notice_url = login_data.getNOTICE_URL();
+
+        String lang = preferences.getString(CommonString.KEY_LANGUAGE, "");
+
+        if(language.size()>0){
+            for(int i=0; i<language.size();i++){
+                if(lang.equals(language.get(i))){
+                    editor.putString(CommonString.KEY_LANGUAGE, language.get(i));
+                    editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(i));
+                    editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, notice_url.get(i));
+                    editor.commit();
+                    break;
+                }
+            }
+        }
+
+        //return ;
+    }
 }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -212,6 +212,19 @@ public class MainActivity extends AppCompatActivity
                     Menu nav_Menu = navigationView.getMenu();
                     nav_Menu.findItem(R.id.nav_delivery_call).setVisible(true);
                 }
+
+                if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("ADDITIONAL STORE") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
+                    Menu nav_Menu = navigationView.getMenu();
+                    nav_Menu.findItem(R.id.nav_additional_stores).setVisible(true);
+                }
+
+                if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("PHARMA STORE") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
+                    Menu nav_Menu = navigationView.getMenu();
+                    nav_Menu.findItem(R.id.nav_pharmacy_stores).setVisible(true);
+                }
+
             }
         }
 
@@ -532,7 +545,7 @@ public class MainActivity extends AppCompatActivity
 
     public boolean isValid() {
         boolean flag = false;
-        String storestatus;
+        String storestatus="";
         for (int i = 0; i < coverageList.size(); i++) {
 
             StoreBean store_data = db.getSpecificStoreData(date, coverageList.get(i).getStoreId(), coverageList.get(i).getFlag_from());

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -182,6 +182,7 @@ public class CommonString {
     public static final String METHOD_UPLOAD_COVERAGE = "UPLOAD_COVERAGENEW1";
     public static final String METHOD_UPLOAD_COVERAGE_NEW = "UPLOAD_COVERAGENEW2";
     public static final String METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL = "UPLOAD_COVERAGENEW2_Additional";
+    public static final String METHOD_UPLOAD_COVERAGE_NEW_PHARMA = "UPLOAD_COVERAGENEW2_Pharma";
     public static final String METHOD_UPLOAD_CHECKOUT_STATUS = "Upload_Store_ChecOut_Status";
     public static final String METHOD_UPLOAD_CHECKOUT_STATUS_ADDITIONAL = "Upload_Store_ChecOut_Status_Additional";
     public static final String METHOD_UPLOAD_CHECKOUT_STATUS_PHARMA = "Upload_Store_ChecOut_Status_Pharma";
@@ -1219,5 +1220,32 @@ public class CommonString {
             + KEY_BRAND + " VARCHAR,"
             + KEY_IMAGE + " VARCHAR,"
             + KEY_PRESENT + " INTEGER)";
+    public static final String TABLE_INSERT_SOS_PHARMA_DATA = "SOS_PHARMA_DATA";
+    public static final String KEY_GSK_FACING= "GSK_FACING";
+    public static final String KEY_COMPETITION_FACING = "COMPETITION_FACING";
 
+    public static final String CREATE_TABLE_INSERT_SOS_PHARMA_DATA = "CREATE TABLE  IF NOT EXISTS " + TABLE_INSERT_SOS_PHARMA_DATA
+            + " ("
+            + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+            + KEY_STORE_ID + " INTEGER, "
+            + KEY_QUESTION_ID + " INTEGER,"
+            + KEY_QUESTION + " VARCHAR,"
+            + KEY_SUB_CATEGORY_ID + " INTEGER,"
+            + KEY_SUB_CATEGORY + " VARCHAR,"
+            + KEY_BRAND_ID + " INTEGER,"
+            + KEY_BRAND + " VARCHAR,"
+            + KEY_GSK_FACING + " INTEGER,"
+            + KEY_COMPETITION_FACING + " INTEGER)";
+
+    public static final String TABLE_INSERT_PHARMA_MSL_DATA = "PHARMA_MSL_DATA";
+
+    public static final String CREATE_TABLE_INSERT_PHARMA_MSL_DATA = "CREATE TABLE  IF NOT EXISTS " + TABLE_INSERT_PHARMA_MSL_DATA
+            + " ("
+            + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+            + KEY_STORE_ID + " INTEGER, "
+            + KEY_BRAND_ID + " INTEGER,"
+            + KEY_SKU_ID + " INTEGER,"
+            + KEY_SKU + " VARCHAR,"
+            + KEY_IMAGE + " VARCHAR,"
+            + KEY_PRESENT + " INTEGER)";
 }

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

@@ -209,6 +209,8 @@ public class CheckoutActivity extends AppCompatActivity {
                     }
                     else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL)){
                         table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL;
+                    }else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
+                        table = CommonString.KEY_JOURNEY_PLAN_PHARMA;
                     }
                     else{
                         table = CommonString.KEY_ADHOC_JOURNEY_PLAN;

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

@@ -91,7 +91,7 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
         this.notice_url = notice_url;
 
         if (!selected_lang.equals("")) {
-            fab.setVisibility(View.VISIBLE);
+            fab.show();
         }
     }
 

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

@@ -831,7 +831,9 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
                                 }
 
                                 if (enteryflag) {
-                                    if(store_flag_str.equals(CommonString.FROM_JCP) || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)){
+                                    if(store_flag_str.equals(CommonString.FROM_PHARMA) && coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){
+                                        Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+                                    }else if(store_flag_str.equals(CommonString.FROM_JCP) || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)){
                                         showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
                                     }
                                     else {

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

@@ -504,7 +504,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
                                     String status;
 
                                     if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5")
-                                            || store_flag_str.equals(CommonString.FROM_ADDITIONAL)) {
+                                            || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) {
                                         status = CommonString.KEY_INVALID;
                                     } else {
                                         status = CommonString.KEY_VALID;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java

@@ -57,6 +57,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaMSLGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramStorewiseGetterSetter;
@@ -124,6 +125,7 @@ public class DownloadActivity extends AppCompatActivity {
     MappingStockGetterSetter mappingStockAdditionalGetterSetter;
     JourneyPlanGetterSetter pharmaJcpGetterSetter;
     MappingPharmaQuestionGetterSetter mappingPharmaQuestionGetterSetter;
+    MappingPharmaMSLGetterSetter mappingPharmaMSLGetterSetter;
 
     private Dialog dialog;
     private ProgressBar pb;
@@ -185,7 +187,7 @@ public class DownloadActivity extends AppCompatActivity {
         protected String doInBackground(Void... voids) {
             try {
 
-                boolean no_jcp_flag = false;
+                boolean no_jcp_flag = false, no_adhoc_flag = false;
 
                 String resultHttp = "";
                 data = new Data();
@@ -274,13 +276,49 @@ public class DownloadActivity extends AppCompatActivity {
                         data.value = 15;
                         data.name = "ADHOC JOURNEYPLAN " + getResources().getString(R.string.download_data);
                     } else {
-                        if (no_jcp_flag) {
+                        no_adhoc_flag = true;
+                        /*if (no_jcp_flag) {
                             return "JOURNEY_PLAN";
-                        }
+                        }*/
                     }
                 }
                 publishProgress(data);
 
+                //JOURNEY_PLAN_ADDITIONAL
+                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+                request.addProperty("UserName", userId);
+                request.addProperty("Type", "JOURNEY_PLAN_ADDITIONAL");
+                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();
+                    additionalJcpGetterSetter = XMLHandlers.JCPXMLHandler(xpp, eventType);
+
+                    if (additionalJcpGetterSetter.getSTORE_ID().size() > 0) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                    }
+                    else {
+
+                        if (no_jcp_flag && no_adhoc_flag) {
+                            return "JOURNEY_PLAN";
+                        }
+                    }
+
+                    String additional_jcpTable = additionalJcpGetterSetter.getTable_journey_plan();
+                    TableBean.setAdditionalJourneyPlan(additional_jcpTable);
+                }
+
                 //GEO_FENCING
                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
                 request.addProperty("UserName", userId);
@@ -1390,35 +1428,6 @@ public class DownloadActivity extends AppCompatActivity {
                 }
                 publishProgress(data);
 
-                //JOURNEY_PLAN_ADDITIONAL
-                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
-                request.addProperty("UserName", userId);
-                request.addProperty("Type", "JOURNEY_PLAN_ADDITIONAL");
-                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();
-                    additionalJcpGetterSetter = XMLHandlers.JCPXMLHandler(xpp, eventType);
-
-                    if (additionalJcpGetterSetter.getSTORE_ID().size() > 0) {
-                        resultHttp = CommonString.KEY_SUCCESS;
-                    }
-
-                    String additional_jcpTable = additionalJcpGetterSetter.getTable_journey_plan();
-                    TableBean.setAdditionalJourneyPlan(additional_jcpTable);
-                }
-                //publishProgress(data);
 
                 // MAPPING_STOCK_ADDITIONAL
                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
@@ -1516,7 +1525,42 @@ public class DownloadActivity extends AppCompatActivity {
                     TableBean.setTable_MAPPING_PHARMA_QUESTION(mapping_pahrma_question_Table);
                 }
 
+                // MAPPING_PHARMA_MSL
+                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+                request.addProperty("UserName", userId);
+                request.addProperty("Type", "MAPPING_PHARMA_MSL");
+                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();
+                    mappingPharmaMSLGetterSetter = XMLHandlers.mappingPharmaMSLXMLHandler(xpp, eventType);
+
+                    String stocktable = mappingPharmaMSLGetterSetter.getTable_MAPPING_PHARMA_MSL();
+                    if (stocktable != null) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                        TableBean.setTable_MAPPING_PHARMA_MSL(stocktable);
+                    }
+
+                    if (mappingPharmaMSLGetterSetter.getSKU_ID().size() > 0) {
+                        data.value = 99;
+                        data.name = "MAPPING_PHARMA_MSL " + getResources().getString(R.string.download_data);
+                    } else {
+                        // return "MAPPING_PHARMA_MSL";
+                    }
+
+                }
+                publishProgress(data);
 
               /*  //MAPPING_COUNTRYWISE_PLANOGRAM
                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
@@ -1899,6 +1943,7 @@ public class DownloadActivity extends AppCompatActivity {
                 db.InsertMappingStock(mappingStockAdditionalGetterSetter, "MAPPING_STOCK_ADDITIONAL");
                 db.insertMappingPahrmaQuestion(mappingPharmaQuestionGetterSetter);
                 db.InsertPharmaJCP(pharmaJcpGetterSetter);
+                db.InsertMAPPING_PHARMA_MSL(mappingPharmaMSLGetterSetter);
 
 
             } catch (MalformedURLException e) {

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

@@ -14,6 +14,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
@@ -45,6 +46,9 @@ import android.widget.TextView;
 import android.widget.ToggleButton;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -93,6 +97,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
     HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> planogramHashMapListChildData = new HashMap<>();
     boolean editFlag = false;
 
+    //temp
+    public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
+    //ImageView bmImage;
+    RelativeLayout view;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -295,6 +304,51 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
         } catch (Resources.NotFoundException e) {
             e.printStackTrace();
         }
+
+
+       /* view = (RelativeLayout)findViewById(R.id.content_msl__availability);
+        //bmImage = (ImageView)findViewById(R.id.image);
+
+        view.setDrawingCacheEnabled(true);
+        // this is the important code :)
+        // Without it the view will have a dimension of 0,0 and the bitmap will be null
+
+        view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+                View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+
+        view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
+
+        view.buildDrawingCache(true);
+        final Bitmap b = Bitmap.createBitmap(view.getDrawingCache());
+        view.setDrawingCacheEnabled(false); // clear drawing cache
+
+        //bmImage.setImageBitmap(b);
+
+        try{
+
+
+            File yourFile = new File(FILE_PATH+"imgForTxt.png");
+            yourFile.createNewFile(); // if file already exists will do nothing
+            final FileOutputStream stream = new FileOutputStream(yourFile, false); //create your FileOutputStream here
+
+            new Thread(new Runnable() {
+                public void run(){
+                    b.compress(Bitmap.CompressFormat.PNG, 85, stream);
+                    b.recycle();
+                    try {
+                        stream.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+
+        }
+        catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }*/
     }
 
     @Override

GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java

@@ -53,6 +53,7 @@ import com.google.firebase.analytics.FirebaseAnalytics;
 import com.google.firebase.perf.FirebasePerformance;
 import com.google.firebase.perf.metrics.Trace;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
@@ -65,7 +66,9 @@ import org.xmlpull.v1.XmlPullParserFactory;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.lang.reflect.Type;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
 import java.util.List;
 
 import cpm.com.gskmtorange.LoginActivity;
@@ -791,9 +794,11 @@ public class MPinActivity extends AppCompatActivity implements
             if (result.equals(CommonString.KEY_SUCCESS)) {
 
 //				database.open();
-                if (preferences.getString(CommonString.KEY_VERSION, "").equals(
+         /*       if (preferences.getString(CommonString.KEY_VERSION, "").equals(
                         Integer.toString(versionCode))) {
 
+                    setLanguageDataFromSharedPreferences();
+
                     Intent in = new Intent(getApplicationContext(), MainActivity.class);
                     in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
                     startActivity(in);
@@ -809,10 +814,10 @@ public class MPinActivity extends AppCompatActivity implements
                             preferences.getString(CommonString.KEY_PATH, ""));
                     startActivity(intent);
                     finish();
-                }
+                }*/
 
                 //For SA Only
-              /*  if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
+                if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
 
                     Intent intent = new Intent(getBaseContext(),
                             SelectLanguageActivity.class);
@@ -823,6 +828,8 @@ public class MPinActivity extends AppCompatActivity implements
                     finish();
                 } else {
 
+                    setLanguageDataFromSharedPreferences();
+
                     CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
 
                     Intent intent = new Intent(getBaseContext(),
@@ -832,13 +839,47 @@ public class MPinActivity extends AppCompatActivity implements
                     finish();
 
                     //uploadPreviousImages();
-                }*/
+                }
             }
             dialog.dismiss();
         }
 
     }
 
+    ArrayList<String> language, culture_id, notice_url;
+
+    LoginGetterSetter login_data;
+
+    private void setLanguageDataFromSharedPreferences(){
+        Gson gson = new Gson();
+        login_data = new LoginGetterSetter();
+
+        String jsonPreferences = preferences.getString(CommonString.KEY_LOOGIN_PREF, "");
+
+        Type type = new TypeToken<LoginGetterSetter>() {}.getType();
+        login_data = gson.fromJson(jsonPreferences, type);
+
+        language = login_data.getCULTURE_NAME();
+        culture_id = login_data.getCULTURE_ID();
+        notice_url = login_data.getNOTICE_URL();
+
+        String lang = preferences.getString(CommonString.KEY_LANGUAGE, "");
+
+        if(language.size()>0){
+            for(int i=0; i<language.size();i++){
+                if(lang.equals(language.get(i))){
+                    editor.putString(CommonString.KEY_LANGUAGE, language.get(i));
+                    editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(i));
+                    editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, notice_url.get(i));
+                    editor.commit();
+                    break;
+                }
+            }
+        }
+
+        //return ;
+    }
+
     public void showAlert(String str) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(MPinActivity.this);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/MSLFragment.java

@@ -1,7 +1,9 @@
 package cpm.com.gskmtorange.pharma_stores;
 
+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;
@@ -44,6 +46,8 @@ import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.dailyentry.StockActivity;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -73,9 +77,9 @@ public class MSLFragment extends Fragment {
     ExpandableListAdapter adapter;
 
     ArrayList<MSL_AvailabilityStockFacingGetterSetter> headerDataList;
-    ArrayList<MSL_AvailabilityStockFacingGetterSetter> childDataList;
+    ArrayList<PharmaMSLInsertedGetterSetter> childDataList;
     List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData;
-    HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData;
+    HashMap<MSL_AvailabilityStockFacingGetterSetter, List<PharmaMSLInsertedGetterSetter>> hashMapListChildData;
 
     List<Integer> checkHeaderArray = new ArrayList<>();
     boolean checkflag = true;
@@ -152,13 +156,45 @@ public class MSLFragment extends Fragment {
 
         prepareList();
 
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if(validateData(headerDataList, hashMapListChildData)){
+                    db.InsertPharmaMSL(store_id, headerDataList, hashMapListChildData);
+
+                    //update status to valid
+                    db.updateCheckoutStatus(store_id, CommonString.KEY_VALID, CommonString.KEY_JOURNEY_PLAN_PHARMA);
+
+                    onButtonPressed();
+                }
+                else {
+                    for (int i = 0; i < adapter.getGroupCount(); i++)
+                        expandableListView.expandGroup(i);
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                    builder.setMessage(Error_Message)
+                            .setCancelable(false)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    expandableListView.smoothScrollToPosition(scrollPosition);
+
+                                    dialog.dismiss();
+                                }
+                            });
+                    AlertDialog alert = builder.create();
+                    alert.show();
+                }
+            }
+        });
+
         return view;
     }
 
     // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
+    public void onButtonPressed() {
         if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
+            mListener.onFragmentInteraction(getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment));
         }
     }
 
@@ -191,7 +227,7 @@ public class MSLFragment extends Fragment {
      */
     public interface OnFragmentInteractionListener {
         // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
+        void onFragmentInteraction(Fragment uri);
     }
 
     private void prepareList() {
@@ -200,30 +236,16 @@ public class MSLFragment extends Fragment {
             hashMapListChildData = new HashMap<>();
 
             //Header
-            if(country_id.equals("7")){
+            headerDataList = db.getPharmaMSLHeaderData();
-                headerDataList = db.getStockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET);
-            }
-            else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
-                headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC);
-            }
-            else {
-                headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET);
-            }
 
             if (headerDataList.size() > 0) {
                 for (int i = 0; i < headerDataList.size(); i++) {
                     hashMapListHeaderData.add(headerDataList.get(i));
 
                     //childDataList = new ArrayList<>();
-                    childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+                    //childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
-                    if (!(childDataList.size() > 0)) {
+                    if (childDataList.size() == 0) {
-                        if (country_id.equals("7")) {
+                        childDataList = db.getPharmaMSLSKUData(headerDataList.get(i).getBrand_id());
-                            childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
-                        } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
-                            childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
-                        } else {
-                            childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
-                        }
                     }
 
                     hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
@@ -315,10 +337,10 @@ public class MSLFragment extends Fragment {
     public class ExpandableListAdapter extends BaseExpandableListAdapter {
         private Context _context;
         private List<MSL_AvailabilityStockFacingGetterSetter> _listDataHeader;
-        private HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> _listDataChild;
+        private HashMap<MSL_AvailabilityStockFacingGetterSetter, List<PharmaMSLInsertedGetterSetter>> _listDataChild;
 
         public ExpandableListAdapter(Context context, List<MSL_AvailabilityStockFacingGetterSetter> listDataHeader,
-                                     HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> listChildData) {
+                                     HashMap<MSL_AvailabilityStockFacingGetterSetter, List<PharmaMSLInsertedGetterSetter>> listChildData) {
             this._context = context;
             this._listDataHeader = listDataHeader;
             this._listDataChild = listChildData;
@@ -442,16 +464,18 @@ public class MSLFragment extends Fragment {
 
             holder.txt_skuName.setText(childData.getSku());
 
-            if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+           /* if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
                 holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
 
             } else {
 
                 holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
 
-            }
+            }*/
 
-            if (childData.getCompany_id().equals("1")) {
+            holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+
+            /*if (childData.getCompany_id().equals("1")) {
 
                 if (childData.getMust_have().equals("1")) {
                     holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
@@ -462,7 +486,7 @@ public class MSLFragment extends Fragment {
             } else {
                 holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
             }
-
+*/
 
             final ViewHolder finalHolder1 = holder;
             holder.rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@@ -655,10 +679,10 @@ public class MSLFragment extends Fragment {
         }
     }
 
-    @Override
+    /*@Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         Log.e("Stock & Facing", "resultCode: " + resultCode + " requestCode: " + requestCode);
-        /*switch (resultCode) {
+        *//*switch (resultCode) {
             case 0:
                 Log.e("Stock & Facing", "User cancelled");
 
@@ -672,7 +696,7 @@ public class MSLFragment extends Fragment {
                     }
                 }
                 break;
-        }*/
+        }*//*
 
         switch (requestCode) {
             case 1:
@@ -694,5 +718,83 @@ public class MSLFragment extends Fragment {
         }
 
         super.onActivityResult(requestCode, resultCode, data);
+    }*/
+
+    boolean validateData(List<MSL_AvailabilityStockFacingGetterSetter> listDataHeader,
+                         HashMap<MSL_AvailabilityStockFacingGetterSetter, List<PharmaMSLInsertedGetterSetter>> listDataChild) {
+        boolean flag = true, child_flag = true, all_flag = true;
+
+        checkHeaderArray.clear();
+        int childCount = 0;
+
+        //temp list data for empty only
+        List<MSL_AvailabilityStockFacingGetterSetter> listDataHeaderTemp = new ArrayList<>();
+
+        HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> listDataChildTemp = new HashMap<>();
+
+
+        for (int i = 0; i < listDataHeader.size(); i++) {
+            flag = true;
+
+            List<MSL_AvailabilityStockFacingGetterSetter> listTemp = new ArrayList<>();
+
+            for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
+
+                child_flag = true;
+
+                PharmaMSLInsertedGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
+
+                int isChecked = data.getPresent();
+                //String imgPath = data.getImgPath();
+
+                if(isChecked==-1){
+
+                    scrollPosition = i + j + childCount;
+
+                    flag = false;
+                    Error_Message = getResources().getString(R.string.msg_select_present);
+                    break;
+                }
+               /* else if (isChecked==1) {
+
+                    if(imgPath == null || imgPath.equals("")){
+
+                        scrollPosition = i + j + childCount;
+
+                        flag = false;
+                        Error_Message = getResources().getString(R.string.click_image);
+                        break;
+                    }
+                }*/
+                /*if (!child_flag)
+                    listTemp.add(data);*/
+
+            }
+
+            if (flag == false) {
+                //checkflag = false;
+               /* listDataHeaderTemp.add(listDataHeader.get(i));
+                listDataChildTemp.put(listDataHeader.get(i), listTemp);*/
+
+                if (!checkHeaderArray.contains(i)) {
+                    checkHeaderArray.add(i);
+                }
+                checkflag = false;
+                break;
+            } else {
+                childCount = childCount + listDataChild.get(listDataHeader.get(i)).size();
+                checkflag = true;
+            }
+        }
+
+       /* if (!all_flag) {
+            adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+            expandableListView.setAdapter(adapter);
+            checkflag = false;
+        } else {
+            checkflag = true;
+        }*/
+
+        return checkflag;
     }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java

@@ -15,7 +15,7 @@ import android.view.View;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonString;
 
-public class PharmaActivity extends AppCompatActivity implements StoreDetailFragment.OnFragmentInteractionListener, MSLFragment.OnFragmentInteractionListener {
+public class PharmaActivity extends AppCompatActivity implements StoreDetailFragment.OnFragmentInteractionListener, MSLFragment.OnFragmentInteractionListener, SOSFragment.OnFragmentInteractionListener{
     private SharedPreferences.Editor editor = null;
     private SharedPreferences preferences;
     FloatingActionButton fab;
@@ -54,7 +54,7 @@ public class PharmaActivity extends AppCompatActivity implements StoreDetailFrag
 
                     getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
                 }
-                else  if(f instanceof SOSFragment){
+                else if(f instanceof SOSFragment){
                     Bundle bundle = new Bundle();
                     bundle.putString("categoryName", "Oral Health");
                     bundle.putString("categoryId", "2");
@@ -62,8 +62,7 @@ public class PharmaActivity extends AppCompatActivity implements StoreDetailFrag
                     fragment.setArguments(bundle);
 
                     getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
-                }
+                } else{
-                else{
                     // do something with f
                     Snackbar.make(fab, "---",Snackbar.LENGTH_SHORT).show();
                 }
@@ -92,11 +91,20 @@ public class PharmaActivity extends AppCompatActivity implements StoreDetailFrag
             fragment.setArguments(bundle);
 
             getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
+        }else if(f instanceof MSLFragment){
+                    /*Bundle bundle = new Bundle();
+                    bundle.putString("categoryName", "Oral Health");
+                    bundle.putString("categoryId", "2");
+                    MSLFragment fragment = new MSLFragment();
+                    fragment.setArguments(bundle);
+
+                    getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();*/
+            finish();
         }
     }
 
     @Override
-    public void onFragmentInteraction(Uri uri) {
+    public void onBackPressed() {
-
+        //super.onBackPressed();
     }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java

@@ -1,18 +1,33 @@
 package cpm.com.gskmtorange.pharma_stores;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PharmaSOSGetterSetter;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -36,6 +51,20 @@ public class SOSFragment extends Fragment {
 
     RecyclerView rec_sos;
 
+    private SharedPreferences preferences;
+    String store_id, visit_date, username, intime, keyAccount_id, class_id, storeType_id, country_id, store_flag_str;
+    GSKOrangeDB db;
+
+    FloatingActionButton fab;
+
+    ArrayList<PharmaSOSGetterSetter> listBrandSubGroup;
+
+    String Error_Message = "";
+    int scrollPosition = 0;
+    boolean checkflag = true;
+
+    SOSAdapter adapter;
+
     public SOSFragment() {
         // Required empty public constructor
     }
@@ -72,18 +101,63 @@ public class SOSFragment extends Fragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_so, container, false);
+
+        preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        CommonFunctions.updateLangResources(getActivity(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+        store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+        visit_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, "");
+        country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+        store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+
+        fab = (FloatingActionButton) getActivity().findViewById(R.id.fab);
+
         rec_sos = view.findViewById(R.id.rec_sos);
 
-        rec_sos.setAdapter(new SOSAdapter(getActivity()));
+        getActivity().setTitle(R.string.sos_detail);
-        rec_sos.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        db = new GSKOrangeDB(getActivity());
+        db.open();
+
+        prepareList();
+
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                rec_sos.clearFocus();
+                if(validateData(listBrandSubGroup)){
+                    db.InsertSOSPharma(store_id, listBrandSubGroup);
+                    onButtonPressed();
+                }
+                else {
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                    builder.setMessage(Error_Message)
+                            .setCancelable(false)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    adapter.notifyDataSetChanged();
+                                    dialog.dismiss();
+                                }
+                            });
+                    AlertDialog alert = builder.create();
+                    alert.show();
+                }
+
+            }
+        });
 
         return view;
     }
 
     // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
+    public void onButtonPressed() {
         if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
+            mListener.onFragmentInteraction(getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment));
         }
     }
 
@@ -116,7 +190,14 @@ public class SOSFragment extends Fragment {
      */
     public interface OnFragmentInteractionListener {
         // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
+        void onFragmentInteraction(Fragment uri);
+    }
+
+    void prepareList(){
+        listBrandSubGroup = db.getStoreDetailPharmaForSOSData(store_id, "1");
+        adapter = new SOSAdapter(getActivity());
+        rec_sos.setAdapter(adapter);
+        rec_sos.setLayoutManager(new LinearLayoutManager(getActivity()));
     }
 
     class SOSAdapter extends RecyclerView.Adapter<SOSAdapter.MyViewHolder> {
@@ -135,28 +216,138 @@ public class SOSFragment extends Fragment {
 
             MyViewHolder holder = new MyViewHolder(view);
 
+
+
             return holder;
         }
 
         @Override
-        public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
+        public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int position) {
+            final PharmaSOSGetterSetter current = listBrandSubGroup.get(position);
 
+            /*holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    final EditText caption = (EditText) v;
+                    String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");*/
+            myViewHolder.et_gsk_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    if(!hasFocus){
+                        final EditText caption = (EditText) v;
+                        String gskFacing = caption.getText().toString().replaceFirst("^0+(?!$)", "");
 
+                        if(gskFacing.equals("")){
+                            current.setGskFacing("");
+                        }
+                        else {
+                            current.setGskFacing(gskFacing);
+                        }
+                    }
+                }
+            });
+
+            myViewHolder.et_competitor_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    if(!hasFocus){
+                        final EditText caption = (EditText) v;
+                        String compFacing = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+
+                        if(compFacing.equals("")){
+                            current.setCompetitorFacing("");
+                        }
+                        else {
+                            current.setCompetitorFacing(compFacing);
+                        }
+                    }
+                }
+            });
+
+            myViewHolder.tv_brand.setText(current.getSUB_CATEGORY() +" - "+ current.getBRAND());
+            myViewHolder.et_gsk_facing.setText(current.getGskFacing());
+            myViewHolder.et_competitor_facing.setText(current.getCompetitorFacing());
+
+            if(!checkflag){
+                if(current.getGskFacing()==null || current.getGskFacing().equals("") || current.getCompetitorFacing()==null || current.getCompetitorFacing().equals("")){
+                    myViewHolder.card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+                }
+                else {
+                    myViewHolder.card_view.setCardBackgroundColor(getResources().getColor(R.color.white));
+                }
+            }
         }
 
         @Override
         public int getItemCount() {
-            return 2;
+
+            return listBrandSubGroup.size();
         }
 
         class MyViewHolder extends RecyclerView.ViewHolder {
 
             TextView tv_brand;
+            EditText et_gsk_facing, et_competitor_facing;
+            CardView card_view;
 
             public MyViewHolder(@NonNull View itemView) {
                 super(itemView);
                 tv_brand = (TextView) itemView.findViewById(R.id.tv_brand);
+                et_gsk_facing = (EditText) itemView.findViewById(R.id.et_gsk_facing);
+                et_competitor_facing = (EditText) itemView.findViewById(R.id.et_competitor_facing);
+                card_view = (CardView) itemView.findViewById(R.id.card_view);
             }
         }
     }
+
+    boolean validateData(List<PharmaSOSGetterSetter> listData) {
+        boolean flag = true, child_flag = true, all_flag = true;
+
+        int childCount = 0;
+
+        //temp list data for empty only
+        List<MappingPharmaQuestionGetterSetter> listDataHeaderTemp = new ArrayList<>();
+
+        flag = true;
+
+            for (int j = 0; j < listData.size(); j++) {
+
+                PharmaSOSGetterSetter data = listData.get(j);
+
+                String gskFacing = data.getGskFacing();
+                String competitionFacing = data.getCompetitorFacing();
+
+                if(gskFacing==null || gskFacing.equals("")){
+
+                    flag = false;
+                    Error_Message = getResources().getString(R.string.enter_facing);
+                    break;
+                }
+                else if (competitionFacing==null || competitionFacing.equals("")) {
+
+                    flag = false;
+                    Error_Message = getResources().getString(R.string.enter_facing);
+                    break;
+                }
+                /*if (!child_flag)
+                    listTemp.add(data);*/
+            }
+
+            if(flag){
+                checkflag = true;
+            }
+            else {
+                checkflag = false;
+            }
+
+       /* if (!all_flag) {
+            adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+            expandableListView.setAdapter(adapter);
+            checkflag = false;
+        } else {
+            checkflag = true;
+        }*/
+
+        return checkflag;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java

@@ -1,7 +1,9 @@
 package cpm.com.gskmtorange.pharma_stores;
 
+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;
@@ -40,7 +42,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
-import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
 
 /**
@@ -66,7 +68,7 @@ public class StoreDetailFragment extends Fragment {
     GSKOrangeDB db;
 
     String categoryName, categoryId, Error_Message = "";
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, country_id, store_flag_str;
+    String store_id, visit_date, username, intime, keyAccount_id, class_id, storeType_id, country_id, store_flag_str;
     boolean isDialogOpen = true;
     private SharedPreferences preferences;
     int scrollPosition = 0;
@@ -76,7 +78,7 @@ public class StoreDetailFragment extends Fragment {
 
     ArrayList<MappingPharmaQuestionGetterSetter> headerDataList;
     ArrayList<MappingPharmaQuestionGetterSetter> childDataList;
-    List<MappingPharmaQuestionGetterSetter> hashMapListHeaderData;
+    //List<MappingPharmaQuestionGetterSetter> hashMapListHeaderData;
     HashMap<MappingPharmaQuestionGetterSetter, List<MappingPharmaQuestionGetterSetter>> hashMapListChildData;
 
     List<Integer> checkHeaderArray = new ArrayList<>();
@@ -136,7 +138,6 @@ public class StoreDetailFragment extends Fragment {
         CommonFunctions.updateLangResources(getActivity(), 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);
         username = preferences.getString(CommonString.KEY_USERNAME, null);
         intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
         keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
@@ -157,8 +158,28 @@ public class StoreDetailFragment extends Fragment {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                db.InsertStoreDetailPharma(store_id, headerDataList, hashMapListChildData);
+
-                onButtonPressed();
+                if(validateData(headerDataList, hashMapListChildData)){
+                    db.InsertStoreDetailPharma(store_id, headerDataList, hashMapListChildData);
+                    onButtonPressed();
+                }
+                else {
+                    for (int i = 0; i < adapter.getGroupCount(); i++)
+                        expandableListView.expandGroup(i);
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                    builder.setMessage(Error_Message)
+                            .setCancelable(false)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    expandableListView.smoothScrollToPosition(scrollPosition);
+
+                                    dialog.dismiss();
+                                }
+                            });
+                    AlertDialog alert = builder.create();
+                    alert.show();
+                }
             }
         });
         
@@ -206,25 +227,43 @@ public class StoreDetailFragment extends Fragment {
 
     private void prepareList() {
         try {
-            hashMapListHeaderData = new ArrayList<>();
+            //hashMapListHeaderData = new ArrayList<>();
             hashMapListChildData = new HashMap<>();
 
             //Header
-            headerDataList = db.getPharmaQuestionsData();
+            headerDataList = db.getStoreDetailPharmaQuestionInsertedData(store_id);
+            //if inserted data not found
+            if(headerDataList.size()==0){
+
+                //default question data
+                headerDataList = db.getPharmaQuestionsData();
+
+                    for (int i = 0; i < headerDataList.size(); i++) {
+
+                        //childDataList = new ArrayList<>();
+                        childDataList = db.getPharmaAnswerData(headerDataList.get(i).getQUESTION_ID().get(0));
+
+                        hashMapListChildData.put(headerDataList.get(i), childDataList);
+                    }
+            }
+            else {
 
-            if (headerDataList.size() > 0) {
                 for (int i = 0; i < headerDataList.size(); i++) {
 
-                    //childDataList = new ArrayList<>();
+                    childDataList = db.getStoreDetailPharmaAnswerInsertedData(store_id, headerDataList.get(i).getQUESTION_ID().get(0));
-                    childDataList = db.getPharmaAnswerData(headerDataList.get(i).getQUESTION_ID().get(0));
 
                     hashMapListChildData.put(headerDataList.get(i), childDataList);
                 }
+
             }
 
+
             adapter = new ExpandableListAdapter(getActivity(), headerDataList, hashMapListChildData);
             expandableListView.setAdapter(adapter);
 
+            for (int i = 0; i < adapter.getGroupCount(); i++)
+                expandableListView.expandGroup(i);
+
             expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
                 @Override
                 public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
@@ -642,4 +681,82 @@ public class StoreDetailFragment extends Fragment {
 
         super.onActivityResult(requestCode, resultCode, data);
     }
+
+    boolean validateData(List<MappingPharmaQuestionGetterSetter> listDataHeader,
+                         HashMap<MappingPharmaQuestionGetterSetter, List<MappingPharmaQuestionGetterSetter>> listDataChild) {
+        boolean flag = true, child_flag = true, all_flag = true;
+
+        checkHeaderArray.clear();
+        int childCount = 0;
+
+        //temp list data for empty only
+        List<MappingPharmaQuestionGetterSetter> listDataHeaderTemp = new ArrayList<>();
+
+        HashMap<MappingPharmaQuestionGetterSetter, List<MappingPharmaQuestionGetterSetter>> listDataChildTemp = new HashMap<>();
+
+
+        for (int i = 0; i < listDataHeader.size(); i++) {
+            flag = true;
+
+            List<MappingPharmaQuestionGetterSetter> listTemp = new ArrayList<>();
+
+            for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
+
+                child_flag = true;
+
+                MappingPharmaQuestionGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
+
+                int isChecked = data.getIsChecked();
+                String imgPath = data.getImgPath();
+
+                if(isChecked==-1){
+
+                    scrollPosition = i + j + childCount;
+
+                    flag = false;
+                    Error_Message = getResources().getString(R.string.msg_select_present);
+                    break;
+                }
+                else if (isChecked==1) {
+
+                    if(imgPath == null || imgPath.equals("")){
+
+                        scrollPosition = i + j + childCount;
+
+                        flag = false;
+                        Error_Message = getResources().getString(R.string.click_image);
+                        break;
+                    }
+                }
+                /*if (!child_flag)
+                    listTemp.add(data);*/
+
+            }
+
+            if (flag == false) {
+                //checkflag = false;
+               /* listDataHeaderTemp.add(listDataHeader.get(i));
+                listDataChildTemp.put(listDataHeader.get(i), listTemp);*/
+
+                if (!checkHeaderArray.contains(i)) {
+                    checkHeaderArray.add(i);
+                }
+                checkflag = false;
+                break;
+            } else {
+                childCount = childCount + listDataChild.get(listDataHeader.get(i)).size();
+                checkflag = true;
+            }
+        }
+
+       /* if (!all_flag) {
+            adapter = new ExpandableListAdapter(this, listDataHeaderTemp, listDataChildTemp);
+            expandableListView.setAdapter(adapter);
+            checkflag = false;
+        } else {
+            checkflag = true;
+        }*/
+
+        return checkflag;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java

@@ -503,16 +503,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                                         } else {
                                             stock = "0";
                                         }
-                                        onXML = "[MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]"
+                                        onXML = "[ST]"
                                                 + "[MID]" + mid + "[/MID]"
-                                                + "[USER_ID]" + userId + "[/USER_ID]"
+                                                //+ "[USERID]" + userId + "[/USERID]"
-                                                + "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]"
+                                                + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
                                                 + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
-                                                + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]"
+                                                + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
-                                                + "[FACING]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]"
+                                                + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
-                                                + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]"
+                                                + "[SK]" + Integer.parseInt(stock) + "[/SK]"
-                                                + "[MUST_HAVE]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MUST_HAVE]" +
+                                                + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
-                                                "[/MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]";
+                                                "[/ST]";
 
                                         mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
                                     }
@@ -522,7 +522,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
 
                                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
                                 request.addProperty("XMLDATA", sos_xml);
-                                request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT");
+                                request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST");
                                 request.addProperty("USERNAME", userId);
                                 request.addProperty("MID", mid);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java

@@ -338,10 +338,15 @@ public class UploadActivity extends AppCompatActivity {
                             String coverage_service, status_service;
 
                             if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
+
                                 status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL;
                                 coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL;
-                            }
+                            }else if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)){
-                            else {
+
+                                status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_PHARMA;
+                                coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_PHARMA;
+                            } else {
+
                                 status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
                                 coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW;
                             }
@@ -588,13 +593,13 @@ public class UploadActivity extends AppCompatActivity {
                                             }
                                             onXML = "[ST]"
                                                     + "[MID]" + mid + "[/MID]"
-                                                    + "[USERID]" + userId + "[/USERID]"
+                                                    //+ "[USERID]" + userId + "[/USERID]"
-                                                    + "[SKUID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKUID]"
+                                                    + "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
                                                     + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
                                                     + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
-                                                    + "[FAC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FAC]"
+                                                    + "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
-                                                    + "[STK]" + Integer.parseInt(stock) + "[/STK]"
+                                                    + "[SK]" + Integer.parseInt(stock) + "[/SK]"
-                                                    + "[MSL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MSL]" +
+                                                    + "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
                                                     "[/ST]";
 
                                             mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
@@ -605,7 +610,7 @@ public class UploadActivity extends AppCompatActivity {
 
                                     request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
                                     request.addProperty("XMLDATA", sos_xml);
-                                    request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_NEW");
+                                    request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST");
                                     request.addProperty("USERNAME", userId);
                                     request.addProperty("MID", mid);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/BrandMasterGetterSetter.java

@@ -15,6 +15,15 @@ public class BrandMasterGetterSetter {
     ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
     ArrayList<String> COMPANY_ID = new ArrayList<>();
     ArrayList<String> BRAND_SEQUENCE = new ArrayList<>();
+    ArrayList<String> BRAND_SEQUENCE_SA = new ArrayList<>();
+
+    public ArrayList<String> getBRAND_SEQUENCE_SA() {
+        return BRAND_SEQUENCE_SA;
+    }
+
+    public void setBRAND_SEQUENCE_SA(String BRAND_SEQUENCE_SA) {
+        this.BRAND_SEQUENCE_SA.add(BRAND_SEQUENCE_SA);
+    }
 
     public String getTable_BRAND_MASTER() {
         return table_BRAND_MASTER;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPharmaMSLGetterSetter.java

@@ -0,0 +1,35 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class MappingPharmaMSLGetterSetter {
+
+    String table_MAPPING_PHARMA_MSL;
+
+    ArrayList<String> COUNTRY_ID = new ArrayList<>();
+    ArrayList<String> SKU_ID = new ArrayList<>();
+
+    public String getTable_MAPPING_PHARMA_MSL() {
+        return table_MAPPING_PHARMA_MSL;
+    }
+
+    public void setTable_MAPPING_PHARMA_MSL(String table_MAPPING_PHARMA_MSL) {
+        this.table_MAPPING_PHARMA_MSL = table_MAPPING_PHARMA_MSL;
+    }
+
+    public ArrayList<String> getCOUNTRY_ID() {
+        return COUNTRY_ID;
+    }
+
+    public void setCOUNTRY_ID(String COUNTRY_ID) {
+        this.COUNTRY_ID.add(COUNTRY_ID);
+    }
+
+    public ArrayList<String> getSKU_ID() {
+        return SKU_ID;
+    }
+
+    public void setSKU_ID(String SKU_ID) {
+        this.SKU_ID.add(SKU_ID);
+    }
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/PharmaMSLInsertedGetterSetter.java

@@ -0,0 +1,40 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+public class PharmaMSLInsertedGetterSetter {
+
+    int present = -1;
+
+    String skuId, sku, brandId;
+
+    public int getPresent() {
+        return present;
+    }
+
+    public void setPresent(int present) {
+        this.present = present;
+    }
+
+    public String getSkuId() {
+        return skuId;
+    }
+
+    public void setSkuId(String skuId) {
+        this.skuId = skuId;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(String brandId) {
+        this.brandId = brandId;
+    }
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/PharmaSOSGetterSetter.java

@@ -0,0 +1,72 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class PharmaSOSGetterSetter {
+
+    String QUESTION_ID, QUESTION, BRAND_ID, BRAND, SUB_CATEGORY_ID, SUB_CATEGORY, gskFacing, competitorFacing;
+
+    public String getQUESTION_ID() {
+        return QUESTION_ID;
+    }
+
+    public void setQUESTION_ID(String QUESTION_ID) {
+        this.QUESTION_ID = QUESTION_ID;
+    }
+
+    public String getQUESTION() {
+        return QUESTION;
+    }
+
+    public void setQUESTION(String QUESTION) {
+        this.QUESTION = QUESTION;
+    }
+
+    public String getBRAND_ID() {
+        return BRAND_ID;
+    }
+
+    public void setBRAND_ID(String BRAND_ID) {
+        this.BRAND_ID = BRAND_ID;
+    }
+
+    public String getBRAND() {
+        return BRAND;
+    }
+
+    public void setBRAND(String BRAND) {
+        this.BRAND = BRAND;
+    }
+
+    public String getSUB_CATEGORY_ID() {
+        return SUB_CATEGORY_ID;
+    }
+
+    public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
+        this.SUB_CATEGORY_ID = SUB_CATEGORY_ID;
+    }
+
+    public String getSUB_CATEGORY() {
+        return SUB_CATEGORY;
+    }
+
+    public void setSUB_CATEGORY(String SUB_CATEGORY) {
+        this.SUB_CATEGORY = SUB_CATEGORY;
+    }
+
+    public String getGskFacing() {
+        return gskFacing;
+    }
+
+    public void setGskFacing(String gskFacing) {
+        this.gskFacing = gskFacing;
+    }
+
+    public String getCompetitorFacing() {
+        return competitorFacing;
+    }
+
+    public void setCompetitorFacing(String competitorFacing) {
+        this.competitorFacing = competitorFacing;
+    }
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuMasterGetterSetter.java

@@ -17,6 +17,16 @@ public class SkuMasterGetterSetter {
     ArrayList<String> SKU_SEQUENCE = new ArrayList<>();
     ArrayList<String> PROMO_SKU = new ArrayList<>();
 
+    public ArrayList<String> getSKU_SEQUENCE_SA() {
+        return SKU_SEQUENCE_SA;
+    }
+
+    public void setSKU_SEQUENCE_SA(String SKU_SEQUENCE_SA) {
+        this.SKU_SEQUENCE_SA.add(SKU_SEQUENCE_SA);
+    }
+
+    ArrayList<String> SKU_SEQUENCE_SA = new ArrayList<>();
+
     public ArrayList<String> getSKU_ID() {
         return SKU_ID;
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SubCategoryMasterGetterSetter.java

@@ -15,6 +15,16 @@ public class SubCategoryMasterGetterSetter {
     ArrayList<String> CATEGORY_ID = new ArrayList<>();
     ArrayList<String> SUB_CATEGORY_SEQUENCE = new ArrayList<>();
 
+    public ArrayList<String> getSUB_CATEGORY_SEQUENCE_SA() {
+        return SUB_CATEGORY_SEQUENCE_SA;
+    }
+
+    public void setSUB_CATEGORY_SEQUENCE_SA(String SUB_CATEGORY_SEQUENCE_SA) {
+        this.SUB_CATEGORY_SEQUENCE_SA.add(SUB_CATEGORY_SEQUENCE_SA);
+    }
+
+    ArrayList<String> SUB_CATEGORY_SEQUENCE_SA = new ArrayList<>();
+
 
     public String getTable_SUB_CATEGORY_MASTER() {
         return table_SUB_CATEGORY_MASTER;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java

@@ -44,6 +44,16 @@ public class TableBean {
     public static String Table_MAPPING_STOCK_STOREWISE;
     public static String Table_MAPPING_PLANOGRAM_STORE_WISE;
 
+    public static String getTable_MAPPING_PHARMA_MSL() {
+        return Table_MAPPING_PHARMA_MSL;
+    }
+
+    public static void setTable_MAPPING_PHARMA_MSL(String table_MAPPING_PHARMA_MSL) {
+        Table_MAPPING_PHARMA_MSL = table_MAPPING_PHARMA_MSL;
+    }
+
+    public static String Table_MAPPING_PHARMA_MSL;
+
     public static String getTable_MAPPING_PHARMA_QUESTION() {
         return Table_MAPPING_PHARMA_QUESTION;
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java

@@ -24,6 +24,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaMSLGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramStorewiseGetterSetter;
@@ -258,6 +259,9 @@ public class XMLHandlers {
                     if (xpp.getName().equals("PROMO_SKU")) {
                         sku.setPROMO_SKU(xpp.nextText());
                     }
+                    if (xpp.getName().equals("SKU_SEQUENCE_SA")) {
+                        sku.setSKU_SEQUENCE_SA(xpp.nextText());
+                    }
 
                 }
                 xpp.next();
@@ -298,6 +302,9 @@ public class XMLHandlers {
                     if (xpp.getName().equals("BRAND_SEQUENCE")) {
                         brand.setBRAND_SEQUENCE(xpp.nextText());
                     }
+                    if (xpp.getName().equals("BRAND_SEQUENCE_SA")) {
+                        brand.setBRAND_SEQUENCE_SA(xpp.nextText());
+                    }
 
                 }
                 xpp.next();
@@ -335,6 +342,9 @@ public class XMLHandlers {
                     if (xpp.getName().equals("SUB_CATEGORY_SEQUENCE")) {
                         category.setSUB_CATEGORY_SEQUENCE(xpp.nextText());
                     }
+                    if (xpp.getName().equals("SUB_CATEGORY_SEQUENCE_SA")) {
+                        category.setSUB_CATEGORY_SEQUENCE_SA(xpp.nextText());
+                    }
 
                 }
                 xpp.next();
@@ -1547,4 +1557,35 @@ public class XMLHandlers {
         }
         return stock;
     }
+
+    // MAPPING_PHARMA_MSL XML HANDLER
+    public static MappingPharmaMSLGetterSetter mappingPharmaMSLXMLHandler(XmlPullParser xpp,
+                                                                  int eventType) {
+        MappingPharmaMSLGetterSetter stock = new MappingPharmaMSLGetterSetter();
+
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+                    if (xpp.getName().equals("META_DATA")) {
+                        stock.setTable_MAPPING_PHARMA_MSL(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("COUNTRY_ID")) {
+                        stock.setCOUNTRY_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("SKU_ID")) {
+                        stock.setSKU_ID(xpp.nextText());
+                    }
+
+                }
+                xpp.next();
+            }
+        } catch (XmlPullParserException e) {
+
+            e.printStackTrace();
+        } catch (IOException e) {
+
+            e.printStackTrace();
+        }
+        return stock;
+    }
 }

GSKMTOrange/src/main/res/layout/content_msl__availability.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_msl__availability"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_msl__availability">
+    tools:showIn="@layout/activity_msl__availability"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -96,4 +97,10 @@
             android:dividerHeight="0dp"
             android:scrollingCache="false" />
     </LinearLayout>
-</RelativeLayout>
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        />
+</LinearLayout>

GSKMTOrange/src/main/res/layout/fragment_so.xml

@@ -12,7 +12,8 @@
         android:orientation="vertical"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        >
 
 
     <LinearLayout

GSKMTOrange/src/main/res/layout/item_pharma_sos.xml

@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:weightSum="3"
+            android:weightSum="4"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
             >
@@ -26,7 +26,7 @@
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1">
+                android:layout_weight="2">
 
                 <TextView
                     android:id="@+id/tv_brand"
@@ -34,7 +34,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/brand"
                     android:padding="5dp"
-                    android:textSize="@dimen/text_size_medium"
+                    android:textSize="@dimen/text_size_small"
                     android:textStyle="bold"
                     android:textColor="@color/colorPrimary"
                     android:layout_centerInParent="true"/>
@@ -42,7 +42,7 @@
 
             <RelativeLayout
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1">
 
                 <EditText
@@ -51,12 +51,14 @@
                     android:layout_height="wrap_content"
                     android:padding="5dp"
                     android:textSize="@dimen/text_size_medium"
+                    android:inputType="number"
+                    android:maxLength="5"
                     android:layout_centerInParent="true"/>
             </RelativeLayout>
 
             <RelativeLayout
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1">
 
                 <EditText
@@ -65,6 +67,8 @@
                     android:layout_height="wrap_content"
                     android:padding="5dp"
                     android:textSize="@dimen/text_size_medium"
+                    android:inputType="number"
+                    android:maxLength="5"
                     android:layout_centerInParent="true"/>
             </RelativeLayout>
 

GSKMTOrange/src/main/res/menu/activity_main_drawer.xml

@@ -52,7 +52,7 @@
             android:id="@+id/nav_pharmacy_stores"
             android:icon="@mipmap/baseline_local_pharmacy_black_48"
             android:title="@string/pharma_stores"
-            
+            android:visible="false"
             />
 
         <item

GSKMTOrange/src/main/res/values/strings.xml

@@ -443,5 +443,6 @@
     <string name="additional_stores">Additional Stores</string>
     <string name="gsk">GSK</string>
     <string name="competitor">Competitor</string>
+    <string name="sos_detail">SOS Detail</string>
 
 </resources>

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

@@ -1,4 +1,4 @@
-#Tue Apr 23 16:25:39 IST 2019
+#Fri May 17 18:44:04 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