diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index e1137ce..8ecd248 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -198,6 +198,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, "Store_Id='" + storeid + "'", null); + db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, "Store_Id='" + storeid + "'", null); } public void deleteAllTables() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 858bd30..8c61768 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -113,6 +113,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onCreate(savedInstanceState); + setContentView(R.layout.additionalvisibilitylayout); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -446,7 +447,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl adGt.setBtn_toogle(togglevalue); adGt.setCategoryId(categoryId); - adGt.setSkuDialogList(defdata); + ArrayList listdataTemp = new ArrayList<>(); + listdataTemp.addAll(defdata); + adGt.setSkuDialogList(listdataTemp); if (validateData(adGt)) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( @@ -703,9 +706,19 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing - btntoggle.setChecked(true); - + //btntoggle.setChecked(true); dialog.cancel(); + + togglevalue = "1"; + btntoggle.setChecked(true); + brandlayout.setVisibility(View.GONE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + btnaddlayout.setVisibility(View.VISIBLE); + cardvew.setVisibility(View.VISIBLE); + listviewlay.setVisibility(View.INVISIBLE); + maincard.setVisibility(View.INVISIBLE); } }); @@ -824,7 +837,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - public class CustomAdapter extends ArrayAdapter { private Activity activity; @@ -949,7 +961,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } - public class CustomSkuMasterAdpter extends ArrayAdapter { private Activity activity; @@ -1012,7 +1023,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } - protected void startCameraActivity() { try { @@ -1116,7 +1126,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl super.onActivityResult(requestCode, resultCode, data); } - public void showSkuDialog() { final ArrayList brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id, categoryId); @@ -1311,7 +1320,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - @Override public void onClick(View arg0) { // TODO Auto-generated method stub @@ -1337,7 +1345,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl return super.onOptionsItemSelected(item); } - public class MyAdaptorStock extends BaseAdapter { private LayoutInflater mInflater; @@ -1451,7 +1458,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } - public class MyAdaptorAdditionalStock extends BaseAdapter { private LayoutInflater mInflater; @@ -1491,21 +1497,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl @Override public View getView(final int position1, View convertView, ViewGroup parent) { - final ViewHolder holder; if (convertView == null) { - - convertView = mInflater - .inflate(R.layout.additionallistlayout, null); + convertView = mInflater.inflate(R.layout.additionallistlayout, null); holder = new ViewHolder(); holder.brand = (TextView) convertView.findViewById(R.id.brand_name); - holder.display = (TextView) convertView.findViewById(R.id.display_name); holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); - - holder.delete = (Button) convertView.findViewById(R.id.delete_btn); convertView.setTag(holder); @@ -1517,7 +1517,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl @Override public void onClick(View v) { - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdditionalVisibility.this); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); @@ -1671,7 +1670,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - private static boolean updateResources(Context context, String language) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 3319f09..6d2ea5a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -24,7 +24,6 @@ import android.provider.MediaStore; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; @@ -57,8 +56,6 @@ import java.util.List; import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; -import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter; -import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter; import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; @@ -87,13 +84,14 @@ public class T2PComplianceActivity extends AppCompatActivity { String error_msg; private SharedPreferences preferences; Spinner spinner_brand; - Button btn_add,btn_close; + Button btn_add, btn_close; ListView listview; LinearLayout linearlay; //CardView cardlay; - String brand_name="",brand_id=""; - ArrayList brand_new_list=new ArrayList(); + String brand_name = "", brand_id = ""; + ArrayList brand_new_list = new ArrayList(); ArrayList brandList; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -247,7 +245,6 @@ public class T2PComplianceActivity extends AppCompatActivity { */ - holder.btn_gaps.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -262,7 +259,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) { mItem.setPresent(true); } else { - mItem.setPresent(false); + /* mItem.setPresent(false); mItem.getGapsChecklist().clear(); mItem.getSkulist().clear(); @@ -283,9 +280,54 @@ public class T2PComplianceActivity extends AppCompatActivity { new File(str + mItem.getImage2()).delete(); mItem.setImage2(""); } +*/ + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(T2PComplianceActivity.this); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); + + // set dialog message + alertDialogBuilder + .setMessage(getResources().getString(R.string.data_will_be_lost)) + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + mItem.setPresent(false); + mItem.getGapsChecklist().clear(); + mItem.getSkulist().clear(); + + //Camera + if (!mItem.getImage().equals("")) { + new File(str + mItem.getImage()).delete(); + mItem.setImage(""); + } + + //Camera 1 + if (!mItem.getImage1().equals("")) { + new File(str + mItem.getImage1()).delete(); + mItem.setImage1(""); + } + + //Camera 2 + if (!mItem.getImage2().equals("")) { + new File(str + mItem.getImage2()).delete(); + mItem.setImage2(""); + } + + t2PAdapter.notifyDataSetChanged(); + } + }) + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + dialog.cancel(); + mItem.setPresent(true); + t2PAdapter.notifyDataSetChanged(); + } + }); + + AlertDialog alertDialog = alertDialogBuilder.create(); + alertDialog.show(); } - t2PAdapter.notifyDataSetChanged(); } }); @@ -336,7 +378,7 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - _pathforcheck = "T2P_Image_" + store_id+ categoryId+ "_" + mItem.getBrand_id() + + _pathforcheck = "T2P_Image_" + store_id + categoryId + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = position; @@ -349,7 +391,6 @@ public class T2PComplianceActivity extends AppCompatActivity { if (mItem.getImage().equals("")) { - if (mItem.isPresent()) { holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); @@ -366,7 +407,7 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - _pathforcheck1 = "T2P_Image1_" + store_id+categoryId + "_" + mItem.getBrand_id() + + _pathforcheck1 = "T2P_Image1_" + store_id + categoryId + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position1 = position; @@ -394,7 +435,7 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - _pathforcheck2 = "T2P_Image2_" + store_id + categoryId+"_" + mItem.getBrand_id() + + _pathforcheck2 = "T2P_Image2_" + store_id + categoryId + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position2 = position; @@ -418,53 +459,41 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam2.setBackgroundResource(R.mipmap.camera_green); } } else { - // holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); - // holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey); - // holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey); + // holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + // holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey); + // holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey); holder.img_cam1.setVisibility(View.INVISIBLE); holder.img_cam2.setVisibility(View.INVISIBLE); holder.img_cam.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - /* Intent in =new Intent(T2PComplianceActivity.this,T2pBrand_Avaibility.class); in.putExtra("categoryName", categoryName); in.putExtra("categoryId", categoryId); startActivity(in);*/ showBrandAvabilitydialog(mItem.getBrandlist()); - - - } }); - - - if(mItem.getBrandlist().size()>0) - { - + if (mItem.getBrandlist().size() > 0) { holder.img_cam.setBackgroundResource(R.mipmap.new_no_camera_done_edit); - }else{ + } else { if (mItem.isPresent()) { - holder.img_cam.setBackgroundResource(R.mipmap.new_no_camera_edit); } else { //if not present camera disabled holder.img_cam.setBackgroundResource(R.mipmap.no_camera); } - } - } - boolean is_enabled = mItem.isPresent(); holder.toggle_btn.setChecked(is_enabled); - holder.img_cam.setEnabled(is_enabled); + holder.img_cam.setEnabled(is_enabled); holder.img_cam1.setEnabled(is_enabled); holder.img_cam2.setEnabled(is_enabled); holder.btn_gaps.setEnabled(is_enabled); @@ -490,7 +519,6 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background)); } } - } @Override @@ -508,12 +536,10 @@ public class T2PComplianceActivity extends AppCompatActivity { public final Button btn_gaps, btn_sku, btn_ref_img; public final ToggleButton toggle_btn; - public ViewHolder(View view) { super(view); mView = view; - tv_brand = (TextView) mView.findViewById(R.id.tv_brand); tv_display = (TextView) mView.findViewById(R.id.tv_display); img_cam = (ImageView) mView.findViewById(R.id.img_cam); @@ -525,9 +551,7 @@ public class T2PComplianceActivity extends AppCompatActivity { btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); - } - } } @@ -805,18 +829,18 @@ public class T2PComplianceActivity extends AppCompatActivity { //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("الاستوديو") ) { + 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("الكاميرا")) { + 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("الكاميرا")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) { defaultCameraPackage = list.get(n).packageName; break; @@ -932,8 +956,7 @@ public class T2PComplianceActivity extends AppCompatActivity { flag = false; error_msg = getResources().getString(R.string.click_image); break; - } - else if (camera_allow.equals("0") && t2PGetterSetters.get(i).getBrandlist().size() == 0) { + } else if (camera_allow.equals("0") && t2PGetterSetters.get(i).getBrandlist().size() == 0) { flag = false; error_msg = getResources().getString(R.string.title_activity_fill_brand); break; @@ -1230,7 +1253,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; - }else{ + } else { lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } @@ -1311,10 +1334,9 @@ public class T2PComplianceActivity extends AppCompatActivity { //// new + public void showBrandAvabilitydialog(final ArrayList brandGetdata) { - public void showBrandAvabilitydialog(final ArrayList brandGetdata) { - - final ArrayList brandList = db.getBrandAvailbilitydata(store_id, categoryId,keyAccount_id,class_id,storeType_id); + final ArrayList brandList = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id); BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter(); brand.setBRAND(getResources().getString(R.string.select)); @@ -1334,7 +1356,7 @@ public class T2PComplianceActivity extends AppCompatActivity { listview = (ListView) dialog.findViewById(R.id.lv); linearlay = (LinearLayout) dialog.findViewById(R.id.list_layout); - // cardlay = (CardView) dialog.findViewById(R.id.cardId); + // cardlay = (CardView) dialog.findViewById(R.id.cardId); // Create custom adapter object ( see below CustomAdapter.java ) T2PComplianceActivity.CustomBRANDAdapter adapter = new T2PComplianceActivity.CustomBRANDAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, brandList); @@ -1343,13 +1365,13 @@ public class T2PComplianceActivity extends AppCompatActivity { if (brandGetdata.size() > 0) { linearlay.setVisibility(View.VISIBLE); - // cardlay.setVisibility(View.VISIBLE); + // cardlay.setVisibility(View.VISIBLE); adapterData = new T2PComplianceActivity.MyAdaptorStock(T2PComplianceActivity.this, brandGetdata); listview.setAdapter(adapterData); listview.invalidateViews(); } else { linearlay.setVisibility(View.GONE); - // cardlay.setVisibility(View.GONE); + // cardlay.setVisibility(View.GONE); } spinner_brand.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -1386,7 +1408,7 @@ public class T2PComplianceActivity extends AppCompatActivity { public void onClick(View v) { BrandAvabilityGetterSetter ab = new BrandAvabilityGetterSetter(); - if (!brand_name.equalsIgnoreCase("") && brand_name!=null){ + if (!brand_name.equalsIgnoreCase("") && brand_name != null) { BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter(); @@ -1399,15 +1421,13 @@ public class T2PComplianceActivity extends AppCompatActivity { listview.setAdapter(adapterData); listview.invalidateViews(); - // cardlay.setVisibility(View.VISIBLE); + // cardlay.setVisibility(View.VISIBLE); linearlay.setVisibility(View.VISIBLE); spinner_brand.setSelection(0); - brand_name=""; - brand_id=""; + brand_name = ""; + brand_id = ""; - } - else - { + } else { Snackbar.make(v, "Please select dropdown", Snackbar.LENGTH_LONG) .setAction("Action", null).show(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java index d2e9615..b88b563 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java @@ -716,9 +716,21 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity { childData.setToggleValue("1"); finalHolder.stock.setVisibility(View.GONE); childData.setStock(""); + childData.setFacing(""); } else { + childData.setStock(""); + childData.setFacing(""); + childData.setToggleValue("0"); finalHolder.stock.setVisibility(View.VISIBLE); + + if (Integer.parseInt(childData.getMbq()) == 0) { + childData.setStock("0"); + childData.setFacing("0"); + + /*finalHolder.stock.setText("0"); + finalHolder.facing.setText("0");*/ + } } expandableListView.invalidateViews(); @@ -733,24 +745,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity { finalHolder.stock.setVisibility(View.VISIBLE); } - holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - final EditText caption = (EditText) v; - final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); - - if (!edFaceup.equals("")) { - String faceup = edFaceup.replaceFirst("^0+(?!$)", ""); - childData.setFacing(faceup); - } else { - childData.setFacing(""); - } - } - }); - - holder.facing.setText(childData.getFacing()); - + final ViewHolder finalHolder2 = holder; holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override public void onFocusChange(View v, boolean hasFocus) { @@ -783,10 +779,71 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity { } } }); - holder.stock.setText(childData.getStock()); + final ViewHolder finalHolder1 = holder; + holder.facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + final EditText caption = (EditText) v; + final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); + + //Toggle is no selected + if (childData.getToggleValue().equals("0")) { + + //if stock is emplty + if (childData.getStock().equals("")) { + AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this); + builder.setMessage(getString(R.string.msl_availability_new_stock_value)) + .setCancelable(false) + .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } else { + if (edFaceup != null && !edFaceup.equals("")) { + + String faceup = edFaceup.replaceFirst("^0+(?!$)", ""); + if (Integer.parseInt(faceup) <= Integer.parseInt(childData.getStock())) { + + if (!edFaceup.equals("")) { + childData.setFacing(faceup); + } else { + childData.setFacing(""); + } + } else { + AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this); + builder.setMessage(getString(R.string.check_faceup)) + .setCancelable(false) + .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + finalHolder1.facing.setText(""); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + } + } + } else { + if (!edFaceup.equals("")) { + String faceup = edFaceup.replaceFirst("^0+(?!$)", ""); + childData.setFacing(faceup); + } else { + childData.setFacing(""); + } + } + } + }); + + holder.facing.setText(childData.getFacing()); + + //empty check color change if (!checkflag) { boolean tempflag = false; 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 49f0e7c..70637a7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -296,14 +296,14 @@ public class UploadActivity extends AppCompatActivity { db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P); } else { - return CommonString.METHOD_UPLOAD_COVERAGE; + continue; + //return CommonString.METHOD_UPLOAD_COVERAGE; } - mid = Integer.parseInt((words[1])); //MSL_Availability - String mslAvailability_xml = ""; + /*String mslAvailability_xml = ""; onXML = ""; msl_availabilityList = db.getMSL_AvailabilityUploadServerData(coverageList.get(i).getStoreId()); @@ -357,72 +357,7 @@ public class UploadActivity extends AppCompatActivity { } data.value = 10; data.name = getString(R.string.availability_data_uploading); - publishProgress(data); - - - //MSL_Availability_StockFacing - String mslAvailability_stockFacing_xml = ""; - onXML = ""; - 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 = "[MSL_AVAILABILITY_STOCK_FACING_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - //+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getCategory_id()) + "[/CATEGORY_ID]" - //+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getBrand_id()) + "[/BRAND_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]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]" - + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" + - "[/MSL_AVAILABILITY_STOCK_FACING_DATA]"; - - 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", "MSL_AVAILABILITY_STOCK_FACING_DATA"); - request.addProperty("USERNAME", userId); - request.addProperty("MID", mid); - - envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); - envelope.dotNet = true; - envelope.setOutputSoapObject(request); - - androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - - result = envelope.getResponse(); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - } - data.value = 15; - data.name = getString(R.string.availability_data_uploading); - publishProgress(data); + publishProgress(data);*/ //Stock and Facing @@ -430,75 +365,6 @@ public class UploadActivity extends AppCompatActivity { onXML = ""; stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId()); - if (stock_facingHeaderList.size() > 0) { - for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - String stockChildXML = ""; - - if (!stock_facingHeaderList.get(i1).getCategory_id().equals("0")) { - - stock_facingChildList = db.getStockAndFacingSKUServerUploadData( - stock_facingHeaderList.get(i1).getCategory_id(), stock_facingHeaderList.get(i1).getBrand_id()); - - String onXML1 = ""; - for (int j = 0; j < stock_facingChildList.size(); j++) { - - onXML1 = "[STOCK_FACING_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - + "[CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" - + "[SUB_CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]" - + "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]" - + "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" - + "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" - + "[SKU_ID]" + Integer.parseInt(stock_facingChildList.get(j).getSku_id()) + "[/SKU_ID]" - //+ "[SKU]" + stock_facingChildList.get(j).getSku() + "[/SKU]" - + "[STOCK]" + Integer.parseInt(stock_facingChildList.get(j).getStock()) + "[/STOCK]" - + "[FACEUP]" + Integer.parseInt(stock_facingChildList.get(j).getFacing()) + "[/FACEUP]" - + "[/STOCK_FACING_DATA]"; - - stockChildXML = stockChildXML + onXML1; - } - } - stock_facing_xml = stock_facing_xml + stockChildXML; - } - - final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]"; - - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); - request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STOCK_FACING_DATA"); - request.addProperty("USERNAME", userId); - request.addProperty("MID", mid); - - envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); - envelope.dotNet = true; - envelope.setOutputSoapObject(request); - - androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - - result = envelope.getResponse(); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - } - data.value = 20; - data.name = "Stock Facing Uploading"; - publishProgress(data);*/ - - String stock_facing_xml = ""; - onXML = ""; - stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId()); - if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { @@ -547,6 +413,61 @@ public class UploadActivity extends AppCompatActivity { } data.value = 20; data.name = getString(R.string.stock_data_uploading); + publishProgress(data);*/ + + + //MSL_Availability_StockFacing + String mslAvailability_stockFacing_xml = ""; + onXML = ""; + 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 = "[MSL_AVAILABILITY_STOCK_FACING_DATA]" + + "[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]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]" + + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" + + "[/MSL_AVAILABILITY_STOCK_FACING_DATA]"; + + 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", "MSL_AVAILABILITY_STOCK_FACING_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 = 15; + data.name = getString(R.string.availability_data_uploading); publishProgress(data); @@ -592,17 +513,9 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } data.value = 30; data.name = getString(R.string.promo_data_uploading); @@ -651,25 +564,15 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } data.value = 35; data.name = getString(R.string.additional_data_uploading); publishProgress(data); - ////ashish open - //Additional Visibility Data String additional_visibility_data_xml = ""; String additional_visibility_dialog_xml = ""; @@ -707,20 +610,6 @@ public class UploadActivity extends AppCompatActivity { if (additionalVisibilitySkuList.size() > 0) { for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { - /*String sku_id = ""; - if (!additionalVisibilitySkuList.get(k).getSku_id().equals("")) { - sku_id = additionalVisibilitySkuList.get(k).getSku_id(); - } - - 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]" + sku_id + "[/SKU_ID]" - + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]" - + "[/VISIBILITY_DAILOG]";*/ - onXMLdIALOG = "[VISIBILITY_DAILOG]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -740,7 +629,7 @@ public class UploadActivity extends AppCompatActivity { + "[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]"*/ + //+ "[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]" @@ -757,6 +646,7 @@ public class UploadActivity extends AppCompatActivity { } final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]"; + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW"); @@ -772,27 +662,16 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } - - data.value = 35; + data.value = 45; data.name = getString(R.string.additional_data_uploading); publishProgress(data); - /////ashish close //T2p Upload Data - String t2p_data_xml = ""; onXML = ""; t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null); @@ -807,14 +686,12 @@ public class UploadActivity extends AppCompatActivity { 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]" @@ -830,7 +707,6 @@ public class UploadActivity extends AppCompatActivity { String sku_child; for (int k = 0; k < skuList.size(); k++) { - sku_child = "[SKU]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -849,12 +725,11 @@ public class UploadActivity extends AppCompatActivity { 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]"*/ + // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/BRAND]"; brandxml = brandxml + brandchild; @@ -881,11 +756,9 @@ public class UploadActivity extends AppCompatActivity { + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]" - + "[/T2P_DATA]"; t2p_data_xml = t2p_data_xml + onXML; - } final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]"; @@ -905,20 +778,11 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } - - data.value = 40; + data.value = 50; data.name = getString(R.string.t2p_data_uploading); publishProgress(data); @@ -964,232 +828,26 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } - data.value = 50; + data.value = 55; data.name = getString(R.string.stock_planogram_data_uploading); publishProgress(data); - //Store Wise Camera - /*String store_wise_camera_xml = ""; - onXML = ""; - storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId()); - - if (storeWiseCameraDataGetterSetters.size() > 0) { - - for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { - onXML = "[STORE_WISE_CAMERA_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - + "[CAMERA1]" + storeWiseCameraDataGetterSetters.get(i).getCamera1() + "[/CAMERA1]" - + "[CAMERA2]" + storeWiseCameraDataGetterSetters.get(i).getCamera2() + "[/CAMERA2]" - + "[CAMERA3]" + storeWiseCameraDataGetterSetters.get(i).getCamera3() + "[/CAMERA3]" - + "[CAMERA4]" + storeWiseCameraDataGetterSetters.get(i).getCamera4() + "[/CAMERA4]" - + "[/STORE_WISE_CAMERA_DATA]"; - - store_wise_camera_xml = store_wise_camera_xml + onXML; - } - - final String sos_xml = "[DATA]" + store_wise_camera_xml + "[/DATA]"; - - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); - request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STORE_WISE_CAMERA_DATA"); - request.addProperty("USERNAME", userId); - request.addProperty("MID", mid); - - envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); - envelope.dotNet = true; - envelope.setOutputSoapObject(request); - - androidHttpTransport = new HttpTransportSE(CommonString.URL); - androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); - - result = envelope.getResponse(); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - } - data.value = 55; - data.name = getString(R.string.stock_planogram_data_uploading); - publishProgress(data);*/ - - - //Image Upload - - //Store Wise Camera Images Upload - /*if (storeWiseCameraDataGetterSetters.size() > 0) { - for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera1()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera1(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera2() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera2().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera2()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera2(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera3() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera3().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera3()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera3(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera4() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera4().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera4()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera4(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - }*/ - - //Stock Facing Images Upload - /*if (stock_facingHeaderList.size() > 0) { - for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - - if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) { - if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage1()).exists()) { - - try { - result = UploadImage(stock_facingHeaderList.get(i1).getImage1(), "StockImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (stock_facingHeaderList.get(i1).getImage2() != null && !stock_facingHeaderList.get(i1).getImage2().equals("")) { - if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage2()).exists()) { - - try { - result = UploadImage(stock_facingHeaderList.get(i1).getImage2(), "StockImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - }*/ - - //Category Picture Data String Category_xml = ""; - onXML = ""; String onCategoryList = ""; String CategoryLISTDATA = ""; String image1, image2, image3, image4; - 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 { @@ -1214,77 +872,40 @@ public class UploadActivity extends AppCompatActivity { 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]" + + "[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]" + + "[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]"; @@ -1304,24 +925,17 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } - - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } - - data.value = 35; + data.value = 60; data.name = getString(R.string.additional_data_uploading); publishProgress(data); + // Images Upload + // ashish visibility image start if (additionalVisibilityList.size() > 0) { for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) { @@ -1331,10 +945,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1352,10 +965,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage2(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1374,10 +986,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage3(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1392,9 +1003,9 @@ public class UploadActivity extends AppCompatActivity { } } - - - //// ashish close image + data.value = 60; + publishProgress(data); + // ashish close image // ashish SUB_CATEGORY_PICTURE start @@ -1413,10 +1024,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1434,10 +1044,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1454,6 +1063,8 @@ public class UploadActivity extends AppCompatActivity { } } } + data.value = 70; + publishProgress(data); // ashish CATEGORY_PICTURE start @@ -1465,10 +1076,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage1(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1486,10 +1096,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage2(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1507,10 +1116,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage3(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1527,10 +1135,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage4(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1545,10 +1152,10 @@ public class UploadActivity extends AppCompatActivity { } } + data.value = 75; + publishProgress(data); - - ///////Start store images - + //Start store images if (coverageList.size() > 0) { for (int i1 = 0; i1 < coverageList.size(); i1++) { @@ -1557,10 +1164,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(coverageList.get(i1).getImage(), "StoreImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "StoreImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1574,6 +1180,8 @@ public class UploadActivity extends AppCompatActivity { } } } + data.value = 80; + publishProgress(data); //CheckOut Store Image @@ -1585,10 +1193,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(coverageList.get(i1).getCheckOut_Image(), "StoreImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "StoreImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1602,10 +1209,11 @@ public class UploadActivity extends AppCompatActivity { } } } + data.value = 85; + publishProgress(data); //T2p Images - for (int m = 0; m < t2PGetterSetters.size(); m++) { if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) { @@ -1613,9 +1221,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1633,9 +1241,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage1(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1653,9 +1261,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage2(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1667,8 +1275,9 @@ public class UploadActivity extends AppCompatActivity { } } } - } + data.value = 90; + publishProgress(data); // SET COVERAGE STATUS @@ -1697,25 +1306,22 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } + //If Result is success then status of that store is update + if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + k = k + factor; + data.value = k; + data.name = "Uploading"; + publishProgress(data); - k = k + factor; - data.value = k; - data.name = "Uploading"; + db.open(); + db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); + db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) + .getVisitDate(), CommonString.KEY_U); + + db.deleteTableWithStoreID(coverageList.get(i).getStoreId()); + } + data.value = 100; publishProgress(data); - - db.open(); - db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); - db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) - .getVisitDate(), CommonString.KEY_U); } } } @@ -1740,17 +1346,13 @@ public class UploadActivity extends AppCompatActivity { super.onPostExecute(result); dialog.dismiss(); - if (result.contains(CommonString.KEY_SUCCESS)) { - db.deleteAllTables(); + //db.deleteAllTables(); showAlert(getString(R.string.menu_upload_data)); - //showAlert(getString(R.string.menu_upload_data)); - } else { showAlert(getString(R.string.error) + result.toString()); } - } } diff --git a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml index 88ba248..3a1c281 100644 --- a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml @@ -2,20 +2,16 @@ + android:orientation="vertical"> - + android:paddingRight="10dp"> @@ -39,41 +33,34 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:inputType="text"> - - + android:inputType="text" /> - + android:weightSum="2"> - - + android:layout_height="wrap_content" + android:layout_weight="1" + android:padding="10dp" + android:textAppearance="?android:attr/textAppearanceListItem" /> - @@ -98,35 +84,23 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:inputType="number"> - - + android:inputType="number" /> - - - + android:orientation="vertical">