diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 7705f9b..6c36d14 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -17,7 +17,7 @@ android {
versionCode 10
versionName "2.3"
-
+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -43,5 +43,6 @@ dependencies {
compile 'com.google.android.gms:play-services-appindexing:9.8.0'
compile 'com.android.support:support-v4:24.2.1'
compile 'com.google.code.gson:gson:2.7'
+ compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
testCompile 'junit:junit:4.12'
}
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index c041dde..facb7c9 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -186,20 +186,23 @@
android:label="@string/title_activity_category_picture"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
-
-
+
\ 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 9347d8e..1539ec9 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -62,7 +62,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/
public class GSKOrangeDB extends SQLiteOpenHelper {
- public static final String DATABASE_NAME = "GSK_ORANGE_DB4";
+ public static final String DATABASE_NAME = "GSK_ORANGE_DB5";
public static final int DATABASE_VERSION = 13;
TableBean tableBean;
private SQLiteDatabase db;
@@ -270,6 +270,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i));
values.put("GEO_TAG", data.getGEO_TAG().get(i));
+ values.put("VISIT_ORDER", data.getVISIT_ORDER().get(i));
db.insert("JOURNEY_PLAN", null, values);
@@ -287,7 +288,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
- dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null);
+ dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH, T.CATEGORY_FIXTURE As CATEGORY_FIXTURE from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -312,6 +313,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
t2p.setRef_image_path(dbcursor.getString(dbcursor
.getColumnIndexOrThrow("IMAGE_PATH")));
+ t2p.setCategory_fixture(dbcursor.getString(dbcursor
+ .getColumnIndexOrThrow("CATEGORY_FIXTURE")));
+
t2p.setImage("");
t2p.setImage1("");
t2p.setImage2("");
@@ -469,7 +473,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
- "where VISIT_DATE ='" + date + "'", null);
+ "where VISIT_DATE ='" + date + "' ORDER BY VISIT_ORDER", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -914,6 +918,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("STORE_ID", data.getSTORE_ID().get(i));
values.put("BRAND_ID", data.getBRAND_ID().get(i));
values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
+ values.put("CATEGORY_FIXTURE", data.getCATEGORY_FIXTURE().get(i));
db.insert("MAPPING_T2P", null, values);
}
@@ -2647,6 +2652,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_IMAGE2, data.get(i).getImage2());
values.put(CommonString.KEY_REMARK, data.get(i).getRemark());
values.put(CommonString.KEY_PRESENT, data.get(i).isPresent());
+ values.put(CommonString.KEY_CATEGORY_FIXTURE, data.get(i).getCategory_fixture());
l = db.insert(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, values);
@@ -2967,6 +2973,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK)));
tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1")));
+ tp.setCategory_fixture(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_FIXTURE)));
list.add(tp);
dbcursor.moveToNext();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
index 1e3a336..a558418 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
@@ -424,7 +424,6 @@ public class LoginActivity extends AppCompatActivity {
@Override
protected String doInBackground(Void... params) {
-
try {
versionCode = getPackageManager().getPackageInfo(
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 418e051..445aff8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -36,6 +36,7 @@ import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.FutureJCPActivity;
import cpm.com.gskmtorange.dailyentry.ServiceActivity;
import cpm.com.gskmtorange.dailyentry.SettingsActivity;
import cpm.com.gskmtorange.dailyentry.StoreListActivity;
@@ -297,6 +298,11 @@ public class MainActivity extends AppCompatActivity
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }else if(id == R.id.nav_future_jcp){
+ Intent startDownload = new Intent(this, FutureJCPActivity.class);
+ startActivity(startDownload);
+
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
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 b4d7c1a..ebcb1d5 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -80,6 +80,7 @@ public class CommonString {
public static final String UNIQUE_KEY_ID = "UNIQUE_KEY_ID";
public static final String KEY_CATEGORY_ID = "CATEGORY_ID";
public static final String KEY_PROCESS_ID = "PROCESS_ID";
+ public static final String KEY_CATEGORY_FIXTURE = "CATEGORY_FIXTURE";
public static final String KEY_JOURNEY_PLAN = "JOURNEY_PLAN";
public static final String TABLE_INSERT_STOCK_DIALOG = "STOCK_DIALOG";
@@ -540,8 +541,8 @@ public class CommonString {
+ KEY_IMAGE1 + " VARCHAR,"
+ KEY_IMAGE2 + " VARCHAR,"
+ KEY_REMARK + " VARCHAR,"
- + KEY_PRESENT + " VARCHAR"
-
+ + KEY_PRESENT + " VARCHAR,"
+ + KEY_CATEGORY_FIXTURE + " INTEGER"
+ ")";
@@ -777,16 +778,16 @@ public class CommonString {
+ " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ "Store_Id"
- + " VARCHAR,"
+ + " INTEGER,"
+ "Category_Id"
- + " VARCHAR,"
+ + " INTEGER,"
+ "Brand_Id"
+ " VARCHAR,"
+ "SKU_ID"
- + " VARCHAR,"
+ + " INTEGER,"
+ "SKU"
+ " VARCHAR,"
@@ -798,13 +799,13 @@ public class CommonString {
+ " VARCHAR,"
+ "COMPANY_ID"
- + " VARCHAR,"
+ + " INTEGER,"
+ "FACING"
- + " VARCHAR,"
+ + " REAL,"
+ "STOCK"
- + " VARCHAR,"
+ + " INTEGER,"
+ "TOGGLE_VALUE"
+ " VARCHAR,"
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
new file mode 100644
index 0000000..6932e13
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java
@@ -0,0 +1,366 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.app.DatePickerDialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+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.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.DatePicker;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.ksoap2.SoapEnvelope;
+import org.ksoap2.SoapFault;
+import org.ksoap2.serialization.SoapObject;
+import org.ksoap2.serialization.SoapSerializationEnvelope;
+import org.ksoap2.transport.HttpTransportSE;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Calendar;
+import java.util.Locale;
+
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.messgae.AlertMessage;
+import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
+import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
+
+public class FutureJCPActivity extends AppCompatActivity implements View.OnClickListener {
+ FloatingActionButton fab;
+ //ImageButton calenderBtn;
+ TextView txt_date;
+ RecyclerView futureJcpList;
+ Calendar c;
+ int year;
+ int month;
+ int day;
+ SharedPreferences preferences;
+ String _UserId;
+ ProgressDialog progressDialog;
+ int eventType;
+ JourneyPlanGetterSetter journeyPlanPreviousGetterSetter;
+ String culture_id;
+ Context context;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_future_jcp);
+ declaration();
+
+ //calenderBtn.setOnClickListener(this);
+ fab.setOnClickListener(this);
+ }
+
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.iconCalender:
+ c = Calendar.getInstance();
+ year = c.get(Calendar.YEAR);
+ month = c.get(Calendar.MONTH);
+ day = c.get(Calendar.DAY_OF_MONTH);
+ showDatePickerDialog(year, month, day);
+ break;
+ case R.id.fab:
+ Snackbar.make(v, "Replace with your own action", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ break;
+
+ }
+
+ }
+
+ protected void showDatePickerDialog(int year, int month, int day) {
+
+ DatePickerDialog datePickerDialog = new DatePickerDialog(this, pickerListener, year, month, day);
+ // ((ViewGroup) datePickerDialog.getDatePicker()).findViewById(Resources.getSystem().getIdentifier("year", "id", "android")).setVisibility(View.GONE);
+ //datePickerDialog.findViewById(Resources.getSystem().getIdentifier("year", "id", "android")).setVisibility(View.GONE);
+ datePickerDialog.setTitle("");
+ datePickerDialog.show();
+ }
+
+ private DatePickerDialog.OnDateSetListener pickerListener = new DatePickerDialog.OnDateSetListener() {
+
+ // when dialog box is closed, below method will be called.
+ @Override
+ public void onDateSet(DatePicker view, int selectedYear,
+ int selectedMonth, int selectedDay) {
+
+ futureJcpList.removeAllViewsInLayout();
+ futureJcpList.invalidate();
+ year = selectedYear;
+ month = selectedMonth + 1;
+ day = selectedDay;
+
+ String day_str = String.valueOf(day);
+ day_str = "00" + day_str;
+ day_str = day_str.substring(day_str.length() - 2, day_str.length());
+
+
+ String month_str = String.valueOf(month);
+ month_str = "00" + month_str;
+ month_str = month_str.substring(month_str.length() - 2, month_str.length());
+
+ String yeat_str = String.valueOf(year);
+
+ txt_date.setText(new StringBuilder().append(month_str).append("/").append(day_str).append("/").append(yeat_str)
+ );
+ new Task().execute(txt_date.getText().toString());
+
+ }
+ };
+
+
+ void declaration() {
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ fab = (FloatingActionButton) findViewById(R.id.fab);
+ //calenderBtn = (ImageButton) findViewById(R.id.iconCalender);
+ txt_date = (TextView) findViewById(R.id.txt_date);
+ futureJcpList = (RecyclerView) findViewById(R.id.futureJcpList);
+ context = this;
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ _UserId = preferences.getString(CommonString.KEY_USERNAME, "");
+ culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
+ progressDialog = new ProgressDialog(FutureJCPActivity.this);
+
+ updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ // AsyncTask asyncTask = new AsyncTask() {
+ class Task extends AsyncTask {
+ @Override
+ protected void onPreExecute() {
+ progressDialog.setTitle("Please wait");
+ progressDialog.setMessage("Fetching Data..");
+ progressDialog.setCancelable(false);
+ progressDialog.show();
+ }
+
+ @Override
+ protected String doInBackground(String... params) {
+ XmlPullParserFactory factory = null;
+ try {
+ factory = XmlPullParserFactory
+ .newInstance();
+
+ factory.setNamespaceAware(true);
+ XmlPullParser xpp = factory.newPullParser();
+ SoapSerializationEnvelope envelope;
+ HttpTransportSE androidHttpTransport;
+ SoapObject request;
+
+ // Brand Master data
+ request = new SoapObject(CommonString.NAMESPACE,
+ CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", _UserId);
+ request.addProperty("Type", "JOURNEY_SEARCH:" + params[0]);
+ 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);
+ Object resultFuturedata = (Object) envelope.getResponse();
+
+ if (resultFuturedata.toString() != null) {
+
+ xpp.setInput(new StringReader(resultFuturedata.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+
+ journeyPlanPreviousGetterSetter = XMLHandlers.JCPXMLHandler(xpp, eventType);
+
+ }
+ return "Success";
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ return "failure";
+ } catch (SoapFault soapFault) {
+ soapFault.printStackTrace();
+ return "failure";
+ } catch (IOException e) {
+ e.printStackTrace();
+ return getResources().getString(R.string.nonetwork);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "failure";
+ }
+ }
+
+
+ @Override
+ protected void onPostExecute(String o) {
+ super.onPostExecute(o);
+ progressDialog.dismiss();
+ if (o.equalsIgnoreCase("Success")) {
+ if (journeyPlanPreviousGetterSetter.getSTORE_ID().size() > 0) {
+
+ MyListAdapter adapter = new MyListAdapter(context, journeyPlanPreviousGetterSetter);
+ futureJcpList.setLayoutManager(new LinearLayoutManager(context));
+ futureJcpList.setAdapter(adapter);
+
+ } else {
+
+ Snackbar.make(futureJcpList,R.string.no_route_plan_for_day,Snackbar.LENGTH_SHORT).show();
+ }
+ } else {
+
+ Snackbar.make(futureJcpList,o,Snackbar.LENGTH_SHORT).show();
+ }
+ }
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.date_menu, menu);
+
+ // return true so that the menu pop up is opened
+ return true;
+ }
+
+ @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 == R.id.iconCalender){
+ c = Calendar.getInstance();
+ year = c.get(Calendar.YEAR);
+ month = c.get(Calendar.MONTH);
+ day = c.get(Calendar.DAY_OF_MONTH);
+ showDatePickerDialog(year, month, day);
+
+ }else if (id == android.R.id.home) {
+
+ // NavUtils.navigateUpFromSameTask(this);
+ finish();
+
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+
+ class MyListAdapter extends RecyclerView.Adapter {
+ LayoutInflater layoutInflater;
+ JourneyPlanGetterSetter journeyPlanPreviousGetterSetter;
+
+ MyListAdapter(Context context, JourneyPlanGetterSetter journeyPlanPreviousGetterSetter) {
+ layoutInflater = LayoutInflater.from(context);
+ this.journeyPlanPreviousGetterSetter = journeyPlanPreviousGetterSetter;
+ }
+
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = layoutInflater.inflate(R.layout.item_future_jcp_list, parent, false);
+ ViewHolder viewHolder = new ViewHolder(view);
+ return viewHolder;
+ }
+
+ @Override
+ public void onBindViewHolder(ViewHolder holder, int position) {
+
+ if (holder != null) {
+ holder.txt_store_cd.setText(journeyPlanPreviousGetterSetter.getSTORE_ID().get(position));
+ holder.txt_keyacct.setText(journeyPlanPreviousGetterSetter.getKEYACCOUNT().get(position));
+ holder.txt_storename.setText(journeyPlanPreviousGetterSetter.getSTORE_NAME().get(position));
+ holder.txt_city.setText(journeyPlanPreviousGetterSetter.getCITY().get(position));
+ holder.txt_storetype.setText(journeyPlanPreviousGetterSetter.getSTORETYPE().get(position));
+
+ }
+ }
+
+
+ @Override
+ public int getItemCount() {
+
+ return journeyPlanPreviousGetterSetter.getSTORE_ID().size();
+ }
+
+ public class ViewHolder extends RecyclerView.ViewHolder {
+ TextView txt_store_cd, txt_keyacct, txt_storename, txt_city, txt_storetype;
+ LinearLayout ll_itemfutureJCP;
+
+ public ViewHolder(View view) {
+ super(view);
+ txt_store_cd = (TextView) view.findViewById(R.id.txt_store_cd);
+ txt_keyacct = (TextView) view.findViewById(R.id.txt_keyacct);
+ txt_storename = (TextView) view.findViewById(R.id.txt_storename);
+ txt_city = (TextView) view.findViewById(R.id.txt_city);
+ txt_storetype = (TextView) view.findViewById(R.id.txt_storetype);
+ ll_itemfutureJCP = (LinearLayout) view.findViewById(R.id.ll_itemfutureJCP);
+ }
+ }
+ }
+
+ private static boolean updateResources(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)) {
+ lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
+ }else{
+ lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
+ }
+
+
+
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
+
+ Resources resources = context.getResources();
+
+ Configuration configuration = resources.getConfiguration();
+ configuration.locale = locale;
+
+ resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+ return true;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index c2f927f..fa26da3 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -160,7 +160,6 @@ public class NonWorkingReason extends AppCompatActivity implements
}
-
if (nonflag) {
reasondata = database.getNonWorkingEntryAllowData();
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 e95e368..55ece16 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -548,10 +548,8 @@ public class StoreListActivity extends AppCompatActivity {
public void onClick(DialogInterface dialog,
int id) {
-
UpdateStore(store_id);
-
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
startActivity(in);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index 93a4100..998d13c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -497,7 +497,14 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.img_cam1.setEnabled(is_enabled);
holder.img_cam2.setEnabled(is_enabled);
holder.btn_gaps.setEnabled(is_enabled);
- holder.btn_sku.setEnabled(is_enabled);
+
+ if(is_enabled && mItem.getCategory_fixture().equals("0")){
+ holder.btn_sku.setEnabled(true);
+ }
+ else{
+ holder.btn_sku.setEnabled(false);
+ }
+
if (mItem.getGapsChecklist().size() > 0) {
@@ -513,7 +520,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
if (mItem.getSkulist().size() > 0) {
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green));
} else {
- if (mItem.isPresent()) {
+ if (mItem.isPresent() && mItem.getCategory_fixture().equals("0")) {
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
} else {
holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background));
@@ -948,10 +955,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
flag = false;
error_msg = getResources().getString(R.string.fill_gaps_data);
break;
- } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
- flag = false;
- error_msg = getResources().getString(R.string.title_activity_fill_sku);
- break;
} else if (camera_allow.equals("1") && (t2PGetterSetters.get(i).getImage().equals("") &&
t2PGetterSetters.get(i).getImage1().equals("") &&
t2PGetterSetters.get(i).getImage2().equals(""))) {
@@ -962,6 +965,10 @@ public class T2PComplianceActivity extends AppCompatActivity {
flag = false;
error_msg = getResources().getString(R.string.title_activity_fill_brand);
break;
+ }else if (t2PGetterSetters.get(i).getCategory_fixture().equals("0") && t2PGetterSetters.get(i).getSkulist().size() == 0) {
+ flag = false;
+ error_msg = getResources().getString(R.string.title_activity_fill_sku);
+ break;
}
}
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 993485d..5843754 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -983,8 +983,6 @@ public class DownloadActivity extends AppCompatActivity {
db.insertNonWorkingData(nonWorkingReasonGetterSetter);
- db.insertNonWorkingData(nonWorkingReasonGetterSetter);
-
db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter);
db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter);
db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
index 4499868..72f0bfe 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
@@ -20,6 +20,8 @@ import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.CardView;
import android.support.v7.widget.Toolbar;
+import android.text.InputFilter;
+import android.text.Spanned;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -43,10 +45,13 @@ import android.widget.TextView;
import android.widget.ToggleButton;
import java.io.File;
+import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -799,6 +804,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
holder.facing = (EditText) convertView.findViewById(R.id.ed_facing);
+ holder.facing.setFilters(new InputFilter[] {new DecimalDigitsInputFilter(6,1)});
holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
holder.stock_view = convertView.findViewById(R.id.stock_view);
@@ -908,7 +914,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
if (Integer.parseInt(stock) >= 0 && Integer.parseInt(stock) < Integer.parseInt(childData.getMbq())) {
if (!childData.getFacing().equals("")) {
- if (Integer.parseInt(stock) >= 0 && Integer.parseInt(childData.getFacing()) <= Integer.parseInt(stock)) {
+ if (Integer.parseInt(stock) >= 0 && Double.parseDouble(childData.getFacing()) <= Integer.parseInt(stock)) {
childData.setStock(stock);
} else {
@@ -954,11 +960,30 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
final ViewHolder finalHolder1 = holder;
+ final ViewHolder finalHolder2 = holder;
holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
final EditText caption = (EditText) v;
- final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+ String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", "");
+
+ if (edFaceup != null && !edFaceup.equals("")){
+ //int num = Integer.parseInt(edFaceup);
+ double faceup = Double.parseDouble(edFaceup);
+ int num = (int)faceup;
+ //int faceint = (int)(faceup - Math.floor( faceup ));
+ int faceint = (int)((faceup%1.0)*10);
+ if((faceup%1.0)*10>5){
+ faceint = 5;
+ edFaceup =String.valueOf(num + faceint/10.0);
+ finalHolder2.facing.setText(edFaceup);
+ }
+
+ /*Double faceup = Double.parseDouble(edFaceup);
+ DecimalFormat twoDForm = new DecimalFormat(".#");
+ faceup= Double.valueOf(twoDForm.format(faceup));*/
+ }
+
boolean isFill = false;
@@ -980,15 +1005,14 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
} else {*/
if (edFaceup != null && !edFaceup.equals("")) {
- if (Integer.parseInt(edFaceup) >= 0 && Integer.parseInt(edFaceup) < Integer.parseInt(childData.getMbq())) {
+ if (Double.parseDouble(edFaceup)>= 0 && Double.parseDouble(edFaceup) < Integer.parseInt(childData.getMbq())) {
if (!childData.getStock().equals("")) {
//if (edFaceup != null && !edFaceup.equals("")) {
String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
-
- if (Integer.parseInt(faceup) <= Integer.parseInt(childData.getStock())) {
+ if (Double.parseDouble(faceup) <= Integer.parseInt(childData.getStock())) {
isFill = true;
@@ -1047,6 +1071,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
if (isFill) {
if (!edFaceup.equals("")) {
String faceup = edFaceup.replaceFirst("^0+(?!$)", "");
+ // String str2 = PerfectDecimal(faceup, 3, 1);
childData.setFacing(faceup);
} else {
childData.setFacing("");
@@ -1057,7 +1082,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
holder.facing.setText(childData.getFacing());
-
//empty check color change
if (!checkflag) {
boolean tempflag = false;
@@ -1218,4 +1242,47 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
}
super.onActivityResult(requestCode, resultCode, data);
}
+
+ public String PerfectDecimal(String str, int MAX_BEFORE_POINT, int MAX_DECIMAL){
+ if(str.charAt(0) == '.') str = "0"+str;
+ int max = str.length();
+
+ String rFinal = "";
+ boolean after = false;
+ int i = 0, up = 0, decimal = 0; char t;
+ while(i < max){
+ t = str.charAt(i);
+ if(t != '.' && after == false){
+ up++;
+ if(up > MAX_BEFORE_POINT) return rFinal;
+ }else if(t == '.'){
+ after = true;
+ }else{
+ decimal++;
+ if(decimal > MAX_DECIMAL)
+ return rFinal;
+ }
+ rFinal = rFinal + t;
+ i++;
+ }return rFinal;
+ }
+
+ public class DecimalDigitsInputFilter implements InputFilter {
+
+ Pattern mPattern;
+
+ public DecimalDigitsInputFilter(int digitsBeforeZero,int digitsAfterZero) {
+ mPattern=Pattern.compile("[0-9]{0," + (digitsBeforeZero-1) + "}+((\\.[0-9]{0," + (digitsAfterZero-1) + "})?)||(\\.)?");
+ }
+
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+
+ Matcher matcher=mPattern.matcher(dest);
+ if(!matcher.matches())
+ return "";
+ return null;
+ }
+
+ }
}
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 deb4da1..50daff1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -437,7 +437,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]"
+ "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]"
- + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]"
+ + "[FACING]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]"
+ "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]"
+ "[MUST_HAVE]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MUST_HAVE]" +
"[/MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]";
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java
index 7150336..faa6b10 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java
@@ -23,6 +23,8 @@ public class JourneyPlanGetterSetter {
ArrayList STORETYPE_ID = new ArrayList();
ArrayList CLASS_ID = new ArrayList();
ArrayList CAMERA_ALLOW = new ArrayList();
+ ArrayList VISIT_ORDER = new ArrayList();
+
public ArrayList getCHANNEL_ID() {
return CHANNEL_ID;
@@ -154,4 +156,12 @@ public class JourneyPlanGetterSetter {
public void setGEO_TAG(String GEO_TAG) {
this.GEO_TAG.add(GEO_TAG);
}
+
+ public ArrayList getVISIT_ORDER() {
+ return VISIT_ORDER;
+ }
+
+ public void setVISIT_ORDER(String VISIT_ORDER) {
+ this.VISIT_ORDER.add(VISIT_ORDER);
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java
index a35f3e6..92ca1ac 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPINGT2PGetterSetter.java
@@ -13,6 +13,7 @@ public class MAPPINGT2PGetterSetter {
ArrayList STORE_ID = new ArrayList<>();
ArrayList BRAND_ID = new ArrayList<>();
ArrayList DISPLAY_ID = new ArrayList<>();
+ ArrayList CATEGORY_FIXTURE = new ArrayList<>();
public String getTable_MAPPING_T2P() {
return table_MAPPING_T2P;
@@ -45,4 +46,12 @@ public class MAPPINGT2PGetterSetter {
public void setDISPLAY_ID(String DISPLAY_ID) {
this.DISPLAY_ID.add(DISPLAY_ID);
}
+
+ public ArrayList getCATEGORY_FIXTURE() {
+ return CATEGORY_FIXTURE;
+ }
+
+ public void setCATEGORY_FIXTURE(String CATEGORY_FIXTURE) {
+ this.CATEGORY_FIXTURE.add(CATEGORY_FIXTURE);
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
index b835b43..e6abf07 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
@@ -10,7 +10,7 @@ import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
public class T2PGetterSetter {
- String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2;
+ String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2, category_fixture;
boolean isPresent;
ArrayList gapsChecklist = new ArrayList<>();
@@ -145,4 +145,12 @@ public class T2PGetterSetter {
public void setImage2(String image2) {
this.image2 = image2;
}
+
+ public String getCategory_fixture() {
+ return category_fixture;
+ }
+
+ public void setCategory_fixture(String category_fixture) {
+ this.category_fixture = category_fixture;
+ }
}
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 d8641ef..1df6842 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -184,6 +184,11 @@ public class XMLHandlers {
jcpGetterSetter.setCHANNEL_ID(xpp.nextText());
}
+ if (xpp.getName().equals("VISIT_ORDER")) {
+ jcpGetterSetter.setVISIT_ORDER(xpp.nextText());
+ }
+
+
}
xpp.next();
@@ -445,6 +450,9 @@ public class XMLHandlers {
if (xpp.getName().equals("DISPLAY_ID")) {
t2p.setDISPLAY_ID(xpp.nextText());
}
+ if (xpp.getName().equals("CATEGORY_FIXTURE")) {
+ t2p.setCATEGORY_FIXTURE(xpp.nextText());
+ }
}
xpp.next();
}
diff --git a/GSKMTOrange/src/main/res/drawable/ic_date_range_black.png b/GSKMTOrange/src/main/res/drawable/ic_date_range_black.png
new file mode 100644
index 0000000..bfa9a0a
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/ic_date_range_black.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/ic_date_range_white.png b/GSKMTOrange/src/main/res/drawable/ic_date_range_white.png
new file mode 100644
index 0000000..1fc8ed3
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/ic_date_range_white.png differ
diff --git a/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml b/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml
new file mode 100644
index 0000000..fe4c674
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/content_future_jcp.xml b/GSKMTOrange/src/main/res/layout/content_future_jcp.xml
new file mode 100644
index 0000000..80097aa
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_future_jcp.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/item_future_jcp_list.xml b/GSKMTOrange/src/main/res/layout/item_future_jcp_list.xml
new file mode 100644
index 0000000..55fa6e7
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/item_future_jcp_list.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml
index d8c96ab..2680f45 100644
--- a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml
+++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml
@@ -103,8 +103,8 @@
android:layout_height="wrap_content"
android:background="@null"
android:gravity="center"
- android:inputType="number"
- android:maxLength="5"
+ android:inputType="numberDecimal"
+ android:maxLength="6"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
index d696f57..49ba52c 100644
--- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
@@ -19,6 +19,11 @@
android:icon="@mipmap/geotag_grey"
android:title="@string/menu_geotag" />
+ -
+