From b0e2e055018b24f3a7aa91cfbd6024c0a7804251 Mon Sep 17 00:00:00 2001
From: yadavendras <yadavendra.singh@in.cpm-int.com>
Date: Mon, 8 Oct 2018 18:46:28 +0530
Subject: [PATCH] Deepak_commit_31_05_2018

---
 .idea/misc.xml                                |   2 +-
 GSKMTOrange/build.gradle                      |  12 +-
 GSKMTOrange/src/main/AndroidManifest.xml      |  13 +-
 .../com/gskmtorange/Database/GSKOrangeDB.java |  52 ++++-
 .../cpm/com/gskmtorange/MainActivity.java     |  28 ++-
 .../gskmtorange/constant/CommonString.java    |  14 ++
 .../dailyentry/CoachingVisitActivity.java     |  34 ++-
 .../dailyentry/DeliveryCallActivity.java      |  34 +++
 .../DeliveryCallAddStoreActivity.java         | 221 ++++++++++++++++++
 .../dailyentry/StoreListActivity.java         |   7 +-
 .../download/DownloadActivity.java            |  61 ++++-
 .../StoreWisePerformanceActivity.java         |  38 ++-
 .../upload/PreviousDataUploadActivity.java    |  48 ++++
 .../gskmtorange/upload/UploadActivity.java    |   2 -
 .../upload/UploadImageWithRetrofit.java       |   4 +-
 .../ConfigurationMasterGetterSetter.java      |  44 ++++
 .../xmlGetterSetter/TableBean.java            |   9 +
 .../gskmtorange/xmlHandlers/XMLHandlers.java  |  33 +++
 GSKMTOrange/src/main/res/drawable/add.png     | Bin 0 -> 12341 bytes
 .../res/layout/activity_delivery_call.xml     |  33 +++
 .../activity_delivery_call_add_store.xml      |  33 +++
 .../main/res/layout/content_delivery_call.xml |  11 +
 .../content_delivery_call_add_store.xml       | 124 ++++++++++
 .../main/res/menu/activity_main_drawer.xml    |   7 +
 .../baseline_local_shipping_black_48.png      | Bin 0 -> 992 bytes
 .../src/main/res/values-ar-rAE/string.xml     |   2 +-
 .../src/main/res/values-ar-rEG/string.xml     |   2 +-
 .../src/main/res/values-ar-rSA/string.xml     |   2 +-
 GSKMTOrange/src/main/res/values-ar/string.xml |   2 +-
 GSKMTOrange/src/main/res/values/strings.xml   |  11 +-
 30 files changed, 841 insertions(+), 42 deletions(-)
 create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java
 create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java
 create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationMasterGetterSetter.java
 create mode 100644 GSKMTOrange/src/main/res/drawable/add.png
 create mode 100644 GSKMTOrange/src/main/res/layout/activity_delivery_call.xml
 create mode 100644 GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml
 create mode 100644 GSKMTOrange/src/main/res/layout/content_delivery_call.xml
 create mode 100644 GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml
 create mode 100644 GSKMTOrange/src/main/res/mipmap-xhdpi/baseline_local_shipping_black_48.png

diff --git a/.idea/misc.xml b/.idea/misc.xml
index bd841ff..6bfc8f4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -31,7 +31,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 0c8e07d..95a3fb7 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -21,20 +21,20 @@ android {
         targetSdkVersion 22
 
         //For Egypt
-        versionCode 19
-        versionName "3.1"
+       /* versionCode 19
+        versionName "3.1"*/
 
         //For UAE
-        /*versionCode 19
-        versionName "3.1"*/
+        /*versionCode 18
+        versionName "3.0"*/
 
         //For Turkey
         /*versionCode 15
          versionName "2.7"*/
 
         //For KSA
-        /*versionCode 19
-        versionName "3.1"*/
+       versionCode 20
+        versionName "3.2"
 
 
         multiDexEnabled true
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 177e941..df65ef7 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -299,7 +299,18 @@
         <activity
             android:name=".dailyentry.CoachingVisitActivity"
             android:label="@string/title_activity_coaching_visit"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".dailyentry.DeliveryCallActivity"
+            android:label="@string/delivery_call"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".dailyentry.DeliveryCallAddStoreActivity"
+            android:label="@string/delivery_call"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index 9759726..bd97dac 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -35,6 +35,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -81,7 +82,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB35";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB37";
     public static final int DATABASE_VERSION = 15;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -181,6 +182,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             db.execSQL(TableBean.getTable_GEO_FENCING());
             db.execSQL(TableBean.getTable_NON_WORKING_SUB_REASON());//--Added 26.09.2018
             db.execSQL(TableBean.getTable_SUPERVISOR_LIST());//--Added 01.10.2018
+            db.execSQL(TableBean.getTable_CONFIGURATION_MASTER());//--Added 03.10.2018
 
             //15-03-2017
             db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING);
@@ -6643,4 +6645,52 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return sb;
     }
 
+    //CONFIGURATION_MASTER
+    public void InsertCONFIGURATION_MASTER(ConfigurationMasterGetterSetter data) {
+        db.delete("CONFIGURATION_MASTER", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getCOUNTRY_ID().size(); i++) {
+
+                values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+                values.put("CONFIGURE", data.getCONFIGURE().get(i));
+                values.put("ACTIVE", data.getACTIVE().get(i));
+
+                db.insert("CONFIGURATION_MASTER", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in CONFIGURATION_MASTER " + ex.toString());
+        }
+    }
+
+    // get Configuration Master data
+    public ArrayList<ConfigurationMasterGetterSetter> getConfigurationMasterData(String country_id) {
+
+        ArrayList<ConfigurationMasterGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("SELECT * FROM CONFIGURATION_MASTER WHERE COUNTRY_ID='" + country_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    ConfigurationMasterGetterSetter msg = new ConfigurationMasterGetterSetter();
+
+                    msg.setCONFIGURE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CONFIGURE")));
+                    msg.setACTIVE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ACTIVE")));
+
+                    list.add(msg);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+
+            Log.d("Exception ", "get Chat Message" + e.toString());
+        }
+        return list;
+    }
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index de085e9..ccede9b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -37,6 +37,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.DeliveryCallActivity;
 import cpm.com.gskmtorange.dailyentry.FutureJCPActivity;
 import cpm.com.gskmtorange.dailyentry.PlanogramPDFActivity;
 import cpm.com.gskmtorange.dailyentry.ServiceActivity;
@@ -46,6 +47,7 @@ import cpm.com.gskmtorange.download.DownloadActivity;
 import cpm.com.gskmtorange.upload.PreviousDataUploadActivity;
 import cpm.com.gskmtorange.upload.UploadActivity;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import io.fabric.sdk.android.Fabric;
 
 public class MainActivity extends AppCompatActivity
@@ -146,7 +148,7 @@ public class MainActivity extends AppCompatActivity
 
         db.open();
 
-        //Deviation - Ad hoc Stores - enable
+        /*//Deviation - Ad hoc Stores - enable
         ArrayList<ConfigurationContrywiseGetterSetter> configuration_data = db.getConfigurationData(country_id);
         if(configuration_data.size()>0){
             if(configuration_data.get(0).getADHOC_REPORTING().get(0).equals("1")){
@@ -158,6 +160,25 @@ public class MainActivity extends AppCompatActivity
                 Menu nav_Menu = navigationView.getMenu();
                 nav_Menu.findItem(R.id.nav_planogram).setVisible(true);
             }
+        }*/
+
+        //Enable disable According to Configuration
+        ArrayList<ConfigurationMasterGetterSetter> configurationData = db.getConfigurationMasterData(country_id);
+        if(configurationData.size()>0){
+            for(int i=0; i<configurationData.size();i++){
+
+                if(configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("ADHOC REPORTING") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")){
+                    Menu nav_Menu = navigationView.getMenu();
+                    nav_Menu.findItem(R.id.nav_deviation).setVisible(true);
+                }
+
+                if(configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("PDF ALLOW") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")){
+                    Menu nav_Menu = navigationView.getMenu();
+                    nav_Menu.findItem(R.id.nav_planogram).setVisible(true);
+                }
+            }
         }
 
         coverageList = db.getCoverageData(date, null);
@@ -371,6 +392,11 @@ public class MainActivity extends AppCompatActivity
 
             startActivity(in);
 
+            overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+        }else if(id == R.id.nav_delivery_call){
+            Intent in = new Intent(this, DeliveryCallActivity.class);
+            startActivity(in);
+
             overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
         }
 
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
index f3a7f90..886af72 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -229,6 +229,20 @@ public class CommonString {
             + KEY_EXIST + " INTEGER)";
 
 
+    public static final String TABLE_DELIVERY_CALLS = "DELIVERY_CALLS";
+
+    public static final String KEY_ADDRESS = "ADDRESS";
+
+    public static final String CREATE_TABLE_DELIVERY_CALLS= "CREATE TABLE  IF NOT EXISTS " + TABLE_DELIVERY_CALLS
+            + " ("
+            + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+            + KEY_STORE_NAME+ " INTEGER,"
+            + KEY_ADDRESS + " VARCHAR,"
+            + KEY_IMAGE + " VARCHAR,"
+            + KEY_IMAGE1 + " VARCHAR,"
+            + KEY_UPLOAD_STATUS + " VARCHAR,"
+            + KEY_VISIT_DATE + " VARCHAR)";
+
     public static final String CREATE_TABLE_STORE_GEOTAGGING = "CREATE TABLE IF NOT EXISTS "
             + TABLE_STORE_GEOTAGGING
             + " ("
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java
index 8ed188f..5b9686a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java
@@ -35,6 +35,7 @@ import cpm.com.gskmtorange.GetterSetter.CoachingVisitGetterSetter;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonFunctions;
 import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.SupervisorListGetterSetter;
 
 public class CoachingVisitActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, View.OnClickListener{
@@ -48,13 +49,14 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
     ImageView img_cam;
     FloatingActionButton fab_next, fab_save;
     String emp_id;
-    protected String _pathforcheck = "", _path, image_name="", str;
+    protected String _pathforcheck = "", _path, image_name="", str, country_id;
     String visit_date, store_id, username;
     private SharedPreferences preferences;
     String gallery_package = "";
     Uri outputFileUri;
     boolean saved_flag = false, update_flag = false;
     CoachingVisitGetterSetter coachingVisitdata;
+    boolean coaching_visit_camera_flag = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -79,8 +81,8 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
         username = preferences.getString(CommonString.KEY_USERNAME, "");
         visit_date = preferences.getString(CommonString.KEY_DATE, null);
-        username = preferences.getString(CommonString.KEY_USERNAME, null);
         store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+        country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
 
         fab_next = (FloatingActionButton) findViewById(R.id.fab);
         fab_save = (FloatingActionButton) findViewById(R.id.fab_save);
@@ -90,6 +92,28 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
 
         coachingVisitdata = database.getCoachingVisitData(store_id);
 
+
+        //Enable disable According to Configuration
+        ArrayList<ConfigurationMasterGetterSetter> configurationData = database.getConfigurationMasterData(country_id);
+        if(configurationData.size()>0){
+
+            for(int i=0; i<configurationData.size();i++){
+                if(configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("COACHING VISIT IMAGE") &&
+                        configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")){
+                    coaching_visit_camera_flag = true;
+                    break;
+                }
+            }
+        }
+
+        if(coaching_visit_camera_flag){
+            img_cam.setVisibility(View.VISIBLE);
+        }
+        else {
+            img_cam.setVisibility(View.GONE);
+        }
+
+
         supervisorList = database.getSupervisorListData();
 
         exist_adapter = new ArrayAdapter<>(this,
@@ -137,8 +161,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
             case R.id.spinner_coaching_visit:
                 if (position != 0) {
 
-
-
                     if(!update_flag){
 
                         fab_save.setVisibility(View.VISIBLE);
@@ -183,8 +205,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
                     fab_save.setVisibility(View.GONE);
                 }
 
-
-
                 break;
 
             case R.id.spinner_supervisor:
@@ -227,7 +247,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
                         flag = false;
                         error_msg = getString(R.string.title_activity_select_dropdown);
                     }
-                    else if(image_name.equals("")){
+                    else if(coaching_visit_camera_flag && image_name.equals("")){
                         flag = false;
                         error_msg = getString(R.string.clickimage);
                     }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java
new file mode 100644
index 0000000..9a29520
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java
@@ -0,0 +1,34 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import cpm.com.gskmtorange.R;
+
+public class DeliveryCallActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delivery_call);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent in = new Intent(getApplicationContext(), DeliveryCallAddStoreActivity.class);
+                startActivity(in);
+
+                overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+            }
+        });
+    }
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java
new file mode 100644
index 0000000..bd3e57a
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java
@@ -0,0 +1,221 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.content.ActivityNotFoundException;
+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.BaseTransientBottomBar;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import com.crashlytics.android.Crashlytics;
+
+import java.io.File;
+import java.util.List;
+
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+
+public class DeliveryCallAddStoreActivity extends AppCompatActivity implements View.OnClickListener{
+
+    EditText et_customer, et_address;
+    ImageView img_checkin, img_checkout;
+    String name, address, error_msg, img_checkin_path="", img_checkout_path="";
+    boolean checkin_flag = true;
+    protected String _pathforcheck = "", _path, str, visit_date;
+    private SharedPreferences preferences;
+    Uri outputFileUri;
+    String gallery_package = "";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_delivery_call_add_store);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        et_customer = findViewById(R.id.et_customer_name);
+        et_address = findViewById(R.id.et_address);
+        img_checkin = findViewById(R.id.img_checkin);
+        img_checkout = findViewById(R.id.img_checkout);
+
+        preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        visit_date = preferences.getString(CommonString.KEY_DATE, null);
+
+        if(checkin_flag){
+            img_checkin.setOnClickListener(this);
+        }
+        else {
+            img_checkout.setOnClickListener(this);
+        }
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+               if(isValid()){
+
+               }
+               else {
+                    Snackbar.make(et_customer,error_msg,Snackbar.LENGTH_SHORT).show();
+               }
+            }
+        });
+
+        str = CommonString.FILE_PATH;
+    }
+
+    protected boolean isValid(){
+        boolean flag = true;
+
+        name = et_customer.getText().toString().replaceAll("[&^<>{}'$]", " ");
+        address = et_address.getText().toString().replaceAll("[&^<>{}'$]", " ");
+
+        if(name.equals("")){
+            error_msg = getString(R.string.please_fill) + " "+ getString(R.string.customer_store_name);
+            flag = false;
+        }
+        else if(address.equals("")){
+            error_msg = getString(R.string.please_fill) + " "+ getString(R.string.address);
+            flag = false;
+        }
+        else if(checkin_flag){
+            if(img_checkin_path.equals("")){
+                error_msg = getString(R.string.please_click) + " "+ getString(R.string.intime_image).toLowerCase();
+                flag = false;
+            }
+        }
+        else if(img_checkout_path.equals("")){
+            error_msg = getString(R.string.please_click) + " "+ getString(R.string.intime_image).toLowerCase();
+            flag = false;
+        }
+
+        return flag;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.img_checkin:
+                _pathforcheck = "CoachingVisit" + visit_date.replace("/", "")+ "InTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+
+                _path = CommonString.FILE_PATH + _pathforcheck;
+
+                startCameraActivity(0);
+                break;
+
+            case R.id.img_checkout:
+
+                _pathforcheck = "CoachingVisit" + visit_date.replace("/", "")+ "OutTime" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg";
+
+                _path = CommonString.FILE_PATH + _pathforcheck;
+
+                startCameraActivity(0);
+                break;
+        }
+    }
+
+    protected void startCameraActivity(int request_code) {
+        try {
+
+            Log.i("MakeMachine", "startCameraActivity()");
+            File file = new File(_path);
+            outputFileUri = Uri.fromFile(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 (android.os.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, request_code);
+        } 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, request_code);
+
+        } catch (Exception e) {
+            Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+            Crashlytics.logException(e.getCause());
+            Crashlytics.logException(new Exception(e.getCause()));
+            e.printStackTrace();
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @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:
+
+                if (_pathforcheck != null && !_pathforcheck.equals("")) {
+                    if (new File(str + _pathforcheck).exists()) {
+
+                        if(requestCode == 0){
+                            img_checkin.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green));
+                            img_checkin_path = _pathforcheck;
+                        }
+                        else {
+                            img_checkout.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green));
+                            img_checkout_path = _pathforcheck;
+                        }
+                        _pathforcheck = "";
+
+                    }
+                }
+
+                break;
+        }
+
+    }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
index dbadfdf..285917c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -852,15 +852,18 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
                                 if (/*true*/distance > distanceGeoPhence) {
                                     flag_entry = false;
                                 }
+                                else {
+                                    String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters";
+
+                                    Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT).show();
+                                }
                             }
                         }
 
 
                         if(flag_entry){
 
-                            String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters";
 
-                            Toast.makeText(getApplicationContext(), msg, Toast.LENGTH_SHORT).show();
 
                             editor = preferences.edit();
                             editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID());
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index fddf268..566cff1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -46,6 +46,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.GeoFencingGetterSetter;
@@ -111,6 +112,7 @@ public class DownloadActivity extends AppCompatActivity {
     GeoFencingGetterSetter geoFencingGetterSetter;
     NonWorkingSubReasonGetterSetter nonWorkingSubReasonGetterSetter;
     SupervisorListGetterSetter supervisorListGetterSetter;
+    ConfigurationMasterGetterSetter configurationMasterGetterSetter;
 
     private Dialog dialog;
     private ProgressBar pb;
@@ -683,17 +685,20 @@ public class DownloadActivity extends AppCompatActivity {
                     xpp.next();
                     eventType = xpp.getEventType();
                     nonWorkingSubReasonGetterSetter = XMLHandlers.nonWorkingSubReasonXMLHandler(xpp, eventType);
-                    if (nonWorkingSubReasonGetterSetter.getREASON_ID().size() > 0) {
-                        String reasontable = nonWorkingSubReasonGetterSetter.getTable_NON_WORKING_SUB_REASON();
-                        if (reasontable != null) {
-                            resultHttp = CommonString.KEY_SUCCESS;
-                            TableBean.setTable_NON_WORKING_SUB_REASON(reasontable);
-                        }
-                    } else {
-                        return "NON_WORKING_SUB_REASON";
+
+                    String reasontable = nonWorkingSubReasonGetterSetter.getTable_NON_WORKING_SUB_REASON();
+                    if (reasontable != null) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                        TableBean.setTable_NON_WORKING_SUB_REASON(reasontable);
                     }
-                    data.value = 70;
-                    data.name = "NON_WORKING_SUB_REASON " + getResources().getString(R.string.download_data);
+
+                    if (nonWorkingSubReasonGetterSetter.getREASON_ID().size() > 0) {
+                        data.value = 70;
+                        data.name = "NON_WORKING_SUB_REASON " + getResources().getString(R.string.download_data);
+                    } else {
+                        //return "NON_WORKING_SUB_REASON";
+                    }
+
                 }
                 publishProgress(data);
 
@@ -1263,6 +1268,41 @@ public class DownloadActivity extends AppCompatActivity {
                 publishProgress(data);
 
 
+                //CONFIGURATION_MASTER
+                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+                request.addProperty("UserName", userId);
+                request.addProperty("Type", "CONFIGURATION_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();
+                    configurationMasterGetterSetter = XMLHandlers.configurationMasterXMLHandler(xpp, eventType);
+
+                    String table_configiration = configurationMasterGetterSetter.getTable_CONFIGURATION_MASTER();
+                    if (table_configiration != null) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                        TableBean.setTable_CONFIGURATION_MASTER(table_configiration);
+                    }
+
+                    if (configurationMasterGetterSetter.getCOUNTRY_ID().size() > 0) {
+                        data.value = 97;
+                        data.name = "CONFIGURATION MASTER DATA" + getResources().getString(R.string.download_data);
+                    }
+                }
+                publishProgress(data);
+
+
               /*  //MAPPING_COUNTRYWISE_PLANOGRAM
                 request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
                 request.addProperty("UserName", userId);
@@ -1567,6 +1607,7 @@ public class DownloadActivity extends AppCompatActivity {
                 db.InsertNO_CAMERA_LAST_VISIT_DATA(noCameraLastVisitGetterSetter);
                 db.insertSUPERVISOR_LIST_DATA(supervisorListGetterSetter);
                 db.InsertGeoTag_DATA(geoFencingGetterSetter);
+                db.InsertCONFIGURATION_MASTER(configurationMasterGetterSetter);
 
             } catch (MalformedURLException e) {
 
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
index bf1d55e..ab9e928 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
@@ -13,6 +13,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,6 +32,7 @@ import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.dailyentry.CoachingVisitActivity;
 import cpm.com.gskmtorange.dailyentry.MessageActivity;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
 
 public class StoreWisePerformanceActivity extends AppCompatActivity {
@@ -41,7 +43,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
     StoreWisePerformaceAdapter adapter;
 
     GSKOrangeDB db;
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, country_id;
     private SharedPreferences preferences;
 
 
@@ -68,6 +70,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
             keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
             class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
             storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+            country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
 
             toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance));
             setSupportActionBar(toolbar);
@@ -80,10 +83,35 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
                 public void onClick(View view) {
                     //Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class);
                     //Intent intent = new Intent(StoreWisePerformanceActivity.this, MessageActivity.class);
-                    Intent intent = new Intent(StoreWisePerformanceActivity.this, CoachingVisitActivity.class);
-                    startActivity(intent);
-                    finish();
-                    overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+
+
+                    boolean coaching_visit_flag=false;
+                    //Enable disable According to Configuration
+                    ArrayList<ConfigurationMasterGetterSetter> configurationData = db.getConfigurationMasterData(country_id);
+                    if(configurationData.size()>0){
+
+                        for(int i=0; i<configurationData.size();i++){
+                            if(configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("COACHING VISIT") &&
+                                    configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")){
+                                coaching_visit_flag = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    if(coaching_visit_flag){
+                        Intent intent = new Intent(StoreWisePerformanceActivity.this, CoachingVisitActivity.class);
+                        startActivity(intent);
+                        finish();
+                        overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+                    }
+                    else {
+                        Intent intent = new Intent(StoreWisePerformanceActivity.this, MessageActivity.class);
+                        startActivity(intent);
+                        finish();
+                        overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+                    }
+
                 }
             });
         } catch (Resources.NotFoundException e) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
index 8b0db74..eec6a82 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -40,6 +40,7 @@ import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
 import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
 import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
 import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.CoachingVisitGetterSetter;
 import cpm.com.gskmtorange.GetterSetter.CoverageBean;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.R;
@@ -1075,6 +1076,53 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                             data.name = getString(R.string.pog);
                             publishProgress(data);
 
+                            //Coaching visit data----------------------------------------
+                            db.open();
+                            CoachingVisitGetterSetter coachingVisitData = db.getCoachingVisitData(coverageList.get(i).getStoreId());
+
+                            if (coachingVisitData!=null && coachingVisitData.getEmp_id()!=null) {
+
+                                String onXml_coaching_data = "";
+
+                                String exist;
+
+                                if(coachingVisitData.isExists()){
+                                    exist = "1";
+                                }
+                                else {
+                                    exist = "0";
+                                }
+
+                                onXml_coaching_data = "[COACHING_VISIT_DATA]"
+                                        + "[MID]" + mid + "[/MID]"
+                                        + "[USER_ID]" + userId + "[/USER_ID]"
+                                        + "[EMP_ID]" + coachingVisitData.getEmp_id() + "[/EMP_ID]"
+                                        + "[IMAGE]" + coachingVisitData.getImg_path() + "[/IMAGE]"
+                                        + "[IS_EXIST]" + exist + "[/IS_EXIST]"
+                                        + "[/COACHING_VISIT_DATA]";
+
+                                final String sos_xml = "[DATA]" + onXml_coaching_data + "[/DATA]";
+
+                                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+                                request.addProperty("XMLDATA", sos_xml);
+                                request.addProperty("KEYS", "COACHING_VISIT_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 = 64;
+                                data.name = getString(R.string.coaching_visit);
+                                publishProgress(data);
+                            }
+
                             //-----------------------------------------------------------------------------------------------------------------------------------------------------
 
                             // Images Upload
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index 2e2f510..8d0c986 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -1215,8 +1215,6 @@ public class UploadActivity extends AppCompatActivity {
                                 publishProgress(data);
                             }
 
-
-
                             // SET COVERAGE STATUS
                             String final_xml = "";
                             onXML = "";
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
index 997697b..f4f2d02 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
@@ -232,7 +232,9 @@ public class UploadImageWithRetrofit {
                             foldername = "CategoryImages";
                         } else if (file[i].getName().contains("AuditAnsPic")) {
                             foldername = "AuditImages";
-                        } else {
+                        } else if (file[i].getName().contains("CoachingVisit")) {
+                            foldername = "CoachingVisits";
+                        } else{
                             foldername = "Bulkimages";
                         }
 
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationMasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationMasterGetterSetter.java
new file mode 100644
index 0000000..c24d5d8
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationMasterGetterSetter.java
@@ -0,0 +1,44 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class ConfigurationMasterGetterSetter {
+
+    String table_CONFIGURATION_MASTER;
+
+    ArrayList<String> COUNTRY_ID = new ArrayList<>();
+    ArrayList<String> CONFIGURE = new ArrayList<>();
+    ArrayList<String> ACTIVE = new ArrayList<>();
+
+    public String getTable_CONFIGURATION_MASTER() {
+        return table_CONFIGURATION_MASTER;
+    }
+
+    public void setTable_CONFIGURATION_MASTER(String table_CONFIGURATION_MASTER) {
+        this.table_CONFIGURATION_MASTER = table_CONFIGURATION_MASTER;
+    }
+
+    public ArrayList<String> getCOUNTRY_ID() {
+        return COUNTRY_ID;
+    }
+
+    public void setCOUNTRY_ID(String COUNTRY_ID) {
+        this.COUNTRY_ID.add(COUNTRY_ID);
+    }
+
+    public ArrayList<String> getCONFIGURE() {
+        return CONFIGURE;
+    }
+
+    public void setCONFIGURE(String CONFIGURE) {
+        this.CONFIGURE.add(CONFIGURE);
+    }
+
+    public ArrayList<String> getACTIVE() {
+        return ACTIVE;
+    }
+
+    public void setACTIVE(String ACTIVE) {
+        this.ACTIVE.add(ACTIVE);
+    }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
index 041bdba..6ef079a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -40,6 +40,7 @@ public class TableBean {
     public static String Table_GEO_FENCING;
     public static String Table_NON_WORKING_SUB_REASON;
     public static String Table_SUPERVISOR_LIST;
+    public static String Table_CONFIGURATION_MASTER;
 
     public static String getTable_NON_WORKING_SUB_REASON() {
         return Table_NON_WORKING_SUB_REASON;
@@ -297,4 +298,12 @@ public class TableBean {
     public static void setTable_SUPERVISOR_LIST(String table_SUPERVISOR_LIST) {
         Table_SUPERVISOR_LIST = table_SUPERVISOR_LIST;
     }
+
+    public static String getTable_CONFIGURATION_MASTER() {
+        return Table_CONFIGURATION_MASTER;
+    }
+
+    public static void setTable_CONFIGURATION_MASTER(String table_CONFIGURATION_MASTER) {
+        Table_CONFIGURATION_MASTER = table_CONFIGURATION_MASTER;
+    }
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
index 3ec63c5..876cab3 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -11,6 +11,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
@@ -1380,4 +1381,36 @@ public class XMLHandlers {
         }
         return st;
     }
+
+    //CONFIGURATION_MASTER
+    public static ConfigurationMasterGetterSetter configurationMasterXMLHandler(XmlPullParser xpp, int eventType) {
+        ConfigurationMasterGetterSetter st = new ConfigurationMasterGetterSetter();
+
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+                    if (xpp.getName().equals("META_DATA")) {
+                        st.setTable_CONFIGURATION_MASTER(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("COUNTRY_ID")) {
+                        st.setCOUNTRY_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("CONFIGURE")) {
+                        st.setCONFIGURE(xpp.nextText());
+                    }
+
+                    if (xpp.getName().equals("ACTIVE")) {
+                        st.setACTIVE(xpp.nextText());
+                    }
+                }
+                xpp.next();
+            }
+        } catch (XmlPullParserException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return st;
+    }
 }
diff --git a/GSKMTOrange/src/main/res/drawable/add.png b/GSKMTOrange/src/main/res/drawable/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe413021c39f8802701e21569c92ac06aac1c9fb
GIT binary patch
literal 12341
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

literal 0
HcmV?d00001

diff --git a/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml b/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml
new file mode 100644
index 0000000..19f47db
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_delivery_call.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.DeliveryCallActivity">
+
+    <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_delivery_call" />
+
+    <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="@drawable/save_icon" />
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml b/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml
new file mode 100644
index 0000000..367d88f
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.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.DeliveryCallAddStoreActivity">
+
+    <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_delivery_call_add_store" />
+
+    <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="@drawable/save_icon" />
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/content_delivery_call.xml b/GSKMTOrange/src/main/res/layout/content_delivery_call.xml
new file mode 100644
index 0000000..9eb48dc
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_delivery_call.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".dailyentry.DeliveryCallActivity"
+    tools:showIn="@layout/activity_delivery_call">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml b/GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml
new file mode 100644
index 0000000..758e91d
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_delivery_call_add_store.xml
@@ -0,0 +1,124 @@
+<?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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".dailyentry.DeliveryCallAddStoreActivity"
+    tools:showIn="@layout/activity_delivery_call_add_store"
+    android:background="@color/grey_background">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:elevation="5dp">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/tv_customer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/customer_store_name"
+                android:textSize="@dimen/text_size_normal"
+                android:padding="5dp"
+                />
+
+            <EditText
+                android:id="@+id/et_customer_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/tv_customer"
+                android:padding="5dp"
+                />
+
+            <TextView
+                android:id="@+id/tv_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/et_customer_name"
+                android:text="@string/address"
+                android:textSize="@dimen/text_size_normal"
+                android:padding="5dp"
+                />
+
+            <EditText
+                android:id="@+id/et_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@+id/tv_address"
+                android:padding="5dp"
+                />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@+id/et_address"
+                android:layout_marginTop="10dp">
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    >
+
+                    <TextView
+                        android:id="@+id/tv_intime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/intime_image"
+                        android:textSize="@dimen/text_size_small"
+                        android:layout_centerHorizontal="true"/>
+
+                    <ImageView
+                        android:id="@+id/img_checkin"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@mipmap/camera_orange"
+                        android:layout_centerInParent="true"
+                        android:layout_below="@+id/tv_intime"
+                        />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    >
+
+                    <TextView
+                        android:id="@+id/tv_outtime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/outtime_image"
+                        android:textSize="@dimen/text_size_small"
+                        android:layout_centerHorizontal="true"/>
+
+
+                    <ImageView
+                        android:id="@+id/img_checkout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@mipmap/camera_orange"
+                        android:layout_centerInParent="true"
+                        android:layout_below="@+id/tv_outtime"
+                        />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+
+        </android.support.constraint.ConstraintLayout>
+    </android.support.v7.widget.CardView>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
index b0a7544..250512d 100644
--- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
@@ -28,6 +28,13 @@
             android:title="@string/menu_deviation_data"
             android:visible="false"/>
 
+        <item
+            android:id="@+id/nav_delivery_call"
+            android:icon="@mipmap/baseline_local_shipping_black_48"
+            android:title="@string/delivery_call"
+            android:visible="false"
+            />
+
         <item
             android:id="@+id/nav_future_jcp"
             android:icon="@drawable/ic_date_range_black"
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/baseline_local_shipping_black_48.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/baseline_local_shipping_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9d475bbe824fb8f3ab2bc79f6ac35fd5eb7262b
GIT binary patch
literal 992
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfqA*7i(^Oy<J()zJxkL?+CQfE
zI_63jCg+B156s=oo8>BfwRweGjC5h{ZMO~EzF(QQ`}<*Q%cGxvAGbMaJh{B!=llsO
zo|8~fu;m2nir)1RUVn~%@88U5zG=pZ8H~q@HMu+ING8b6Q{9x-Ap2vEfy1<~Kihz$
z<{mEzh4WKe7(eA46Jk!;HPOIfUZ;+k!?IdVAnzQ*&Upq7>-u>nWKU!)YGvd}U|^Ow
zz`$nEfQ4C~#K64cG0%kEu5Yp$?(97t!u;f&8S|g^xTb=g`i?v9Ojn3`=PjW3U6o_{
zZ=sgcwVa1i_pz|8cy;Vz6(>)?S(Z52xzi6Ygyx=F^GUyv@zsoDt1f})oeRErCp7Gm
z)B7zXv0z=CoyJcfz3**Az$aA$huYs$t2uctoO!x5j)~dCc$)g@JuGY)S+V<cKLS<l
zyc==vA5fL_@$L0MRp)r$#xpT*F>DOK4YW8TJvePENb@z5u&tFq`rgl6pdnK}6tqrP
zP;D?iuwTEyxPfsFBhLe%x6>JzEr4E^Jiu^{fvo@-0O(Q)YUUgDtuK1ZTW_>CH=6Ac
zap><)#(fV$)INj@TTWfy*`j)9zT|^CwaX_{-YE)AE2s}^P~0V{0Ajf{v`aXfCs#C_
zi2wQfGjq-1kX18InY;Y+x<6n3fyOGUStsIeg2dfq=L`PSuB@+XaC{}9@+th&zdsDs
zfyd{${5y4jzGQ;?s~ZzRCKxk+33j)ixPQv;=xD#59dWN-sJh)Lx_0LGOygDe4;Am(
z|B^qUI_S6@Z@t8qIyq&xI}B4xes-TqzIXqu>5-1#drn+`*zmo)nB!uid(hR1F72|9
z{@%@TE4g9rv#?9E#=GRkvU~UM&UR_H4S0EeC%>TVH?@252P4=1TWIJ~a%bkfcvtz)
z(*M2R*DZSd?DF%!S9wZ)F8`LP{4e<T7QO#h<PQASzBOs-5h?T6)B8)mg#L>-9<=St
zzgNqITg_$PuTK<`7hwIaIC;<hd2=IuL~b#a9s8YqyFb*Wacxrkp8XSpJD98m-{-$+
znHKN5+Jf<Yermm#0Ppq*e?R`aR`%?3+kB^cobUCMw8RZoKYRXOKSAqWd;tIR53+%Y
z_lx*~8Q$yXDIG8W$@*NjFP-VZ-^CfxeF-z3N4ovlv~<q_1@}#|t(En5=s9ZA7u$U0
WR}Rk(>AC`QE`z75pUXO@geCwQM8t>y

literal 0
HcmV?d00001

diff --git a/GSKMTOrange/src/main/res/values-ar-rAE/string.xml b/GSKMTOrange/src/main/res/values-ar-rAE/string.xml
index 3e0bc53..7602de1 100644
--- a/GSKMTOrange/src/main/res/values-ar-rAE/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar-rAE/string.xml
@@ -24,7 +24,7 @@
     <string name="availability_data_uploading">توافر تحميل البيانات</string>
     <string name="brand">العلامة التجارية</string>
     <string name="brandname">اسم العلامة التجارية</string>
-    <string name="address">C 126, Okhla II,</string>
+
     <string name="camera">الكاميرا</string>
     <string name="cancel">إلغاء الأمر</string>
     <string name="title_activity_category_list">قائمة الفئات</string>
diff --git a/GSKMTOrange/src/main/res/values-ar-rEG/string.xml b/GSKMTOrange/src/main/res/values-ar-rEG/string.xml
index 3e0bc53..7602de1 100644
--- a/GSKMTOrange/src/main/res/values-ar-rEG/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar-rEG/string.xml
@@ -24,7 +24,7 @@
     <string name="availability_data_uploading">توافر تحميل البيانات</string>
     <string name="brand">العلامة التجارية</string>
     <string name="brandname">اسم العلامة التجارية</string>
-    <string name="address">C 126, Okhla II,</string>
+
     <string name="camera">الكاميرا</string>
     <string name="cancel">إلغاء الأمر</string>
     <string name="title_activity_category_list">قائمة الفئات</string>
diff --git a/GSKMTOrange/src/main/res/values-ar-rSA/string.xml b/GSKMTOrange/src/main/res/values-ar-rSA/string.xml
index 3e0bc53..7602de1 100644
--- a/GSKMTOrange/src/main/res/values-ar-rSA/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar-rSA/string.xml
@@ -24,7 +24,7 @@
     <string name="availability_data_uploading">توافر تحميل البيانات</string>
     <string name="brand">العلامة التجارية</string>
     <string name="brandname">اسم العلامة التجارية</string>
-    <string name="address">C 126, Okhla II,</string>
+
     <string name="camera">الكاميرا</string>
     <string name="cancel">إلغاء الأمر</string>
     <string name="title_activity_category_list">قائمة الفئات</string>
diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml
index 3f975f1..40abe6d 100644
--- a/GSKMTOrange/src/main/res/values-ar/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar/string.xml
@@ -24,7 +24,7 @@
     <string name="availability_data_uploading">توافر تحميل البيانات</string>
     <string name="brand">العلامة التجارية</string>
     <string name="brandname">اسم العلامة التجارية</string>
-    <string name="address">C 126, Okhla II,</string>
+
     <string name="camera">الكاميرا</string>
     <string name="cancel">إلغاء الأمر</string>
     <string name="title_activity_category_list">قائمة الفئات</string>
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index a704f9e..9498f15 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name="delete">Delete</string>
     <string name="StoreVisited"> Store Visited</string>
     <string name="GSKMT">GSK MT ORANGE STORE</string>
-    <string name="address">C 126, Okhla II,</string>
+
     <string name="storefront">Click Store Front Image</string>
 
     <string name="select_language">Please select language</string>
@@ -376,5 +376,14 @@
     <string name="select_supervisor">Select Supervisor</string>
     <string name="coaching_visit">Coaching Visit</string>
     <string name="please_save_data">Please save data</string>
+    <string name="delivery_call">Delivery Call</string>
+    <string name="add_store">Add Store</string>
+    <string name="please_fill">Please fill</string>
+    <string name="address">Address</string>
+    <string name="customer_store_name">Customer Store Name</string>
+    <string name="please_click">Please click</string>
+    <string name="intime_image">In time image</string>
+    <string name="outtime_image">Out time image</string>
+
 
 </resources>