usk_promotion

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/gradle.xml

@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -13,6 +16,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

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

GSKMTOrange/build.gradle

@@ -21,15 +21,15 @@ android {
         targetSdkVersion 26
 
         //For Egypt
-        /*versionCode 27
+        versionCode 28
-        versionName "3.9"*/
+        versionName "4.0"
 
         //For UAE
         /*versionCode 24
         versionName "3.6"*/
 
         //For Turkey
-        /*versionCode 23
+      /*  versionCode 23
         versionName "3.5"*/
 
         //For KSA
@@ -37,8 +37,8 @@ android {
         versionName "3.7"*/
 
         //For SA
-        versionCode 26
+       /* versionCode 26
-        versionName "3.7"
+        versionName "3.7"*/
 
         multiDexEnabled true
 

GSKMTOrange/src/main/AndroidManifest.xml

@@ -358,6 +358,13 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".dailyentry.CompetitionPromoActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:label="@string/competition_promotion"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"

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

@@ -34,6 +34,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.CategoryImagesAllowed;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
@@ -68,6 +69,7 @@ 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.PROMOTION_TYPE_MASTERGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.PharmaSOSGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.PromoComplianceSkuwiseGetterSetter;
@@ -92,7 +94,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB60";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB63";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -226,7 +228,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             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
+            db.execSQL(TableBean.getTable_PROMOTION_TYPE_MASTER());//--Added 18.12.2019
             db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_IMAGE_DATA);//--Added 20.05.2019
+            db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO);//--Added 17.12.2019
+            db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS);//--Added 17.12.2019
 
             db.execSQL(TableBean.getAdhocJourneyplanAdditional());//--Added 7.10.2019
 
@@ -295,6 +300,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, "STORE_ID" + "='" + storeid + "'", null);
         db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, "STORE_ID" + "='" + storeid + "'", null);
         db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, "STORE_ID" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, "STORE_ID" + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, "STORE_ID" + "='" + storeid + "'", null);
 
     }
 
@@ -335,6 +342,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         db.delete(CommonString.TABLE_COACHING_VISIT, null, null);
         db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, null, null);
         db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, null, null);
+        db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, null, null);
+        db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, null, null);
     }
 
     public void InsertJCP(JourneyPlanGetterSetter data) {
@@ -2431,7 +2440,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("SOS", data.getSOS().get(i));
                 values.put("T2P", data.getT2P().get(i));
                 values.put("PROMO", data.getPROMO().get(i));
-                values.put("OSS", data.getOSS().get(i));
                 values.put("ORDERID", data.getORDERID().get(i));
                 values.put("PLANOGRAM", data.getPLANOGRAM().get(i));
 
@@ -2463,7 +2471,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS")));
                     cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P")));
                     cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
-                    cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS")));
                     cd.setOrder_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ORDERID")));
                     cd.setPLANOGRAM(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM")));
                     list.add(cd);
@@ -2484,11 +2491,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         Cursor dbcursor = null;
 
         try {
-            dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL),1) as MSL,ROUND(avg(sos),1) as SOS ," +
+           /* dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL),1) as MSL,ROUND(avg(sos),1) as SOS ," +
                     " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO , ROUND(avg(pLANOGRAM),1) as PLANOGRAM, ROUND(SUM(oss),1) AS OSS " +
                     "from "+ tableName +
                     " where  STORE_ID='" + store_id + "' " +
                     "GROUP BY PERIOD " +
+                    "ORDER BY ORDERID ", null);*/
+            dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL),1) as MSL,ROUND(avg(sos),1) as SOS ," +
+                    " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO , ROUND(avg(pLANOGRAM),1) as PLANOGRAM " +
+                    "from "+ tableName +
+                    " where  STORE_ID='" + store_id + "' " +
+                    "GROUP BY PERIOD " +
                     "ORDER BY ORDERID ", null);
 
             if (dbcursor != null) {
@@ -2500,10 +2513,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));*/
                     cd.setPeriod(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PERIOD")));
                     cd.setMsl_availability(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MSL")));
-                    cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS")));
                     cd.setT2p(dbcursor.getString(dbcursor.getColumnIndexOrThrow("T2P")));
                     cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
-                    cd.setOss(dbcursor.getString(dbcursor.getColumnIndexOrThrow("OSS")));
+                    cd.setSos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS")));
                     cd.setPLANOGRAM(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM")));
 
                     list.add(cd);
@@ -8425,7 +8437,261 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             }
 
         } catch (Exception ex) {
-            Log.d("Exception in ADHOC_Add_JCP", ex.toString());
+
         }
     }
+
+    //usk
+    public void InsertComptionPromotData(ArrayList<CompetitonPromoGetterSetter> counterfeitProductListData, String category_id, String store_id, boolean exists) {
+
+        try {
+            db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null);
+            db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null);
+
+            ContentValues values = new ContentValues();
+            ContentValues values1 = new ContentValues();
+            int existexist_int = 0;
+
+            if(exists){
+                existexist_int = 1;
+            }
+
+            values1.put("STORE_ID", Integer.parseInt(store_id));
+            values1.put("CATEGORY_ID", Integer.parseInt(category_id));
+            values1.put("Existss", existexist_int);
+
+            long id = db.insert(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, null, values1);
+
+
+            db.beginTransaction();
+            for (int i = 0; i < counterfeitProductListData.size(); i++) {
+                CompetitonPromoGetterSetter data = counterfeitProductListData.get(i);
+
+                values.put("STORE_ID", Integer.parseInt(store_id));
+                values.put("CATEGORY_ID", Integer.parseInt(category_id));
+                values.put("BRAND_ID", data.getBrandId());
+                values.put("BRAND", data.getBrand());
+                values.put("PROMOTION_ID", data.getPromotion_id());
+                values.put("PROMOTION", data.getPromotion());
+                values.put("SKU", data.getSkuName());
+                values.put("IMAGE", data.getImgStr());
+                values.put("IMAGE1", data.getImgStr1());
+                values.put("IMAGE2", data.getImgStr2());
+                values.put("COMMON_ID", id);
+
+                db.insert(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, null, values);
+            }
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        } catch (Exception ex) {
+            Log.d("Exception ", "Counterfeit Data " + ex.toString());
+        }
+    }
+
+    public ArrayList<CompetitonPromoGetterSetter> getCompetitionPromoExistsAfterData(String store_id, String category_id) {
+        ArrayList<CompetitonPromoGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+
+            if(category_id==null){
+                dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO_EXISTS " +
+                        "where STORE_ID='" + store_id + "'", null);
+            }
+            else {
+                dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO_EXISTS " +
+                        "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null);
+            }
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    CompetitonPromoGetterSetter cd = new CompetitonPromoGetterSetter();
+
+                    cd.setExists(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Existss")).equals("1"));
+                    cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+                    cd.set_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEY_ID")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "getCounterfeitAfterData!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+
+    public ArrayList<CompetitonPromoGetterSetter> getCometionPromoAfterData(String store_id, String category_id) {
+        ArrayList<CompetitonPromoGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+
+            if(category_id==null){
+
+                dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO " +
+                        "where COMMON_ID='" + store_id + "'", null);
+            }
+            else {
+                dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO " +
+                        "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null);
+            }
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    CompetitonPromoGetterSetter cd = new CompetitonPromoGetterSetter();
+
+                    cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+                    cd.setSkuName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+                    cd.setBrandId(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
+                    cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
+                    cd.setPromotion_id(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("PROMOTION_ID")));
+                    cd.setPromotion(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMOTION")));
+                    cd.setImgStr(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE")));
+                    cd.setImgStr1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE1")));
+                    cd.setImgStr2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE2")));
+
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "getPromoComplianceSkuwiseAfterData!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    public ArrayList<BrandMasterGetterSetter> getCompetionData(String keyaccountId, String storetypeid,String classid,String categoryid,int subcategoryId) {
+        Cursor cursordata = null;
+        ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
+
+        try {
+
+            cursordata = db.rawQuery("Select DISTINCT bm.BRAND_ID,bm.BRAND from MAPPING_STOCK ms inner join SKU_MASTER sm on sm.SKU_ID=ms.SKU_ID  " +
+                    "inner join BRAND_MASTER bm on bm.BRAND_ID=sm.BRAND_ID " +
+                    "inner join SUB_CATEGORY_MASTER cm on cm.SUB_CATEGORY_ID=bm.SUB_CATEGORY_ID " +
+                    "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid +"' AND ms.CLASS_ID='" + classid +"' AND cm.CATEGORY_ID='" + categoryid +"'AND cm.SUB_CATEGORY_ID='" + subcategoryId +"' AND bm.COMPANY_ID<>1 ", null);
+
+
+            if (cursordata != null) {
+                cursordata.moveToFirst();
+                while (!cursordata.isAfterLast()) {
+                    BrandMasterGetterSetter sb = new BrandMasterGetterSetter();
+
+                    sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
+                    sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND")));
+
+                    Data.add(sb);
+                    cursordata.moveToNext();
+                }
+                cursordata.close();
+
+            }
+
+
+        } catch (Exception ex) {
+
+        }
+        return Data;
+
+    }
+
+    public ArrayList<BrandMasterGetterSetter> getSubcategoryData(String keyaccountId, String storetypeid,String classid,String categoryid) {
+        Cursor cursordata = null;
+        ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
+
+        try {
+
+            cursordata = db.rawQuery("Select DISTINCT cm.SUB_CATEGORY_ID,cm.SUB_CATEGORY from MAPPING_STOCK ms inner join SKU_MASTER sm on sm.SKU_ID=ms.SKU_ID  " +
+                    "inner join BRAND_MASTER bm on bm.BRAND_ID=sm.BRAND_ID " +
+                    "inner join SUB_CATEGORY_MASTER cm on cm.SUB_CATEGORY_ID=bm.SUB_CATEGORY_ID " +
+                    "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid +"' AND ms.CLASS_ID='" + classid +"' AND cm.CATEGORY_ID='" + categoryid +"' AND bm.COMPANY_ID<>1 ", null);
+
+            if (cursordata != null) {
+                cursordata.moveToFirst();
+                while (!cursordata.isAfterLast()) {
+                    BrandMasterGetterSetter sb = new BrandMasterGetterSetter();
+
+                    sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+                    sb.setSUB_CATEGORY(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY")));
+
+                    Data.add(sb);
+                    cursordata.moveToNext();
+                }
+                cursordata.close();
+
+            }
+
+
+        } catch (Exception ex) {
+            Log.d("Exception ", "getPromoComplianceSkuwiseAfterData!" + ex.toString());
+        }
+        return Data;
+
+    }
+
+
+    public ArrayList<PROMOTION_TYPE_MASTERGetterSetter> getPromotionTypeData() {
+        Cursor cursordata = null;
+        ArrayList<PROMOTION_TYPE_MASTERGetterSetter> Data = new ArrayList<PROMOTION_TYPE_MASTERGetterSetter>();
+
+        try {
+
+            cursordata = db.rawQuery("SELECT * FROM PROMOTION_TYPE_MASTER", null);
+
+            if (cursordata != null) {
+                cursordata.moveToFirst();
+                while (!cursordata.isAfterLast()) {
+                    PROMOTION_TYPE_MASTERGetterSetter sb = new PROMOTION_TYPE_MASTERGetterSetter();
+
+                    sb.setPROMOTION_TYPE_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("PROMOTION_TYPE_ID")));
+                    sb.setPROMOTION_TYPE(cursordata.getString(cursordata.getColumnIndexOrThrow("PROMOTION_TYPE")));
+
+                    Data.add(sb);
+                    cursordata.moveToNext();
+                }
+                cursordata.close();
+
+            }
+
+
+        } catch (Exception ex) {
+
+        }
+        return Data;
+
+    }
+
+
+    public void InsertPROMOTION_TYPE_MASTER(PROMOTION_TYPE_MASTERGetterSetter data) {
+        db.delete("PROMOTION_TYPE_MASTER", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+
+            for (int i = 0; i < data.getPROMOTION_TYPE_ID().size(); i++) {
+
+                values.put("PROMOTION_TYPE_ID", data.getPROMOTION_TYPE_ID().get(i));
+                values.put("PROMOTION_TYPE", data.getPROMOTION_TYPE().get(i));
+                db.insert("PROMOTION_TYPE_MASTER", null, values);
+
+            }
+
+        } catch (Exception ex) {
+
+        }
+    }
+
+
+
 }

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

@@ -193,9 +193,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
         //populateAutoComplete();
         mPasswordView = (EditText) findViewById(R.id.password);
 
-       /* museridView.setText("testmer");
+      //  museridView.setText("egypt.1");
-        mPasswordView.setText("cpm123");
+      // museridView.setText("DSR_Alex_61");
-*/
+     //   mPasswordView.setText("cpm123");
         mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
@@ -686,16 +686,14 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
             if (result.equals(CommonString.KEY_SUCCESS)) {
 
                 //set true for South Africa
-                boolean forSA = true;
+                boolean forSA = false;
 
 //				database.open();
                 if(forSA){
                     //For SA Only
                     if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
 
-                        Intent intent = new Intent(getBaseContext(),
+                        Intent intent = new Intent(getBaseContext(), SelectLanguageActivity.class);
-                                SelectLanguageActivity.class);
-
                         intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
                         startActivity(intent);
 

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

@@ -99,14 +99,10 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
 
         switch (id) {
             case R.id.btn_language_one:
-
                 selected_flag = true;
-
                 CommonFunctions.updateLangResources(getApplicationContext(), language.get(0));
-
                 btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
                 btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
-
                 editor.putString(CommonString.KEY_LANGUAGE, language.get(0));
                 editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0));
                 editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0));

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

@@ -29,16 +29,12 @@ public class CommonFunctions {
     public static boolean updateLangResources(Context context, String language) {
 
         String lang;
-
         if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH;
-
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA;
-
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH;
-
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC;
         }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {

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

@@ -1087,7 +1087,7 @@ public class CommonString {
     public static String TABLE_MAPPING_PLANOGRAM_ADHOC = "MAPPING_PLANOGRAM_ADHOC";
     public static String TABLE_MAPPING_SOS_TARGET_ADHOC = "MAPPING_SOS_TARGET_ADHOC";
     public static String TABLE_NO_CAMERA_LAST_VISIT_DATA_ADHOC = "NO_CAMERA_LAST_VISIT_DATA_ADHOC";
-    public static String TABLE_STORE_PERFORMANCE_NEW_ADHOC = "STORE_PERFORMANCE_NEW_ADHOC";
+    public static String TABLE_STORE_PERFORMANCE_NEW_ADHOC = "STORE_PERFORMANCE_NEW_ADHOC_REVISED";
 
     public static final String TABLE_IS_ADHOC_SAVED = "IS_ADHOC_SAVED";
     public static final String CREATE_ABLE_IS_ADHOC_SAVED = "CREATE TABLE IF NOT EXISTS "
@@ -1269,4 +1269,70 @@ public class CommonString {
             + KEY_SKU + " VARCHAR,"
             + KEY_IMAGE + " VARCHAR,"
             + KEY_PRESENT + " INTEGER)";
+
+    //usk
+    public static final String TABLE_INSERT_COMPETIOTIONN_PROMO = "COMPETIOTIONN_PROMO";
+
+    public static final String CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO = "CREATE TABLE IF NOT EXISTS "
+            + TABLE_INSERT_COMPETIOTIONN_PROMO
+            + "("
+            + "KEY_ID"
+            + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+
+            + "STORE_ID"
+            + " INTEGER,"
+
+            + "CATEGORY_ID"
+            + " INTEGER,"
+
+            + "COMMON_ID"
+            + " INTEGER,"
+
+            + "SKU"
+            + " VARCHAR,"
+
+            + "BRAND_ID"
+            + " INTEGER,"
+
+            + "BRAND"
+            + " VARCHAR,"
+
+            + "PROMOTION_ID"
+            + " INTEGER,"
+
+            + "PROMOTION"
+            + " VARCHAR,"
+
+            + "STOCK"
+            + " INTEGER,"
+
+            + "IMAGE"
+            + " VARCHAR,"
+
+            + "IMAGE1"
+            + " VARCHAR,"
+
+            + "IMAGE2"
+            + " VARCHAR"
+
+            + ")";
+
+    public static final String TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS = "COMPETIOTIONN_PROMO_EXISTS";
+
+    public static final String CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS = "CREATE TABLE IF NOT EXISTS "
+            + TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS
+            + "("
+            + "KEY_ID"
+            + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+
+            + "STORE_ID"
+            + " INTEGER,"
+
+            + "CATEGORY_ID"
+            + " INTEGER,"
+
+            + "Existss"
+            + " INTEGER"
+
+            + ")";
 }

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

@@ -0,0 +1,809 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.app.Activity;
+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;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v4.content.FileProvider;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.ToggleButton;
+
+import java.io.File;
+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.BrandMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter;
+
+public class CompetitionPromoActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, View.OnClickListener {
+
+    ToggleButton btntoggle;
+    boolean isDataAdded = false, isExists = true, is_camera_compulsory = false;
+    LinearLayout lin_parent;
+    GSKOrangeDB db;
+    private SharedPreferences preferences;
+    Spinner spinner_brand_list,sp_promotion_typ,sp_subcategory;
+    String store_id, visit_date, username, country_id,keyAccount_id,class_id,storeType_id;
+    String categoryName, categoryId;
+    ArrayList<BrandMasterGetterSetter> brand_list = new ArrayList<>();
+    ArrayList<BrandMasterGetterSetter> subcategory_list = new ArrayList<>();
+    ArrayList<PROMOTION_TYPE_MASTERGetterSetter> promotion_list = new ArrayList<>();
+    String brand = "",subcategory="", _path = "";
+    String promotion = "";
+    EditText et_sku_name;
+    FloatingActionButton fab_save, fab_add;
+    ImageView imgCam, imgCam1, imgCam2;
+    String img_str = "", img_str1 = "", img_str2 = "";
+    String _pathforcheck, _pathforcheck1, _pathforcheck2;
+    Uri outputFileUri;
+    String gallery_package = "";
+    boolean editFlag = false, isdata_added = false;
+    String str, skuName;
+    int brand_id = 0;
+    int subcategoryId = 0;
+    int promotion_id = 0;
+    RecyclerView rec_added_counterfeit_product;
+    ArrayList<CompetitonPromoGetterSetter> addedCounterfeitProducts = new ArrayList<>();
+    ArrayList<CompetitonPromoGetterSetter> exists_data = new ArrayList<>();
+    private  LinearLayout lay_competitor_name;
+
+    ProductAdapter productAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_compition_promo);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        btntoggle = (ToggleButton) findViewById(R.id.btntoggle);
+        lin_parent = (LinearLayout) findViewById(R.id.lin_parent_promo);
+        et_sku_name = (EditText) findViewById(R.id.et_sku_name);
+        sp_subcategory = (Spinner) findViewById(R.id.sp_subcategory);
+        spinner_brand_list = (Spinner) findViewById(R.id.sp_brand);
+        sp_promotion_typ = (Spinner) findViewById(R.id.sp_promotion_typ);
+        lay_competitor_name = (LinearLayout) findViewById(R.id.lay_competitor_name);
+        rec_added_counterfeit_product = (RecyclerView) findViewById(R.id.rec_added_counterfeit_product);
+
+        //fab
+        fab_save = findViewById(R.id.fab);
+        fab_add = findViewById(R.id.fab_add);
+
+        //camera Images
+        imgCam = (ImageView) findViewById(R.id.img_cam);
+        imgCam1 = (ImageView) findViewById(R.id.img_cam1);
+        imgCam2 = (ImageView) findViewById(R.id.img_cam2);
+
+        //preference data
+        preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+        visit_date = preferences.getString(CommonString.KEY_DATE, null);
+        username = preferences.getString(CommonString.KEY_USERNAME, null);
+        country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
+
+
+        keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+        class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+        storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+
+
+        CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+        //Intent data
+        categoryName = getIntent().getStringExtra("categoryName");
+        categoryId = getIntent().getStringExtra("categoryId");
+
+        db = new GSKOrangeDB(CompetitionPromoActivity.this);
+        db.open();
+
+        btntoggle.setOnClickListener(this);
+        fab_save.setOnClickListener(this);
+        fab_add.setOnClickListener(this);
+        imgCam.setOnClickListener(this);
+        imgCam1.setOnClickListener(this);
+        imgCam2.setOnClickListener(this);
+
+        promotion_list = db.getPromotionTypeData();
+        subcategory_list = db.getSubcategoryData(keyAccount_id, storeType_id,class_id,categoryId);
+
+        //subcategory data
+        BrandMasterGetterSetter subcategory_select = new BrandMasterGetterSetter();
+        String subcat_select = getResources().getString(R.string.select);
+        subcategory_select.setSUB_CATEGORY(subcat_select);
+        subcategory_select.setSUB_CATEGORY_ID("0");
+        subcategory_list.add(0, subcategory_select);
+        CustomSubcategoryAdapter subcat_adapter = new CustomSubcategoryAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, subcategory_list);
+        sp_subcategory.setAdapter(subcat_adapter);
+        sp_subcategory.setOnItemSelectedListener(this);
+
+
+        /*//brand data
+        BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter();
+        String select = getResources().getString(R.string.select);
+        brand_select.setBRAND(select);
+        brand_select.setBRAND_ID("0");
+        brand_list.add(0, brand_select);
+        CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list);
+        spinner_brand_list.setAdapter(adapter);
+        spinner_brand_list.setOnItemSelectedListener(this);*/
+
+        //competitor
+        PROMOTION_TYPE_MASTERGetterSetter promoType_select = new PROMOTION_TYPE_MASTERGetterSetter();
+        String selectcomp = getResources().getString(R.string.select);
+        promoType_select.setPROMOTION_TYPE(selectcomp);
+        promoType_select.setPROMOTION_TYPE_ID("0");
+        promotion_list.add(0, promoType_select);
+        CustomPromotionTypeAdapter comp_adapter = new CustomPromotionTypeAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, promotion_list);
+        sp_promotion_typ.setAdapter(comp_adapter);
+        sp_promotion_typ.setOnItemSelectedListener(this);
+
+
+
+
+        //Product List
+        exists_data = db.getCompetitionPromoExistsAfterData(store_id, categoryId);
+
+        if(exists_data.size()>0){
+            isExists = exists_data.get(0).isExists();
+            if(exists_data.get(0).isExists()){
+                addedCounterfeitProducts = db.getCometionPromoAfterData(store_id, categoryId);
+                if(addedCounterfeitProducts.size()>0){
+                    rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+                    productAdapter = new ProductAdapter(addedCounterfeitProducts);
+                    rec_added_counterfeit_product.setAdapter(productAdapter);
+                }
+            }
+            else {
+                //fab_add.hide();//.setVisibility(View.GONE);
+                addedCounterfeitProducts.clear();
+                lin_parent.setVisibility(View.GONE);
+            }
+        }
+
+        btntoggle.setChecked(isExists);
+
+        str = CommonString.FILE_PATH;
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+
+        switch (id) {
+            case R.id.btntoggle:
+                isExists = btntoggle.isChecked();
+
+                if (isExists) {
+                    lin_parent.setVisibility(View.VISIBLE);
+                    isdata_added = true;
+                } else {
+                    android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CompetitionPromoActivity.this);
+                    builder.setTitle("Parinaam");
+                    builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+                            .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+
+                                    lin_parent.setVisibility(View.GONE);
+
+                                    brand = "";
+                                    subcategory = "";
+                                    promotion = "";
+                                    brand_id = 0;
+                                    subcategoryId = 0;
+                                    promotion_id = 0;
+                                    skuName = "";
+                                    img_str = "";
+                                    img_str1 = "";
+                                    img_str2 = "";
+                                    et_sku_name.setText("");
+                                    sp_subcategory.setSelection(0);
+                                    spinner_brand_list.setSelection(0);
+                                    sp_promotion_typ.setSelection(0);
+
+                                    addedCounterfeitProducts.clear();
+                                    isdata_added = true;
+                                }
+                            })
+                            .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    //checkBox.setChecked(true);
+                                    btntoggle.setChecked(true);
+                                }
+                            });
+                    android.app.AlertDialog alert = builder.create();
+                    alert.show();
+                }
+                break;
+
+            case R.id.fab_add:
+
+                skuName = et_sku_name.getText().toString().replaceAll("[&^<>{}'$]", "").replaceFirst("^0+(?!$)", "");
+
+                if (promotion.equals("")) {
+                    Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_promo_type, Snackbar.LENGTH_SHORT).show();
+                } else if (subcategory.equals("")) {
+                    Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_sub_category, Snackbar.LENGTH_SHORT).show();
+                }else if (brand.equals("")) {
+                    Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_competitor, Snackbar.LENGTH_SHORT).show();
+                } else if (skuName.equals("")) {
+                    Snackbar.make(rec_added_counterfeit_product, R.string.pls_enter_comment, Snackbar.LENGTH_SHORT).show();
+                } /*else  if (img_str.equals("") && img_str1.equals("") && img_str2.equals("")) {
+                    Snackbar.make(rec_added_counterfeit_product, R.string.click_image, Snackbar.LENGTH_SHORT).show();
+                }*/ else {
+                    CompetitonPromoGetterSetter product = new CompetitonPromoGetterSetter();
+                    product.setBrand(brand);
+                    product.setPromotion(promotion);
+                    product.setBrandId(brand_id);
+                    product.setPromotion_id(promotion_id);
+                    product.setSkuName(skuName);
+                    product.setImgStr(img_str);
+                    product.setImgStr1(img_str1);
+                    product.setImgStr2(img_str2);
+
+                    addedCounterfeitProducts.add(product);
+
+                    rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+                    productAdapter = new ProductAdapter(addedCounterfeitProducts);
+                    rec_added_counterfeit_product.setAdapter(productAdapter);
+
+                    subcategory = "";
+                    brand = "";
+                    promotion = "";
+                    subcategoryId = 0;
+                    brand_id = 0;
+                    promotion_id = 0;
+                    skuName = "";
+                    img_str = "";
+                    img_str1 = "";
+                    img_str2 = "";
+                    et_sku_name.setText("");
+                    sp_subcategory.setSelection(0);
+                    spinner_brand_list.setSelection(0);
+                    sp_promotion_typ.setSelection(0);
+                    //clearBrandSpinner();
+
+                    imgCam.setBackgroundResource(R.mipmap.camera_orange);
+                    imgCam1.setBackgroundResource(R.mipmap.camera_orange);
+                    imgCam2.setBackgroundResource(R.mipmap.camera_orange);
+
+                    isdata_added = true;
+                }
+
+                break;
+
+            case R.id.fab:
+                if(isExists && addedCounterfeitProducts.size()==0){
+                    Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add,Snackbar.LENGTH_SHORT).show();
+                }
+                else {
+                    db.InsertComptionPromotData(addedCounterfeitProducts, categoryId, store_id, isExists);
+                    finish();
+                    overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+                }
+
+                break;
+
+            case R.id.img_cam:
+                _pathforcheck = store_id + "CounterfeitProductImg1" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+                _path = CommonString.FILE_PATH + _pathforcheck;
+                startCameraActivity();
+                break;
+
+            case R.id.img_cam1:
+                _pathforcheck1 = store_id + "CounterfeitProductImg2" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+                _path = CommonString.FILE_PATH + _pathforcheck1;
+                startCameraActivity();
+                break;
+
+            case R.id.img_cam2:
+                _pathforcheck2 = store_id + "CounterfeitProductImg3" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+                _path = CommonString.FILE_PATH + _pathforcheck2;
+                startCameraActivity();
+                break;
+        }
+
+    }
+
+    void clearBrandSpinner() {
+        brand_list.clear();
+
+        BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter();
+        String str = getResources().getString(R.string.select);
+        brand_select.setBRAND(str);
+        brand_select.setBRAND_ID("0");
+        brand_list.add(0, brand_select);
+        CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list);
+
+        spinner_brand_list.setAdapter(adapter);
+        spinner_brand_list.setOnItemSelectedListener(this);
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        switch (parent.getId()) {
+            case R.id.sp_subcategory:
+                if (position != 0) {
+                    subcategory = subcategory_list.get(position).getSUB_CATEGORY().get(0);
+                    subcategoryId = Integer.parseInt(subcategory_list.get(position).getSUB_CATEGORY_ID().get(0));
+
+                    brand_list = db.getCompetionData(keyAccount_id, storeType_id,class_id,categoryId,subcategoryId);
+                    //brand data
+                    BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter();
+                    String select = getResources().getString(R.string.select);
+                    brand_select.setBRAND(select);
+                    brand_select.setBRAND_ID("0");
+                    brand_list.add(0, brand_select);
+                    CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list);
+                    spinner_brand_list.setAdapter(adapter);
+                    spinner_brand_list.setOnItemSelectedListener(this);
+
+                    lay_competitor_name.setVisibility(View.VISIBLE);
+                } else {
+                    subcategory = "";
+                    subcategoryId = 0;
+                    lay_competitor_name.setVisibility(View.GONE);
+                }
+                break;
+
+                case R.id.sp_brand:
+
+                if (position != 0) {
+                    brand = brand_list.get(position).getBRAND().get(0);
+                    brand_id = Integer.parseInt(brand_list.get(position).getBRAND_ID().get(0));
+                } else {
+                    brand = "";
+                    brand_id = 0;
+                }
+
+                break;
+            case R.id.sp_promotion_typ:
+
+                if (position != 0) {
+                    promotion = promotion_list.get(position).getPROMOTION_TYPE().get(0);
+                    promotion_id = Integer.parseInt(promotion_list.get(position).getPROMOTION_TYPE_ID().get(0));
+                } else {
+                    promotion = "";
+                    promotion_id = 0;
+
+                }
+
+                break;
+
+
+        }
+
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+
+    }
+
+    //subcategory data
+    public class CustomSubcategoryAdapter extends ArrayAdapter<String> {
+
+        private Activity activity;
+        private ArrayList data;
+        BrandMasterGetterSetter tempValues = null;
+        LayoutInflater inflater;
+
+        /*************
+         * CustomSubcategoryAdapter Constructor
+         *****************/
+        public CustomSubcategoryAdapter(
+                CompetitionPromoActivity activitySpinner,
+                int textViewResourceId,
+                ArrayList objects
+
+        ) {
+            super(activitySpinner, textViewResourceId, objects);
+
+            /********** Take passed values **********/
+            activity = activitySpinner;
+            data = objects;
+            /***********  Layout inflator to call external xml layout () **********************/
+            inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            return getCustomView(position, convertView, parent);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            return getCustomView(position, convertView, parent);
+        }
+
+        // This funtion called for each row ( Called data.size() times )
+        public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+            /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+            View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+            /***** Get each Model object from Arraylist ********/
+            tempValues = null;
+            tempValues = (BrandMasterGetterSetter) data.get(position);
+
+            TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+            if (position == 0) {
+
+                // Default selected Spinner item
+                label.setText(getResources().getString(R.string.select));
+                //sub.setText("");
+            } else {
+                // Set values for spinner each row
+                label.setText(tempValues.getSUB_CATEGORY().get(0));
+            }
+
+            return row;
+        }
+    }
+
+
+
+    public class CustomBrandAdapter extends ArrayAdapter<String> {
+
+        private Activity activity;
+        private ArrayList data;
+        BrandMasterGetterSetter tempValues = null;
+        LayoutInflater inflater;
+
+        /*************
+         * CustomBrandAdapter Constructor
+         *****************/
+        public CustomBrandAdapter(
+                CompetitionPromoActivity activitySpinner,
+                int textViewResourceId,
+                ArrayList objects
+
+        ) {
+            super(activitySpinner, textViewResourceId, objects);
+
+            /********** Take passed values **********/
+            activity = activitySpinner;
+            data = objects;
+            /***********  Layout inflator to call external xml layout () **********************/
+            inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            return getCustomView(position, convertView, parent);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            return getCustomView(position, convertView, parent);
+        }
+
+        // This funtion called for each row ( Called data.size() times )
+        public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+            /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+            View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+            /***** Get each Model object from Arraylist ********/
+            tempValues = null;
+            tempValues = (BrandMasterGetterSetter) data.get(position);
+
+            TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+            if (position == 0) {
+
+                // Default selected Spinner item
+                label.setText(getResources().getString(R.string.select));
+                //sub.setText("");
+            } else {
+                // Set values for spinner each row
+                label.setText(tempValues.getBRAND().get(0));
+            }
+
+            return row;
+        }
+    }
+
+
+    public class CustomPromotionTypeAdapter extends ArrayAdapter<String> {
+
+        private Activity activity;
+        private ArrayList data;
+        PROMOTION_TYPE_MASTERGetterSetter tempValues = null;
+        LayoutInflater inflater;
+
+        /*************
+         * CustomPromotionTypeAdapter Constructor
+         *****************/
+        public CustomPromotionTypeAdapter(
+                CompetitionPromoActivity activitySpinner,
+                int textViewResourceId,
+                ArrayList objects
+
+        ) {
+            super(activitySpinner, textViewResourceId, objects);
+
+            /********** Take passed values **********/
+            activity = activitySpinner;
+            data = objects;
+            /***********  Layout inflator to call external xml layout () **********************/
+            inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            return getCustomView(position, convertView, parent);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            return getCustomView(position, convertView, parent);
+        }
+
+        // This funtion called for each row ( Called data.size() times )
+        public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+            /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+            View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+            /***** Get each Model object from Arraylist ********/
+            tempValues = null;
+            tempValues = (PROMOTION_TYPE_MASTERGetterSetter) data.get(position);
+
+            TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+            if (position == 0) {
+
+                // Default selected Spinner item
+                label.setText(getResources().getString(R.string.select));
+                //sub.setText("");
+            } else {
+                // Set values for spinner each row
+                label.setText(tempValues.getPROMOTION_TYPE().get(0));
+            }
+
+            return row;
+        }
+    }
+
+    protected void startCameraActivity() {
+        try {
+
+            Log.i("MakeMachine", "startCameraActivity()");
+            File file = new File(_path);
+            outputFileUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", file);
+
+            String defaultCameraPackage = "";
+            final PackageManager packageManager = getPackageManager();
+            List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
+            for (int n = 0; n < list.size(); n++) {
+                if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "package name  : " + list.get(n).packageName);
+
+                    //temp value in case camera is gallery app above jellybean
+                    String packag = list.get(n).loadLabel(packageManager).toString();
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
+                        gallery_package = list.get(n).packageName;
+                    }
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+                            defaultCameraPackage = list.get(n).packageName;
+                            break;
+                        }
+                    } else {
+
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+
+                            defaultCameraPackage = list.get(n).packageName;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            //com.android.gallery3d
+
+            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+            intent.setPackage(defaultCameraPackage);
+            startActivityForResult(intent, 0);
+        } catch (ActivityNotFoundException e) {
+            e.printStackTrace();
+
+            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+            intent.setPackage(gallery_package);
+            startActivityForResult(intent, 0);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+        Log.i("MakeMachine", "resultCode: " + resultCode);
+        switch (resultCode) {
+            case 0:
+                Log.i("MakeMachine", "User cancelled");
+                break;
+
+            case -1:
+
+                editFlag = true;
+
+                if (_pathforcheck != null && !_pathforcheck.equals("")) {
+                    if (new File(str + _pathforcheck).exists()) {
+
+                        imgCam.setBackgroundResource(R.mipmap.camera_green);
+
+                        img_str = _pathforcheck;
+                        _pathforcheck = "";
+                    }
+                }
+
+                if (_pathforcheck1 != null && !_pathforcheck1.equals("")) {
+                    if (new File(str + _pathforcheck1).exists()) {
+
+                        imgCam1.setBackgroundResource(R.mipmap.camera_green);
+
+                        img_str1 = _pathforcheck1;
+                        _pathforcheck1 = "";
+                    }
+                }
+                if (_pathforcheck2 != null && !_pathforcheck2.equals("")) {
+                    if (new File(str + _pathforcheck2).exists()) {
+
+                        imgCam2.setBackgroundResource(R.mipmap.camera_green);
+
+                        img_str2 = _pathforcheck2;
+                        _pathforcheck2 = "";
+                    }
+                }
+
+
+                break;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.ViewHolder> {
+
+        private ArrayList<CompetitonPromoGetterSetter> list;
+
+        public ProductAdapter(ArrayList<CompetitonPromoGetterSetter> promoList) {
+            list = promoList;
+        }
+
+        @Override
+        public ProductAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.item_competition_promo, parent, false);
+            return new ProductAdapter.ViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(final ProductAdapter.ViewHolder holder, int position) {
+
+            final CompetitonPromoGetterSetter mItem = list.get(position);
+            holder.tv_brand.setText(getString(R.string.promotion_type) + " - " + mItem.getPromotion());
+            holder.tv_competitor.setText(getString(R.string.competitor) + " - " + mItem.getBrand());
+            holder.tv_sku_name.setText(getString(R.string.comment) + " - " + mItem.getSkuName());
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return list.size();
+        }
+
+        public class ViewHolder extends RecyclerView.ViewHolder {
+            public final View mView;
+            public final TextView tv_brand, tv_competitor,tv_sku_name;
+
+            public ViewHolder(View view) {
+                super(view);
+
+                mView = view;
+                tv_brand = (TextView) mView.findViewById(R.id.tv_brand);
+                tv_sku_name = (TextView) mView.findViewById(R.id.tv_sku_name);
+                tv_competitor = (TextView) mView.findViewById(R.id.tv_competitor);
+
+            }
+
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            ischanged();
+        }
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    void ischanged(){
+        if(isdata_added){
+            android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CompetitionPromoActivity.this);
+            builder.setTitle("Parinaam");
+            builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+                    .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+
+                            finish();
+                            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+                        }
+                    })
+                    .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                        }
+                    });
+            android.app.AlertDialog alert = builder.create();
+            alert.show();
+        }
+        else {
+            super.onBackPressed();
+            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        ischanged();
+    }
+}

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

@@ -72,7 +72,6 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
     RecyclerView rec_added_counterfeit_product;
     ArrayList<CounterfeitProductGetterSetter> addedCounterfeitProducts = new ArrayList<>();
     ArrayList<CounterfeitProductGetterSetter> exists_data = new ArrayList<>();
-
     ProductAdapter productAdapter;
 
     @Override

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

@@ -1704,7 +1704,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
                 //STORE_PERFORMANCE_NEW_ADHOC
                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
                 request.addProperty("UserName", storeId);
-                request.addProperty("Type", "STORE_PERFORMANCE_NEW_ADHOC");
+                request.addProperty("Type", "STORE_PERFORMANCE_NEW_ADHOC_REVISED");
                 request.addProperty("cultureid", culture_id);
 
                 envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);

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

@@ -70,6 +70,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
@@ -127,6 +128,7 @@ public class DownloadActivity extends AppCompatActivity {
     JourneyPlanGetterSetter pharmaJcpGetterSetter;
     MappingPharmaQuestionGetterSetter mappingPharmaQuestionGetterSetter;
     MappingPharmaMSLGetterSetter mappingPharmaMSLGetterSetter;
+    PROMOTION_TYPE_MASTERGetterSetter promotion_type_masterGetterSetter;
 
     private Dialog dialog;
     private ProgressBar pb;
@@ -308,8 +310,7 @@ public class DownloadActivity extends AppCompatActivity {
 
                     if (additionalJcpGetterSetter.getSTORE_ID().size() > 0) {
                         resultHttp = CommonString.KEY_SUCCESS;
-                    }
+                    } else {
-                    else {
 
                         no_addtional_jcp_flag = true;
 
@@ -342,8 +343,7 @@ public class DownloadActivity extends AppCompatActivity {
 
                     if (additionalAdhocJcpGetterSetter.getSTORE_ID().size() > 0) {
                         resultHttp = CommonString.KEY_SUCCESS;
-                    }
+                    } else {
-                    else {
 
                         if (no_jcp_flag && no_adhoc_flag && no_addtional_jcp_flag) {
                             return "JOURNEY_PLAN";
@@ -905,7 +905,7 @@ public class DownloadActivity extends AppCompatActivity {
                 //STORE_PERFORMANCE
                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
                 request.addProperty("UserName", userId);
-                request.addProperty("Type", "STORE_PERFORMANCE_NEW");
+                request.addProperty("Type", "STORE_PERFORMANCE_REVISED");
                 request.addProperty("cultureid", culture_id);
 
                 envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -1595,6 +1595,47 @@ public class DownloadActivity extends AppCompatActivity {
                     }
 
                 }
+
+
+                //usk
+                // MAPPING_PHARMA_MSL
+                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+                request.addProperty("UserName", userId);
+                request.addProperty("Type", "PROMOTION_TYPE_MASTER");
+                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();
+
+                    promotion_type_masterGetterSetter = XMLHandlers.mappingPROMOTION_TYPE_MASTERXMLHandler(xpp, eventType);
+
+                    String stocktable = promotion_type_masterGetterSetter.getTable_PROMOTION_TYPE_MASTER();
+                    if (stocktable != null) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                        TableBean.setTable_PROMOTION_TYPE_MASTER(stocktable);
+                    }
+
+                    if (mappingPharmaMSLGetterSetter.getSKU_ID().size() > 0) {
+                        data.value = 99;
+                        data.name = "PROMOTION_TYPE_MASTER " + getResources().getString(R.string.download_data);
+                    } else {
+                        // return "MAPPING_PHARMA_MSL";
+                    }
+
+                }
+
+
                 publishProgress(data);
 
               /*  //MAPPING_COUNTRYWISE_PLANOGRAM
@@ -1654,7 +1695,7 @@ public class DownloadActivity extends AppCompatActivity {
                             file.mkdir();
                         }
 
-                        if(!new File(PATH + image_name).exists()){
+                        if (!new File(PATH + image_name).exists()) {
                             if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) {
                                 URL url = new URL(path + "/" + image_name);
                                 HttpURLConnection c = (HttpURLConnection) url.openConnection();
@@ -1780,7 +1821,7 @@ public class DownloadActivity extends AppCompatActivity {
                             file.mkdir();
                         }
 
-                        if(!new File(PATH + image_name).exists()){
+                        if (!new File(PATH + image_name).exists()) {
                             if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) {
                                 URL url = new URL(path + "/" + image_name);
                                 HttpURLConnection c = (HttpURLConnection) url.openConnection();
@@ -1953,8 +1994,8 @@ public class DownloadActivity extends AppCompatActivity {
 
                 //NON_WORKING_SUB_REASON added - 26.09.2018
                 db.insertNonWorkingSubreasonData(nonWorkingSubReasonGetterSetter);
-
+                //usk
-                db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter, "STORE_PERFORMANCE_NEW");
+                db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter, "STORE_PERFORMANCE_REVISED");
                 db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter, "MAPPING_PLANOGRAM");
                 db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter);
                 db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter, "MAPPING_SOS_TARGET");
@@ -1968,7 +2009,7 @@ public class DownloadActivity extends AppCompatActivity {
                 db.InsertPOGQUESTION(pogQuestionGetterSetter);
                 db.InsertNON_T2P_REASON(nonT2pReasonGetterSetter);
                 db.InsertCONFIGURATION_COUNTRY_WISE(configurationContrywiseGetterSetter);
-                db.InsertNO_CAMERA_LAST_VISIT_DATA(noCameraLastVisitGetterSetter,"NO_CAMERA_LAST_VISIT_DATA");
+                db.InsertNO_CAMERA_LAST_VISIT_DATA(noCameraLastVisitGetterSetter, "NO_CAMERA_LAST_VISIT_DATA");
                 db.insertSUPERVISOR_LIST_DATA(supervisorListGetterSetter);
                 db.InsertGeoTag_DATA(geoFencingGetterSetter);
                 db.InsertCONFIGURATION_MASTER(configurationMasterGetterSetter);
@@ -1980,6 +2021,7 @@ public class DownloadActivity extends AppCompatActivity {
                 db.InsertPharmaJCP(pharmaJcpGetterSetter);
                 db.InsertMAPPING_PHARMA_MSL(mappingPharmaMSLGetterSetter);
                 db.InsertAdditionalAdhocJCP(additionalAdhocJcpGetterSetter);
+                db.InsertPROMOTION_TYPE_MASTER(promotion_type_masterGetterSetter);
 
 
             } catch (MalformedURLException e) {

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

@@ -271,6 +271,16 @@ public class CategoryListActivity extends AppCompatActivity {
                                }
 
                            }
+                           //usk
+                           if(country_id.equals("6")&& category_id.equals("2")){
+
+                               if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) {
+                                   flag = false;
+                               }
+
+                           }
+
+
                        }
 
                        flag_filled = flag;
@@ -656,6 +666,15 @@ public class CategoryListActivity extends AppCompatActivity {
                             break;
                         }
 
+                    }
+                    //usk
+                    if(country_id.equals("6")&& category_id.equals("2")){
+
+                        if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) {
+                            flag_filled = false;
+                            break;
+                        }
+
                     }
 
                     flag_filled = true;

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

@@ -107,7 +107,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
                 categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, CommonString.TABLE_STORE_PERFORMANCE_NEW_ADHOC);
             }
             else {
-                categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, "STORE_PERFORMANCE_NEW");
+                categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, "STORE_PERFORMANCE_REVISED");
             }
 
 
@@ -180,7 +180,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
             holder.txt_sos.setText(categoryData.getSos());
             holder.txt_t2p.setText(categoryData.getT2p());
             holder.txt_promo.setText(categoryData.getPromo());
-            holder.txt_oss.setText(categoryData.getOss());
+
             holder.txt_planogram.setText(categoryData.getPLANOGRAM());
 
         }
@@ -191,7 +191,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
         }
 
         class MyViewHolder extends RecyclerView.ViewHolder {
-            TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss,txt_planogram;
+            TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability,txt_planogram;
             LinearLayout lay_menu;
 
             public MyViewHolder(View itemView) {
@@ -202,7 +202,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
                 txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p);
                 txt_promo = (TextView) itemView.findViewById(R.id.txt_promo);
                 txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability);
-                txt_oss = (TextView) itemView.findViewById(R.id.txt_oss);
                 txt_planogram = (TextView) itemView.findViewById(R.id.txt_planogram);
 
             }

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

@@ -36,6 +36,7 @@ import cpm.com.gskmtorange.dailyentry.AdditionalPromoSKUwiseActivity;
 import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
 import cpm.com.gskmtorange.dailyentry.AuditActivity;
 import cpm.com.gskmtorange.dailyentry.CategoryPicture;
+import cpm.com.gskmtorange.dailyentry.CompetitionPromoActivity;
 import cpm.com.gskmtorange.dailyentry.CounterfeitProductsActivity;
 import cpm.com.gskmtorange.dailyentry.CreateSelfActivity;
 import cpm.com.gskmtorange.dailyentry.POGQuestionsActivity;
@@ -342,6 +343,24 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                     categoryList.add(data);
                 }
 
+                //usk
+                //Cometition promo Option - Egypt
+                if (categoryId.equals("2")){
+                    if(country_id.equals("6")){
+                        data = new DailyDataMenuGetterSetter();
+
+                        if (db.getCompetitionPromoExistsAfterData(store_id, categoryId).size() > 0) {
+                            data.setCategory_img(R.mipmap.competition_done);
+                        } else {
+                            data.setCategory_img(R.mipmap.competition);
+                        }
+
+                        data.setCategory_name(getString(R.string.title_activity_competition_promo));
+                        categoryList.add(data);
+                    }
+
+                }
+
                 //Stock Pricing Option - Turkey
                 /*if(country_id.equals("4")){
                     data = new DailyDataMenuGetterSetter();
@@ -727,8 +746,16 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                         intent.putExtra("categoryId", categoryId);
                         startActivity(intent);
                         overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+                    } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_competition_promo))) {
+                        Intent intent = new Intent(DailyDataMenuActivity.this, CompetitionPromoActivity.class);
+                        intent.putExtra("categoryName", dailyData.getCategory_name());
+                        intent.putExtra("categoryId", categoryId);
+                        startActivity(intent);
+                        overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
                     }
 
+
+
                 }
             });
         }

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

@@ -136,7 +136,8 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
                 storeWisePerformanceList = db.getStoreWisePerformance(store_id, CommonString.TABLE_STORE_PERFORMANCE_NEW_ADHOC);
             }
             else {
-                storeWisePerformanceList = db.getStoreWisePerformance(store_id, "STORE_PERFORMANCE_NEW");
+                storeWisePerformanceList = db.getStoreWisePerformance(store_id, "STORE_PERFORMANCE_REVISED");
+
 
             }
 
@@ -208,7 +209,6 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
             holder.txt_sos.setText(categoryData.getSos());
             holder.txt_t2p.setText(categoryData.getT2p());
             holder.txt_promo.setText(categoryData.getPromo());
-            holder.txt_oss.setText(categoryData.getOss());
             holder.txt_planogram.setText(categoryData.getPLANOGRAM());
 
         }
@@ -219,7 +219,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
         }
 
         class MyViewHolder extends RecyclerView.ViewHolder {
-            TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss,txt_planogram;
+            TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability,txt_planogram;
             LinearLayout lay_menu;
 
             public MyViewHolder(View itemView) {
@@ -230,7 +230,6 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
                 txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p);
                 txt_promo = (TextView) itemView.findViewById(R.id.txt_promo);
                 txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability);
-                txt_oss = (TextView) itemView.findViewById(R.id.txt_oss);
                 txt_planogram = (TextView) itemView.findViewById(R.id.txt_planogram);
 
 

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

@@ -47,6 +47,7 @@ import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -105,6 +106,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
     ArrayList<PromoComplianceSkuwiseGetterSetter> promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters;
 
     ArrayList<CounterfeitProductGetterSetter> counterfeitProductGetterSetters, counterfeitProductExistsGetterSetters;
+    ArrayList<CompetitonPromoGetterSetter> competitonGetterSetters, competitonExistsGetterSetters;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -1470,6 +1472,76 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                                 data.value = 65;
                                 data.name = getString(R.string.title_activity_counterfeit_products);
                                 publishProgress(data);
+
+                                //usk upload
+                                //Competitomn promo - Country Id - 6 (egipt)
+                                String competiton_data_xml = "", add_competiton_data_xml = "", competiton_exists_xml = "", competiton_add_xml = "";
+
+                                db.open();
+                                competitonExistsGetterSetters = db.getCompetitionPromoExistsAfterData(coverageList.get(i).getStoreId(), null);
+                                if (competitonExistsGetterSetters.size() > 0) {
+
+                                    for (int l = 0; l < competitonExistsGetterSetters.size(); l++) {
+
+                                        add_competiton_data_xml = "";
+
+                                        competitonGetterSetters = db.getCometionPromoAfterData(competitonExistsGetterSetters.get(l).get_id(), null);
+
+                                        for (int i1 = 0; i1 < competitonGetterSetters.size(); i1++) {
+                                            if (!competitonGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+                                                competiton_add_xml = "[COMPETITION_DATA]"
+                                                        + "[MID]" + mid + "[/MID]"
+                                                        + "[USER_ID]" + userId + "[/USER_ID]"
+                                                        + "[CATEGORY_ID]" + Integer.parseInt(competitonGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+                                                        + "[COMMENT]" + competitonGetterSetters.get(i1).getSkuName() + "[/COMMENT]"
+                                                        + "[BRAND_ID]" + competitonGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
+                                                        + "[IMAGE1]" + competitonGetterSetters.get(i1).getImgStr() + "[/IMAGE1]"
+                                                        + "[PROMO_TYPE]" + competitonGetterSetters.get(i1).getPromotion_id() + "[/PROMO_TYPE]"
+                                                        + "[/COMPETITION_DATA]";
+
+                                                add_competiton_data_xml = add_competiton_data_xml + competiton_add_xml;
+                                            }
+                                        }
+
+                                        int exists = 0;
+                                        if (competitonExistsGetterSetters.get(l).isExists()) {
+                                            exists = 1;
+                                        }
+
+                                        competiton_exists_xml = "[COMPETITION_PROMOTION_DATA]"
+                                                + "[MID]" + mid + "[/MID]"
+                                                + "[USER_ID]" + userId + "[/USER_ID]"
+                                                + "[CATEGORY_ID]" + Integer.parseInt(competitonExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+                                                + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+                                                + "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]"
+                                                + "[/COMPETITION_PROMOTION_DATA]";
+
+                                        competiton_data_xml = competiton_data_xml + competiton_exists_xml;
+
+                                    }
+
+                                    final String sos_xml = "[DATA]" + competiton_data_xml + "[/DATA]";
+
+                                    request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+                                    request.addProperty("XMLDATA", sos_xml);
+                                    request.addProperty("KEYS", "COMPETITION_PROMOTION_DATA");
+                                    request.addProperty("USERNAME", userId);
+                                    request.addProperty("MID", mid);
+
+                                    envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                                    envelope.dotNet = true;
+                                    envelope.setOutputSoapObject(request);
+
+                                    androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                                    androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+                                    result = envelope.getResponse();
+                                }
+
+                                data.value = 68;
+                                data.name = getString(R.string.title_activity_competition_promo);
+                                publishProgress(data);
                             }
 
                             //-----------------------------------------------------------------------------------------------------------------------------------------------------

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

@@ -63,6 +63,7 @@ import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.retrofit.PostApiForFile;
 import cpm.com.gskmtorange.retrofit.StringConverterFactory;
 import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -120,6 +121,7 @@ public class UploadActivity extends AppCompatActivity {
     ArrayList<Store_wise_camera_DataGetterSetter> storeWiseCameraDataGetterSetters;
     ArrayList<PromoComplianceSkuwiseGetterSetter> promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters;
     ArrayList<CounterfeitProductGetterSetter> counterfeitProductGetterSetters, counterfeitProductExistsGetterSetters;
+    ArrayList<CompetitonPromoGetterSetter> competitonGetterSetters, competitonExistsGetterSetters;
 
     RequestBody body1;
     private Retrofit adapter;
@@ -1650,6 +1652,76 @@ public class UploadActivity extends AppCompatActivity {
                                 data.value = 65;
                                 data.name = getString(R.string.title_activity_counterfeit_products);
                                 publishProgress(data);
+
+                                //usk upload
+                                //Competion promo - Country Id - 6 (egipt)
+                                String competiton_data_xml = "", add_competiton_data_xml = "", competiton_exists_xml = "", competiton_add_xml = "";
+
+                                db.open();
+                                competitonExistsGetterSetters = db.getCompetitionPromoExistsAfterData(coverageList.get(i).getStoreId(), null);
+                                if (competitonExistsGetterSetters.size() > 0) {
+
+                                    for (int l = 0; l < competitonExistsGetterSetters.size(); l++) {
+
+                                        add_competiton_data_xml = "";
+
+                                        competitonGetterSetters = db.getCometionPromoAfterData(competitonExistsGetterSetters.get(l).get_id(), null);
+
+                                        for (int i1 = 0; i1 < competitonGetterSetters.size(); i1++) {
+                                            if (!competitonGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+                                                competiton_add_xml = "[COMPETITION_DATA]"
+                                                        + "[MID]" + mid + "[/MID]"
+                                                        + "[USER_ID]" + userId + "[/USER_ID]"
+                                                        + "[CATEGORY_ID]" + Integer.parseInt(competitonGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+                                                        + "[COMMENT]" + competitonGetterSetters.get(i1).getSkuName() + "[/COMMENT]"
+                                                        + "[BRAND_ID]" + competitonGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
+                                                        + "[IMAGE1]" + competitonGetterSetters.get(i1).getImgStr() + "[/IMAGE1]"
+                                                        + "[PROMO_TYPE]" + competitonGetterSetters.get(i1).getPromotion_id() + "[/PROMO_TYPE]"
+                                                        + "[/COMPETITION_DATA]";
+
+                                                add_competiton_data_xml = add_competiton_data_xml + competiton_add_xml;
+                                            }
+                                        }
+
+                                        int exists = 0;
+                                        if (competitonExistsGetterSetters.get(l).isExists()) {
+                                            exists = 1;
+                                        }
+
+                                        competiton_exists_xml = "[COMPETITION_PROMOTION_DATA]"
+                                                + "[MID]" + mid + "[/MID]"
+                                                + "[USER_ID]" + userId + "[/USER_ID]"
+                                                + "[CATEGORY_ID]" + Integer.parseInt(competitonExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+                                                + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+                                                + "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]"
+                                                + "[/COMPETITION_PROMOTION_DATA]";
+
+                                        competiton_data_xml = competiton_data_xml + competiton_exists_xml;
+
+                                    }
+
+                                    final String sos_xml = "[DATA]" + competiton_data_xml + "[/DATA]";
+
+                                    request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+                                    request.addProperty("XMLDATA", sos_xml);
+                                    request.addProperty("KEYS", "COMPETITION_PROMOTION_DATA");
+                                    request.addProperty("USERNAME", userId);
+                                    request.addProperty("MID", mid);
+
+                                    envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                                    envelope.dotNet = true;
+                                    envelope.setOutputSoapObject(request);
+
+                                    androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                                    androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+                                    result = envelope.getResponse();
+                                }
+
+                                data.value = 68;
+                                data.name = getString(R.string.title_activity_competition_promo);
+                                publishProgress(data);
                             }
 
 

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

@@ -13,6 +13,16 @@ public class BrandMasterGetterSetter {
     ArrayList<String> BRAND_ID = new ArrayList<>();
     ArrayList<String> BRAND = new ArrayList<>();
     ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
+
+    public ArrayList<String> getSUB_CATEGORY() {
+        return SUB_CATEGORY;
+    }
+
+    public void setSUB_CATEGORY(String SUB_CATEGORY) {
+        this.SUB_CATEGORY.add(SUB_CATEGORY);
+    }
+
+    ArrayList<String> SUB_CATEGORY = new ArrayList<>();
     ArrayList<String> COMPANY_ID = new ArrayList<>();
     ArrayList<String> BRAND_SEQUENCE = new ArrayList<>();
     ArrayList<String> BRAND_SEQUENCE_SA = new ArrayList<>();

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

@@ -0,0 +1,105 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+public class CompetitonPromoGetterSetter {
+
+    String skuName;
+    String imgStr;
+    String imgStr1;
+    String imgStr2;
+    String brand;
+    String _id;
+    String category_id;
+    int brandId;
+    String promotion;
+    int promotion_id;
+
+    public String getPromotion() {
+        return promotion;
+    }
+
+    public void setPromotion(String promotion) {
+        this.promotion = promotion;
+    }
+
+    public int getPromotion_id() {
+        return promotion_id;
+    }
+
+    public void setPromotion_id(int promotion_id) {
+        this.promotion_id = promotion_id;
+    }
+
+    boolean isExists = true;
+
+    public String getSkuName() {
+        return skuName;
+    }
+
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
+    public String getImgStr() {
+        return imgStr;
+    }
+
+    public void setImgStr(String imgStr) {
+        this.imgStr = imgStr;
+    }
+
+    public String getImgStr1() {
+        return imgStr1;
+    }
+
+    public void setImgStr1(String imgStr1) {
+        this.imgStr1 = imgStr1;
+    }
+
+    public String getImgStr2() {
+        return imgStr2;
+    }
+
+    public void setImgStr2(String imgStr2) {
+        this.imgStr2 = imgStr2;
+    }
+
+    public int getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(int brandId) {
+        this.brandId = brandId;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String get_id() {
+        return _id;
+    }
+
+    public void set_id(String _id) {
+        this._id = _id;
+    }
+
+    public boolean isExists() {
+        return isExists;
+    }
+
+    public void setExists(boolean exists) {
+        isExists = exists;
+    }
+
+    public String getCategory_id() {
+        return category_id;
+    }
+
+    public void setCategory_id(String category_id) {
+        this.category_id = category_id;
+    }
+}

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

@@ -0,0 +1,35 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class PROMOTION_TYPE_MASTERGetterSetter {
+
+    String table_PROMOTION_TYPE_MASTER;
+
+    ArrayList<String> PROMOTION_TYPE_ID = new ArrayList<>();
+    ArrayList<String> PROMOTION_TYPE = new ArrayList<>();
+
+    public String getTable_PROMOTION_TYPE_MASTER() {
+        return table_PROMOTION_TYPE_MASTER;
+    }
+
+    public void setTable_PROMOTION_TYPE_MASTER(String table_PROMOTION_TYPE_MASTER) {
+        this.table_PROMOTION_TYPE_MASTER = table_PROMOTION_TYPE_MASTER;
+    }
+
+    public ArrayList<String> getPROMOTION_TYPE_ID() {
+        return PROMOTION_TYPE_ID;
+    }
+
+    public void setPROMOTION_TYPE_ID(String PROMOTION_TYPE_ID) {
+        this.PROMOTION_TYPE_ID.add(PROMOTION_TYPE_ID);
+    }
+
+    public ArrayList<String> getPROMOTION_TYPE() {
+        return PROMOTION_TYPE;
+    }
+
+    public void setPROMOTION_TYPE(String PROMOTION_TYPE) {
+        this.PROMOTION_TYPE.add(PROMOTION_TYPE);
+    }
+}

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

@@ -16,7 +16,6 @@ public class STORE_PERFORMANCE_MasterGetterSetter {
     ArrayList<String> T2P = new ArrayList<>();
     ArrayList<String> PROMO = new ArrayList<>();
     ArrayList<String> MSL_AVAILABILITY = new ArrayList<>();
-    ArrayList<String> OSS = new ArrayList<>();
     ArrayList<String> ORDERID = new ArrayList<>();
     ArrayList<String> PLANOGRAM = new ArrayList<>();
     public ArrayList<String> getPLANOGRAM() {
@@ -95,14 +94,6 @@ public class STORE_PERFORMANCE_MasterGetterSetter {
         this.MSL_AVAILABILITY.add(MSL_AVAILABILITY);
     }
 
-    public ArrayList<String> getOSS() {
-        return OSS;
-    }
-
-    public void setOSS(String OSS) {
-        this.OSS.add(OSS);
-    }
-
     public ArrayList<String> getORDERID() {
         return ORDERID;
     }

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

@@ -43,6 +43,15 @@ public class TableBean {
     public static String Table_CONFIGURATION_MASTER;
     public static String Table_MAPPING_STOCK_STOREWISE;
     public static String Table_MAPPING_PLANOGRAM_STORE_WISE;
+    public static String Table_PROMOTION_TYPE_MASTER;
+
+    public static String getTable_PROMOTION_TYPE_MASTER() {
+        return Table_PROMOTION_TYPE_MASTER;
+    }
+
+    public static void setTable_PROMOTION_TYPE_MASTER(String table_PROMOTION_TYPE_MASTER) {
+        Table_PROMOTION_TYPE_MASTER = table_PROMOTION_TYPE_MASTER;
+    }
 
     public static String getTable_MAPPING_PHARMA_MSL() {
         return Table_MAPPING_PHARMA_MSL;

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

@@ -38,6 +38,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
@@ -771,9 +772,6 @@ public class XMLHandlers {
                     if (xpp.getName().equals("MSL")) {
                         st.setMSL_AVAILABILITY(xpp.nextText());
                     }
-                    if (xpp.getName().equals("OSS")) {
-                        st.setOSS(xpp.nextText());
-                    }
                     if (xpp.getName().equals("ORDERID")) {
                         st.setORDERID(xpp.nextText());
                     }
@@ -1590,4 +1588,37 @@ public class XMLHandlers {
         }
         return stock;
     }
+
+
+
+    public static PROMOTION_TYPE_MASTERGetterSetter mappingPROMOTION_TYPE_MASTERXMLHandler(XmlPullParser xpp,
+                                                                                           int eventType) {
+        PROMOTION_TYPE_MASTERGetterSetter stock = new PROMOTION_TYPE_MASTERGetterSetter();
+
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+                    if (xpp.getName().equals("META_DATA")) {
+                        stock.setTable_PROMOTION_TYPE_MASTER(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("PROMOTION_TYPE_ID")) {
+                        stock.setPROMOTION_TYPE_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("PROMOTION_TYPE")) {
+                        stock.setPROMOTION_TYPE(xpp.nextText());
+                    }
+
+                }
+                xpp.next();
+            }
+        } catch (XmlPullParserException e) {
+
+            e.printStackTrace();
+        } catch (IOException e) {
+
+            e.printStackTrace();
+        }
+        return stock;
+    }
+
 }

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".dailyentry.CompetitionPromoActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_compition_promo" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@mipmap/save_icon" />
+
+</android.support.design.widget.CoordinatorLayout>

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

@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                    android:weightSum="28">
+                    android:weightSum="24">
 
                     <TextView
                         android:layout_width="0dp"
@@ -118,20 +118,6 @@
                         android:layout_height="match_parent"
                         android:background="@color/colorPrimary" />
 
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="4"
-                        android:gravity="center"
-                        android:padding="5dp"
-                        android:text="@string/category_performance_oss"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#000" />
-
-                    <View
-                        android:layout_width="1dp"
-                        android:layout_height="match_parent"
-                        android:background="@color/colorPrimary" />
 
                     <TextView
                         android:layout_width="0dp"

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

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".dailyentry.CompetitionPromoActivity"
+    tools:showIn="@layout/activity_compition_promo"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        card_view:cardCornerRadius="10dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:weightSum="4">
+
+            <!--Additional Promo-->
+            <LinearLayout
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/colorPrimaryDark"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="5dp"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="5dp"
+                    android:text="@string/promo_compliance_additional_promo"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="5dp"
+                android:weightSum="2"
+                android:background="@color/light_orange_background">
+
+                <TextView
+                    android:id="@+id/tv_"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1.5"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="5dp"
+                    android:text="@string/exists" />
+
+                <ToggleButton
+                    android:id="@+id/btntoggle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:textOn="@string/yes"
+                    android:textOff="@string/no"
+                    android:background="@drawable/toggle_selector_background"
+                    android:layout_weight=".5" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/lin_parent_promo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight=".8"
+                        android:paddingBottom="5dp"
+                        android:paddingLeft="10dp"
+                        android:paddingTop="5dp"
+                        android:text="@string/promotion_type"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/black" />
+
+                    <Spinner
+                        android:id="@+id/sp_promotion_typ"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.2" />
+                </LinearLayout>
+
+//SUB CATEGORY
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight=".8"
+                        android:paddingBottom="5dp"
+                        android:paddingLeft="10dp"
+                        android:paddingTop="5dp"
+                        android:text="@string/sub_category"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/black" />
+
+                    <Spinner
+                        android:id="@+id/sp_subcategory"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.2" />
+                </LinearLayout>
+
+                <!--Brand Spinner-->
+                <LinearLayout
+                    android:id="@+id/lay_competitor_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:visibility="visible"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight=".8"
+                        android:paddingBottom="5dp"
+                        android:paddingLeft="10dp"
+                        android:paddingTop="5dp"
+                        android:text="@string/competitor"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/black" />
+
+                    <Spinner
+                        android:id="@+id/sp_brand"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.2" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:orientation="horizontal"
+                    android:weightSum="2">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight=".8"
+                        android:paddingLeft="10dp"
+                        android:text="@string/comment"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/black"
+                        android:textAllCaps="false"/>
+
+                    <EditText
+                        android:id="@+id/et_sku_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/text_size_xsmall"
+                        android:inputType="text"
+                        android:layout_weight="1.2"
+                        />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="3">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center_vertical"
+                            android:padding="@dimen/custom_margin"
+                            android:text="@string/image"
+                            android:textStyle="bold"
+                            android:visibility="invisible"/>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:visibility="visible"
+                        android:orientation="horizontal"
+                        android:weightSum="3">
+
+                        <RelativeLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="10dp"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:id="@+id/img_cam"
+                                android:layout_width="50dp"
+                                android:layout_height="50dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_centerHorizontal="true"
+                                android:layout_weight="1"
+                                android:background="@mipmap/camera_orange"
+                                android:padding="@dimen/custom_margin"
+                                android:text="@string/image" />
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="10dp"
+                            android:visibility="gone"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:id="@+id/img_cam1"
+                                android:layout_width="50dp"
+                                android:layout_height="50dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_centerHorizontal="true"
+                                android:layout_weight="1"
+                                android:background="@mipmap/camera_orange"
+                                android:padding="@dimen/custom_margin"
+                                android:text="@string/image" />
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="10dp"
+                            android:visibility="gone"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:id="@+id/img_cam2"
+                                android:layout_width="50dp"
+                                android:layout_height="50dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_centerHorizontal="true"
+                                android:layout_weight="1"
+                                android:background="@mipmap/camera_orange"
+                                android:padding="@dimen/custom_margin"
+                                android:text="@string/image" />
+                        </RelativeLayout>
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/fab_add"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:layout_margin="5dp"
+                    app:srcCompat="@drawable/add" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rec_added_counterfeit_product"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+</LinearLayout>

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

@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                    android:weightSum="28">
+                    android:weightSum="24">
 
                     <TextView
                         android:layout_width="0dp"
@@ -118,21 +118,6 @@
                         android:layout_height="match_parent"
                         android:background="@color/colorPrimary" />
 
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="4"
-                        android:gravity="center"
-                        android:padding="5dp"
-                        android:text="@string/category_performance_oss"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#000" />
-
-                    <View
-                        android:layout_width="1dp"
-                        android:layout_height="match_parent"
-                        android:background="@color/colorPrimary" />
-
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"

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

@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
-            android:weightSum="28">
+            android:weightSum="24">
 
             <TextView
                 android:id="@+id/txt_period"
@@ -96,21 +96,6 @@
                 android:layout_height="match_parent"
                 android:background="@color/colorPrimary" />
 
-            <TextView
-                android:id="@+id/txt_oss"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="4"
-                android:gravity="center"
-                android:padding="5dp"
-                android:text="OSS"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="#000" />
-
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/colorPrimary" />
 
             <TextView
                 android:id="@+id/txt_planogram"

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:card="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/card_view"
+        android:layout_margin="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        card_view:cardCornerRadius="10dp"
+        card:background="@color/white"
+        android:elevation="5dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_margin="5dp">
+
+                <TextView
+                    android:id="@+id/tv_brand"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:paddingBottom="2dp"
+                    android:paddingRight="2dp"
+                    android:paddingTop="2dp"
+                    android:text="@string/promotion_type"
+                    android:textColor="#222" />
+            <TextView
+                android:id="@+id/tv_competitor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:paddingBottom="2dp"
+                android:paddingRight="2dp"
+                android:paddingTop="2dp"
+                android:text="@string/competitor"
+                android:textColor="#222" />
+
+                <TextView
+                    android:id="@+id/tv_sku_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:paddingBottom="2dp"
+                    android:paddingRight="2dp"
+                    android:paddingTop="2dp"
+                    android:text="@string/comment"
+                    android:textColor="#222" />
+
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+
+</LinearLayout>

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

@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
-            android:weightSum="28">
+            android:weightSum="24">
 
             <TextView
                 android:id="@+id/txt_period"
@@ -96,21 +96,6 @@
                 android:layout_height="match_parent"
                 android:background="@color/colorPrimary" />
 
-            <TextView
-                android:id="@+id/txt_oss"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="4"
-                android:gravity="center"
-                android:padding="5dp"
-                android:text="OSS"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="#000" />
-            <View
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="@color/colorPrimary" />
-
             <TextView
                 android:id="@+id/txt_planogram"
                 android:layout_width="0dp"

GSKMTOrange/src/main/res/values-ar-rAE/string.xml

@@ -231,4 +231,12 @@
     <string name="check_stock"> المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ</string>
 
     <string name="check_faceing">المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ</string>
+
+
+    <!--usk competition promotion-->
+    <string name="promotion_type">نوع العرض الترويجى</string>
+    <string name="competitor">اسم المنافس</string>
+    <string name="comment">تعليق</string>
+    <string name="competition_promotion">تعليق</string>
+    <string name="exists">التواجد</string>
 </resources>

GSKMTOrange/src/main/res/values-ar-rEG/string.xml

@@ -200,28 +200,22 @@
     <string name="uploadimge">تحميل صور جغرافية</string>
     <string name="data_will_be_lost">هل ترغب في الاستمرار؟ سيتم حذف البيانات الغير المحفوظة</string>
     <string name="yes">نعم</string>
-
     <!--Stock Facing Planogram Tracker-->
     <string name="stock_planogram_data_uploading">تحميل بيانات البلانوجرام الخاص بالمخزون</string>
-
     <string name="daily_data_menu_category_picture">صور الفئة</string>
     <string name="title_activity_category_picture">صور الفئة</string>
-
     <string name="stock_planogram_data_noCamera_data">رجاء املأ بيانات عدم امكانية التصوير</string>
     <string name="stock_planogram_shelf"> الرف</string>
     <string name="stock_planogram_shelf_position"> الموقع </string>
     <string name="stock_planogram_already_exists">موجود بالفعل</string>
     <string name="stock_planogram_data_select_one_sku">رجاء اختيار صنف واحد على الأقل</string>
     <string name="stock_planogram_data_add_shelf">أضف صنف لا يمكن ترك الرف فارغا</string>
-
     <string name="stock_planogram_data_add_shelf_position_already_exists">الرف/ الموقع موجود بالفعل</string>
-
     <string name="stock_planogram_add_shelf">إضافة الرف</string>
     <string name="stock_planogram_add_sku">الصنف إضافة</string>
     <string name="stock_planogram_add_sku_to_shelf">إضافة منتج إلى الجرف</string>
     <string name="stock_planogram_planogram_tracker">صورة مقطعية المقتفي</string>
     <string name="stock_planogram_position_on_shelf">موقف بشأن الجرف</string>
-
     <!--Change 06-03-2017-->
     <string name="title_activity_store_checkout_image"> صوره الخروج من المتجر</string>
     <string name="store_checkout">انقر فوق الصورة الامامية لمخزن الصورة</string>
@@ -229,6 +223,11 @@
     <string name="stock_value"> -برجاء تعبئه المخزون بقيمه عدد او صفر</string>
     <string name="msl_availability_new_stock_value">أول تعبئة لقيمة المخزون</string>
     <string name="check_stock"> المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ</string>
-
     <string name="check_faceing">المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ</string>
+    <!--usk competition promotion-->
+    <string name="promotion_type">نوع العرض الترويجى</string>
+    <string name="competitor">اسم المنافس</string>
+    <string name="comment">تعليق</string>
+    <string name="competition_promotion">تعليق</string>
+    <string name="exists">التواجد</string>
 </resources>

GSKMTOrange/src/main/res/values-ar-rSA/string.xml

@@ -231,4 +231,11 @@
     <string name="check_stock"> المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ</string>
 
     <string name="check_faceing">المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ</string>
+
+    <!--usk competition promotion-->
+    <string name="promotion_type">نوع العرض الترويجى</string>
+    <string name="competitor">اسم المنافس</string>
+    <string name="comment">تعليق</string>
+    <string name="competition_promotion">تعليق</string>
+    <string name="exists">التواجد</string>
 </resources>

GSKMTOrange/src/main/res/values-ar/string.xml

@@ -335,4 +335,11 @@
 
     <string name="additional_adhoc_stores">زيارات التحصيل الغير مخطط لها</string>
 
+    <!--usk competition promotion-->
+    <string name="promotion_type">نوع العرض الترويجى</string>
+    <string name="competitor">اسم المنافس</string>
+    <string name="comment">تعليق</string>
+    <string name="competition_promotion">تعليق</string>
+    <string name="exists">التواجد</string>
+
 </resources>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -317,6 +317,13 @@
     <string name="you_need_to_be_in_the_store">Giriş/Çıkış yapmak için mağazada olmalısınız</string>
     <string name="distance_from_the_store">Mağazadan uzaklık</string>
 
+    <!--usk competition promotion-->
+    <string name="promotion_type">نوع العرض الترويجى</string>
+    <string name="competitor">اسم المنافس</string>
+    <string name="comment">تعليق</string>
+    <string name="competition_promotion">تعليق</string>
+    <string name="exists">التواجد</string>
+
 </resources>
 
 

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

@@ -1,10 +1,8 @@
 <resources>
     <string name="app_name">GSK MT Orange</string>
     <string name="main_menu_activity_name">GSK Orange Stores</string>
-
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-
     <string name="action_settings">Settings</string>
     <string name="title_activity_login">Sign in</string>
 
@@ -44,27 +42,19 @@
     <string name="delete">Delete</string>
     <string name="StoreVisited"> Store Visited</string>
     <string name="GSKMT">GSK MT ORANGE STORE</string>
-
     <string name="storefront">Click Store Front Image</string>
-
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">Select Language</string>
-
     <string name="title_activity_store_list">Store List</string>
-
     <string name="title_activity_store_geotag">Geo Tag</string>
-
-
     <string name="menu_daily_route_plan">Daily Route Plan</string>
     <string name="menu_daily_download">Daily Data Download</string>
     <string name="menu_upload_data">Upload Data</string>
     <string name="menu_geotag">Geo Tag</string>
     <string name="menu_export">Data Export</string>
-
     <string name="menu_exit">Exit</string>
     <string name="menu_setting">Settings</string>
     <string name="menu_services">Services</string>
-
     <string name="title_activity_t2_pcompliance">Visibility/T2P</string>
 
     <!--Gagan start code-->
@@ -73,7 +63,6 @@
     <string name="title_activity_daily_main_menu">Daily Data Menu</string>
     <string name="title_activity_msl__availability">SKU Availability</string>
     <string name="title_activity_stock_facing">Stock and Facing</string>
-
     <string name="daily_data_menu_msl_availability">SKU Availability</string>
     <string name="daily_data_menu_stock_facing">Stock and Facing</string>
     <string name="daily_data_menu_t2p">Visibility/T2P</string>
@@ -81,11 +70,9 @@
     <string name="daily_data_menu_promo_compliance">Promo Compliance</string>
     <string name="daily_data_menu_competition_tracking">Competition Visibility</string>
     <string name="daily_data_menu_additional_promotions">Competition Promo</string>
-
     <string name="msl_availability_sku">SKU Name</string>
     <string name="msl_availability_mbq">MBQ</string>
     <string name="msl_availability_availability">Availability</string>
-
     <string name="stock_facing_reference_image">Reference Image</string>
     <string name="stock_facing_sku_name">SKU Name</string>
     <string name="stock_facing_stock">Stock</string>
@@ -97,21 +84,16 @@
     <string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
     <string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
     <string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
-
     <string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
     <string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
     <string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
     <string name="title_store_list_activity_store_again_uploaded">Please Upload data again</string>
     <string name="title_store_list_activity_store_closed">Store Closed</string>
     <string name="title_store_list_activity_already_store_closed">Store Already Closed</string>
-
     <string name="title_store_list_checkout_current">Please checkout from current store</string>
     <string name="title_store_list_checkout_Already_filled">Data already filled</string>
-
     <string name="title_store_list_download_data">Please Download Data First</string>
-
     <string name="enter_the_values">Enter the values</string>
-
     <string name="title_activity_upload">Upload Data</string>
     <string name="no_data_for_upload">No Data For Upload</string>
     <string name="first_checkout_store">First checkout of store</string>
@@ -127,7 +109,6 @@
     <string name="promo_compliance_promoAnnouncer">Promo Announcer</string>
     <string name="promo_compliance_runningPOS">Running on POS</string>
     <string name="promo_compliance_add">Add</string>
-
     <string name="category_performance_period">Period</string>
     <string name="category_performance_msl_availability">MSL</string>
     <string name="category_performance_sos">SOS</string>
@@ -138,7 +119,6 @@
     <string name="category_performance_ltm">LTM</string>
     <string name="category_performance_mtd">MTD</string>
     <string name="category_performance_lsv">LSV</string>
-
     <string name="title_activity_store_wise_performance">Store wise Performance</string>
     <!--Gagan end new code 1-->
 
@@ -147,7 +127,6 @@
     <string name="Display">Display</string>
     <string name="Photo">Photo</string>
     <string name="title_activity_Additional_visibility">Additional Visibility</string>
-
     <string name="title_activity_Want_save"> Are you sure you want to save</string>
     <string name="title_activity_Want_add"> Please Add Data</string>
     <string name="title_activity_Want_to_add">Are you sure you want to add</string>
@@ -157,11 +136,9 @@
     <string name="title_activity_click_delete">Click Yes To Delete!</string>
     <string name="title_activity_select_dropdown">Please Select dropdown</string>
     <string name="title_activity_take_image">Please Take a image</string>
-
     <string name="title_activity_fill_sku">Please fill sku data</string>
     <string name="title_activity_enter_quantity">Please enter Quantity</string>
     <string name="title_activity_save_data">Do you want to save the data</string>
-
     <string name="clickimage">Please click the image</string>
     <string name="gps">GPS IS DISABLED...</string>
     <string name="gpsebale">Click ok to enable GPS.</string>
@@ -174,19 +151,15 @@
     <string name="success">success</string>
     <string name="wantcheckout">Are you sure you want to Checkout</string>
     <string name="nonetwork"> No Network Connection. Please Check Your Internet Connection</string>
-
     <string name="title_activity_Non_Work">Non Working Reason</string>
     <string name="closed">Close</string>
-
     <string name="click_image">Please click image</string>
     <string name="fill_sku_data">Please fill SKU data</string>
     <string name="fill_gaps_data">Please fill GAP data</string>
     <string name="data_will_be_lost">Do you Want to proceed? Unsaved Data will be deleted.</string>
-
     <string name="download_data">Downloading Data</string>
     <string name="store_visited">Store Visited</string>
     <string name="store_image">Click Store Front Image</string>
-
     <string name="title_activity_store_image">Store Front Image</string>
     <string name="reason">Reason</string>
     <string name="select_reason">Select Reason</string>
@@ -195,7 +168,6 @@
     <!--Gagan start new code 2-->
     <string name="stock_facing_planogram_dialog_title">Reference Image</string>
     <string name="title_activity_settings">Settings</string>
-
     <string name="ok">OK</string>
     <string name="check_save_message">Are you sure you want to save</string>
     <string name="save_message">Data has been saved</string>
@@ -211,36 +183,24 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="title_activity_checkout">Checkout Activity</string>
     <string name="checkout_successful">Checkout Success</string>
-
     <string name="NetworkError">Network Error ,</string>
     <string name="DataNot"> Data Not Uploaded ,</string>
     <string name="displayname">Display Name</string>
     <string name="adddatatoclick">Click Yes To Add Data</string>
     <string name="Remark">Remark</string>
     <string name="pleaseenterRemarks">Please fill Remark</string>
-
     <string name="title_activity_service">Service</string>
-
     <string name="data_downloaded_successfully">Data downloaded successfully</string>
     <string name="export_database">Export Database</string>
     <string name="data_exported_successfully">Database Exported Successfully</string>
-
     <string name="databasexported">Database Exported And Uploaded Successfully</string>
-
     <string name="data_uploaded_successfully">Data Uploaded Successfully</string>
-
     <string name="uploadeddata">Uploaded Data</string>
-
     <string name="previous_data_upload">Please Upload Previous Data First</string>
-
     <string name="error_incorrect_username">This username is incorrect</string>
-
     <string name="error">Error Uploading</string>
-
-
     <string name="gallery">Gallery</string>
     <string name="camera">Camera</string>
-
     <string name="DELETE_ALERT_MESSAGE">Saved data will be lost - Do you want to continue?</string>
     <string name="NodataAvailable">No data available</string>
     <string name="Pleasedownaloaddata">Please download data</string>
@@ -389,6 +349,7 @@
     <string name="discount_value">Discount Percentage</string>
     <string name="pls_select_sub_category">Please select Sub category</string>
     <string name="pls_select_brand">Please select Brand</string>
+    <string name="pls_select_promo_type">Please select Promotion Type</string>
     <string name="pls_select_sku">Please select SKU</string>
     <string name="pls_enter_discount">Please enter discount percentage </string>
     <string name="pls_enter_price">Please enter price</string>
@@ -396,7 +357,6 @@
     <string name="exists">Exists</string>
     <string name="price_flasher_available">Price flasher available?</string>
     <string name="title_activity_change_password">Change Password</string>
-
     <string name="want_to_download">Do you want to download data</string>
     <string name="want_to_upload">Do you want to upload data</string>
     <string name="want_to_exit">Do you want to exit</string>
@@ -422,9 +382,12 @@
     <string name="incorrect_mpin_limit_reached">Incorrect MPin limit reached</string>
     <string name="need_to_reset_mpin">Need to reset MPin</string>
     <string name="title_activity_counterfeit_products">Counterfeit Products</string>
+    <string name="title_activity_competition_promo">Competition Promo</string>
     <string name="is_there_counterfeit_product">Is there counterfeit products in Store?</string>
     <string name="pls_enter_sku">Please enter SKU name</string>
+    <string name="pls_enter_comment">Please enter comment</string>
     <string name="pls_enter_stock">Please enter Stock</string>
+    <string name="pls_select_competitor">Please select Competitor</string>
 
     <!--MPin-->
     <string name="forget_mpin">Forgot MPin</string>
@@ -442,16 +405,20 @@
     <string name="store_detail">Store Detail</string>
     <string name="additional_stores">Additional Stores</string>
     <string name="gsk">GSK</string>
-    <string name="competitor">Competitor</string>
     <string name="sos_detail">SOS Detail</string>
     <string name="title_activity_stock_pricing">Stock Pricing</string>
-
     <!--Stock Pricing-->
     <string name="price">Price</string>
     <!--Audit Turkey Number Input-->
     <string name="pls_fill_stock_count">Please fill Stock Count</string>
     <string name="title_activity_counterfeit_indicator_web">Counterfeit Indicators</string>
-
     <string name="additional_adhoc_stores">Additional Stores - Adhoc</string>
 
+   <!-- usk competition promotion-->
+    <string name="promotion_type">Promo Type</string>
+    <string name="competitor">Competitor Name</string>
+    <string name="comment">Comment</string>
+    <string name="competition_promotion">Competition Promotion</string>
+
+
 </resources>

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         // Add dependency
         classpath 'io.fabric.tools:gradle:1.26.1'
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 28 18:51:36 IST 2019
+#Tue Jan 07 11:36:04 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java

@@ -5,6 +5,11 @@ package com.androidbuts.multispinnerfilter;
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
   public static final String APPLICATION_ID = "com.androidbuts.multispinnerfilter";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";

library/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,41 +1,41 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
 	package
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
 	android:versionName
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
 	android:versionCode
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69
 application
-ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19
+ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19
 	android:allowBackup
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44
 uses-sdk
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml
-		INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
+		INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml