checkHeaderArray = new ArrayList<>();
+ boolean checkflag = true;
+ FloatingActionButton fab;
+ boolean editFlag = false;
+
+ String gallery_package = "";
+ Uri outputFileUri;
+
+ String str = CommonString.FILE_PATH, path = "", _pathforcheck = "";
+
+ int child_position = -1;
+ int group_position = -1;
+
+ public MSLFragment() {
+ // 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 MSLFragment.
+ */
+ // TODO: Rename and change types and number of parameters
+ public static MSLFragment newInstance(String param1, String param2) {
+ MSLFragment fragment = new MSLFragment();
+ Bundle args = new Bundle();
+ args.putString(CategoryName, param1);
+ args.putString(CategoryId, param2);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ categoryName = getArguments().getString(CategoryName);
+ categoryId = getArguments().getString(CategoryId);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View view = inflater.inflate(R.layout.fragment_msl, container, false);
+ // Inflate the layout for this fragment
+
+ expandableListView = (ExpandableListView) view.findViewById(R.id.expandableListView);
+ fab = (FloatingActionButton) getActivity().findViewById(R.id.fab);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+ CommonFunctions.updateLangResources(getActivity(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+
+ expandableListView = (ExpandableListView) view.findViewById(R.id.expandableListView);
+
+ getActivity().setTitle(R.string.msl_availability_availability);
+
+ db = new GSKOrangeDB(getActivity());
+ db.open();
+
+ prepareList();
+
+ return view;
+ }
+
+ // TODO: Rename method, update argument and hook method into UI event
+ public void onButtonPressed(Uri uri) {
+ if (mListener != null) {
+ mListener.onFragmentInteraction(uri);
+ }
+ }
+
+ @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;
+ }
+
+ /**
+ * 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(Uri uri);
+ }
+
+ private void prepareList() {
+ try {
+ hashMapListHeaderData = new ArrayList<>();
+ hashMapListChildData = new HashMap<>();
+
+ //Header
+ if(country_id.equals("7")){
+ headerDataList = db.getStockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET);
+ }
+ else if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC);
+ }
+ else {
+ headerDataList = db.getStockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id,CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET);
+ }
+
+ if (headerDataList.size() > 0) {
+ for (int i = 0; i < headerDataList.size(); i++) {
+ hashMapListHeaderData.add(headerDataList.get(i));
+
+ //childDataList = new ArrayList<>();
+ childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
+ if (!(childDataList.size() > 0)) {
+ if (country_id.equals("7")) {
+ childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
+ } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
+ childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
+ } else {
+ childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
+ }
+ }
+
+ hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
+ }
+ }
+
+ adapter = new ExpandableListAdapter(getActivity(), hashMapListHeaderData, hashMapListChildData);
+ expandableListView.setAdapter(adapter);
+
+ expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
+ int lastItem = firstVisibleItem + visibleItemCount;
+
+ if (firstVisibleItem == 0) {
+ fab.show();//setVisibility(View.VISIBLE);
+ } else if (lastItem == totalItemCount) {
+ fab.hide();//setVisibility(View.INVISIBLE);
+ } else {
+ fab.show();//setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(AbsListView arg0, int arg1) {
+ InputMethodManager inputManager = (InputMethodManager) getActivity()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getActivity().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+ getActivity().getCurrentFocus().clearFocus();
+ }
+
+ expandableListView.invalidateViews();
+ //adapter.notifyDataSetChanged();
+ }
+ });
+
+ // Listview Group click listener
+ expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+ @Override
+ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+ return false;
+ }
+ });
+
+ // Listview Group expanded listener
+ expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
+ @Override
+ public void onGroupExpand(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) getActivity()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getActivity().getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+ getActivity().getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview Group collasped listener
+ expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
+ @Override
+ public void onGroupCollapse(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) getActivity().getApplicationContext()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getActivity().getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+ getActivity().getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview on child click listener
+ expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+ @Override
+ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+ int childPosition, long id) {
+ return false;
+ }
+ });
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ 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) {
+ MSL_AvailabilityStockFacingGetterSetter headerTitle = (MSL_AvailabilityStockFacingGetterSetter) getGroup(groupPosition);
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_msl_availability_stock_facing_header, null, false);
+ }
+
+ TextView txt_categoryHeader = (TextView) convertView.findViewById(R.id.txt_categoryHeader);
+ RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
+ ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
+ CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
+
+ txt_categoryHeader.setTypeface(null, Typeface.BOLD);
+
+ if (headerTitle.getCompany_id().equals("1")) {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
+ }
+ txt_categoryHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
+
+
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
+ }
+ }
+
+ //empty check color change
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ //card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ }
+ }
+ } else {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.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 MSL_AvailabilityStockFacingGetterSetter childData =
+ (MSL_AvailabilityStockFacingGetterSetter) getChild(groupPosition, childPosition);
+ ViewHolder holder = null;
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.pharma_msl_item, 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.rg = (RadioGroup) convertView.findViewById(R.id.radio_group);
+ holder.radio_yes = (RadioButton) convertView.findViewById(R.id.radio_yes);
+ holder.radio_no = (RadioButton) convertView.findViewById(R.id.radio_no);
+ holder.img_cam = (ImageView) convertView.findViewById(R.id.img_cam);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ //hidden for MSL
+ holder.img_cam.setVisibility(View.GONE);
+
+ holder.txt_skuName.setText(childData.getSku());
+
+ if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+
+ } else {
+
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+
+ }
+
+ if (childData.getCompany_id().equals("1")) {
+
+ if (childData.getMust_have().equals("1")) {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.blue));
+ }
+
+ } else {
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+ }
+
+
+ final ViewHolder finalHolder1 = holder;
+ holder.rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup group, int checkedId) {
+ if (finalHolder1.radio_yes.isChecked()) {
+
+ finalHolder1.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_green));
+ finalHolder1.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
+ //finalHolder1.img_cam.setVisibility(View.VISIBLE);
+
+ childData.setIsChecked(1);
+ //adapter.notifyDataSetChanged();
+ }
+ if (finalHolder1.radio_no.isChecked()){
+
+ finalHolder1.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
+ finalHolder1.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
+ //finalHolder1.img_cam.setVisibility(View.GONE);
+
+ childData.setIsChecked(0);
+ //adapter.notifyDataSetChanged();
+ }
+ }
+ });
+
+ //Camera
+ /* holder.img_cam.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ _pathforcheck = "Pharma_MSL_Image_" + store_id + categoryId + "_" + childData.getBrand_id() + visit_date.replace("/", "") + "_" +
+ CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
+ child_position = childPosition;
+ group_position = groupPosition;
+ path = str + _pathforcheck;
+
+ startCameraActivity(1);
+ }
+ });
+*/
+
+
+ if(childData.getIsChecked()==1){
+ holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_green));
+ holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
+ //holder.img_cam.setVisibility(View.VISIBLE);
+ holder.radio_yes.setChecked(true);
+ //notifyDataSetChanged();
+ }
+ else if(childData.getIsChecked()==0){
+ holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
+ holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
+ //holder.img_cam.setVisibility(View.GONE);
+ holder.radio_no.setChecked(true);
+ //notifyDataSetChanged();
+ }else {
+ holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
+ holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
+ //holder.img_cam.setVisibility(View.GONE);
+ holder.rg.clearCheck();
+ //notifyDataSetChanged();
+ }
+
+ /* if(childData.getImgPath().equals("")){
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ }
+ else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+ }*/
+
+ //empty check color change
+ if (!checkflag) {
+ boolean tempflag = false;
+
+ if (childData.getCompany_id().equals("1")) {
+
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ } else {
+ /* if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }*/
+
+
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ } else {
+ holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
+ }
+ }
+ }
+ }
+
+ return convertView;
+ }
+
+ @Override
+ public boolean hasStableIds() {
+ return false;
+ }
+
+ @Override
+ public boolean isChildSelectable(int groupPosition, int childPosition) {
+ return true;
+ }
+ }
+
+ public class ViewHolder {
+ CardView cardView;
+ TextView txt_skuName;
+ LinearLayout lin_category;
+ RadioGroup rg;
+ RadioButton radio_yes;
+ RadioButton radio_no;
+ ImageView img_cam;
+ }
+
+ private void startCameraActivity(int pos) {
+ try {
+
+ Log.i("Stock & Facing ", "startCameraActivity()");
+ File file = new File(path);
+ outputFileUri = FileProvider.getUriForFile(getActivity(), "cpm.com.gskmtorange.fileprovider", file);
+
+ String defaultCameraPackage = "";
+ final PackageManager packageManager = getActivity().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
+ String packag = list.get(n).loadLabel(packageManager).toString();
+ if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
+ gallery_package = list.get(n).packageName;
+ }
+
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+
+ if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+ }
+
+ Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ //startActivityForResult(intent, 1);
+ startActivityForResult(intent, pos);
+ //startActivityForResult(intent, position);
+
+ } catch (ActivityNotFoundException e) {
+ e.printStackTrace();
+
+ Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(gallery_package);
+ //startActivityForResult(intent, 0);
+ startActivityForResult(intent, pos);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ Log.e("Stock & Facing", "resultCode: " + resultCode + " requestCode: " + requestCode);
+ /*switch (resultCode) {
+ case 0:
+ Log.e("Stock & Facing", "User cancelled");
+
+ break;
+ case -1:
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ img = _pathforcheck;
+ t2PAdapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ break;
+ }*/
+
+ switch (requestCode) {
+ case 1:
+ if (resultCode == 0) {
+ Log.e("Stock & Facing", "User cancelled");
+ } else if (resultCode == -1) {
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+
+ hashMapListChildData.get(headerDataList.get(group_position)).get(child_position).setImgPath(_pathforcheck);
+
+ expandableListView.invalidateViews();
+ adapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ }
+ break;
+ }
+
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java
new file mode 100644
index 0000000..c9a36dd
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java
@@ -0,0 +1,102 @@
+package cpm.com.gskmtorange.pharma_stores;
+
+import android.app.FragmentTransaction;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+
+public class PharmaActivity extends AppCompatActivity implements StoreDetailFragment.OnFragmentInteractionListener, MSLFragment.OnFragmentInteractionListener {
+ private SharedPreferences.Editor editor = null;
+ private SharedPreferences preferences;
+ FloatingActionButton fab;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_paharma);
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+ editor = preferences.edit();
+
+
+ Bundle bundle = new Bundle();
+ bundle.putString("categoryName", "Oral Health");
+ bundle.putString("categoryId", "2");
+ StoreDetailFragment fragment = new StoreDetailFragment();
+ fragment.setArguments(bundle);
+
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
+
+ fab = findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Fragment f = getSupportFragmentManager().findFragmentById(R.id.fragment);
+ if(f instanceof StoreDetailFragment){
+ Bundle bundle = new Bundle();
+ bundle.putString("categoryName", "Oral Health");
+ bundle.putString("categoryId", "2");
+ SOSFragment fragment = new SOSFragment();
+ fragment.setArguments(bundle);
+
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
+ }
+ else if(f instanceof SOSFragment){
+ Bundle bundle = new Bundle();
+ bundle.putString("categoryName", "Oral Health");
+ bundle.putString("categoryId", "2");
+ MSLFragment fragment = new MSLFragment();
+ fragment.setArguments(bundle);
+
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
+ }
+ else{
+ // do something with f
+ Snackbar.make(fab, "---",Snackbar.LENGTH_SHORT).show();
+ }
+
+ }
+ });
+ }
+
+ @Override
+ public void onFragmentInteraction(Fragment f) {
+
+ if(f instanceof StoreDetailFragment){
+ Bundle bundle = new Bundle();
+ bundle.putString("categoryName", "Oral Health");
+ bundle.putString("categoryId", "2");
+ SOSFragment fragment = new SOSFragment();
+ fragment.setArguments(bundle);
+
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
+ }
+ else if(f instanceof SOSFragment){
+ Bundle bundle = new Bundle();
+ bundle.putString("categoryName", "Oral Health");
+ bundle.putString("categoryId", "2");
+ MSLFragment fragment = new MSLFragment();
+ fragment.setArguments(bundle);
+
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment, fragment).commit();
+ }
+ }
+
+ @Override
+ public void onFragmentInteraction(Uri uri) {
+
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java
new file mode 100644
index 0000000..b464bf8
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java
@@ -0,0 +1,24 @@
+package cpm.com.gskmtorange.pharma_stores;
+
+import android.support.v4.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import cpm.com.gskmtorange.R;
+
+/**
+ * A placeholder fragment containing a simple view.
+ */
+public class PharmaActivityFragment extends Fragment {
+
+ public PharmaActivityFragment() {
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ return inflater.inflate(R.layout.fragment_paharma, container, false);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java
new file mode 100644
index 0000000..962c25f
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java
@@ -0,0 +1,162 @@
+package cpm.com.gskmtorange.pharma_stores;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+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 cpm.com.gskmtorange.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * {@link SOSFragment.OnFragmentInteractionListener} interface
+ * to handle interaction events.
+ * Use the {@link SOSFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class SOSFragment extends Fragment {
+ // TODO: Rename parameter arguments, choose names that match
+ // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+ private static final String ARG_PARAM1 = "param1";
+ private static final String ARG_PARAM2 = "param2";
+
+ // TODO: Rename and change types of parameters
+ private String mParam1;
+ private String mParam2;
+
+ private OnFragmentInteractionListener mListener;
+
+ RecyclerView rec_sos;
+
+ public SOSFragment() {
+ // 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 SOSFragment.
+ */
+ // TODO: Rename and change types and number of parameters
+ public static SOSFragment newInstance(String param1, String param2) {
+ SOSFragment fragment = new SOSFragment();
+ 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_so, container, false);
+ rec_sos = view.findViewById(R.id.rec_sos);
+
+ rec_sos.setAdapter(new SOSAdapter(getActivity()));
+ rec_sos.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+ return view;
+ }
+
+ // TODO: Rename method, update argument and hook method into UI event
+ public void onButtonPressed(Uri uri) {
+ if (mListener != null) {
+ mListener.onFragmentInteraction(uri);
+ }
+ }
+
+ @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;
+ }
+
+ /**
+ * 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(Uri uri);
+ }
+
+ class SOSAdapter extends RecyclerView.Adapter {
+
+ private LayoutInflater inflator;
+
+ public SOSAdapter(Context context) {
+ inflator = LayoutInflater.from(context);
+ //this.data = data;
+ }
+
+ @NonNull
+ @Override
+ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int i) {
+ View view = inflator.inflate(R.layout.item_pharma_sos, parent, false);
+
+ MyViewHolder holder = new MyViewHolder(view);
+
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
+
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return 2;
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+
+ TextView tv_brand;
+
+ public MyViewHolder(@NonNull View itemView) {
+ super(itemView);
+ tv_brand = (TextView) itemView.findViewById(R.id.tv_brand);
+ }
+ }
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java
new file mode 100644
index 0000000..6d564c8
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java
@@ -0,0 +1,645 @@
+package cpm.com.gskmtorange.pharma_stores;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Typeface;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.FileProvider;
+import android.support.v7.widget.CardView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsListView;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.ExpandableListView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonFunctions;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * {@link StoreDetailFragment.OnFragmentInteractionListener} interface
+ * to handle interaction events.
+ * Use the {@link StoreDetailFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class StoreDetailFragment extends Fragment {
+ // TODO: Rename parameter arguments, choose names that match
+ // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+ private static final String CategoryName = "categoryName";
+ private static final String CategoryId = "categoryId";
+
+ // TODO: Rename and change types of parameters
+ private String mParam1;
+ private String mParam2;
+
+ private OnFragmentInteractionListener mListener;
+
+ GSKOrangeDB db;
+
+ String categoryName, categoryId, Error_Message = "";
+ String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, country_id, store_flag_str;
+ boolean isDialogOpen = true;
+ private SharedPreferences preferences;
+ int scrollPosition = 0;
+
+ ExpandableListView expandableListView;
+ ExpandableListAdapter adapter;
+
+ ArrayList headerDataList;
+ ArrayList childDataList;
+ List hashMapListHeaderData;
+ HashMap> hashMapListChildData;
+
+ List checkHeaderArray = new ArrayList<>();
+ boolean checkflag = true;
+ FloatingActionButton fab;
+ boolean editFlag = false;
+
+ String gallery_package = "";
+ Uri outputFileUri;
+
+ String str = CommonString.FILE_PATH, path = "", _pathforcheck = "";
+
+ int child_position = -1;
+ int group_position = -1;
+
+ public StoreDetailFragment() {
+ // 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 StoreDetailFragment.
+ */
+ // TODO: Rename and change types and number of parameters
+ public static StoreDetailFragment newInstance(String param1, String param2) {
+ StoreDetailFragment fragment = new StoreDetailFragment();
+ Bundle args = new Bundle();
+ args.putString(CategoryName, param1);
+ args.putString(CategoryId, param2);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ categoryName = getArguments().getString(CategoryName);
+ categoryId = getArguments().getString(CategoryId);
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ View view = inflater.inflate(R.layout.fragment_storedetail, container, false);
+
+ expandableListView = (ExpandableListView) view.findViewById(R.id.expandableListView);
+ fab = (FloatingActionButton) getActivity().findViewById(R.id.fab);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+ CommonFunctions.updateLangResources(getActivity(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ username = preferences.getString(CommonString.KEY_USERNAME, null);
+ intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+ keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
+ class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
+ storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
+ store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
+
+ expandableListView = (ExpandableListView) view.findViewById(R.id.expandableListView);
+
+ getActivity().setTitle(R.string.store_detail);
+
+ db = new GSKOrangeDB(getActivity());
+ db.open();
+
+ prepareList();
+
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ db.InsertStoreDetailPharma(store_id, headerDataList, hashMapListChildData);
+ onButtonPressed();
+ }
+ });
+
+ return view;
+ }
+
+ // TODO: Rename method, update argument and hook method into UI event
+ public void onButtonPressed() {
+ if (mListener != null) {
+ mListener.onFragmentInteraction(getActivity().getSupportFragmentManager().findFragmentById(R.id.fragment));
+ }
+ }
+
+ @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;
+ }
+
+ /**
+ * 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(Fragment uri);
+ }
+
+ private void prepareList() {
+ try {
+ hashMapListHeaderData = new ArrayList<>();
+ hashMapListChildData = new HashMap<>();
+
+ //Header
+ headerDataList = db.getPharmaQuestionsData();
+
+ if (headerDataList.size() > 0) {
+ for (int i = 0; i < headerDataList.size(); i++) {
+
+ //childDataList = new ArrayList<>();
+ childDataList = db.getPharmaAnswerData(headerDataList.get(i).getQUESTION_ID().get(0));
+
+ hashMapListChildData.put(headerDataList.get(i), childDataList);
+ }
+ }
+
+ adapter = new ExpandableListAdapter(getActivity(), headerDataList, hashMapListChildData);
+ expandableListView.setAdapter(adapter);
+
+ expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+
+ expandableListView.invalidate();
+
+ int lastItem = firstVisibleItem + visibleItemCount;
+
+ if (firstVisibleItem == 0) {
+ fab.show();//setVisibility(View.VISIBLE);
+ } else if (lastItem == totalItemCount) {
+ fab.hide();//setVisibility(View.INVISIBLE);
+ } else {
+ fab.show();//setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(AbsListView arg0, int arg1) {
+ InputMethodManager inputManager = (InputMethodManager) getActivity()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getActivity().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+ getActivity().getCurrentFocus().clearFocus();
+ }
+
+ expandableListView.invalidateViews();
+ //adapter.notifyDataSetChanged();
+ }
+ });
+
+ // Listview Group click listener
+ expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+ @Override
+ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+ return false;
+ }
+ });
+
+ // Listview Group expanded listener
+ expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
+ @Override
+ public void onGroupExpand(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) getActivity()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getActivity().getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+ getActivity().getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview Group collasped listener
+ expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
+ @Override
+ public void onGroupCollapse(int groupPosition) {
+ InputMethodManager inputManager = (InputMethodManager) getActivity().getApplicationContext()
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (getActivity().getWindow().getCurrentFocus() != null) {
+ inputManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
+ getActivity().getCurrentFocus().clearFocus();
+ }
+ }
+ });
+
+ // Listview on child click listener
+ expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+ @Override
+ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+ int childPosition, long id) {
+ return false;
+ }
+ });
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ 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) {
+ MappingPharmaQuestionGetterSetter headerTitle = (MappingPharmaQuestionGetterSetter) getGroup(groupPosition);
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.item_msl_availability_stock_facing_header, null, false);
+ }
+
+ TextView txt_categoryHeader = (TextView) convertView.findViewById(R.id.txt_categoryHeader);
+ RelativeLayout rel_header = (RelativeLayout) convertView.findViewById(R.id.rel_categoryHeader);
+ ImageView img_camera = (ImageView) convertView.findViewById(R.id.img_camera);
+ CardView card_view = (CardView) convertView.findViewById(R.id.card_view);
+
+ txt_categoryHeader.setTypeface(null, Typeface.BOLD);
+
+ txt_categoryHeader.setText(headerTitle.getQUESTION().get(0));
+
+
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
+ }
+ }
+
+ //empty check color change
+ /*if (headerTitle.getCompany_id().equals("1")) {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ //card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+ }
+ }
+ } else {
+ if (!checkflag) {
+ if (checkHeaderArray.contains(groupPosition)) {
+ txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ txt_categoryHeader.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 MappingPharmaQuestionGetterSetter childData =
+ (MappingPharmaQuestionGetterSetter) getChild(groupPosition, childPosition);
+ ViewHolder holder = null;
+
+ if (convertView == null) {
+ LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = infalInflater.inflate(R.layout.pharma_msl_item, 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.rg = (RadioGroup) convertView.findViewById(R.id.radio_group);
+ holder.radio_yes = (RadioButton) convertView.findViewById(R.id.radio_yes);
+ holder.radio_no = (RadioButton) convertView.findViewById(R.id.radio_no);
+ holder.img_cam = (ImageView) convertView.findViewById(R.id.img_cam);
+
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ holder.txt_skuName.setText(childData.getSUB_CATEGORY().get(0) + " - " + childData.getBRAND().get(0));
+
+ holder.txt_skuName.setTextColor(getResources().getColor(R.color.black));
+
+
+ final ViewHolder finalHolder1 = holder;
+ holder.rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(RadioGroup group, int checkedId) {
+ if (finalHolder1.radio_yes.isChecked()) {
+
+ finalHolder1.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_green));
+ finalHolder1.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
+ finalHolder1.img_cam.setVisibility(View.VISIBLE);
+
+ childData.setIsChecked(1);
+ //adapter.notifyDataSetChanged();
+ }
+ if (finalHolder1.radio_no.isChecked()){
+
+ finalHolder1.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
+ finalHolder1.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
+ finalHolder1.img_cam.setVisibility(View.GONE);
+
+ childData.setIsChecked(0);
+ //adapter.notifyDataSetChanged();
+ }
+ }
+ });
+
+ //Camera
+ holder.img_cam.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ _pathforcheck = "Pharma_MSL_Image_" + store_id + categoryId + "_" + childData.getBRAND_ID() + visit_date.replace("/", "") + "_" +
+ CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
+ child_position = childPosition;
+ group_position = groupPosition;
+ path = str + _pathforcheck;
+
+ startCameraActivity(1);
+ }
+ });
+
+
+
+ if(childData.getIsChecked()==1){
+ holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_green));
+ holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
+ holder.img_cam.setVisibility(View.VISIBLE);
+ holder.radio_yes.setChecked(true);
+ //notifyDataSetChanged();
+ }
+ else if(childData.getIsChecked()==0){
+ holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
+ holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
+ holder.img_cam.setVisibility(View.GONE);
+ holder.radio_no.setChecked(true);
+ //notifyDataSetChanged();
+ }else {
+ holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
+ holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
+ holder.img_cam.setVisibility(View.GONE);
+ holder.rg.clearCheck();
+ //notifyDataSetChanged();
+ }
+
+ if(childData.getImgPath().equals("")){
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ }
+ else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+ }
+
+ //empty check color change
+ if (!checkflag) {
+ boolean tempflag = false;
+
+ /* if (holder.facing.getText().toString().equals("")) {
+ holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+ holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.facing.setHint(getString(R.string.empty));
+ tempflag = true;
+ }*/
+
+
+ if (tempflag) {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
+ } else {
+ //holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
+ holder.lin_category.setBackgroundColor(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 {
+ CardView cardView;
+ TextView txt_skuName;
+ LinearLayout lin_category;
+ RadioGroup rg;
+ RadioButton radio_yes;
+ RadioButton radio_no;
+ ImageView img_cam;
+ }
+
+ private void startCameraActivity(int pos) {
+ try {
+
+ Log.i("Stock & Facing ", "startCameraActivity()");
+ File file = new File(path);
+ outputFileUri = FileProvider.getUriForFile(getActivity(), "cpm.com.gskmtorange.fileprovider", file);
+
+ String defaultCameraPackage = "";
+ final PackageManager packageManager = getActivity().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
+ String packag = list.get(n).loadLabel(packageManager).toString();
+ if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
+ gallery_package = list.get(n).packageName;
+ }
+
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ } else {
+
+ if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
+
+ defaultCameraPackage = list.get(n).packageName;
+ break;
+ }
+ }
+ }
+ }
+
+ Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(defaultCameraPackage);
+ //startActivityForResult(intent, 1);
+ startActivityForResult(intent, pos);
+ //startActivityForResult(intent, position);
+
+ } catch (ActivityNotFoundException e) {
+ e.printStackTrace();
+
+ Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+ intent.setPackage(gallery_package);
+ //startActivityForResult(intent, 0);
+ startActivityForResult(intent, pos);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ Log.e("Stock & Facing", "resultCode: " + resultCode + " requestCode: " + requestCode);
+ /*switch (resultCode) {
+ case 0:
+ Log.e("Stock & Facing", "User cancelled");
+
+ break;
+ case -1:
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+ img = _pathforcheck;
+ t2PAdapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ break;
+ }*/
+
+ switch (requestCode) {
+ case 1:
+ if (resultCode == 0) {
+ Log.e("Stock & Facing", "User cancelled");
+ } else if (resultCode == -1) {
+ if (_pathforcheck != null && !_pathforcheck.equals("")) {
+ if (new File(str + _pathforcheck).exists()) {
+
+ hashMapListChildData.get(headerDataList.get(group_position)).get(child_position).setImgPath(_pathforcheck);
+
+ expandableListView.invalidateViews();
+ adapter.notifyDataSetChanged();
+ _pathforcheck = "";
+ }
+ }
+ }
+ break;
+ }
+
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java
index 2c37b9a..03e0625 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java
@@ -460,7 +460,7 @@ public class StoreRouteActivity extends FragmentActivity implements OnMapReadyCa
// Adding all the points in the route to LineOptions
lineOptions.addAll(points);
- lineOptions.width(15);
+ lineOptions.width(12);
lineOptions.color(Color.parseColor("#5ac614"));
Log.d("onPostExecute","onPostExecute lineoptions decoded");
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
index 0b8ff95..e9ee013 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -309,6 +309,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
adhoc = "0";
}
+ String coverage_service, status_service;
+
+ if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
+ status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL;
+ coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL;
+ }
+ else {
+ status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
+ coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW;
+ }
String sub_reason_id = coverageList.get(i).getSub_reasonId();
if (sub_reason_id!=null && sub_reason_id.equals("")) {
@@ -336,7 +346,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
+ "[/USER_DATA]"
+ "[/DATA]";
- SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE);
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, coverage_service);
request.addProperty("onXML", onXML);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -344,7 +354,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + coverage_service, envelope);
result = envelope.getResponse();
@@ -1866,7 +1876,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
final String sos_xml = "[DATA]" + final_xml + "[/DATA]";
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
+ request = new SoapObject(CommonString.NAMESPACE, status_service);
request.addProperty("onXML", sos_xml);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -1874,7 +1884,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + status_service, envelope);
result = envelope.getResponse();
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 5febb4b..79a75c5 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -335,6 +335,17 @@ public class UploadActivity extends AppCompatActivity {
}
+ String coverage_service, status_service;
+
+ if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
+ status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL;
+ coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL;
+ }
+ else {
+ status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
+ coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW;
+ }
+
String sub_reason_id = coverageList.get(i).getSub_reasonId();
if (sub_reason_id.equals("")) {
sub_reason_id = "0";
@@ -361,7 +372,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[/USER_DATA]"
+ "[/DATA]";
- SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_NEW);
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, coverage_service);
request.addProperty("onXML", onXML);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -369,7 +380,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE_NEW, envelope);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + coverage_service, envelope);
result = envelope.getResponse();
@@ -501,415 +512,472 @@ public class UploadActivity extends AppCompatActivity {
data.name = getString(R.string.stock_data_uploading);
publishProgress(data);*/
+ if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
- //MSL_Availability_StockFacing
- String mslAvailability_stockFacing_xml = "";
- onXML = "";
- db.open();
- msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
+ //MSL_Availability_StockFacing
+ String mslAvailability_stockFacing_xml = "";
+ onXML = "";
+ db.open();
+ msl_availabilityStockFacingList = db.getStockUploadServerData(coverageList.get(i).getStoreId());
- if (msl_availabilityStockFacingList.size() > 0) {
- for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
- if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
+ if (msl_availabilityStockFacingList.size() > 0) {
+ for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
+ if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
- String stock;
- if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
- stock = msl_availabilityStockFacingList.get(j).getStock();
- } else {
- stock = "0";
- }
- onXML = "[MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]"
- + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
- + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]"
- + "[FACING]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]"
- + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]"
- + "[MUST_HAVE]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MUST_HAVE]" +
- "[/MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]";
-
- mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
- }
- }
-
- final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT");
- 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;
- }*/
- }
- data.value = 15;
- data.name = getString(R.string.availability_data_uploading);
- publishProgress(data);
-
-
- //Promo Compliance - Promotion Data
- String promoition_data_xml = "";
- onXML = "";
- db.open();
- promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
-
- if (promotionSkuList.size() > 0) {
- for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
- if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
-
- onXML = "[PROMOTION_DATA_NEW]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
- //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
- + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
- + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
- + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
- + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]"
- + "[/PROMOTION_DATA_NEW]";
-
- promoition_data_xml = promoition_data_xml + onXML;
- }
- }
-
- final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "PROMOTION_DATA_NEW");
- 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;
- }*/
- }
- data.value = 30;
- data.name = getString(R.string.promo_data_uploading);
- publishProgress(data);
-
- //Promo Compliance - Country Id - 7 (SA) Promotion Data
- String promotion_sku_wise_data_xml = "", add_promotion_data_xml = "", exists_xml = "", add_xml = "";
-
- db.open();
- promoComplianceSkuwiseExistsGetterSetters = db.getPromoComplianceSkuwiseExistsAfterData(coverageList.get(i).getStoreId(), null);
- if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
-
- for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
-
- promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
-
- for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
- if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
-
- String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
- if(discount_val.equals("")){
- discount_val = "0";
+ String stock;
+ if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
+ stock = msl_availabilityStockFacingList.get(j).getStock();
+ } else {
+ stock = "0";
}
-
- add_xml = "[PROMOTION_DATA]"
+ onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
- + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
- + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
- + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
- + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
- + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
- + "[/PROMOTION_DATA]";
+ + "[USERID]" + userId + "[/USERID]"
+ + "[SKUID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKUID]"
+ + "[STK]" + Integer.parseInt(stock) + "[/STK]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ + "[MSL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MSL]" +
- add_promotion_data_xml = add_promotion_data_xml + add_xml;
+ "[/ST]";
+
+ mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
}
}
- int exists = 0;
- if (promoComplianceSkuwiseExistsGetterSetters.get(l).isExists()) {
- exists = 1;
- }
+ final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
- exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
- + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
- + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
- + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "STOCK_ADDITIONAL_STORE");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
+ 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);
- final String sos_xml = "[DATA]" + promotion_sku_wise_data_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "ADDITIONAL_PROMOTION_SKUWISE_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();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
+ }
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
}
+ else {
+ //MSL_Availability_StockFacing
+ String mslAvailability_stockFacing_xml = "";
+ onXML = "";
+ db.open();
+ msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
+
+ if (msl_availabilityStockFacingList.size() > 0) {
+ for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
+ if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
+
+ String stock;
+ if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
+ stock = msl_availabilityStockFacingList.get(j).getStock();
+ } else {
+ stock = "0";
+ }
+ onXML = "[ST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USERID]" + userId + "[/USERID]"
+ + "[SKUID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKUID]"
+ + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ + "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ + "[FAC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FAC]"
+ + "[STK]" + Integer.parseInt(stock) + "[/STK]"
+ + "[MSL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MSL]" +
+ "[/ST]";
+
+ mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
+ }
+ }
+
+ final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_NEW");
+ request.addProperty("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;
+ }*/
+ }
+ data.value = 15;
+ data.name = getString(R.string.availability_data_uploading);
+ publishProgress(data);
- data.value = 30;
- data.name = getString(R.string.promo_data_uploading);
- publishProgress(data);
+ //Promo Compliance - Promotion Data
+ String promoition_data_xml = "";
+ onXML = "";
+ db.open();
+ promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
+ if (promotionSkuList.size() > 0) {
+ for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
+ if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
- //Promo Compliance -Additional Promotion Data
- String additional_promoition_data_xml = "";
- onXML = "";
- db.open();
- additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
+ onXML = "[PROMOTION_DATA_NEW]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+ //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
+ + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+ + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+ + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+ + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]"
+ + "[/PROMOTION_DATA_NEW]";
- if (additionalPromotionList.size() > 0) {
- for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
- if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
+ promoition_data_xml = promoition_data_xml + onXML;
+ }
+ }
- onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]"
+ final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "PROMOTION_DATA_NEW");
+ 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;
+ }*/
+ }
+ data.value = 30;
+ data.name = getString(R.string.promo_data_uploading);
+ publishProgress(data);
+
+ //Promo Compliance - Country Id - 7 (SA) Promotion Data
+ String promotion_sku_wise_data_xml = "", add_promotion_data_xml = "", exists_xml = "", add_xml = "";
+
+ db.open();
+ promoComplianceSkuwiseExistsGetterSetters = db.getPromoComplianceSkuwiseExistsAfterData(coverageList.get(i).getStoreId(), null);
+ if (promoComplianceSkuwiseExistsGetterSetters.size() > 0) {
+
+ for (int l = 0; l < promoComplianceSkuwiseExistsGetterSetters.size(); l++) {
+
+ promoComplianceSkuwiseGetterSetters = db.getPromoComplianceSkuwiseAfterData(promoComplianceSkuwiseExistsGetterSetters.get(l).get_id(), null);
+
+ for (int i1 = 0; i1 < promoComplianceSkuwiseGetterSetters.size(); i1++) {
+ if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+ String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
+ if(discount_val.equals("")){
+ discount_val = "0";
+ }
+
+ add_xml = "[PROMOTION_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
+ + "[SKU_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[BRAND_ID]" + Integer.parseInt(promoComplianceSkuwiseGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ + "[DISCOUNT_VALUE]" + discount_val + "[/DISCOUNT_VALUE]"
+ + "[PRICE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice() + "[/PRICE]"
+ + "[PROMO_IMAGE]" + promoComplianceSkuwiseGetterSetters.get(i1).getImg() + "[/PROMO_IMAGE]"
+ + "[PRICE_FLASHER_AVAILABLE]" + promoComplianceSkuwiseGetterSetters.get(i1).getPrice_flasher() + "[/PRICE_FLASHER_AVAILABLE]"
+ + "[/PROMOTION_DATA]";
+
+ add_promotion_data_xml = add_promotion_data_xml + add_xml;
+ }
+ }
+
+ int exists = 0;
+ if (promoComplianceSkuwiseExistsGetterSetters.get(l).isExists()) {
+ exists = 1;
+ }
+
+ exists_xml = "[ADDITIONAL_PROMOTION_SKUWISE_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
- + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
- //+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
- + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
- + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
- + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
- + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]"
- + "[/ADDITIONAL_PROMOTION_DATA_NEW]";
+ + "[CATEGORY_ID]" + Integer.parseInt(promoComplianceSkuwiseExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+ + "[ADDITIONAL_PROMOTION_DATA]" + add_promotion_data_xml + "[/ADDITIONAL_PROMOTION_DATA]"
+ + "[/ADDITIONAL_PROMOTION_SKUWISE_DATA]";
+
+ promotion_sku_wise_data_xml = promotion_sku_wise_data_xml + exists_xml;
- additional_promoition_data_xml = additional_promoition_data_xml + onXML;
}
- }
- final String sos_xml = "[DATA]" + additional_promoition_data_xml + "[/DATA]";
+ final String sos_xml = "[DATA]" + promotion_sku_wise_data_xml + "[/DATA]";
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA_NEW");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "ADDITIONAL_PROMOTION_SKUWISE_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
+ 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);
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- result = envelope.getResponse();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
- data.value = 35;
- data.name = getString(R.string.additional_data_uploading);
- publishProgress(data);
+ }
- //Additional Visibility Data
- String additional_visibility_data_xml = "";
- String additional_visibility_dialog_xml = "";
- onXML = "";
- String onXMLdIALOG = "";
- String imageV1, imageV2, imageV3;
+ data.value = 30;
+ data.name = getString(R.string.promo_data_uploading);
+ publishProgress(data);
- db.open();
- additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
- if (additionalVisibilityList.size() > 0) {
- for (int J = 0; J < additionalVisibilityList.size(); J++) {
+ //Promo Compliance -Additional Promotion Data
+ String additional_promoition_data_xml = "";
+ onXML = "";
+ db.open();
+ additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
- if (additionalVisibilityList.get(J).getImage() == null) {
- imageV1 = "";
- } else {
- imageV1 = additionalVisibilityList.get(J).getImage();
- }
+ if (additionalPromotionList.size() > 0) {
+ for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
+ if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
- if (additionalVisibilityList.get(J).getImage2() == null) {
- imageV2 = "";
- } else {
- imageV2 = additionalVisibilityList.get(J).getImage2();
- }
-
- if (additionalVisibilityList.get(J).getImage3() == null) {
- imageV3 = "";
- } else {
- imageV3 = additionalVisibilityList.get(J).getImage3();
- }
-
- String KeyID = additionalVisibilityList.get(J).getKey_id();
-
- additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
- //additionalVisibilitySkuList = additionalVisibilityList.get(J).getSkuDialogList();
-
- if (additionalVisibilitySkuList.size() > 0) {
- for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
-
- onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
- + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
- + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]"
- + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
- + "[/VISIBILITY_DAILOG]";
+ + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+ + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
+ //+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
+ + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+ + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+ + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+ + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]"
+ + "[/ADDITIONAL_PROMOTION_DATA_NEW]";
- additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
+ additional_promoition_data_xml = additional_promoition_data_xml + onXML;
}
}
- onXML = "[ADDITIONAL_VISIBILITY_NEW]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]"
- + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]"
- + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
- //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"
- + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]"
- + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]"
- + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]"
- + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
- + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
- + "[/ADDITIONAL_VISIBILITY_NEW]";
- //Here getSku_id gives display_id
+ final String sos_xml = "[DATA]" + additional_promoition_data_xml + "[/DATA]";
- additional_visibility_data_xml = additional_visibility_data_xml + onXML;
- KeyID = "";
- additionalVisibilitySkuList.clear();
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA_NEW");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- additional_visibility_dialog_xml = "";
- }
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
- final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]";
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW");
- 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();
+ result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
- }
- data.value = 45;
- data.name = getString(R.string.additional_data_uploading);
- publishProgress(data);
+ }
+ data.value = 35;
+ data.name = getString(R.string.additional_data_uploading);
+ publishProgress(data);
- //T2p Upload Data
- String t2p_data_xml = "";
- onXML = "";
- db.open();
- t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
+ //Additional Visibility Data
+ String additional_visibility_data_xml = "";
+ String additional_visibility_dialog_xml = "";
+ onXML = "";
+ String onXMLdIALOG = "";
+ String imageV1, imageV2, imageV3;
- if (t2PGetterSetters.size() > 0) {
- for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
+ db.open();
+ additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
- ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id());
- ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id());
- ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i1).getKey_id());
- String gaps_xml = "";
- String gaps_child;
+ if (additionalVisibilityList.size() > 0) {
+ for (int J = 0; J < additionalVisibilityList.size(); J++) {
- for (int l = 0; l < gapsList.size(); l++) {
- String present = "";
- if (gapsList.get(l).isPresent()) {
- present = "1";
+ if (additionalVisibilityList.get(J).getImage() == null) {
+ imageV1 = "";
} else {
- present = "0";
+ imageV1 = additionalVisibilityList.get(J).getImage();
}
- gaps_child = "[GAPS]"
+
+ if (additionalVisibilityList.get(J).getImage2() == null) {
+ imageV2 = "";
+ } else {
+ imageV2 = additionalVisibilityList.get(J).getImage2();
+ }
+
+ if (additionalVisibilityList.get(J).getImage3() == null) {
+ imageV3 = "";
+ } else {
+ imageV3 = additionalVisibilityList.get(J).getImage3();
+ }
+
+ String KeyID = additionalVisibilityList.get(J).getKey_id();
+
+ additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
+ //additionalVisibilitySkuList = additionalVisibilityList.get(J).getSkuDialogList();
+
+ if (additionalVisibilitySkuList.size() > 0) {
+ for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
+
+ onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
+ + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
+ + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]"
+ + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
+ + "[/VISIBILITY_DAILOG]";
+
+ additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
+ }
+ }
+
+ onXML = "[ADDITIONAL_VISIBILITY_NEW]"
+ "[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;
+ + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]"
+ + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]"
+ + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
+ //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"
+ + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]"
+ + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]"
+ + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]"
+ + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
+ + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
+ + "[/ADDITIONAL_VISIBILITY_NEW]";
+ //Here getSku_id gives display_id
+
+ additional_visibility_data_xml = additional_visibility_data_xml + onXML;
+ KeyID = "";
+ additionalVisibilitySkuList.clear();
+
+ additional_visibility_dialog_xml = "";
}
- String sku_xml = "";
- String sku_child;
+ final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]";
- 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;
- }
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW");
+ 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;
+ }*/
+ }
+ data.value = 45;
+ data.name = getString(R.string.additional_data_uploading);
+ publishProgress(data);
- String brandxml = "";
- String brandchild;
+ //T2p Upload Data
+ String t2p_data_xml = "";
+ onXML = "";
+ db.open();
+ t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
- if (brandList.size() > 0) {
+ if (t2PGetterSetters.size() > 0) {
+ for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
- for (int M = 0; M < brandList.size(); M++) {
- brandchild = "[BRAND]"
+ ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id());
+ ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id());
+ ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i1).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]"
- + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
- // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"
+ + "[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]"
- + "[/BRAND]";
- brandxml = brandxml + brandchild;
+ + "[/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 brandxml = "";
+ String brandchild;
+
+ if (brandList.size() > 0) {
+
+ for (int M = 0; M < brandList.size(); M++) {
+ brandchild = "[BRAND]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
+ // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"
+ + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
+ + "[/BRAND]";
+ brandxml = brandxml + brandchild;
+ }
}
- }
/* String present = "";
if (t2PGetterSetters.get(i1).isPresent()) {
@@ -918,236 +986,282 @@ public class UploadActivity extends AppCompatActivity {
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]"
- + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]"
- + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
- + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
-
- //Non t2p reason id added - 21-6-2018
- + "[TREASON_ID]" + t2PGetterSetters.get(i1).getNon_t2p_reason_id() + "[/TREASON_ID]"
-
- + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
- + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
- + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]"
- + "[BRAND_DATA]" + brandxml + "[/BRAND_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_FIXTURE_NEW");
- 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;
- }*/
- }
- data.value = 50;
- data.name = getString(R.string.t2p_data_uploading);
- publishProgress(data);
-
-
- //Stock Facing Planogram Tracker
- String stock_facing_planogram_xml = "";
- onXML = "";
- db.open();
- stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId());
-
- if (stockFacingPlanogramDataList.size() > 0) {
-
- for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) {
- onXML = "[STOCK_FACING_PLANOGRAM_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
- //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
- //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
- + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
- + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
- //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
- + "[/STOCK_FACING_PLANOGRAM_DATA]";
-
- stock_facing_planogram_xml = stock_facing_planogram_xml + onXML;
- }
-
- final String sos_xml = "[DATA]" + stock_facing_planogram_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "STOCK_FACING_PLANOGRAM_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;
- }*/
- }
- data.value = 55;
- data.name = getString(R.string.stock_planogram_data_uploading);
- publishProgress(data);
-
-
- //Category Picture Data
- String Category_xml = "";
- onXML = "";
- String onCategoryList = "";
- String CategoryLISTDATA = "";
- String image1, image2, image3, image4;
-
- db.open();
- adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId());
-
- if (adddata.size() > 0) {
- for (int J = 0; J < adddata.size(); J++) {
- if (adddata.get(J).getCategoryImage1() == null) {
- image1 = "";
- } else {
- image1 = adddata.get(J).getCategoryImage1();
- }
-
- if (adddata.get(J).getCategoryImage2() == null) {
- image2 = "";
- } else {
- image2 = adddata.get(J).getCategoryImage2();
- }
-
- if (adddata.get(J).getCategoryImage3() == null) {
- image3 = "";
- } else {
- image3 = adddata.get(J).getCategoryImage3();
- }
-
- if (adddata.get(J).getCategoryImage4() == null) {
- image4 = "";
- } else {
- image4 = adddata.get(J).getCategoryImage4();
- }
-
- String KeyID = adddata.get(J).getKEY_ID();
-
- listdat = db.getCategoryPictureListUploaded(KeyID);
-
- if (listdat.size() > 0) {
- for (int k = 0; k < listdat.size(); k++) {
- onCategoryList = "[SUB_CATEGORY_LIST]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]"
- + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
- + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]"
- + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]"
- + "[/SUB_CATEGORY_LIST]";
-
- CategoryLISTDATA = CategoryLISTDATA + onCategoryList;
- }
- }
-
- onXML = "[CATEGORY_LIST]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]"
- + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]"
- + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]"
- + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]"
- + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]"
- + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]"
- + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]"
- + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]"
- + "[/CATEGORY_LIST]";
-
- Category_xml = Category_xml + onXML;
- CategoryLISTDATA = "";
- }
-
- final String sos_xml = "[DATA]" + Category_xml + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "CATEGORY_PICTURE");
- 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;
- }*/
- } else {
-
- db.open();
- ArrayList nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId());
-
- if (nocamera_data_list.size() > 0) {
-
- String onXml_nodata = "", No_camera_data = "";
- for (int n = 0; n < nocamera_data_list.size(); n++) {
-
- int vertical;
- if (nocamera_data_list.get(n).isVertical()) {
- vertical = 1;
- } else {
- vertical = 0;
- }
-
- onXml_nodata = "[NO_CAMERA_POG_DATA]"
+ onXML = "[T2P_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
- + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
- + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]"
- + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]"
- + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]"
- + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]"
- + "[IS_VERTICAL]" + vertical + "[/IS_VERTICAL]"
- + "[/NO_CAMERA_POG_DATA]";
+ + "[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]"
+ + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]"
+ + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
+ + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
- No_camera_data = No_camera_data + onXml_nodata;
+ //Non t2p reason id added - 21-6-2018
+ + "[TREASON_ID]" + t2PGetterSetters.get(i1).getNon_t2p_reason_id() + "[/TREASON_ID]"
+
+ + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
+ + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
+ + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]"
+ + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]"
+ + "[/T2P_DATA]";
+
+ t2p_data_xml = t2p_data_xml + onXML;
}
- final String sos_xml = "[DATA]" + No_camera_data + "[/DATA]";
+ 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_FIXTURE_NEW");
+ 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;
+ }*/
+ }
+ data.value = 50;
+ data.name = getString(R.string.t2p_data_uploading);
+ publishProgress(data);
+
+
+ //Stock Facing Planogram Tracker
+ String stock_facing_planogram_xml = "";
+ onXML = "";
+ db.open();
+ stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId());
+
+ if (stockFacingPlanogramDataList.size() > 0) {
+
+ for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) {
+ onXML = "[STOCK_FACING_PLANOGRAM_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]"
+ //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]"
+ //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]"
+ + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]"
+ //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]"
+ + "[/STOCK_FACING_PLANOGRAM_DATA]";
+
+ stock_facing_planogram_xml = stock_facing_planogram_xml + onXML;
+ }
+
+ final String sos_xml = "[DATA]" + stock_facing_planogram_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "NO_CAMERA_POG");
+ request.addProperty("KEYS", "STOCK_FACING_PLANOGRAM_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;
+ }*/
+ }
+ data.value = 55;
+ data.name = getString(R.string.stock_planogram_data_uploading);
+ publishProgress(data);
+
+
+ //Category Picture Data
+ String Category_xml = "";
+ onXML = "";
+ String onCategoryList = "";
+ String CategoryLISTDATA = "";
+ String image1, image2, image3, image4;
+
+ db.open();
+ adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId());
+
+ if (adddata.size() > 0) {
+ for (int J = 0; J < adddata.size(); J++) {
+ if (adddata.get(J).getCategoryImage1() == null) {
+ image1 = "";
+ } else {
+ image1 = adddata.get(J).getCategoryImage1();
+ }
+
+ if (adddata.get(J).getCategoryImage2() == null) {
+ image2 = "";
+ } else {
+ image2 = adddata.get(J).getCategoryImage2();
+ }
+
+ if (adddata.get(J).getCategoryImage3() == null) {
+ image3 = "";
+ } else {
+ image3 = adddata.get(J).getCategoryImage3();
+ }
+
+ if (adddata.get(J).getCategoryImage4() == null) {
+ image4 = "";
+ } else {
+ image4 = adddata.get(J).getCategoryImage4();
+ }
+
+ String KeyID = adddata.get(J).getKEY_ID();
+
+ listdat = db.getCategoryPictureListUploaded(KeyID);
+
+ if (listdat.size() > 0) {
+ for (int k = 0; k < listdat.size(); k++) {
+ onCategoryList = "[SUB_CATEGORY_LIST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]"
+ + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]"
+ + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]"
+ + "[/SUB_CATEGORY_LIST]";
+
+ CategoryLISTDATA = CategoryLISTDATA + onCategoryList;
+ }
+ }
+
+ onXML = "[CATEGORY_LIST]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]"
+ + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]"
+ + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]"
+ + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]"
+ + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]"
+ + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]"
+ + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]"
+ + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]"
+ + "[/CATEGORY_LIST]";
+
+ Category_xml = Category_xml + onXML;
+ CategoryLISTDATA = "";
+ }
+
+ final String sos_xml = "[DATA]" + Category_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "CATEGORY_PICTURE");
+ 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;
+ }*/
+ } else {
+
+ db.open();
+ ArrayList nocamera_data_list = db.getNoCameraCategoryStoreWiseDataInserted(coverageList.get(i).getStoreId());
+
+ if (nocamera_data_list.size() > 0) {
+
+ String onXml_nodata = "", No_camera_data = "";
+ for (int n = 0; n < nocamera_data_list.size(); n++) {
+
+ int vertical;
+ if (nocamera_data_list.get(n).isVertical()) {
+ vertical = 1;
+ } else {
+ vertical = 0;
+ }
+
+ onXml_nodata = "[NO_CAMERA_POG_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + nocamera_data_list.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + nocamera_data_list.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ + "[SKU_GROUP_ID]" + nocamera_data_list.get(n).getSKUGROUP_ID() + "[/SKU_GROUP_ID]"
+ + "[ROW_NO]" + nocamera_data_list.get(n).getRow_no() + "[/ROW_NO]"
+ + "[COLUMN_NO]" + nocamera_data_list.get(n).getColumn_no() + "[/COLUMN_NO]"
+ + "[FACING]" + nocamera_data_list.get(n).getFacing() + "[/FACING]"
+ + "[IS_VERTICAL]" + vertical + "[/IS_VERTICAL]"
+ + "[/NO_CAMERA_POG_DATA]";
+
+ No_camera_data = No_camera_data + onXml_nodata;
+ }
+
+ final String sos_xml = "[DATA]" + No_camera_data + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "NO_CAMERA_POG");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+ }
+
+ }
+ data.value = 60;
+ data.name = getString(R.string.additional_data_uploading);
+ publishProgress(data);
+
+ //Audit data
+ db.open();
+ ArrayList audit_data = db.getAuditDataForUpload(coverageList.get(i).getStoreId());
+
+ if (audit_data.size() > 0) {
+
+ String onXml_audit_data = "", Audit_data = "";
+ for (int n = 0; n < audit_data.size(); n++) {
+
+ onXml_audit_data = "[AUDIT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
+ + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
+ + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
+ + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
+ + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
+ + "[/AUDIT_DATA]";
+
+ Audit_data = Audit_data + onXml_audit_data;
+ }
+
+ final String sos_xml = "[DATA]" + Audit_data + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "AUDIT_DATA_LATEST");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
@@ -1161,222 +1275,178 @@ public class UploadActivity extends AppCompatActivity {
result = envelope.getResponse();
}
- }
- data.value = 60;
- data.name = getString(R.string.additional_data_uploading);
- publishProgress(data);
-
- //Audit data
- db.open();
- ArrayList audit_data = db.getAuditDataForUpload(coverageList.get(i).getStoreId());
-
- if (audit_data.size() > 0) {
-
- String onXml_audit_data = "", Audit_data = "";
- for (int n = 0; n < audit_data.size(); n++) {
-
- onXml_audit_data = "[AUDIT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + audit_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
- + "[QUESTION_ID]" + audit_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
- + "[ANSWER_ID]" + audit_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
- + "[ANSWER_IMAGE]" + audit_data.get(n).getCAM_IMAGE() + "[/ANSWER_IMAGE]"
- + "[ANSWER_IMAGE2]" + audit_data.get(n).getCAM_IMAGE2() + "[/ANSWER_IMAGE2]"
- + "[ANSWER]" + audit_data.get(n).getANSWER() + "[/ANSWER]"
- + "[/AUDIT_DATA]";
-
- Audit_data = Audit_data + onXml_audit_data;
- }
-
- final String sos_xml = "[DATA]" + Audit_data + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "AUDIT_DATA_LATEST");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
- }
-
- data.value = 62;
- data.name = getString(R.string.audit);
- publishProgress(data);
-
- //POG data
- db.open();
- ArrayList pog_data = db.getAfterSavePOGForUploadData(coverageList.get(i).getStoreId());
-
- if (pog_data.size() > 0) {
-
- String onXml_pog_data = "", POG_data = "";
- for (int n = 0; n < pog_data.size(); n++) {
-
- onXml_pog_data = "[POG_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
- + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
- + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
- + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
- + "[/POG_DATA]";
-
- POG_data = POG_data + onXml_pog_data;
- }
-
- final String sos_xml = "[DATA]" + POG_data + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "POG_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
- }
-
- data.value = 63;
- data.name = getString(R.string.pog);
- publishProgress(data);
-
- //Coaching visit data
- db.open();
- coachingVisitData = db.getCoachingVisitData(coverageList.get(i).getStoreId());
-
- if (coachingVisitData.size() > 0) {
-
- String onXml_coaching_data = "", coaching_xml = "";
- for (int j = 0; j < coachingVisitData.size(); j++) {
-
- String exist;
-
- if (coachingVisitData.get(j).isExists()) {
- exist = "1";
- } else {
- exist = "0";
- }
-
- coaching_xml = "[COACHING_VISIT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
- + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
- + "[IS_EXIST]" + exist + "[/IS_EXIST]"
- + "[/COACHING_VISIT_DATA]";
- onXml_coaching_data = onXml_coaching_data + coaching_xml;
- }
-
- final String sos_xml = "[DATA]" + onXml_coaching_data + "[/DATA]";
-
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "COACHING_VISIT_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
-
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
-
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
-
- result = envelope.getResponse();
-
- data.value = 64;
- data.name = getString(R.string.coaching_visit);
+ data.value = 62;
+ data.name = getString(R.string.audit);
publishProgress(data);
- }
- //Counterfeit Product - Country Id - 6 (UAE)
- String counterfeit_product_data_xml = "", add_product_data_xml = "", product_exists_xml = "", product_add_xml = "";
+ //POG data
+ db.open();
+ ArrayList pog_data = db.getAfterSavePOGForUploadData(coverageList.get(i).getStoreId());
- db.open();
- counterfeitProductExistsGetterSetters = db.getCounterfeitProductExistsAfterData(coverageList.get(i).getStoreId(), null);
- if (counterfeitProductExistsGetterSetters.size() > 0) {
+ if (pog_data.size() > 0) {
- for (int l = 0; l < counterfeitProductExistsGetterSetters.size(); l++) {
+ String onXml_pog_data = "", POG_data = "";
+ for (int n = 0; n < pog_data.size(); n++) {
- add_product_data_xml ="";
+ onXml_pog_data = "[POG_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + pog_data.get(n).getCATEGORY_ID() + "[/CATEGORY_ID]"
+ + "[SUB_CATEGORY_ID]" + pog_data.get(n).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]"
+ + "[QUESTION_ID]" + pog_data.get(n).getQUESTION_ID() + "[/QUESTION_ID]"
+ + "[ANSWER_ID]" + pog_data.get(n).getANSWER_ID() + "[/ANSWER_ID]"
+ + "[/POG_DATA]";
- counterfeitProductGetterSetters = db.getCounterfeitProductAfterData(counterfeitProductExistsGetterSetters.get(l).get_id(), null);
-
- for (int i1 = 0; i1 < counterfeitProductGetterSetters.size(); i1++) {
- if (!counterfeitProductGetterSetters.get(i1).getCategory_id().equals("0")) {
-
- product_add_xml = "[PRODUCT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
- + "[SKU_NAME]" + counterfeitProductGetterSetters.get(i1).getSkuName() + "[/SKU_NAME]"
- + "[BRAND_ID]" + counterfeitProductGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
- + "[STOCK]" + counterfeitProductGetterSetters.get(i1).getStock() + "[/STOCK]"
- + "[IMAGE]" + counterfeitProductGetterSetters.get(i1).getImgStr() + "[/IMAGE]"
- + "[IMAGE1]" + counterfeitProductGetterSetters.get(i1).getImgStr1() + "[/IMAGE1]"
- + "[IMAGE2]" + counterfeitProductGetterSetters.get(i1).getImgStr2() + "[/IMAGE2]"
- + "[/PRODUCT_DATA]";
-
- add_product_data_xml = add_product_data_xml + product_add_xml;
- }
+ POG_data = POG_data + onXml_pog_data;
}
- int exists = 0;
- if (counterfeitProductExistsGetterSetters.get(l).isExists()) {
- exists = 1;
- }
+ final String sos_xml = "[DATA]" + POG_data + "[/DATA]";
- product_exists_xml = "[COUNTERFEIT_PRODUCT_DATA]"
- + "[MID]" + mid + "[/MID]"
- + "[USER_ID]" + userId + "[/USER_ID]"
- + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
- + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
- + "[COUNTERFEIT_DATA]" + add_product_data_xml + "[/COUNTERFEIT_DATA]"
- + "[/COUNTERFEIT_PRODUCT_DATA]";
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "POG_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
- counterfeit_product_data_xml = counterfeit_product_data_xml + product_exists_xml;
+ 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();
}
- final String sos_xml = "[DATA]" + counterfeit_product_data_xml + "[/DATA]";
+ data.value = 63;
+ data.name = getString(R.string.pog);
+ publishProgress(data);
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
- request.addProperty("XMLDATA", sos_xml);
- request.addProperty("KEYS", "COUNTERFEIT_PRODUCT_DATA");
- request.addProperty("USERNAME", userId);
- request.addProperty("MID", mid);
+ //Coaching visit data
+ db.open();
+ coachingVisitData = db.getCoachingVisitData(coverageList.get(i).getStoreId());
- envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
- envelope.dotNet = true;
- envelope.setOutputSoapObject(request);
+ if (coachingVisitData.size() > 0) {
- androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+ String onXml_coaching_data = "", coaching_xml = "";
+ for (int j = 0; j < coachingVisitData.size(); j++) {
- result = envelope.getResponse();
+ String exist;
+
+ if (coachingVisitData.get(j).isExists()) {
+ exist = "1";
+ } else {
+ exist = "0";
+ }
+
+ coaching_xml = "[COACHING_VISIT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
+ + "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
+ + "[IS_EXIST]" + exist + "[/IS_EXIST]"
+ + "[/COACHING_VISIT_DATA]";
+ onXml_coaching_data = onXml_coaching_data + coaching_xml;
+ }
+
+ final String sos_xml = "[DATA]" + onXml_coaching_data + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "COACHING_VISIT_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+
+ data.value = 64;
+ data.name = getString(R.string.coaching_visit);
+ publishProgress(data);
+ }
+
+ //Counterfeit Product - Country Id - 6 (UAE)
+ String counterfeit_product_data_xml = "", add_product_data_xml = "", product_exists_xml = "", product_add_xml = "";
+
+ db.open();
+ counterfeitProductExistsGetterSetters = db.getCounterfeitProductExistsAfterData(coverageList.get(i).getStoreId(), null);
+ if (counterfeitProductExistsGetterSetters.size() > 0) {
+
+ for (int l = 0; l < counterfeitProductExistsGetterSetters.size(); l++) {
+
+ add_product_data_xml ="";
+
+ counterfeitProductGetterSetters = db.getCounterfeitProductAfterData(counterfeitProductExistsGetterSetters.get(l).get_id(), null);
+
+ for (int i1 = 0; i1 < counterfeitProductGetterSetters.size(); i1++) {
+ if (!counterfeitProductGetterSetters.get(i1).getCategory_id().equals("0")) {
+
+ product_add_xml = "[PRODUCT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[SKU_NAME]" + counterfeitProductGetterSetters.get(i1).getSkuName() + "[/SKU_NAME]"
+ + "[BRAND_ID]" + counterfeitProductGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]"
+ + "[STOCK]" + counterfeitProductGetterSetters.get(i1).getStock() + "[/STOCK]"
+ + "[IMAGE]" + counterfeitProductGetterSetters.get(i1).getImgStr() + "[/IMAGE]"
+ + "[IMAGE1]" + counterfeitProductGetterSetters.get(i1).getImgStr1() + "[/IMAGE1]"
+ + "[IMAGE2]" + counterfeitProductGetterSetters.get(i1).getImgStr2() + "[/IMAGE2]"
+ + "[/PRODUCT_DATA]";
+
+ add_product_data_xml = add_product_data_xml + product_add_xml;
+ }
+ }
+
+ int exists = 0;
+ if (counterfeitProductExistsGetterSetters.get(l).isExists()) {
+ exists = 1;
+ }
+
+ product_exists_xml = "[COUNTERFEIT_PRODUCT_DATA]"
+ + "[MID]" + mid + "[/MID]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[CATEGORY_ID]" + Integer.parseInt(counterfeitProductExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]"
+ + "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+ + "[COUNTERFEIT_DATA]" + add_product_data_xml + "[/COUNTERFEIT_DATA]"
+ + "[/COUNTERFEIT_PRODUCT_DATA]";
+
+ counterfeit_product_data_xml = counterfeit_product_data_xml + product_exists_xml;
+
+ }
+
+ final String sos_xml = "[DATA]" + counterfeit_product_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", sos_xml);
+ request.addProperty("KEYS", "COUNTERFEIT_PRODUCT_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;
}*/
+ }
+
+ data.value = 65;
+ data.name = getString(R.string.title_activity_counterfeit_products);
+ publishProgress(data);
}
- data.value = 65;
- data.name = getString(R.string.title_activity_counterfeit_products);
- publishProgress(data);
// SET COVERAGE STATUS
String final_xml = "";
@@ -1392,7 +1462,8 @@ public class UploadActivity extends AppCompatActivity {
final String sos_xml = "[DATA]" + final_xml + "[/DATA]";
- request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
+
+ request = new SoapObject(CommonString.NAMESPACE, status_service);
request.addProperty("onXML", sos_xml);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -1400,7 +1471,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
- androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + status_service, envelope);
result = envelope.getResponse();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
index 847d2cc..3aee28a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
@@ -65,7 +65,7 @@ public class UploadImageWithRetrofit {
int storeId = 0;
GSKOrangeDB db;
ProgressDialog pd;
- ArrayList storeList, storeList_deviation;
+ ArrayList storeList, storeList_deviation, storeListAdditional, storeListPharma;
private int factor, k = 0;
Data data;
@@ -237,6 +237,8 @@ public class UploadImageWithRetrofit {
foldername = "CoachingVisits";
} else if (file[i].getName().contains("DeliveryCalls")) {
foldername = "DeliveryCallsImages";
+ } else if (file[i].getName().contains("CounterfeitProduct")) {//added 15.04.2019
+ foldername = "CounterFeitImages";
} else{
foldername = "Bulkimages";
}
@@ -600,6 +602,115 @@ public class UploadImageWithRetrofit {
}
}
+ //for Turkey Pharma Stores
+ storeListPharma = db.getStoreData(visitDate, CommonString.KEY_JOURNEY_PLAN_PHARMA);
+ for (int i = 0; i < storeListPharma.size(); i++) {
+ if (storeListPharma.get(i).getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
+ // SET COVERAGE STATUS
+ String final_xml = "";
+ String onXML = "";
+ onXML = "[COVERAGE_STATUS]"
+ + "[STORE_ID]" + storeListPharma.get(i).getSTORE_ID() + "[/STORE_ID]"
+ + "[VISIT_DATE]" + storeListPharma.get(i).getVISIT_DATE()+ "[/VISIT_DATE]"
+ + "[USER_ID]" + userID + "[/USER_ID]"
+ + "[STATUS]" + CommonString.KEY_U + "[/STATUS]"
+ + "[/COVERAGE_STATUS]";
+
+ final_xml = final_xml + onXML;
+
+ final String sos_xml = "[DATA]" + final_xml + "[/DATA]";
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS_PHARMA);
+ request.addProperty("onXML", sos_xml);
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS_PHARMA, envelope);
+
+ Object result = envelope.getResponse();
+
+ //If Result is success then status of that store is update
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+
+ db.open();
+
+ final CoverageBean coverageObj = db.getCoverageSpecificData(storeListPharma.get(i).getVISIT_DATE(), storeListPharma.get(i).getSTORE_ID());
+
+ String uploadStatus;
+ if(coverageObj.getReasonid().equalsIgnoreCase("0")){
+ uploadStatus = CommonString.KEY_U;
+ }
+ else {
+ uploadStatus = CommonString.KEY_UN;
+ }
+
+ db.updateCoverageStatus(storeListPharma.get(i).getSTORE_ID(), uploadStatus);
+ db.updateStoreStatusOnLeave(storeListPharma.get(i).getSTORE_ID(), storeList.get(i).getVISIT_DATE(),
+ uploadStatus, CommonString.FROM_PHARMA);
+
+ db.deleteTableWithStoreID(storeListPharma.get(i).getSTORE_ID());
+ }
+
+ }
+ }
+
+ //Additional Stores Egypt
+ storeListAdditional = db.getStoreData(visitDate, CommonString.KEY_JOURNEY_PLAN_ADDITIONAL);
+ for (int i = 0; i < storeListAdditional.size(); i++) {
+ if (storeListAdditional.get(i).getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
+ // SET COVERAGE STATUS
+ String final_xml = "";
+ String onXML = "";
+ onXML = "[COVERAGE_STATUS]"
+ + "[STORE_ID]" + storeListAdditional.get(i).getSTORE_ID() + "[/STORE_ID]"
+ + "[VISIT_DATE]" + storeListAdditional.get(i).getVISIT_DATE()+ "[/VISIT_DATE]"
+ + "[USER_ID]" + userID + "[/USER_ID]"
+ + "[STATUS]" + CommonString.KEY_U + "[/STATUS]"
+ + "[/COVERAGE_STATUS]";
+
+ final_xml = final_xml + onXML;
+
+ final String sos_xml = "[DATA]" + final_xml + "[/DATA]";
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL);
+ request.addProperty("onXML", sos_xml);
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL, envelope);
+
+ Object result = envelope.getResponse();
+
+ //If Result is success then status of that store is update
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+
+ db.open();
+
+ final CoverageBean coverageObj = db.getCoverageSpecificData(storeListAdditional.get(i).getVISIT_DATE(), storeListAdditional.get(i).getSTORE_ID());
+
+ String uploadStatus;
+ if(coverageObj.getReasonid().equalsIgnoreCase("0")){
+ uploadStatus = CommonString.KEY_U;
+ }
+ else {
+ uploadStatus = CommonString.KEY_UN;
+ }
+
+ db.updateCoverageStatus(storeListAdditional.get(i).getSTORE_ID(), uploadStatus);
+ db.updateStoreStatusOnLeave(storeListAdditional.get(i).getSTORE_ID(), storeList.get(i).getVISIT_DATE(),
+ uploadStatus, CommonString.FROM_ADDITIONAL);
+
+ db.deleteTableWithStoreID(storeListAdditional.get(i).getSTORE_ID());
+ }
+
+ }
+ }
} catch (MalformedURLException e) {
e.printStackTrace();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java
index ff93a38..9b25a82 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java
@@ -10,6 +10,25 @@ public class MSL_AvailabilityStockFacingGetterSetter implements Serializable{
String sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, toggleValue, mbq, category_id, facing="", stock,company_id,must_have;
+ public String getImgPath() {
+ return imgPath;
+ }
+
+ public void setImgPath(String imgPath) {
+ this.imgPath = imgPath;
+ }
+
+ public int getIsChecked() {
+ return isChecked;
+ }
+
+ public void setIsChecked(int isChecked) {
+ this.isChecked = isChecked;
+ }
+
+ String imgPath="";
+ int isChecked=-1;
+
public String getSub_category_id() {
return sub_category_id;
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPharmaQuestionGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPharmaQuestionGetterSetter.java
new file mode 100644
index 0000000..b72fef3
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingPharmaQuestionGetterSetter.java
@@ -0,0 +1,99 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class MappingPharmaQuestionGetterSetter {
+
+ String table_MAPPING_PHARMA_QUESTION;
+
+ public String getImgPath() {
+ return imgPath;
+ }
+
+ public void setImgPath(String imgPath) {
+ this.imgPath = imgPath;
+ }
+
+ public int getIsChecked() {
+ return isChecked;
+ }
+
+ public void setIsChecked(int isChecked) {
+ this.isChecked = isChecked;
+ }
+
+ String imgPath="";
+ int isChecked=-1;
+
+ ArrayList QUESTION_ID = new ArrayList<>();
+ ArrayList QUESTION= new ArrayList<>();
+ ArrayList BRAND_ID= new ArrayList<>();
+ ArrayList BRAND= new ArrayList<>();
+ ArrayList SUB_CATEGORY_ID= new ArrayList<>();
+ ArrayList SUB_CATEGORY= new ArrayList<>();
+ ArrayList QUESTION_SEQUENCE= new ArrayList<>();
+
+ public String getTable_MAPPING_PHARMA_QUESTION() {
+ return table_MAPPING_PHARMA_QUESTION;
+ }
+
+ public void setTable_MAPPING_PHARMA_QUESTION(String table_MAPPING_PHARMA_QUESTION) {
+ this.table_MAPPING_PHARMA_QUESTION = table_MAPPING_PHARMA_QUESTION;
+ }
+
+ public ArrayList getQUESTION_ID() {
+ return QUESTION_ID;
+ }
+
+ public void setQUESTION_ID(String QUESTION_ID) {
+ this.QUESTION_ID.add(QUESTION_ID);
+ }
+
+ public ArrayList getQUESTION() {
+ return QUESTION;
+ }
+
+ public void setQUESTION(String QUESTION) {
+ this.QUESTION.add(QUESTION);
+ }
+
+ public ArrayList getBRAND_ID() {
+ return BRAND_ID;
+ }
+
+ public void setBRAND_ID(String BRAND_ID) {
+ this.BRAND_ID.add(BRAND_ID);
+ }
+
+ public ArrayList getBRAND() {
+ return BRAND;
+ }
+
+ public void setBRAND(String BRAND) {
+ this.BRAND.add(BRAND);
+ }
+
+ public ArrayList getSUB_CATEGORY_ID() {
+ return SUB_CATEGORY_ID;
+ }
+
+ public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
+ this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID);
+ }
+
+ public ArrayList getSUB_CATEGORY() {
+ return SUB_CATEGORY;
+ }
+
+ public void setSUB_CATEGORY(String SUB_CATEGORY) {
+ this.SUB_CATEGORY.add(SUB_CATEGORY);
+ }
+
+ public ArrayList getQUESTION_SEQUENCE() {
+ return QUESTION_SEQUENCE;
+ }
+
+ public void setQUESTION_SEQUENCE(String QUESTION_SEQUENCE) {
+ this.QUESTION_SEQUENCE.add(QUESTION_SEQUENCE);
+ }
+}
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 2f0e7cf..5f0c00d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -44,6 +44,45 @@ public class TableBean {
public static String Table_MAPPING_STOCK_STOREWISE;
public static String Table_MAPPING_PLANOGRAM_STORE_WISE;
+ public static String getTable_MAPPING_PHARMA_QUESTION() {
+ return Table_MAPPING_PHARMA_QUESTION;
+ }
+
+ public static void setTable_MAPPING_PHARMA_QUESTION(String table_MAPPING_PHARMA_QUESTION) {
+ Table_MAPPING_PHARMA_QUESTION = table_MAPPING_PHARMA_QUESTION;
+ }
+
+ public static String getTable_JOURNEY_PLAN_PHARMA() {
+ return Table_JOURNEY_PLAN_PHARMA;
+ }
+
+ public static void setTable_JOURNEY_PLAN_PHARMA(String table_JOURNEY_PLAN_PHARMA) {
+ Table_JOURNEY_PLAN_PHARMA = table_JOURNEY_PLAN_PHARMA;
+ }
+
+ public static String Table_MAPPING_PHARMA_QUESTION;
+ public static String Table_JOURNEY_PLAN_PHARMA;
+
+ public static String getAdditionalJourneyPlan() {
+ return ADDITIONAL_JOURNEY_PLAN;
+ }
+
+ public static void setAdditionalJourneyPlan(String additionalJourneyPlan) {
+ ADDITIONAL_JOURNEY_PLAN = additionalJourneyPlan;
+ }
+
+ public static String ADDITIONAL_JOURNEY_PLAN;
+
+ public static String getMappingStockAdditional() {
+ return MAPPING_STOCK_ADDITIONAL;
+ }
+
+ public static void setMappingStockAdditional(String mappingStockAdditional) {
+ MAPPING_STOCK_ADDITIONAL = mappingStockAdditional;
+ }
+
+ public static String MAPPING_STOCK_ADDITIONAL;
+
public static String getTable_NON_WORKING_SUB_REASON() {
return Table_NON_WORKING_SUB_REASON;
}
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 204976d..7e53811 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -24,6 +24,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramStorewiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
@@ -1502,4 +1503,48 @@ public class XMLHandlers {
}
return st;
}
+
+ // MAPPING_PHARMA_QUESTION XML HANDLER
+ public static MappingPharmaQuestionGetterSetter mappingPharmaQuestionXMLHandler(XmlPullParser xpp,
+ int eventType) {
+ MappingPharmaQuestionGetterSetter stock = new MappingPharmaQuestionGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+ if (xpp.getName().equals("META_DATA")) {
+ stock.setTable_MAPPING_PHARMA_QUESTION(xpp.nextText());
+ }
+ if (xpp.getName().equals("QUESTION_ID")) {
+ stock.setQUESTION_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("QUESTION")) {
+ stock.setQUESTION(xpp.nextText());
+ }
+ if (xpp.getName().equals("BRAND_ID")) {
+ stock.setBRAND_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("BRAND")) {
+ stock.setBRAND(xpp.nextText());
+ }
+ if (xpp.getName().equals("SUB_CATEGORY_ID")) {
+ stock.setSUB_CATEGORY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("SUB_CATEGORY")) {
+ stock.setSUB_CATEGORY(xpp.nextText());
+ }if (xpp.getName().equals("QUESTION_SEQUENCE")) {
+ stock.setQUESTION_SEQUENCE(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+
+ e.printStackTrace();
+ } catch (IOException e) {
+
+ e.printStackTrace();
+ }
+ return stock;
+ }
}
diff --git a/GSKMTOrange/src/main/res/layout/activity_no_camera.xml b/GSKMTOrange/src/main/res/layout/activity_no_camera.xml
index e2b9356..64f5a49 100644
--- a/GSKMTOrange/src/main/res/layout/activity_no_camera.xml
+++ b/GSKMTOrange/src/main/res/layout/activity_no_camera.xml
@@ -31,5 +31,12 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
+
diff --git a/GSKMTOrange/src/main/res/layout/activity_paharma.xml b/GSKMTOrange/src/main/res/layout/activity_paharma.xml
new file mode 100644
index 0000000..88f287d
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_paharma.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/activity_stock.xml b/GSKMTOrange/src/main/res/layout/activity_stock.xml
new file mode 100644
index 0000000..c6556f6
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_stock.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/content_paharma.xml b/GSKMTOrange/src/main/res/layout/content_paharma.xml
new file mode 100644
index 0000000..8ca753f
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_paharma.xml
@@ -0,0 +1,8 @@
+
diff --git a/GSKMTOrange/src/main/res/layout/content_stock.xml b/GSKMTOrange/src/main/res/layout/content_stock.xml
new file mode 100644
index 0000000..fb33f93
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_stock.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/delete_row_alert_dialog.xml b/GSKMTOrange/src/main/res/layout/delete_row_alert_dialog.xml
new file mode 100644
index 0000000..f232daf
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/delete_row_alert_dialog.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/fragment_msl.xml b/GSKMTOrange/src/main/res/layout/fragment_msl.xml
new file mode 100644
index 0000000..cb3855b
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/fragment_msl.xml
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/fragment_paharma.xml b/GSKMTOrange/src/main/res/layout/fragment_paharma.xml
new file mode 100644
index 0000000..1c8d790
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/fragment_paharma.xml
@@ -0,0 +1,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/fragment_so.xml b/GSKMTOrange/src/main/res/layout/fragment_so.xml
new file mode 100644
index 0000000..db51dbb
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/fragment_so.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/fragment_storedetail.xml b/GSKMTOrange/src/main/res/layout/fragment_storedetail.xml
new file mode 100644
index 0000000..5491d03
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/fragment_storedetail.xml
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/item_pharma_sos.xml b/GSKMTOrange/src/main/res/layout/item_pharma_sos.xml
new file mode 100644
index 0000000..0c40785
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/item_pharma_sos.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/pharma_msl_item.xml b/GSKMTOrange/src/main/res/layout/pharma_msl_item.xml
new file mode 100644
index 0000000..5833895
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/pharma_msl_item.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/stock_child_item.xml b/GSKMTOrange/src/main/res/layout/stock_child_item.xml
new file mode 100644
index 0000000..2fba867
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/stock_child_item.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/storelist_child.xml b/GSKMTOrange/src/main/res/layout/storelist_child.xml
index a0ea509..d83720c 100644
--- a/GSKMTOrange/src/main/res/layout/storelist_child.xml
+++ b/GSKMTOrange/src/main/res/layout/storelist_child.xml
@@ -1,6 +1,7 @@
diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
index 6888772..70462aa 100644
--- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
@@ -48,6 +48,20 @@
android:title="@string/category_performance_PLANOGRAM"
android:visible="false"/>
+
+
+
+
-
+
+
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/first_aid_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/first_aid_tick.png
index 6bf8e08..3cdd881 100644
Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/first_aid_tick.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/first_aid_tick.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/no_gray.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/no_gray.png
new file mode 100644
index 0000000..a197a9f
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/no_gray.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/no_red.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/no_red.png
new file mode 100644
index 0000000..85a4005
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/no_red.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/no_white.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/no_white.png
new file mode 100644
index 0000000..f519b95
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/no_white.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/outline_library_add_black_48.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/outline_library_add_black_48.png
new file mode 100644
index 0000000..78923a4
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/outline_library_add_black_48.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_gray.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_gray.png
new file mode 100644
index 0000000..e217997
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_gray.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_green.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_green.png
new file mode 100644
index 0000000..8859dfe
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_green.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_white.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_white.png
new file mode 100644
index 0000000..a6f319f
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xhdpi/yes_white.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-xxhdpi/baseline_local_pharmacy_black_48.png b/GSKMTOrange/src/main/res/mipmap-xxhdpi/baseline_local_pharmacy_black_48.png
new file mode 100644
index 0000000..bea61d8
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-xxhdpi/baseline_local_pharmacy_black_48.png differ
diff --git a/GSKMTOrange/src/main/res/values/dimens.xml b/GSKMTOrange/src/main/res/values/dimens.xml
index 83064d9..1599c1c 100644
--- a/GSKMTOrange/src/main/res/values/dimens.xml
+++ b/GSKMTOrange/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
5dp
20sp
+ 18sp
16sp
15sp
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 65612e7..9eec228 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -427,4 +427,21 @@
Please enter SKU name
Please enter Stock
+ Forgot MPin
+ Please Enter Four Digit MPin
+ Set MPin
+ Please Set Four Digit MPin
+ Attempt left
+ Reset
+ clear
+ StockActivity
+
+
+ Pharmacy Stores
+ Pharma Activity
+ Store Detail
+ Additional Stores
+ GSK
+ Competitor
+
diff --git a/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 2a23d25..bf36fd7 100644
--- a/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Fri Mar 15 09:43:47 IST 2019
+#Tue Apr 23 16:25:39 IST 2019
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_single.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_multiple.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\activity_main.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml