language, culture_id;
+
+ LoginGetterSetter login_data;
+
+ public SelectLanguageFragment() {
+ // Required empty public constructor
+ }
+
+ /**
+ * Use this factory method to create a new instance of
+ * this fragment using the provided parameters.
+ *
+ * @param param1 Parameter 1.
+ * @param param2 Parameter 2.
+ * @return A new instance of fragment SelectLanguageFragment.
+ */
+ // TODO: Rename and change types and number of parameters
+ public static SelectLanguageFragment newInstance(String param1, String param2) {
+ SelectLanguageFragment fragment = new SelectLanguageFragment();
+ Bundle args = new Bundle();
+ args.putString(ARG_PARAM1, param1);
+ args.putString(ARG_PARAM2, param2);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ mParam1 = getArguments().getString(ARG_PARAM1);
+ mParam2 = getArguments().getString(ARG_PARAM2);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.fragment_select_language, container, false);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+ editor = preferences.edit();
+
+ getDataFromSharedPreferences();
+
+ btn_lang_1 = (Button) view.findViewById(R.id.btn_language_one);
+ btn_lang_2 = (Button) view.findViewById(R.id.btn_language_two);
+
+
+ /* login_data = (LoginGetterSetter) getIntent().getSerializableExtra(CommonString.KEY_LOGIN_DATA);
+ language = login_data.getCULTURE_NAME();
+ culture_id = login_data.getCULTURE_ID();
+*/
+ if (language.size() > 1) {
+
+ btn_lang_1.setText(language.get(0));
+ btn_lang_2.setText(language.get(1));
+
+ btn_lang_1.setOnClickListener(this);
+ btn_lang_2.setOnClickListener(this);
+ }
+ return view;
+ }
+
+ // TODO: Rename method, update argument and hook method into UI event
+ public void onButtonPressed(boolean selected_flag) {
+ if (mListener != null) {
+
+ mListener.onFragmentInteraction(selected_flag);
+ }
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (context instanceof OnFragmentInteractionListener) {
+ mListener = (OnFragmentInteractionListener) context;
+ } else {
+ throw new RuntimeException(context.toString()
+ + " must implement OnFragmentInteractionListener");
+ }
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ mListener = null;
+ }
+
+ @Override
+ public void onClick(View view) {
+ int id = view.getId();
+
+ switch (id) {
+ case R.id.btn_language_one:
+
+ //selected_flag = true;
+ onButtonPressed(true);
+
+ updateResources(getActivity(), language.get(0));
+
+ btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+ btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
+
+ editor.putString(CommonString.KEY_LANGUAGE, language.get(0));
+ editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0));
+ editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0));
+ editor.commit();
+
+ break;
+
+ case R.id.btn_language_two:
+
+ //selected_flag = true;
+
+ onButtonPressed(true);
+
+ updateResources(getActivity(), language.get(1));
+
+ btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
+ btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+
+ editor.putString(CommonString.KEY_LANGUAGE, language.get(1));
+ editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(1));
+ editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(1));
+ editor.commit();
+
+ break;
+ }
+ }
+
+ /**
+ * This interface must be implemented by activities that contain this
+ * fragment to allow an interaction in this fragment to be communicated
+ * to the activity and potentially other fragments contained in that
+ * activity.
+ *
+ * See the Android Training lesson Communicating with Other Fragments for more information.
+ */
+ public interface OnFragmentInteractionListener {
+ // TODO: Update argument type and name
+ void onFragmentInteraction(boolean flag);
+ }
+
+ private void getDataFromSharedPreferences(){
+ Gson gson = new Gson();
+ login_data = new LoginGetterSetter();
+
+ String jsonPreferences = preferences.getString(CommonString.KEY_LOOGIN_PREF, "");
+
+ Type type = new TypeToken() {}.getType();
+ login_data = gson.fromJson(jsonPreferences, type);
+
+ language = login_data.getCULTURE_NAME();
+ culture_id = login_data.getCULTURE_ID();
+
+ //return ;
+ }
+
+ private static boolean updateResources(Context context, String language) {
+ String lang;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+
+ lang = "AR";
+ } else {
+ lang = "TR";
+ }
+
+ 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/fragment/SettingsActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java
new file mode 100644
index 0000000..1d68584
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java
@@ -0,0 +1,140 @@
+package cpm.com.gskmtorange.fragment;
+
+import android.app.Activity;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
+
+/**
+ * A placeholder fragment containing a simple view.
+ */
+public class SettingsActivityFragment extends Fragment {
+
+ ArrayList settingsList;
+
+ public SettingsActivityFragment() {
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.fragment_settings, container, false);
+
+ RecyclerView rec = (RecyclerView) view.findViewById(R.id.rec_settings);
+
+ SettingsGetterSetter settings = new SettingsGetterSetter();
+ settings.setName(getString(R.string.select_language_item));
+ settings.setIcon(R.mipmap.entry_grey);
+ SelectLanguageFragment selectLanguageFragment = new SelectLanguageFragment();
+ settings.setFragment(selectLanguageFragment);
+
+ settingsList = new ArrayList<>();
+ settingsList.add(settings);
+
+ rec.setLayoutManager(new LinearLayoutManager(getActivity()));
+ SettingsAdapter settingsAdapter = new SettingsAdapter();
+ rec.setAdapter(settingsAdapter);
+
+ return view;
+ }
+
+ class SettingsAdapter extends RecyclerView.Adapter{
+
+
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext())
+ .inflate(R.layout.settings_item_layout, parent, false);
+ return new ViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(ViewHolder holder, int position) {
+ final SettingsGetterSetter mItem = settingsList.get(position);
+ holder.tv_settings.setText(mItem.getName());
+
+ holder.cardView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Fragment nextFrag= mItem.getFragment();
+ getActivity().getSupportFragmentManager().beginTransaction()
+ .replace(R.id.fragment, nextFrag,"Settings")
+ .addToBackStack(null)
+ .commit();
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return settingsList.size();
+ }
+
+ class ViewHolder extends RecyclerView.ViewHolder{
+
+ public CardView cardView;
+ public TextView tv_settings;
+
+ public ViewHolder(View itemView) {
+ super(itemView);
+ cardView = (CardView) itemView.findViewById(R.id.card_layout);
+ tv_settings = (TextView) itemView.findViewById(R.id.tv_settings);
+ }
+ }
+ }
+
+ class SettingsGetterSetter{
+
+ String name;
+ int icon;
+ Fragment fragment;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getIcon() {
+ return icon;
+ }
+
+ public void setIcon(int icon) {
+ this.icon = icon;
+ }
+
+
+ public Fragment getFragment() {
+ return fragment;
+ }
+
+ public void setFragment(Fragment fragment) {
+ this.fragment = fragment;
+ }
+ }
+
+
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
index 0b6a11d..5e41666 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
@@ -3,6 +3,8 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -23,6 +25,7 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -37,9 +40,8 @@ public class CategoryListActivity extends AppCompatActivity {
CategoryListAdapter adapter;
GSKOrangeDB db;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +54,9 @@ public class CategoryListActivity extends AppCompatActivity {
db.open();
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -83,20 +88,90 @@ public class CategoryListActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
categoryList = new ArrayList<>();
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id);
- adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList);
- recyclerView.setAdapter(adapter);
- recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2));
+ if(categoryList.size()>0){
+
+ for(int i=0;i {
- private LayoutInflater inflator;
List list = Collections.emptyList();
Context context;
+ private LayoutInflater inflator;
public CategoryListAdapter(CategoryListActivity context, List list) {
inflator = LayoutInflater.from(context);
@@ -116,39 +191,8 @@ public class CategoryListActivity extends AppCompatActivity {
final CategoryGetterSetter categoryData = list.get(position);
holder.categoryName.setText(categoryData.getCategory());
- //holder.categoryIcon.setImageResource(R.drawable.category);
-
- if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) {
- if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
- && db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
- && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
-
- holder.categoryIcon.setImageResource(R.drawable.ohc_done);
- } else {
- holder.categoryIcon.setImageResource(R.drawable.ohc);
- }
- } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) {
- if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
- && db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
- && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
-
- holder.categoryIcon.setImageResource(R.drawable.pdr_done);
- } else {
-
- holder.categoryIcon.setImageResource(R.drawable.pdr);
- }
- } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) {
-
- if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id())
- && db.checkStockAndFacingData(store_id, categoryData.getCategory_id())
- && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) {
-
- holder.categoryIcon.setImageResource(R.drawable.hfd_done);
- } else {
- holder.categoryIcon.setImageResource(R.drawable.hfd);
- }
- }
+ holder.categoryIcon.setImageResource(categoryData.getCategory_img());
holder.lay_menu.setOnClickListener(new View.OnClickListener() {
@Override
@@ -180,29 +224,58 @@ public class CategoryListActivity extends AppCompatActivity {
}
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ 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;
}
- @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();
+ public void updateStatus() {
+ //Update Checkout Status
+ boolean flag_filled = false;
- if (id == android.R.id.home) {
- finish();
+ for (int i = 0; i < categoryList.size(); i++) {
+ String category_id = categoryList.get(i).getCategory_id();
+
+ if (db.checkMsl_AvailabilityData(store_id, category_id)
+ && db.checkStockAndFacingData(store_id, category_id)
+ && db.checkPromoComplianceData(store_id, category_id)
+ && db.isFilledT2P(store_id, category_id)
+ && db.additionalVisibilitydata(store_id, category_id)) {
+
+ flag_filled = true;
+ } else {
+ flag_filled = false;
+ break;
+ }
}
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
+ if (flag_filled) {
+ db.updateCheckoutStatus(store_id, CommonString.KEY_VALID);
}
-
- return super.onOptionsItemSelected(item);
}
+
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
index 3553a8a..c92ae49 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
@@ -2,7 +2,11 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
@@ -18,128 +22,115 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
public class CategoryWisePerformanceActivity extends AppCompatActivity {
- TextView txt_categoryName;
RecyclerView recyclerView;
+ Toolbar toolbar;
String categoryName = "", categoryId;
ArrayList categoryWisePerformanceList;
CategoryWisePerformaceAdapter adapter;
+ GSKOrangeDB db;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_category_wise_performance);
+ try {
+ setContentView(R.layout.activity_category_wise_performance);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
+ recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
- recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
- //txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
- categoryName = getIntent().getStringExtra("categoryName");
- categoryId = getIntent().getStringExtra("categoryId");
+ db = new GSKOrangeDB(this);
+ db.open();
- //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
- toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
- setSupportActionBar(toolbar);
- getSupportActionBar().setHomeButtonEnabled(true);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+
+ //Intent data
+ categoryName = getIntent().getStringExtra("categoryName");
+ categoryId = getIntent().getStringExtra("categoryId");
+
+ //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
+ toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class);
+ intent.putExtra("categoryName", categoryName);
+ intent.putExtra("categoryId", categoryId);
+ startActivity(intent);
+ }
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
- FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
- fab.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- Intent intent = new Intent(CategoryWisePerformanceActivity.this, DailyDataMenuActivity.class);
- intent.putExtra("categoryName", categoryName);
- intent.putExtra("categoryId", categoryId);
- startActivity(intent);
- }
- });
}
@Override
protected void onResume() {
super.onResume();
+ try {
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId);
- categoryWisePerformanceList = new ArrayList<>();
- CategoryWisePerformaceGetterSetter data = new CategoryWisePerformaceGetterSetter();
+ adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList);
+ recyclerView.setAdapter(adapter);
+ recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
- data.setPeriod("Period");
- data.setSos("SOS");
- data.setT2p("T2P");
- data.setPromo("Promo");
- data.setMsl_availability("MSL Availability");
- data.setOss("OSS");
- categoryWisePerformanceList.add(data);
+ @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();
- data = new CategoryWisePerformaceGetterSetter();
- data.setPeriod("LTM");
- data.setSos("75");
- data.setT2p("0");
- data.setPromo("0");
- data.setMsl_availability("25");
- data.setOss("55");
- categoryWisePerformanceList.add(data);
+ if (id == android.R.id.home) {
+ finish();
+ }
- data = new CategoryWisePerformaceGetterSetter();
- data.setPeriod("MTM");
- data.setSos("75");
- data.setT2p("0");
- data.setPromo("0");
- data.setMsl_availability("25");
- data.setOss("55");
- categoryWisePerformanceList.add(data);
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
- data = new CategoryWisePerformaceGetterSetter();
- data.setPeriod("RTM");
- data.setSos("75");
- data.setT2p("0");
- data.setPromo("0");
- data.setMsl_availability("25");
- data.setOss("55");
- categoryWisePerformanceList.add(data);
-
- data = new CategoryWisePerformaceGetterSetter();
- data.setPeriod("LTM");
- data.setSos("75");
- data.setT2p("0");
- data.setPromo("0");
- data.setMsl_availability("25");
- data.setOss("55");
- categoryWisePerformanceList.add(data);
-
- data = new CategoryWisePerformaceGetterSetter();
- data.setPeriod("MTM");
- data.setSos("75");
- data.setT2p("0");
- data.setPromo("0");
- data.setMsl_availability("25");
- data.setOss("55");
- categoryWisePerformanceList.add(data);
-
- data = new CategoryWisePerformaceGetterSetter();
- data.setPeriod("RTM");
- data.setSos("75");
- data.setT2p("0");
- data.setPromo("0");
- data.setMsl_availability("25");
- data.setOss("55");
- categoryWisePerformanceList.add(data);
-
- adapter = new CategoryWisePerformaceAdapter(CategoryWisePerformanceActivity.this, categoryWisePerformanceList);
- recyclerView.setAdapter(adapter);
- recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ return super.onOptionsItemSelected(item);
}
public class CategoryWisePerformaceAdapter extends RecyclerView.Adapter {
Context context;
- private LayoutInflater inflator;
List list = Collections.emptyList();
+ private LayoutInflater inflator;
public CategoryWisePerformaceAdapter(Context context, List list) {
inflator = LayoutInflater.from(context);
@@ -158,11 +149,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
public void onBindViewHolder(CategoryWisePerformaceAdapter.MyViewHolder holder, int position) {
final CategoryWisePerformaceGetterSetter categoryData = list.get(position);
- holder.txt_period.setText(categoryData.getPeriod());
+ if (categoryData.getPeriod().equalsIgnoreCase("LTM")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_ltm));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("MTD")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_mtd));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("LSV")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_lsv));
+ }
+ //holder.txt_period.setText(categoryData.getPeriod());
+ holder.txt_msl_availability.setText(categoryData.getMsl_availability());
holder.txt_sos.setText(categoryData.getSos());
holder.txt_t2p.setText(categoryData.getT2p());
holder.txt_promo.setText(categoryData.getPromo());
- holder.txt_msl_availability.setText(categoryData.getMsl_availability());
holder.txt_oss.setText(categoryData.getOss());
}
@@ -186,25 +184,33 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
txt_oss = (TextView) itemView.findViewById(R.id.txt_oss);
}
}
-
}
- @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();
+ private static boolean updateResources(Context context, String language) {
- if (id == android.R.id.home) {
- finish();
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
}
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
- return super.onOptionsItemSelected(item);
+ 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/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
index c234e7a..6d1971f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
@@ -3,6 +3,7 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -22,6 +23,7 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -38,9 +40,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName = "", categoryId;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +59,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
@@ -94,6 +98,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
protected void onResume() {
super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
try {
categoryList = new ArrayList<>();
@@ -111,17 +117,24 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//data.setCategory_name("Stock & Facing");
data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
if (db.checkStockAndFacingData(store_id, categoryId)) {
- data.setCategory_img(R.mipmap.stock_and_facing_done);
+ data.setCategory_img(R.mipmap.stock_facing_done);
} else {
- data.setCategory_img(R.mipmap.stock_and_facing);
+ data.setCategory_img(R.mipmap.stock_facing);
}
categoryList.add(data);
+ //T2p
data = new DailyDataMenuGetterSetter();
- //data.setCategory_name("T2P Compliance");
data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p));
- data.setCategory_img(R.mipmap.t2p_compliance);
+
+ if (db.isFilledT2P(store_id, categoryId)) {
+ data.setCategory_img(R.mipmap.t2p_compliance_done);
+ } else {
+ data.setCategory_img(R.mipmap.t2p_compliance);
+ }
+
categoryList.add(data);
+ //T2p added
data = new DailyDataMenuGetterSetter();
//data.setCategory_name("Additional Visibility");
@@ -165,10 +178,36 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ //getMenuInflater().inflate(R.menu.main, menu);
+ 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 == android.R.id.home) {
+ finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
public class DailyDataMenuAdapter extends RecyclerView.Adapter {
- private LayoutInflater inflator;
List list = Collections.emptyList();
Context context;
+ private LayoutInflater inflator;
public DailyDataMenuAdapter(Context context, List list) {
inflator = LayoutInflater.from(context);
@@ -250,30 +289,32 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ 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;
}
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- if (id == android.R.id.home) {
- finish();
- }
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
index 7513fe0..6a1f03b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.Bundle;
@@ -34,6 +35,7 @@ import android.widget.ToggleButton;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -54,9 +56,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName, categoryId, storeId;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -72,6 +73,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
db = new GSKOrangeDB(this);
db.open();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
@@ -102,18 +105,18 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
//if (validateData(listDataHeader, listDataChild)) {
AlertDialog.Builder builder = new AlertDialog.Builder(MSL_AvailabilityActivity.this);
- builder.setMessage("Are you sure you want to save")
+ builder.setMessage(getResources().getString(R.string.check_save_message))
.setCancelable(false)
- .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+ .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.open();
if (db.checkMsl_AvailabilityData(store_id, categoryId)) {
db.updateMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
- Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
- Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
//Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
@@ -121,7 +124,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
- .setNegativeButton("No", new DialogInterface.OnClickListener() {
+ .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
@@ -217,6 +220,13 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
} catch (Resources.NotFoundException e) {
e.printStackTrace();
}
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
private void prepareList() {
@@ -248,6 +258,63 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
}
}
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ //finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
+ public void onBackPressed() {
+ //super.onBackPressed();
+
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ }
+
public class ExpandableListAdapter extends BaseExpandableListAdapter {
private Context _context;
private List _listDataHeader;
@@ -289,6 +356,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
txt_categoryHeader.setTypeface(null, Typeface.BOLD);
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimary));
txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
/*img_camera.setOnClickListener(new View.OnClickListener() {
@@ -362,14 +430,15 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
- holder.toggle_available.setTextOff("No");
- holder.toggle_available.setTextOn("Yes");
+ /*holder.toggle_available.setTextOff("No");
+ holder.toggle_available.setTextOn("Yes");*/
convertView.setTag(holder);
} else {
holder = (ViewHolder) convertView.getTag();
}
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
holder.txt_skuName.setText(childData.getSku());
holder.txt_mbq.setText(childData.getMbq());
@@ -419,22 +488,32 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
LinearLayout lin_category;
}
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
- if (id == android.R.id.home) {
- finish();
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
}
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
+ Locale locale = new Locale(lang);
+ Locale.setDefault(locale);
- return super.onOptionsItemSelected(item);
+ 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/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
index 8824f9d..0e0ae6b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
@@ -1,8 +1,11 @@
package cpm.com.gskmtorange.gsk_dailyentry;
import android.app.AlertDialog;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -22,6 +25,7 @@ import android.widget.TextView;
import android.widget.ToggleButton;
import java.util.ArrayList;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
@@ -41,9 +45,35 @@ public class PromoComplianceActivity extends AppCompatActivity {
GSKOrangeDB db;
String categoryName, categoryId;
-
- private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ 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;
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -71,6 +101,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
db = new GSKOrangeDB(this);
db.open();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
@@ -258,6 +290,13 @@ public class PromoComplianceActivity extends AppCompatActivity {
} catch (Exception e) {
e.printStackTrace();
}
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
private void prepareList() {
@@ -411,7 +450,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
+ //getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@@ -423,7 +462,23 @@ public class PromoComplianceActivity extends AppCompatActivity {
int id = item.getItemId();
if (id == android.R.id.home) {
- finish();
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ //finish();
}
//noinspection SimplifiableIfStatement
@@ -433,4 +488,26 @@ public class PromoComplianceActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
+
+ @Override
+ public void onBackPressed() {
+ //super.onBackPressed();
+
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
index 3d28cac..0421cc9 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
@@ -1,14 +1,21 @@
package cpm.com.gskmtorange.gsk_dailyentry;
import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import android.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -20,14 +27,20 @@ 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.Editable;
+import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView;
import android.widget.BaseExpandableListAdapter;
+import android.widget.Button;
import android.widget.EditText;
import android.widget.ExpandableListView;
import android.widget.ImageView;
@@ -44,35 +57,62 @@ import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
public class Stock_FacingActivity extends AppCompatActivity {
+ static int child_position = -1;
ExpandableListView expandableListView;
TextView txt_stockFacingName;
-
ArrayList headerDataList;
ArrayList childDataList;
List hashMapListHeaderData;
HashMap> hashMapListChildData;
List checkHeaderArray = new ArrayList<>();
-
ExpandableListAdapter adapter;
GSKOrangeDB db;
-
String categoryName, categoryId, Error_Message = "";
-
String path = "", str = "", _pathforcheck = "", img1 = "", img2 = "";
- static int child_position = -1;
boolean isDialogOpen = true;
boolean checkflag = true;
-
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
+ Uri outputFileUri = null;
+ String gallery_package = "";
private SharedPreferences preferences;
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ 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;
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -88,6 +128,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
//txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName);
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
@@ -98,6 +140,7 @@ public class Stock_FacingActivity 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, "");
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -121,18 +164,18 @@ public class Stock_FacingActivity extends AppCompatActivity {
if (validateData(hashMapListHeaderData, hashMapListChildData)) {
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
- builder.setMessage("Are you sure you want to save")
+ builder.setMessage(getResources().getString(R.string.check_save_message))
.setCancelable(false)
- .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+ .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.open();
if (db.checkStockAndFacingData(store_id, categoryId)) {
db.updateStockAndFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
- Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertStock_Facing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
- Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+ Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
//Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
}
@@ -140,7 +183,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
- .setNegativeButton("No", new DialogInterface.OnClickListener() {
+ .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
@@ -149,9 +192,10 @@ public class Stock_FacingActivity extends AppCompatActivity {
alert.show();
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
- builder.setMessage("Fill the value or fill 0 ")
+ //builder.setMessage(getResources().getString(R.string.empty_field))
+ builder.setMessage(Error_Message)
.setCancelable(false)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
}
@@ -207,6 +251,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
getCurrentFocus().clearFocus();
}
+
+ fab.setVisibility(View.INVISIBLE);
}
});
@@ -220,6 +266,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
getCurrentFocus().clearFocus();
}
+
+ fab.setVisibility(View.INVISIBLE);
}
});
@@ -234,6 +282,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
} catch (Resources.NotFoundException e) {
e.printStackTrace();
}
+
}
private void prepareList() {
@@ -269,295 +318,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
}
- public class ExpandableListAdapter extends BaseExpandableListAdapter {
- private Context _context;
- private List _listDataHeader;
- private HashMap> _listDataChild;
-
- public ExpandableListAdapter(Context context, List listDataHeader,
- HashMap> listChildData) {
- this._context = context;
- this._listDataHeader = listDataHeader;
- this._listDataChild = listChildData;
- }
-
- @Override
- public Object getGroup(int groupPosition) {
- return this._listDataHeader.get(groupPosition);
- }
-
- @Override
- public int getGroupCount() {
- return this._listDataHeader.size();
- }
-
- @Override
- public long getGroupId(int groupPosition) {
- return groupPosition;
- }
-
- @Override
- public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
- final Stock_FacingGetterSetter headerTitle = (Stock_FacingGetterSetter) getGroup(groupPosition);
-
- if (convertView == null) {
- LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- convertView = infalInflater.inflate(R.layout.item_stock_facing_header, null, false);
- }
-
- TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader);
- LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader);
- ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference);
- ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1);
- ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2);
- ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit);
-
- txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
- txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
-
- img_camera1.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //String date = new Date().toLocaleString().toString();
- //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
-
- _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
- child_position = groupPosition;
- path = str + _pathforcheck;
-
- startCameraActivity1(groupPosition);
- }
- });
-
- if (!img1.equalsIgnoreCase("")) {
- if (groupPosition == child_position) {
- headerTitle.setImage1(img1);
- img1 = "";
- }
- }
-
- if (headerTitle.getImage1().equals("")) {
- img_camera1.setBackgroundResource(R.mipmap.camera);
- } else {
- img_camera1.setBackgroundResource(R.mipmap.camera_done);
- }
-
-
- img_camera2.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //String date = new Date().toLocaleString().toString();
- //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
-
- _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
- child_position = groupPosition;
- path = str + _pathforcheck;
-
- startCameraActivity2(groupPosition);
- }
- });
-
- if (!img2.equalsIgnoreCase("")) {
- if (groupPosition == child_position) {
- headerTitle.setImage2(img2);
- img2 = "";
- }
- }
-
- if (headerTitle.getImage2().equals("")) {
- img_camera2.setBackgroundResource(R.mipmap.camera);
- } else {
- img_camera2.setBackgroundResource(R.mipmap.camera_done);
- }
-
-
- if (!checkflag) {
- if (checkHeaderArray.contains(groupPosition)) {
- txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
- } else {
- txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
- }
- }
-
- return convertView;
- }
-
- @Override
- public Object getChild(int groupPosition, int childPosititon) {
- return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
- }
-
- @Override
- public int getChildrenCount(int groupPosition) {
- return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
- }
-
- @Override
- public long getChildId(int groupPosition, int childPosition) {
- return childPosition;
- }
-
- @Override
- public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
- View convertView, ViewGroup parent) {
- final Stock_FacingGetterSetter childData = (Stock_FacingGetterSetter) getChild(groupPosition, childPosition);
- ViewHolder holder = null;
-
- if (convertView == null) {
- LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- convertView = infalInflater.inflate(R.layout.item_stock_facing_child, null, false);
-
- holder = new ViewHolder();
- holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
- holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
-
- holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
- holder.ed_stock = (EditText) convertView.findViewById(R.id.ed_stock);
- holder.ed_facing = (EditText) convertView.findViewById(R.id.ed_facing);
- convertView.setTag(holder);
- } else {
- holder = (ViewHolder) convertView.getTag();
- }
-
- holder.txt_skuName.setText(childData.getSku());
-
- if (childData.getCompany_id().equals("1")) {
- holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
- } else {
- holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
- }
-
-
- if (childData.getStock().equals("0")) {
- holder.ed_facing.setEnabled(false);
- } else {
- holder.ed_facing.setEnabled(true);
- }
-
- final ViewHolder finalHolder = holder;
- holder.ed_stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
-
- final EditText caption = (EditText) v;
- String edStock = caption.getText().toString();
-
- if (!edStock.equals("")) {
- String stock = edStock.replaceFirst("^0+(?!$)", "");
- childData.setStock(stock);
-
- if (edStock.equals("0")) {
- childData.setFacing("0");
-
- finalHolder.ed_facing.setEnabled(false);
- } else {
- childData.setFacing(childData.getFacing());
- finalHolder.ed_facing.setEnabled(true);
- }
- } else {
- childData.setStock("");
- finalHolder.ed_facing.setEnabled(true);
- }
- }
- });
-
- holder.ed_stock.setText(childData.getStock());
-
- holder.ed_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+(?!$)", "");
-
- if (!childData.getStock().equals("")) {
- if (!edFaceup.equals("")) {
- if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) {
- childData.setFacing(edFaceup);
- } else {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
- builder.setMessage("Faceup can not be greater than stock value")
- .setCancelable(false)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- }
- } else {
- childData.setFacing("");
- }
- } else {
- if (isDialogOpen) {
- isDialogOpen = !isDialogOpen;
- AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
- builder.setMessage("First fill the stock value")
- .setCancelable(false)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.dismiss();
- isDialogOpen = !isDialogOpen;
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- }
- }
- }
- });
-
- holder.ed_facing.setText(childData.getFacing());
-
- if (!checkflag) {
- boolean tempflag = false;
-
- if (holder.ed_stock.getText().toString().equals("")) {
- holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white));
- holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.ed_stock.setHint("Empty");
- tempflag = true;
- }
-
- if (holder.ed_facing.getText().toString().equals("")) {
- holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white));
- holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
- holder.ed_facing.setHint("Empty");
- tempflag = true;
- }
-
- if (tempflag) {
- holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
- } else {
- holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
- }
- }
-
- return convertView;
- }
-
- @Override
- public boolean hasStableIds() {
- return false;
- }
-
- @Override
- public boolean isChildSelectable(int groupPosition, int childPosition) {
- return true;
- }
- }
-
- public class ViewHolder {
- EditText ed_stock, ed_facing;
- CardView cardView;
- TextView txt_skuName;
- LinearLayout lin_category;
- }
-
boolean validateData(List listDataHeader,
HashMap> listDataChild) {
boolean flag = true;
@@ -571,36 +331,77 @@ public class Stock_FacingActivity extends AppCompatActivity {
String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock();
String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing();
- if (!imagePath.equals("") || !imagePath1.equals("")) {
- if (!stock.equals("0")) {
- if (stock.equals("") || faceup.equals("")) {
+ //Company_id
+ if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
+ //Camera allow enable
+ if (camera_allow.equalsIgnoreCase("1")) {
+
+ if (!imagePath.equals("") || !imagePath1.equals("")) {
+ if (!stock.equals("0")) {
+ if (stock.equals("") || faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = getResources().getString(R.string.fill_data);
+ break;
+ }
+ } else {
+ if (stock.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = getResources().getString(R.string.fill_data);
+ break;
+ }
+ }
+ } else {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
flag = false;
- Error_Message = "Please fill all the data";
+ Error_Message = getResources().getString(R.string.click_image);
break;
}
- } else {
- if (stock.equals("")) {
- if (!checkHeaderArray.contains(i)) {
- checkHeaderArray.add(i);
- }
- flag = false;
- Error_Message = "Please fill all the data";
- break;
+ } else {
+ //Camera allow disable
+ if (!stock.equals("0")) {
+ if (stock.equals("") || faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
+ } else {
+ if (stock.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
+
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
}
}
} else {
- if (!checkHeaderArray.contains(i)) {
- checkHeaderArray.add(i);
- }
+ if (faceup.equals("")) {
+ if (!checkHeaderArray.contains(i)) {
+ checkHeaderArray.add(i);
+ }
- flag = false;
- Error_Message = "Please click either 1 image";
- break;
+ flag = false;
+ Error_Message = "Please fill all the data";
+ break;
+ }
}
}
@@ -618,16 +419,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
private void startCameraActivity1(int position) {
- try {
- /*Log.e("Stock and Facing ", "startCameraActivity()");
- File file = new File(path);
- Uri outputFileUri = Uri.fromFile(file);
-
- Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
- intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
- startActivityForResult(intent, position);*/
-
- Log.i("Stock & Facing ", "startCameraActivity()");
+ /*try {
+ Log.e("Stock & Facing ", "startCameraActivity()");
File file = new File(path);
Uri outputFileUri = Uri.fromFile(file);
@@ -636,8 +429,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
List 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);*/
+ *//*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
+ Log.e("TAG", "package name : " + list.get(n).packageName);*//*
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
@@ -659,21 +452,58 @@ public class Stock_FacingActivity extends AppCompatActivity {
startActivityForResult(intent, 1);
//startActivityForResult(intent, position);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }*/
+
+ try {
+ Log.e("MakeMachine", "startCameraActivity()");
+ File file = new File(path);
+ outputFileUri = Uri.fromFile(file);
+
+ String defaultCameraPackage = "";
+ final PackageManager packageManager = getPackageManager();
+ List 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
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ gallery_package = list.get(n).packageName;
+ }
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+ }
+
+ Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ startActivityForResult(intent, 1);
+ } 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, 1);
} catch (Exception e) {
e.printStackTrace();
}
}
private void startCameraActivity2(int position) {
- try {
- /*Log.e("Stock and Facing ", "startCameraActivity()");
- File file = new File(path);
- Uri outputFileUri = Uri.fromFile(file);
-
- Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
- intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
- startActivityForResult(intent, position);*/
-
+ /*try {
Log.i("Stock & Facing ", "startCameraActivity()");
File file = new File(path);
Uri outputFileUri = Uri.fromFile(file);
@@ -683,8 +513,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
List 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);*/
+ *//*Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
+ Log.e("TAG", "package name : " + list.get(n).packageName);*//*
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
@@ -704,7 +534,51 @@ public class Stock_FacingActivity extends AppCompatActivity {
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
intent.setPackage(defaultCameraPackage);
startActivityForResult(intent, 2);
- //startActivityForResult(intent, position);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }*/
+
+ try {
+ Log.e("MakeMachine", "startCameraActivity()");
+ File file = new File(path);
+ outputFileUri = Uri.fromFile(file);
+
+ String defaultCameraPackage = "";
+ final PackageManager packageManager = getPackageManager();
+ List 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
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) {
+ gallery_package = list.get(n).packageName;
+ }
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+ if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+ }
+
+ Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ startActivityForResult(intent, 2);
+ } 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, 2);
} catch (Exception e) {
e.printStackTrace();
}
@@ -769,6 +643,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
return cdate;
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.planogram, menu);
+ return true;
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
@@ -777,14 +657,486 @@ public class Stock_FacingActivity extends AppCompatActivity {
int id = item.getItemId();
if (id == android.R.id.home) {
- finish();
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(Stock_FacingActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ //finish();
}
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
+ //Planogram Dialog
+ if (id == R.id.action_planogram) {
+ //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+ final Dialog dialog = new Dialog(Stock_FacingActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ dialog.setContentView(R.layout.planogram_dialog_layout);
+ dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+
+ ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+
+ ArrayList mp = db.getMappingPlanogramData("");
+
+ String planogram_image = mp.get(0).getPLANOGRAM_IMAGE();
+ if (new File(str + planogram_image).exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
+ img_planogram.setImageBitmap(bmp);
+ } else {
+ img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+ }
+
+ /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg");
+ img_planogram.setImageBitmap(bmp);
+ } else {
+ img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+ }*/
+
+
+ ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel);
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ }
+ });
+
+ dialog.show();
return true;
}
return super.onOptionsItemSelected(item);
}
+
+ @Override
+ public void onBackPressed() {
+ //super.onBackPressed();
+
+ android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(Stock_FacingActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ android.app.AlertDialog alert = builder.create();
+ alert.show();
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ }
+
+ public class ExpandableListAdapter extends BaseExpandableListAdapter {
+ private Context _context;
+ private List _listDataHeader;
+ private HashMap> _listDataChild;
+
+ public ExpandableListAdapter(Context context, List listDataHeader,
+ HashMap> listChildData) {
+ this._context = context;
+ this._listDataHeader = listDataHeader;
+ this._listDataChild = listChildData;
+ }
+
+ @Override
+ public Object getGroup(int groupPosition) {
+ return this._listDataHeader.get(groupPosition);
+ }
+
+ @Override
+ public int getGroupCount() {
+ return this._listDataHeader.size();
+ }
+
+ @Override
+ public long getGroupId(int groupPosition) {
+ return groupPosition;
+ }
+
+ @Override
+ public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+ final Stock_FacingGetterSetter headerTitle = (Stock_FacingGetterSetter) getGroup(groupPosition);
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_stock_facing_header, null, false);
+ }
+
+ TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader);
+ TextView txt_sosHeader = (TextView) convertView.findViewById(R.id.txt_sosHeader);
+ LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader);
+ ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1);
+ ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2);
+ //ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference);
+ //ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit);
+
+ txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
+ txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
+
+ if (headerTitle.getCompany_id().equals("1")) {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+
+ txt_sosHeader.setVisibility(View.VISIBLE);
+ img_camera1.setVisibility(View.VISIBLE);
+ img_camera2.setVisibility(View.VISIBLE);
+ } else {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
+
+ txt_sosHeader.setVisibility(View.GONE);
+ img_camera1.setVisibility(View.GONE);
+ img_camera2.setVisibility(View.GONE);
+ }
+
+ //Camera allow enable
+ if (camera_allow.equalsIgnoreCase("1")) {
+
+ img_camera1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //String date = new Date().toLocaleString().toString();
+ //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
+
+ _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id()
+ + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ child_position = groupPosition;
+ path = str + _pathforcheck;
+
+ startCameraActivity1(groupPosition);
+ }
+ });
+
+ if (!img1.equalsIgnoreCase("")) {
+ if (groupPosition == child_position) {
+ headerTitle.setImage1(img1);
+ img1 = "";
+ }
+ }
+
+ if (headerTitle.getImage1().equals("")) {
+ img_camera1.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ img_camera1.setBackgroundResource(R.mipmap.camera_green);
+ }
+
+
+ img_camera2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //String date = new Date().toLocaleString().toString();
+ //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-');
+
+ _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id()
+ + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+ child_position = groupPosition;
+ path = str + _pathforcheck;
+
+ startCameraActivity2(groupPosition);
+ }
+ });
+
+ if (!img2.equalsIgnoreCase("")) {
+ if (groupPosition == child_position) {
+ headerTitle.setImage2(img2);
+ img2 = "";
+ }
+ }
+
+ if (headerTitle.getImage2().equals("")) {
+ img_camera2.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ img_camera2.setBackgroundResource(R.mipmap.camera_green);
+ }
+ } else {
+ //Camera allow disable
+ img_camera1.setBackgroundResource(R.mipmap.camera_grey);
+ img_camera2.setBackgroundResource(R.mipmap.camera_grey);
+ }
+
+ if (headerTitle.getCompany_id().equals("1")) {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ } else {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
+ }*/
+ }
+ }
+ } else {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ } else {*/
+ txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
+ //}
+ }
+ }
+ }
+
+ return convertView;
+ }
+
+ @Override
+ public Object getChild(int groupPosition, int childPosititon) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon);
+ }
+
+ @Override
+ public int getChildrenCount(int groupPosition) {
+ return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size();
+ }
+
+ @Override
+ public long getChildId(int groupPosition, int childPosition) {
+ return childPosition;
+ }
+
+ @Override
+ public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
+ View convertView, ViewGroup parent) {
+ final Stock_FacingGetterSetter childData = (Stock_FacingGetterSetter) getChild(groupPosition, childPosition);
+ ViewHolder holder = null;
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_stock_facing_child, null, false);
+
+ holder = new ViewHolder();
+ holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
+ holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
+
+ holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
+ holder.ed_stock = (EditText) convertView.findViewById(R.id.ed_stock);
+ holder.ed_facing = (EditText) convertView.findViewById(R.id.ed_facing);
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ holder.txt_skuName.setText(childData.getSku());
+
+ if (childData.getCompany_id().equals("1")) {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ holder.ed_stock.setVisibility(View.VISIBLE);
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ holder.ed_stock.setVisibility(View.GONE);
+ }
+
+
+ if (childData.getStock().equals("0")) {
+ holder.ed_facing.setEnabled(false);
+ } else {
+ holder.ed_facing.setEnabled(true);
+ }
+
+ final ViewHolder finalHolder = holder;
+ holder.ed_stock.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+
+ final EditText caption = (EditText) v;
+ String edStock = caption.getText().toString();
+
+ if (!edStock.equals("")) {
+ String stock = edStock.replaceFirst("^0+(?!$)", "");
+ childData.setStock(stock);
+
+ if (edStock.equals("0")) {
+ childData.setFacing("0");
+
+ finalHolder.ed_facing.setEnabled(false);
+ } else {
+ childData.setFacing(childData.getFacing());
+ finalHolder.ed_facing.setEnabled(true);
+ }
+ } else {
+ childData.setStock("");
+ finalHolder.ed_facing.setEnabled(true);
+ }
+ }
+ });
+
+ /*holder.ed_stock.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ //final EditText caption = (EditText) v;
+ String edStock = s.toString();
+
+ if (!edStock.equals("")) {
+ String stock = edStock.replaceFirst("^0+(?!$)", "");
+ childData.setStock(stock);
+
+ if (edStock.equals("0")) {
+ childData.setFacing("0");
+
+ finalHolder.ed_facing.setEnabled(false);
+ } else {
+ childData.setFacing(childData.getFacing());
+ finalHolder.ed_facing.setEnabled(true);
+ }
+ } else {
+ childData.setStock("");
+ finalHolder.ed_facing.setEnabled(true);
+ }
+
+ expandableListView.invalidateViews();
+ }
+ });*/
+
+ holder.ed_stock.setText(childData.getStock());
+
+ holder.ed_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+(?!$)", "");
+
+ if (childData.getCompany_id().equals("1")) {
+ if (!childData.getStock().equals("")) {
+ if (!edFaceup.equals("")) {
+ if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) {
+ childData.setFacing(edFaceup);
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
+ builder.setMessage("Faceup can not be greater than stock value")
+ .setCancelable(false)
+ .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ } else {
+ childData.setFacing("");
+ }
+ } else {
+ if (isDialogOpen) {
+ isDialogOpen = !isDialogOpen;
+ AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
+ builder.setMessage("First fill the stock value")
+ .setCancelable(false)
+ .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ isDialogOpen = !isDialogOpen;
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+ }
+ } else {
+ childData.setFacing(edFaceup);
+ childData.setStock("0");
+ }
+ }
+ });
+
+ holder.ed_facing.setText(childData.getFacing());
+
+ if (!checkflag) {
+ boolean tempflag = false;
+
+ if (childData.getCompany_id().equals("1")) {
+ if (holder.ed_stock.getText().toString().equals("")) {
+ holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.ed_stock.setHint("Empty");
+ tempflag = true;
+ }
+
+ if (holder.ed_facing.getText().toString().equals("")) {
+ holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.ed_facing.setHint("Empty");
+ tempflag = true;
+ }
+
+ if (tempflag) {
+ holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ }
+ } else {
+ if (holder.ed_facing.getText().toString().equals("")) {
+ holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.ed_facing.setHint("Empty");
+ tempflag = true;
+ }
+
+ if (tempflag) {
+ holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ }
+
+ return convertView;
+ }
+
+ @Override
+ public boolean hasStableIds() {
+ return false;
+ }
+
+ @Override
+ public boolean isChildSelectable(int groupPosition, int childPosition) {
+ return true;
+ }
+ }
+
+ public class ViewHolder {
+ EditText ed_stock, ed_facing;
+ CardView cardView;
+ TextView txt_skuName;
+ LinearLayout lin_category;
+ }
}
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
new file mode 100644
index 0000000..956ad29
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
@@ -0,0 +1,209 @@
+package cpm.com.gskmtorange.gsk_dailyentry;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+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.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
+
+public class StoreWisePerformanceActivity extends AppCompatActivity {
+ RecyclerView recyclerView;
+ Toolbar toolbar;
+
+ ArrayList storeWisePerformanceList;
+ StoreWisePerformaceAdapter adapter;
+
+ GSKOrangeDB db;
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ private SharedPreferences preferences;
+
+ private static boolean updateResources(Context context, String language) {
+
+ String lang ;
+
+ if(language.equalsIgnoreCase("English")){
+ lang = "EN";
+ }
+ else if(language.equalsIgnoreCase("UAE")) {
+ lang = "AR";
+ }
+ else {
+ lang = "TR";
+ }
+
+ 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;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ try {
+ setContentView(R.layout.activity_store_wise_performance);
+
+ toolbar = (Toolbar) findViewById(R.id.toolbar);
+ recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
+
+ db = new GSKOrangeDB(this);
+ db.open();
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+ //preference data
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+
+ toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance));
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class);
+ startActivity(intent);
+ }
+ });
+ } catch (Resources.NotFoundException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ try {
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+ storeWisePerformanceList = db.getStoreWisePerformance(store_id);
+
+ adapter = new StoreWisePerformaceAdapter(StoreWisePerformanceActivity.this, storeWisePerformanceList);
+ recyclerView.setAdapter(adapter);
+ recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ }
+
+ //noinspection SimplifiableIfStatement
+ if (id == R.id.action_settings) {
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ public class StoreWisePerformaceAdapter extends RecyclerView.Adapter {
+ Context context;
+ List list = Collections.emptyList();
+ private LayoutInflater inflator;
+
+ public StoreWisePerformaceAdapter(Context context, List list) {
+ inflator = LayoutInflater.from(context);
+ this.list = list;
+ this.context = context;
+ }
+
+ @Override
+ public StoreWisePerformaceAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) {
+ View view = inflator.inflate(R.layout.item_store_wise_performance, parent, false);
+ StoreWisePerformaceAdapter.MyViewHolder holder = new StoreWisePerformaceAdapter.MyViewHolder(view);
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(StoreWisePerformaceAdapter.MyViewHolder holder, int position) {
+ final StoreWisePerformaceGetterSetter categoryData = list.get(position);
+
+ if (categoryData.getPeriod().equalsIgnoreCase("LTM")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_ltm));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("MTD")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_mtd));
+ } else if (categoryData.getPeriod().equalsIgnoreCase("LSV")) {
+ holder.txt_period.setText(getResources().getString(R.string.category_performance_lsv));
+ }
+ holder.txt_msl_availability.setText(categoryData.getMsl_availability());
+ holder.txt_sos.setText(categoryData.getSos());
+ holder.txt_t2p.setText(categoryData.getT2p());
+ holder.txt_promo.setText(categoryData.getPromo());
+ holder.txt_oss.setText(categoryData.getOss());
+ }
+
+ @Override
+ public int getItemCount() {
+ return list.size();
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+ TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss;
+ LinearLayout lay_menu;
+
+ public MyViewHolder(View itemView) {
+ super(itemView);
+ lay_menu = (LinearLayout) itemView.findViewById(R.id.lay_menu);
+ txt_period = (TextView) itemView.findViewById(R.id.txt_period);
+ txt_sos = (TextView) itemView.findViewById(R.id.txt_sos);
+ txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p);
+ txt_promo = (TextView) itemView.findViewById(R.id.txt_promo);
+ txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability);
+ txt_oss = (TextView) itemView.findViewById(R.id.txt_oss);
+ }
+ }
+ }
+
+}
+
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 a8ea3b7..0e1bd16 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -3,6 +3,8 @@ package cpm.com.gskmtorange.upload;
import android.app.Dialog;
import android.content.Context;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.AsyncTask;
@@ -26,6 +28,7 @@ import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.Locale;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -38,38 +41,38 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class UploadActivity extends AppCompatActivity {
- private Dialog dialog;
- private ProgressBar pb;
- private TextView percentage, message;
GSKOrangeDB db;
ArrayList coverageList;
-
- private FailureGetterSetter failureGetterSetter = null;
- private SharedPreferences preferences;
String date, userId, app_version;
-
StoreBean storeData;
String datacheck = "";
String[] words;
String validity;
int mid;
- private int factor, k = 0;
String errormsg = "", Path;
-
Data data;
-
ArrayList msl_availabilityList;
ArrayList stock_facingHeaderList, stock_facingChildList;
ArrayList promotionSkuList, additionalPromotionList;
+ ArrayList t2PGetterSetters;
ArrayList additionalVisibilityList;
ArrayList additionalVisibilitySkuList;
+ private Dialog dialog;
+ private ProgressBar pb;
+ private TextView percentage, message;
+ private FailureGetterSetter failureGetterSetter = null;
+ private SharedPreferences preferences;
+ private int factor, k = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -79,6 +82,9 @@ public class UploadActivity extends AppCompatActivity {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
date = preferences.getString(CommonString.KEY_DATE, null);
userId = preferences.getString(CommonString.KEY_USERNAME, null);
app_version = preferences.getString(CommonString.KEY_VERSION, null);
@@ -92,6 +98,85 @@ public class UploadActivity extends AppCompatActivity {
new UploadTask(this).execute();
}
+ public String UploadImage(String path, String folder_name) throws Exception {
+ errormsg = "";
+ BitmapFactory.Options o = new BitmapFactory.Options();
+ o.inJustDecodeBounds = true;
+ BitmapFactory.decodeFile(Path + path, o);
+
+ // The new size we want to scale to
+ final int REQUIRED_SIZE = 1639;
+
+ // Find the correct scale value. It should be the power of 2.
+ int width_tmp = o.outWidth, height_tmp = o.outHeight;
+ int scale = 1;
+
+ while (true) {
+ if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
+ break;
+ width_tmp /= 2;
+ height_tmp /= 2;
+ scale *= 2;
+ }
+
+ // Decode with inSampleSize
+ BitmapFactory.Options o2 = new BitmapFactory.Options();
+ o2.inSampleSize = scale;
+ Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2);
+
+ ByteArrayOutputStream bao = new ByteArrayOutputStream();
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao);
+ byte[] ba = bao.toByteArray();
+ String ba1 = Base64.encodeBytes(ba);
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
+
+ String[] split = path.split("/");
+ String path1 = split[split.length - 1];
+
+ request.addProperty("img", ba1);
+ request.addProperty("name", path1);
+ request.addProperty("FolderName", folder_name);
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
+
+ Object result = envelope.getResponse();
+
+ if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
+ return CommonString.KEY_FALSE;
+ }
+
+ SAXParserFactory saxPF = SAXParserFactory.newInstance();
+ SAXParser saxP = saxPF.newSAXParser();
+ XMLReader xmlR = saxP.getXMLReader();
+
+ // for failure
+ FailureXMLHandler failureXMLHandler = new FailureXMLHandler();
+ xmlR.setContentHandler(failureXMLHandler);
+
+ InputSource is = new InputSource();
+ is.setCharacterStream(new StringReader(result.toString()));
+ xmlR.parse(is);
+
+ failureGetterSetter = failureXMLHandler.getFailureGetterSetter();
+
+ if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
+ errormsg = failureGetterSetter.getErrorMsg();
+ return CommonString.KEY_FAILURE;
+ }
+ } else {
+ new File(Path + path).delete();
+ }
+
+ return result.toString();
+ }
+
class Data {
int value;
String name;
@@ -180,7 +265,7 @@ public class UploadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
- Object result = (Object) envelope.getResponse();
+ Object result = envelope.getResponse();
datacheck = result.toString();
words = datacheck.split("\\;");
@@ -212,6 +297,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]"
+ "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityList.get(j).getMbq()) + "[/MBQ]"
//+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
+ "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+ "[/MSL_AVAILABILITY_DATA]";
@@ -235,7 +321,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -304,7 +390,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -363,7 +449,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -422,7 +508,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -440,6 +526,7 @@ public class UploadActivity extends AppCompatActivity {
data.name = "Additional Promotion Data Uploading";
publishProgress(data);
+
////ashish open
//Additional Visibility Data
@@ -535,7 +622,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = (Object) envelope.getResponse();
+ result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -549,17 +636,154 @@ public class UploadActivity extends AppCompatActivity {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
+
+
data.value = 35;
data.name = "Additional Visibility Data";
publishProgress(data);
-
-
/////ashish close
+ //T2p Upload Data
+ String t2p_data_xml = "";
+ onXML = "";
+ t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
+ if (t2PGetterSetters.size() > 0) {
+ for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
+ ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
+ ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
+
+ String gaps_xml = "";
+ String gaps_child;
+
+ for (int l = 0; l < gapsList.size(); l++) {
+
+ String present = "";
+ if (gapsList.get(l).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+
+ gaps_child = "[GAPS]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CHECK_LIST_ID]"
+ + gapsList.get(l).getChecklist_id()
+ + "[/CHECK_LIST_ID]"
+ + "[DISPLAY_ID]"
+ + gapsList.get(l).getDisplay_id()
+ + "[/DISPLAY_ID]"
+ + "[PRESENT]"
+ + present
+ + "[/PRESENT]"
+ + "[COMMON_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ + "[/COMMON_ID]"
+ + "[/GAPS]";
+ gaps_xml = gaps_xml + gaps_child;
+ }
+
+ String sku_xml = "";
+ String sku_child;
+
+ for (int k = 0; k < skuList.size(); k++) {
+
+ sku_child = "[SKU]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[SKU_ID]"
+ + skuList.get(k).getSKU_ID()
+ + "[/SKU_ID]"
+ + "[BRAND_ID]"
+ + skuList.get(k).getBRAND_ID()
+ + "[/BRAND_ID]"
+ + "[STOCK]"
+ + skuList.get(k).getSTOCK()
+ + "[/STOCK]"
+ + "[COMMON_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ + "[/COMMON_ID]"
+ + "[/SKU]";
+ sku_xml = sku_xml + sku_child;
+ }
+
+ String present = "";
+ if (t2PGetterSetters.get(i1).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+
+ onXML = "[T2P_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id())
+ + "[/CATEGORY_ID]"
+ + "[BRAND_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id())
+ + "[/BRAND_ID]"
+ + "[DISPLAY_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id())
+ + "[/DISPLAY_ID]"
+ + "[COMMON_ID]"
+ + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ + "[/COMMON_ID]"
+ + "[IMAGE]"
+ + t2PGetterSetters.get(i1).getImage()
+ + "[/IMAGE]"
+ + "[PRESENT]"
+ + present
+ + "[/PRESENT]"
+ + "[GAPS_DATA]"
+ + gaps_xml
+ + "[/GAPS_DATA]"
+ + "[SKU_DATA]"
+ + sku_xml
+ + "[/SKU_DATA]"
+ + "[/T2P_DATA]";
+
+ t2p_data_xml = t2p_data_xml + onXML;
+
+ }
+
+ final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", t2p_final_xml);
+ request.addProperty("KEYS", "T2P_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();
+
+ if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+ }
+
+ data.value = 40;
+ data.name = "T2P Data Uploading";
+ publishProgress(data);
//Image Upload
@@ -641,6 +865,31 @@ public class UploadActivity extends AppCompatActivity {
+ for(int m=0;m KEYACCOUNT_ID = new ArrayList<>();
+ ArrayList STORETYPE_ID = new ArrayList<>();
+ ArrayList CLASS_ID = new ArrayList<>();
+ ArrayList PLANOGRAM_IMAGE = new ArrayList<>();
+ ArrayList IMAGE_PATH = new ArrayList<>();
+
+ public String getTable_MAPPING_PLANOGRAM() {
+ return table_MAPPING_PLANOGRAM;
+ }
+
+ public void setTable_MAPPING_PLANOGRAM(String table_MAPPING_PLANOGRAM) {
+ this.table_MAPPING_PLANOGRAM = table_MAPPING_PLANOGRAM;
+ }
+
+ public ArrayList getKEYACCOUNT_ID() {
+ return KEYACCOUNT_ID;
+ }
+
+ public void setKEYACCOUNT_ID(String KEYACCOUNT_ID) {
+ this.KEYACCOUNT_ID.add(KEYACCOUNT_ID);
+ }
+
+ public ArrayList getSTORETYPE_ID() {
+ return STORETYPE_ID;
+ }
+
+ public void setSTORETYPE_ID(String STORETYPE_ID) {
+ this.STORETYPE_ID.add(STORETYPE_ID);
+ }
+
+ public ArrayList getCLASS_ID() {
+ return CLASS_ID;
+ }
+
+ public void setCLASS_ID(String CLASS_ID) {
+ this.CLASS_ID.add(CLASS_ID);
+ }
+
+ public ArrayList getPLANOGRAM_IMAGE() {
+ return PLANOGRAM_IMAGE;
+ }
+
+ public void setPLANOGRAM_IMAGE(String PLANOGRAM_IMAGE) {
+ this.PLANOGRAM_IMAGE.add(PLANOGRAM_IMAGE);
+ }
+
+ public ArrayList getIMAGE_PATH() {
+ return IMAGE_PATH;
+ }
+
+ public void setIMAGE_PATH(String IMAGE_PATH) {
+ this.IMAGE_PATH.add(IMAGE_PATH);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java
new file mode 100644
index 0000000..9b546b7
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java
@@ -0,0 +1,101 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by gagang on 11-01-2017.
+ */
+
+public class STORE_PERFORMANCE_MasterGetterSetter {
+ String table_STORE_PERFORMANCE;
+
+ ArrayList STORE_ID = new ArrayList<>();
+ ArrayList CATEGORY_ID = new ArrayList<>();
+ ArrayList PERIOD = new ArrayList<>();
+ ArrayList SOS = new ArrayList<>();
+ ArrayList T2P = new ArrayList<>();
+ ArrayList PROMO = new ArrayList<>();
+ ArrayList MSL_AVAILABILITY = new ArrayList<>();
+ ArrayList OSS = new ArrayList<>();
+ ArrayList ORDERID = new ArrayList<>();
+
+ public String getTable_STORE_PERFORMANCE() {
+ return table_STORE_PERFORMANCE;
+ }
+
+ public void setTable_STORE_PERFORMANCE(String table_STORE_PERFORMANCE) {
+ this.table_STORE_PERFORMANCE = table_STORE_PERFORMANCE;
+ }
+
+ public ArrayList getSTORE_ID() {
+ return STORE_ID;
+ }
+
+ public void setSTORE_ID(String STORE_ID) {
+ this.STORE_ID.add(STORE_ID);
+ }
+
+ public ArrayList getCATEGORY_ID() {
+ return CATEGORY_ID;
+ }
+
+ public void setCATEGORY_ID(String CATEGORY_ID) {
+ this.CATEGORY_ID.add(CATEGORY_ID);
+ }
+
+ public ArrayList getPERIOD() {
+ return PERIOD;
+ }
+
+ public void setPERIOD(String PERIOD) {
+ this.PERIOD.add(PERIOD);
+ }
+
+ public ArrayList getSOS() {
+ return SOS;
+ }
+
+ public void setSOS(String SOS) {
+ this.SOS.add(SOS);
+ }
+
+ public ArrayList getT2P() {
+ return T2P;
+ }
+
+ public void setT2P(String t2P) {
+ this.T2P.add(t2P);
+ }
+
+ public ArrayList getPROMO() {
+ return PROMO;
+ }
+
+ public void setPROMO(String PROMO) {
+ this.PROMO.add(PROMO);
+ }
+
+ public ArrayList getMSL_AVAILABILITY() {
+ return MSL_AVAILABILITY;
+ }
+
+ public void setMSL_AVAILABILITY(String MSL_AVAILABILITY) {
+ this.MSL_AVAILABILITY.add(MSL_AVAILABILITY);
+ }
+
+ public ArrayList getOSS() {
+ return OSS;
+ }
+
+ public void setOSS(String OSS) {
+ this.OSS.add(OSS);
+ }
+
+ public ArrayList getORDERID() {
+ return ORDERID;
+ }
+
+ public void setORDERID(String ORDERID) {
+ this.ORDERID.add(ORDERID);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java
new file mode 100644
index 0000000..9f290d7
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StoreWisePerformaceGetterSetter.java
@@ -0,0 +1,81 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+/**
+ * Created by gagang on 23-12-2016.
+ */
+
+public class StoreWisePerformaceGetterSetter {
+ String store_id, category_id, period, msl_availability, sos, t2p, promo, oss, order_id;
+
+ public String getStore_id() {
+ return store_id;
+ }
+
+ public void setStore_id(String store_id) {
+ this.store_id = store_id;
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public void setCategory_id(String category_id) {
+ this.category_id = category_id;
+ }
+
+ public String getPeriod() {
+ return period;
+ }
+
+ public void setPeriod(String period) {
+ this.period = period;
+ }
+
+ public String getMsl_availability() {
+ return msl_availability;
+ }
+
+ public void setMsl_availability(String msl_availability) {
+ this.msl_availability = msl_availability;
+ }
+
+ public String getSos() {
+ return sos;
+ }
+
+ public void setSos(String sos) {
+ this.sos = sos;
+ }
+
+ public String getT2p() {
+ return t2p;
+ }
+
+ public void setT2p(String t2p) {
+ this.t2p = t2p;
+ }
+
+ public String getPromo() {
+ return promo;
+ }
+
+ public void setPromo(String promo) {
+ this.promo = promo;
+ }
+
+ public String getOss() {
+ return oss;
+ }
+
+ public void setOss(String oss) {
+ this.oss = oss;
+ }
+
+ public String getOrder_id() {
+ return order_id;
+ }
+
+ public void setOrder_id(String order_id) {
+ this.order_id = order_id;
+ }
+}
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 f79aec6..b040e6b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
public class T2PGetterSetter {
- String brand_id, display_id, brand, display, image, remark;
+ String brand_id, display_id, brand, display, image, remark, key_id, category_id;
boolean isPresent;
ArrayList gapsChecklist = new ArrayList<>();
@@ -85,4 +85,20 @@ public class T2PGetterSetter {
public void setSkulist(ArrayList skulist) {
this.skulist = skulist;
}
+
+ public String getKey_id() {
+ return key_id;
+ }
+
+ public void setKey_id(String key_id) {
+ this.key_id = key_id;
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public void setCategory_id(String category_id) {
+ this.category_id = category_id;
+ }
}
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 28b4f06..5fb75a8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -21,6 +21,9 @@ public class TableBean {
//Gagan start code
public static String MAPPING_ADDITIONAL_PROMOTION;
+ public static String STORE_PERFORMANCE;
+ public static String MAPPING_PLANOGRAM;
+
//Gagan end code
public static String getJourneyPlan() {
@@ -129,5 +132,21 @@ public class TableBean {
MAPPING_ADDITIONAL_PROMOTION = mappingAdditionalPromotion;
}
+ public static String getStorePerformance() {
+ return STORE_PERFORMANCE;
+ }
+
+ public static void setStorePerformance(String storePerformance) {
+ STORE_PERFORMANCE = storePerformance;
+ }
+
+ public static String getMappingPlanogram() {
+ return MAPPING_PLANOGRAM;
+ }
+
+ public static void setMappingPlanogram(String mappingPlanogram) {
+ MAPPING_PLANOGRAM = mappingPlanogram;
+ }
+
//Gagan end code
}
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 d152992..cffad97 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -14,10 +14,12 @@ import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
@@ -621,5 +623,89 @@ public class XMLHandlers {
return map;
}
+
+ public static STORE_PERFORMANCE_MasterGetterSetter STORE_PERFORMANCEXMLHandler(XmlPullParser xpp, int eventType) {
+ STORE_PERFORMANCE_MasterGetterSetter st = new STORE_PERFORMANCE_MasterGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_STORE_PERFORMANCE(xpp.nextText());
+ }
+ if (xpp.getName().equals("STORE_ID")) {
+ st.setSTORE_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("CATEGORY_ID")) {
+ st.setCATEGORY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("PERIOD")) {
+ st.setPERIOD(xpp.nextText());
+ }
+ if (xpp.getName().equals("SOS")) {
+ st.setSOS(xpp.nextText());
+ }
+ if (xpp.getName().equals("T2P")) {
+ st.setT2P(xpp.nextText());
+ }
+ if (xpp.getName().equals("PROMO")) {
+ st.setPROMO(xpp.nextText());
+ }
+ if (xpp.getName().equals("MSL_AVAILABILITY")) {
+ st.setMSL_AVAILABILITY(xpp.nextText());
+ }
+ if (xpp.getName().equals("OSS")) {
+ st.setOSS(xpp.nextText());
+ }
+ if (xpp.getName().equals("ORDERID")) {
+ st.setORDERID(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
+
+ public static MAPPING_PLANOGRAM_MasterGetterSetter MAPPING_PLANOGRAM_XMLHandler(XmlPullParser xpp, int eventType) {
+ MAPPING_PLANOGRAM_MasterGetterSetter st = new MAPPING_PLANOGRAM_MasterGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_MAPPING_PLANOGRAM(xpp.nextText());
+ }
+ if (xpp.getName().equals("KEYACCOUNT_ID")) {
+ st.setKEYACCOUNT_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("STORETYPE_ID")) {
+ st.setSTORETYPE_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("CLASS_ID")) {
+ st.setCLASS_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("PLANOGRAM_IMAGE")) {
+ st.setPLANOGRAM_IMAGE(xpp.nextText());
+ }
+ if (xpp.getName().equals("IMAGE_PATH")) {
+ st.setIMAGE_PATH(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
//Gagan End Code
}
diff --git a/GSKMTOrange/src/main/res/drawable/HFD.png b/GSKMTOrange/src/main/res/drawable/HFD.png
deleted file mode 100644
index 8278277..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/HFD.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/HFD_done.png b/GSKMTOrange/src/main/res/drawable/HFD_done.png
deleted file mode 100644
index 073f978..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/HFD_done.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/OHC.png b/GSKMTOrange/src/main/res/drawable/OHC.png
deleted file mode 100644
index 9ccf323..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/OHC.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/OHC_done.png b/GSKMTOrange/src/main/res/drawable/OHC_done.png
deleted file mode 100644
index 9654568..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/OHC_done.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/PDR.png b/GSKMTOrange/src/main/res/drawable/PDR.png
deleted file mode 100644
index 9190d2d..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/PDR.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/PDR_done.png b/GSKMTOrange/src/main/res/drawable/PDR_done.png
deleted file mode 100644
index 4b99cf5..0000000
Binary files a/GSKMTOrange/src/main/res/drawable/PDR_done.png and /dev/null differ
diff --git a/GSKMTOrange/src/main/res/drawable/hfd.png b/GSKMTOrange/src/main/res/drawable/hfd.png
index 8278277..f8b2211 100644
Binary files a/GSKMTOrange/src/main/res/drawable/hfd.png and b/GSKMTOrange/src/main/res/drawable/hfd.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/hfd_done.png b/GSKMTOrange/src/main/res/drawable/hfd_done.png
index 073f978..90def7b 100644
Binary files a/GSKMTOrange/src/main/res/drawable/hfd_done.png and b/GSKMTOrange/src/main/res/drawable/hfd_done.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/ohc.png b/GSKMTOrange/src/main/res/drawable/ohc.png
index 9ccf323..ba146f8 100644
Binary files a/GSKMTOrange/src/main/res/drawable/ohc.png and b/GSKMTOrange/src/main/res/drawable/ohc.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/ohc_done.png b/GSKMTOrange/src/main/res/drawable/ohc_done.png
index 9654568..7c96401 100644
Binary files a/GSKMTOrange/src/main/res/drawable/ohc_done.png and b/GSKMTOrange/src/main/res/drawable/ohc_done.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/pdr.png b/GSKMTOrange/src/main/res/drawable/pdr.png
index 9190d2d..8d4b787 100644
Binary files a/GSKMTOrange/src/main/res/drawable/pdr.png and b/GSKMTOrange/src/main/res/drawable/pdr.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/pdr_done.png b/GSKMTOrange/src/main/res/drawable/pdr_done.png
index 4b99cf5..ed70cc6 100644
Binary files a/GSKMTOrange/src/main/res/drawable/pdr_done.png and b/GSKMTOrange/src/main/res/drawable/pdr_done.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/toggle_green.png b/GSKMTOrange/src/main/res/drawable/toggle_green.png
new file mode 100644
index 0000000..f431425
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/toggle_green.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/toggle_grey.png b/GSKMTOrange/src/main/res/drawable/toggle_grey.png
new file mode 100644
index 0000000..3e650b8
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/toggle_grey.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
index 3044f98..93933bf 100644
--- a/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
+++ b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml
@@ -1,5 +1,5 @@
-