AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Msl_Availability_StockFacing_New Merge into Main Project

Browse Source
This commit is contained in:
Gagan290
2017-03-22 17:50:28 +05:30
parent d0c6e921fa
commit 32ad33b0fc
5 changed files with 232 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+48 -4
View File
@@ -2387,9 +2387,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public void deleteStockEntryall(String storeid, String categoryid) { public void deleteStockEntryall(String storeid, String categoryid) {
try { try {
db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null); /* db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null); db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null);
*/
db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null); db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null);
db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null); db.delete(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, "Store_Id" + "='" + storeid + "'AND categoryId" + "='" + categoryid + "'", null);
@@ -2544,7 +2544,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try { try {
// cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id + "'categoryId = '"+categoryId + "'", null); // cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility WHERE Store_Id = '"+store_id + "'categoryId = '"+categoryId + "'", null);
cursordata = db.rawQuery("Select * from Stock_Additional_visibility " + "where categoryId='" + categoryId + "' and Store_Id='" + store_id + "'", null); cursordata = db.rawQuery("Select * from Stock_Additional_visibility_Main " + "where categoryId='" + categoryId + "' and Store_Id='" + store_id + "'", null);
if (cursordata != null) { if (cursordata != null) {
cursordata.moveToFirst(); cursordata.moveToFirst();
@@ -2783,7 +2783,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
} }
public void InsertMainListAdditionalData(AddittionalGetterSetter Mainlist, ArrayList<AdditionalDialogGetterSetter> skulist, String categoryId) { /*public void InsertMainListAdditionalData(AddittionalGetterSetter Mainlist, ArrayList<AdditionalDialogGetterSetter> skulist, String categoryId) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues(); ContentValues values1 = new ContentValues();
try { try {
@@ -2821,6 +2821,50 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Log.d("Database Exception ", ex.getMessage()); Log.d("Database Exception ", ex.getMessage());
} }
}*/
public void InsertMainListAdditionalData(ArrayList<AddittionalGetterSetter> Mainlist, String categoryId) {
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
try {
for (int i = 0; i < Mainlist.size(); i++) {
AddittionalGetterSetter data = Mainlist.get(i);
values.put("Store_Id", data.getStore_id());
values.put("categoryId", categoryId);
values.put("brand_name", data.getBrand());
values.put("brand_id", data.getBrand_id());
values.put("image_url", data.getImage());
values.put("image_url2", data.getImage2());
values.put("image_url3", data.getImage3());
values.put("sku_id", data.getSku_id());
values.put("sku_name", data.getSku());
values.put("toggle_value", data.getBtn_toogle());
long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, values);
ArrayList<AdditionalDialogGetterSetter> skulist = data.getSkuDialogList();
if (skulist != null) {
for (int j = 0; j < skulist.size(); j++) {
values1.put(CommonString.KEY_Common_ID, key_id);
values1.put(CommonString.KEY_STORE_ID, skulist.get(j).getStore_id());
values1.put("categoryId", categoryId);
values1.put(CommonString.KEY_BRAND, skulist.get(j).getBrand());
values1.put(CommonString.KEY_BRAND_ID, skulist.get(j).getBrand_id());
values1.put(CommonString.KEY_QUANTITY, skulist.get(j).getQuantity());
values1.put(CommonString.KEY_SKU_ID, skulist.get(j).getSku_id());
values1.put(CommonString.KEY_SKUNAME, skulist.get(j).getSku_name());
db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, null, values1);
}
}
}
} catch (Exception ex) {
Log.d("Database Exception ", ex.getMessage());
}
} }
public ArrayList<AdditionalDialogGetterSetter> getDialogStockUpload(String keyid) { public ArrayList<AdditionalDialogGetterSetter> getDialogStockUpload(String keyid) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/AddittionalGetterSetter.java
+12
View File
@@ -1,11 +1,14 @@
package cpm.com.gskmtorange.GetterSetter; package cpm.com.gskmtorange.GetterSetter;
import java.util.ArrayList;
/** /**
* Created by ashishc on 09-01-2017. * Created by ashishc on 09-01-2017.
*/ */
public class AddittionalGetterSetter { public class AddittionalGetterSetter {
public String getBrand() { public String getBrand() {
return Brand; return Brand;
} }
@@ -107,4 +110,13 @@ public class AddittionalGetterSetter {
String categoryId; String categoryId;
ArrayList<AdditionalDialogGetterSetter> skuDialogList = new ArrayList<>();
public ArrayList<AdditionalDialogGetterSetter> getSkuDialogList() {
return skuDialogList;
}
public void setSkuDialogList(ArrayList<AdditionalDialogGetterSetter> skuDialogList) {
this.skuDialogList = skuDialogList;
}
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+2 -2
View File
@@ -242,8 +242,8 @@ public class LoginActivity extends AppCompatActivity {
mPasswordView.setError(null); mPasswordView.setError(null);
// Store values at the time of the login attempt. // Store values at the time of the login attempt.
userid = museridView.getText().toString(); userid = museridView.getText().toString().trim();
password = mPasswordView.getText().toString(); password = mPasswordView.getText().toString().trim();
boolean cancel = false; boolean cancel = false;
View focusView = null; View focusView = null;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+141 -153
View File
@@ -12,9 +12,6 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
@@ -40,7 +37,6 @@ import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ToggleButton; import android.widget.ToggleButton;
@@ -49,21 +45,17 @@ import java.io.File;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GeoTag.GeoTagActivity;
import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter; import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter; import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.gsk_dailyentry.DailyDataMenuActivity;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
/** /**
* Created by ashishc on 05-01-2017. * Created by ashishc on 05-01-2017.
@@ -71,7 +63,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
public class AdditionalVisibility extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener { public class AdditionalVisibility extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemSelectedListener {
ArrayList<AdditionalDialogGetterSetter> list = new ArrayList<AdditionalDialogGetterSetter>(); ArrayList<AdditionalDialogGetterSetter> list = new ArrayList<AdditionalDialogGetterSetter>();
ArrayList<AddittionalGetterSetter> listdata = new ArrayList<AddittionalGetterSetter>(); ArrayList<AddittionalGetterSetter> listdata = new ArrayList<>();
ArrayList<AddittionalGetterSetter> listMain = new ArrayList<AddittionalGetterSetter>(); ArrayList<AddittionalGetterSetter> listMain = new ArrayList<AddittionalGetterSetter>();
ArrayList<AdditionalDialogGetterSetter> additionalVisibilitySkuList; ArrayList<AdditionalDialogGetterSetter> additionalVisibilitySkuList;
ArrayList<AdditionalDialogGetterSetter> additionalVisibilityinsertSkuList; ArrayList<AdditionalDialogGetterSetter> additionalVisibilityinsertSkuList;
@@ -226,22 +218,45 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
/// maintable /// maintable
listMain = db.getAdditionalMainStock(store_id, categoryId); listdata = db.getAdditionalMainStock(store_id, categoryId);
for (int k = 0; k < listMain.size(); k++) { for (int k = 0; k < listdata.size(); k++) {
listdata.get(k).setSkuDialogList(db.getDialogStock(listdata.get(k).getKey_id()));
String tooglevalue = listMain.get(k).getBtn_toogle(); String tooglevalue = listdata.get(k).getBtn_toogle();
if (tooglevalue.equalsIgnoreCase("0")) { /*if (tooglevalue.equalsIgnoreCase("0")) {
btnaddlayout.setVisibility(View.INVISIBLE); btnaddlayout.setVisibility(View.INVISIBLE);
cardvew.setVisibility(View.INVISIBLE); cardvew.setVisibility(View.INVISIBLE);
listviewlay.setVisibility(View.INVISIBLE); listviewlay.setVisibility(View.INVISIBLE);
maincard.setVisibility(View.INVISIBLE); maincard.setVisibility(View.INVISIBLE);
btntoggle.setChecked(false); btntoggle.setChecked(false);
brandlayout.setVisibility(View.GONE); brandlayout.setVisibility(View.GONE);
diaplylayout.setVisibility(View.INVISIBLE); diaplylayout.setVisibility(View.INVISIBLE);
cameralayout.setVisibility(View.INVISIBLE); cameralayout.setVisibility(View.INVISIBLE);
btnsku.setVisibility(View.INVISIBLE); btnsku.setVisibility(View.INVISIBLE);
}*/
if (tooglevalue.equalsIgnoreCase("0")) {
listviewlay.setVisibility(View.INVISIBLE);
maincard.setVisibility(View.INVISIBLE);
cardvew.setVisibility(View.INVISIBLE);
btnaddlayout.setVisibility(View.INVISIBLE);
btntoggle.setChecked(false);
brandlayout.setVisibility(View.GONE);
diaplylayout.setVisibility(View.INVISIBLE);
cameralayout.setVisibility(View.INVISIBLE);
btnsku.setVisibility(View.INVISIBLE);
} else {
adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
listviewlay.setAdapter(adapteradditional);
listviewlay.invalidateViews();
btnaddlayout.setVisibility(View.VISIBLE);
cardvew.setVisibility(View.VISIBLE);
listviewlay.setVisibility(View.VISIBLE);
maincard.setVisibility(View.VISIBLE);
} }
/* String KeyID = listdata.get(k).getKey_id(); /* String KeyID = listdata.get(k).getKey_id();
@@ -250,7 +265,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
listdata = db.getAdditionalStock(store_id, categoryId); /* listdata = db.getAdditionalStock(store_id, categoryId);
for (int k = 0; k < listdata.size(); k++) { for (int k = 0; k < listdata.size(); k++) {
@@ -269,10 +284,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnsku.setVisibility(View.INVISIBLE); btnsku.setVisibility(View.INVISIBLE);
} }
} }*/
if (listdata.size() > 0) { /*if (listdata.size() > 0) {
for (int i = 0; i < listdata.size(); i++) { for (int i = 0; i < listdata.size(); i++) {
if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) { if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) {
listviewlay.setVisibility(View.INVISIBLE); listviewlay.setVisibility(View.INVISIBLE);
@@ -290,7 +305,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
} }
} }*/
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
@Override @Override
@@ -298,7 +313,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (togglevalue.equals("1")) { if (togglevalue.equals("1")) {
listdata = db.getAdditionalStock(store_id, categoryId); //listdata = db.getAdditionalStock(store_id, categoryId);
if (listdata.size() > 0) { if (listdata.size() > 0) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
@@ -314,7 +329,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
db.deleteStockEntryMainTable(store_id, categoryId); db.deleteStockEntryMainTable(store_id, categoryId);
for (int J = 0; J < listdata.size(); J++) { /*for (int J = 0; J < listdata.size(); J++) {
newadd = new AddittionalGetterSetter(); newadd = new AddittionalGetterSetter();
newadd.setBrand(listdata.get(J).getBrand_id()); newadd.setBrand(listdata.get(J).getBrand_id());
newadd.setBrand_id(listdata.get(J).getBrand_id()); newadd.setBrand_id(listdata.get(J).getBrand_id());
@@ -327,13 +342,16 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
newadd.setBtn_toogle(listdata.get(J).getBtn_toogle()); newadd.setBtn_toogle(listdata.get(J).getBtn_toogle());
newadd.setCategoryId(listdata.get(J).getCategoryId()); newadd.setCategoryId(listdata.get(J).getCategoryId());
String KeyID = listdata.get(J).getKey_id(); String KeyID = listdata.get(J).getKey_id();
additionalVisibilitySkuList = db.getDialogStock(KeyID);
db.InsertMainListAdditionalData(newadd, additionalVisibilitySkuList, categoryId); //additionalVisibilitySkuList = db.getDialogStock(KeyID);
db.InsertMainListAdditionalData(listdata, additionalVisibilitySkuList, categoryId);
KeyID = ""; KeyID = "";
additionalVisibilitySkuList.clear(); additionalVisibilitySkuList.clear();
} }*/
db.InsertMainListAdditionalData(listdata, categoryId);
finish(); finish();
} }
}) })
@@ -369,22 +387,25 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
db.deleteStockEntryall(store_id, categoryId); db.deleteStockEntryMainTable(store_id, categoryId);
listdata.clear();
newadd = new AddittionalGetterSetter(); newadd = new AddittionalGetterSetter();
newadd.setBrand(brand_list_name); newadd.setBrand("");
newadd.setBrand_id(brand_list_id); newadd.setBrand_id("");
newadd.setImage(img_str1); newadd.setImage("");
newadd.setImage2(img_str2); newadd.setImage2("");
newadd.setImage3(img_str3); newadd.setImage3("");
newadd.setSku(sku_list_name); newadd.setSku("");
newadd.setSku_id(sku_list_id); newadd.setSku_id("");
newadd.setStore_id(store_id); newadd.setStore_id(store_id);
newadd.setBtn_toogle(togglevalue); newadd.setBtn_toogle(togglevalue);
newadd.setCategoryId(categoryId); newadd.setCategoryId(categoryId);
listdata.add(newadd);
db.InsertMainListAdditionalData(newadd, additionalVisibilitySkuList, categoryId); db.InsertMainListAdditionalData(listdata, categoryId);
finish(); finish();
} }
}) })
@@ -425,7 +446,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
adGt.setBtn_toogle(togglevalue); adGt.setBtn_toogle(togglevalue);
adGt.setCategoryId(categoryId); adGt.setCategoryId(categoryId);
if (validateData(adGt, defdata)) { adGt.setSkuDialogList(defdata);
if (validateData(adGt)) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
@@ -437,7 +460,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
db.InsertAdditionalData(adGt, defdata, categoryId); // db.InsertAdditionalData(adGt, defdata, categoryId);
//Adding data to existing parent list
listdata.add(adGt);
spinner_brand_list.setSelection(0); spinner_brand_list.setSelection(0);
spinner_sku_list.setSelection(0); spinner_sku_list.setSelection(0);
img_str1 = ""; img_str1 = "";
@@ -449,16 +476,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
sku_list_id = ""; sku_list_id = "";
defdata.clear(); defdata.clear();
if(defdata.size()>0) btnsku.setBackgroundResource(R.color.colorPrimary);
{
// btn_add.setBackgroundResource(Color);
btnsku.setBackgroundResource(R.color.green);
}else{
btnsku.setBackgroundResource(R.color.colorPrimary);
}
if (camera_allow.equals("1")) { if (camera_allow.equals("1")) {
btnimage.setBackgroundResource(R.mipmap.camera_orange); btnimage.setBackgroundResource(R.mipmap.camera_orange);
@@ -474,7 +492,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
listdata = db.getAdditionalStock(store_id, categoryId); //listdata = db.getAdditionalStock(store_id, categoryId);
if (listdata.size() > 0) { if (listdata.size() > 0) {
for (int i = 0; i < listdata.size(); i++) { for (int i = 0; i < listdata.size(); i++) {
if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) { if (listdata.get(i).getBtn_toogle().equalsIgnoreCase("0")) {
@@ -490,12 +508,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
cardvew.setVisibility(View.VISIBLE); cardvew.setVisibility(View.VISIBLE);
listviewlay.setVisibility(View.VISIBLE); listviewlay.setVisibility(View.VISIBLE);
maincard.setVisibility(View.VISIBLE); maincard.setVisibility(View.VISIBLE);
} }
} }
} else {
} }
} }
@@ -525,9 +539,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (btntoggle.isChecked()) { if (btntoggle.isChecked()) {
listdata = db.getAdditionalStock(store_id, categoryId); //listdata = db.getAdditionalStock(store_id, categoryId);
if (listdata.size() > 0) { /*if (listdata.size() > 0) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this); AdditionalVisibility.this);
// set title // set title
@@ -549,6 +563,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
cardvew.setVisibility(View.VISIBLE); cardvew.setVisibility(View.VISIBLE);
listviewlay.setVisibility(View.VISIBLE); listviewlay.setVisibility(View.VISIBLE);
maincard.setVisibility(View.INVISIBLE); maincard.setVisibility(View.INVISIBLE);
listdata = db.getAdditionalStock(store_id, categoryId); listdata = db.getAdditionalStock(store_id, categoryId);
adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
@@ -628,11 +643,24 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
} }*/
listdata.clear();
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);
} else { } else {
listdata = db.getAdditionalStock(store_id, categoryId); //listdata = db.getAdditionalStock(store_id, categoryId);
if (listdata.size() > 0) { if (listdata.size() > 0) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
@@ -646,22 +674,28 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
db.deleteStockEntryall(store_id, categoryId); //db.deleteStockEntryall(store_id, categoryId);
togglevalue = "0"; /* togglevalue = "0";
btntoggle.setChecked(false); btntoggle.setChecked(false);
*/
//clear both parent and child data lists
//defdata.clear();
listdata.clear();
defdata.clear(); /* btnaddlayout.setVisibility(View.INVISIBLE);
btnaddlayout.setVisibility(View.INVISIBLE);
brandlayout.setVisibility(View.GONE); brandlayout.setVisibility(View.GONE);
diaplylayout.setVisibility(View.INVISIBLE); diaplylayout.setVisibility(View.INVISIBLE);
cameralayout.setVisibility(View.INVISIBLE); cameralayout.setVisibility(View.INVISIBLE);
btnsku.setVisibility(View.INVISIBLE); btnsku.setVisibility(View.INVISIBLE);
maincard.setVisibility(View.INVISIBLE); maincard.setVisibility(View.INVISIBLE);*/
listdata = db.getAdditionalStock(store_id, categoryId);
adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
listviewlay.setAdapter(adapteradditional);
listviewlay.invalidateViews();
// listdata = db.getAdditionalStock(store_id, categoryId);
/* adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
listviewlay.setAdapter(adapteradditional);
listviewlay.invalidateViews();*/
adapteradditional.notifyDataSetChanged();
} }
}) })
@@ -679,18 +713,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
AlertDialog alertDialog = alertDialogBuilder.create(); AlertDialog alertDialog = alertDialogBuilder.create();
// show it // show it
alertDialog.show(); alertDialog.show();
} else {
togglevalue = "0";
defdata.clear();
btntoggle.setChecked(false);
btnaddlayout.setVisibility(View.INVISIBLE);
brandlayout.setVisibility(View.GONE);
diaplylayout.setVisibility(View.INVISIBLE);
cameralayout.setVisibility(View.INVISIBLE);
btnsku.setVisibility(View.INVISIBLE);
maincard.setVisibility(View.INVISIBLE);
} }
togglevalue = "0";
btntoggle.setChecked(false);
defdata.clear();
btnaddlayout.setVisibility(View.INVISIBLE);
brandlayout.setVisibility(View.GONE);
diaplylayout.setVisibility(View.INVISIBLE);
cameralayout.setVisibility(View.INVISIBLE);
btnsku.setVisibility(View.INVISIBLE);
maincard.setVisibility(View.INVISIBLE);
} }
} }
}); });
@@ -701,7 +737,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnimage.setOnClickListener(new View.OnClickListener() { btnimage.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
_pathforcheck1 = store_id +categoryId+ "AdditionalImage1" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _pathforcheck1 = store_id + categoryId + "AdditionalImage1" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck1; _path = CommonString.FILE_PATH + _pathforcheck1;
intime = getCurrentTime(); intime = getCurrentTime();
@@ -713,7 +749,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnimage1.setOnClickListener(new View.OnClickListener() { btnimage1.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
_pathforcheck2 = store_id +categoryId+ "AdditionalImage2" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _pathforcheck2 = store_id + categoryId + "AdditionalImage2" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck2; _path = CommonString.FILE_PATH + _pathforcheck2;
intime = getCurrentTime(); intime = getCurrentTime();
@@ -725,7 +761,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btnimage2.setOnClickListener(new View.OnClickListener() { btnimage2.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
_pathforcheck3 = store_id +categoryId+ "AdditionalImage3" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _pathforcheck3 = store_id + categoryId + "AdditionalImage3" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck3; _path = CommonString.FILE_PATH + _pathforcheck3;
intime = getCurrentTime(); intime = getCurrentTime();
@@ -746,7 +782,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override @Override
public void onClick(View view) { public void onClick(View view) {
showSkuDialog(); showSkuDialog();
} }
}); });
@@ -995,18 +1030,18 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
//temp value in case camera is gallery app above jellybean //temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString(); 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; gallery_package = list.get(n).packageName;
} }
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { 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; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
} else { } else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) { if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName; defaultCameraPackage = list.get(n).packageName;
break; break;
@@ -1089,6 +1124,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
BrandMasterGetterSetter brand = new BrandMasterGetterSetter(); BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
brand.setBRAND(getResources().getString(R.string.select)); brand.setBRAND(getResources().getString(R.string.select));
brandList.add(0, brand); brandList.add(0, brand);
// ArrayList<SkuMasterGetterSetter> skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",) // ArrayList<SkuMasterGetterSetter> skuMasterGetterSetterArrayList = db.getSkuT2PData("1", "1", "1",)
final Dialog dialog = new Dialog(AdditionalVisibility.this); final Dialog dialog = new Dialog(AdditionalVisibility.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -1106,27 +1142,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
linearlay = (LinearLayout) dialog.findViewById(R.id.list_layout); linearlay = (LinearLayout) dialog.findViewById(R.id.list_layout);
cardlay = (CardView) dialog.findViewById(R.id.cardId); cardlay = (CardView) dialog.findViewById(R.id.cardId);
//list = db.getDialogStock(store_id); //list = db.getDialogStock(store_id);
if (defdata.size() > 0) { if (defdata.size() > 0) {
linearlay.setVisibility(View.VISIBLE); linearlay.setVisibility(View.VISIBLE);
cardlay.setVisibility(View.VISIBLE); cardlay.setVisibility(View.VISIBLE);
adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata); adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata);
listview.setAdapter(adapterData); listview.setAdapter(adapterData);
listview.invalidateViews(); listview.invalidateViews();
} else { } else {
linearlay.setVisibility(View.INVISIBLE); linearlay.setVisibility(View.INVISIBLE);
cardlay.setVisibility(View.INVISIBLE); cardlay.setVisibility(View.INVISIBLE);
} }
spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -1150,19 +1179,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btn_close.setOnClickListener(new View.OnClickListener() { btn_close.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
dialog.cancel(); dialog.cancel();
if(defdata.size()>0) if (defdata.size() > 0) {
{
// btn_add.setBackgroundResource(Color); // btn_add.setBackgroundResource(Color);
btnsku.setBackgroundResource(R.color.green); btnsku.setBackgroundResource(R.color.green);
}else{ } else {
btnsku.setBackgroundResource(R.color.colorPrimary); btnsku.setBackgroundResource(R.color.colorPrimary);
} }
} }
}); });
@@ -1172,10 +1197,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
public void onClick(View v) { public void onClick(View v) {
AdditionalDialogGetterSetter ab = new AdditionalDialogGetterSetter(); AdditionalDialogGetterSetter ab = new AdditionalDialogGetterSetter();
ab.setBrand(brand_name); ab.setBrand(brand_name);
ab.setBrand_id(brand_id); ab.setBrand_id(brand_id);
//ab.setDisplay_id(data.get(position).getDisplay_id()); //ab.setDisplay_id(data.get(position).getDisplay_id());
ab.setStore_id(store_id); ab.setStore_id(store_id);
// ab.setUnique_id(data.get(position).getUnique_id()); // ab.setUnique_id(data.get(position).getUnique_id());
@@ -1186,30 +1209,24 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
// ab.setCategory_id(category_id); // ab.setCategory_id(category_id);
if (validateDialogData(ab)) { if (validateDialogData(ab)) {
defdata.add(ab); defdata.add(ab);
// db.InsertStockDialog(ab); // db.InsertStockDialog(ab);
// spinner_brand.setSelection(0); // spinner_brand.setSelection(0);
spinner_sku.setSelection(0); spinner_sku.setSelection(0);
Edt_txt.setText(""); Edt_txt.setText("");
SKU_ID=""; SKU_ID = "";
SKU_name=""; SKU_name = "";
// list = db.getDialogStock(store_id); // list = db.getDialogStock(store_id);
linearlay.setVisibility(View.VISIBLE); linearlay.setVisibility(View.VISIBLE);
cardlay.setVisibility(View.VISIBLE); cardlay.setVisibility(View.VISIBLE);
adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata); adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata);
listview.setAdapter(adapterData); listview.setAdapter(adapterData);
listview.invalidateViews(); listview.invalidateViews();
} else { } else {
Snackbar.make(v, msg, Snackbar.LENGTH_LONG).setAction("Action", null).show(); Snackbar.make(v, msg, Snackbar.LENGTH_LONG).setAction("Action", null).show();
} }
// dialog.cancel(); // dialog.cancel();
} }
}); });
@@ -1246,7 +1263,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
spinner_sku.setAdapter(skuadapter); spinner_sku.setAdapter(skuadapter);
spinner_sku.setSelection(0); spinner_sku.setSelection(0);
SKU_ID=""; SKU_ID = "";
} }
} }
@@ -1258,12 +1275,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}); });
if(defdata.size()>0) if (defdata.size() > 0) {
{
// btn_add.setBackgroundResource(Color); // btn_add.setBackgroundResource(Color);
btnsku.setBackgroundResource(R.color.green); btnsku.setBackgroundResource(R.color.green);
}else{ } else {
btnsku.setBackgroundResource(R.color.colorPrimary); btnsku.setBackgroundResource(R.color.colorPrimary);
} }
@@ -1278,10 +1294,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
SKU_name = sku_list.get(position).getSKU(); SKU_name = sku_list.get(position).getSKU();
} } else {
else{ SKU_ID = "";
SKU_ID=""; SKU_name = "";
SKU_name="";
} }
} }
@@ -1330,7 +1345,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
private ArrayList<AdditionalDialogGetterSetter> list; private ArrayList<AdditionalDialogGetterSetter> list;
public MyAdaptorStock(Activity activity, ArrayList<AdditionalDialogGetterSetter> list1) { public MyAdaptorStock(Activity activity, ArrayList<AdditionalDialogGetterSetter> list1) {
mInflater = LayoutInflater.from(getBaseContext()); mInflater = LayoutInflater.from(getBaseContext());
mcontext = activity; mcontext = activity;
list = list1; list = list1;
@@ -1362,42 +1376,31 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override @Override
public View getView(final int position1, View convertView, ViewGroup parent) { public View getView(final int position1, View convertView, ViewGroup parent) {
final ViewHolder holder; final ViewHolder holder;
if (convertView == null) { if (convertView == null) {
convertView = mInflater convertView = mInflater.inflate(R.layout.additionaldialoglayout, null);
.inflate(R.layout.additionaldialoglayout, null);
holder = new ViewHolder(); holder = new ViewHolder();
holder.brand = (TextView) convertView.findViewById(R.id.brand_name); holder.brand = (TextView) convertView.findViewById(R.id.brand_name);
holder.display = (TextView) convertView.findViewById(R.id.display_name); holder.display = (TextView) convertView.findViewById(R.id.display_name);
holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought);
holder.delete = (Button) convertView.findViewById(R.id.delete_btn); holder.delete = (Button) convertView.findViewById(R.id.delete_btn);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
holder = (ViewHolder) convertView.getTag(); holder = (ViewHolder) convertView.getTag();
} }
holder.delete.setOnClickListener(new View.OnClickListener() { holder.delete.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdditionalVisibility.this);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
AdditionalVisibility.this);
// set title
alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
alertDialogBuilder alertDialogBuilder.setMessage(getResources().getString(R.string.data_will_be_lost))
.setMessage(getResources().getString(R.string.data_will_be_lost))
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
@@ -1405,18 +1408,14 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
// db.deletedialogStockEntry(list.get(position1).getKEY_ID()); // db.deletedialogStockEntry(list.get(position1).getKEY_ID());
defdata.remove(position1); defdata.remove(position1);
adapterData.notifyDataSetChanged(); adapterData.notifyDataSetChanged();
/* list = db.getTOTStockEntryDetail(store_id, category_id, process_id, /* list = db.getTOTStockEntryDetail(store_id, category_id, process_id,
list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/ list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/
//list = db.getDialogStock(store_id); //list = db.getDialogStock(store_id);
listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata)); //listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata));
listview.invalidateViews(); listview.invalidateViews();
} }
}) })
.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
@@ -1519,10 +1518,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(AdditionalVisibility.this);
AdditionalVisibility.this);
// set title
alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title));
// set dialog message // set dialog message
@@ -1532,18 +1528,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
db.deleteStockEntry(listdata.get(position1).getKey_id()); //db.deleteStockEntry(listdata.get(position1).getKey_id());
listdata.remove(position1);
adapteradditional.notifyDataSetChanged(); adapteradditional.notifyDataSetChanged();
listviewlay.invalidateViews();
listdata = db.getAdditionalStock(store_id, categoryId); /*listdata = db.getAdditionalStock(store_id, categoryId);
adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata);
listviewlay.setAdapter(adapteradditional); listviewlay.setAdapter(adapteradditional);
listviewlay.invalidateViews(); listviewlay.invalidateViews();*/
if (listdata.size() > 0) { if (listdata.size() > 0) {
@@ -1570,25 +1568,18 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}) })
.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
// if this button is clicked, just close
// the dialog box and do nothing
dialog.cancel(); dialog.cancel();
} }
}); });
// create alert dialog // create alert dialog
AlertDialog alertDialog = alertDialogBuilder.create(); AlertDialog alertDialog = alertDialogBuilder.create();
// show it
alertDialog.show(); alertDialog.show();
} }
}); });
holder.brand.setText(list.get(position1).getBrand().toString()); holder.brand.setText(list.get(position1).getBrand().toString());
holder.display.setText(list.get(position1).getSku().toString()); holder.display.setText(list.get(position1).getSku().toString());
holder.brand.setId(position1); holder.brand.setId(position1);
holder.display.setId(position1); holder.display.setId(position1);
holder.qty_bought.setId(position1); holder.qty_bought.setId(position1);
@@ -1598,7 +1589,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} }
} }
boolean validateData(AddittionalGetterSetter data, ArrayList<AdditionalDialogGetterSetter> dialog) { boolean validateData(AddittionalGetterSetter data) {
boolean flag = true; boolean flag = true;
String brandid = data.getBrand_id(); String brandid = data.getBrand_id();
@@ -1606,7 +1597,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
String imageu = data.getImage(); String imageu = data.getImage();
String toggleid = data.getBtn_toogle(); String toggleid = data.getBtn_toogle();
ArrayList<AdditionalDialogGetterSetter> skuList = data.getSkuDialogList();
if (toggleid.equalsIgnoreCase("0")) { if (toggleid.equalsIgnoreCase("0")) {
flag = true; flag = true;
@@ -1623,12 +1614,12 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
errormsg = getResources().getString(R.string.title_activity_take_image); errormsg = getResources().getString(R.string.title_activity_take_image);
} else if (dialog.size() == 0) { } else if (skuList.size() == 0) {
errormsg = getResources().getString(R.string.title_activity_fill_sku); errormsg = getResources().getString(R.string.title_activity_fill_sku);
flag = false; flag = false;
} }
} else if (dialog.size() == 0) { } else if (skuList.size() == 0) {
errormsg = getResources().getString(R.string.title_activity_fill_sku); errormsg = getResources().getString(R.string.title_activity_fill_sku);
flag = false; flag = false;
@@ -1678,9 +1669,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+29 -51
View File
@@ -675,7 +675,6 @@ public class UploadActivity extends AppCompatActivity {
String additional_visibility_dialog_xml = ""; String additional_visibility_dialog_xml = "";
onXML = ""; onXML = "";
String onXMLdIALOG = ""; String onXMLdIALOG = "";
String imageV1, imageV2, imageV3; String imageV1, imageV2, imageV3;
additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId()); additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
@@ -701,71 +700,52 @@ public class UploadActivity extends AppCompatActivity {
imageV3 = additionalVisibilityList.get(J).getImage3(); imageV3 = additionalVisibilityList.get(J).getImage3();
} }
String KeyID = additionalVisibilityList.get(J).getKey_id(); String KeyID = additionalVisibilityList.get(J).getKey_id();
additionalVisibilitySkuList = db.getDialogStockUpload(KeyID); additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
if (additionalVisibilitySkuList.size() > 0) { if (additionalVisibilitySkuList.size() > 0) {
for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { 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]" onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ "[MID]" + mid + "[/MID]" + "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + "[USER_ID]" + userId + "[/USER_ID]"
+ userId + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
+ "[/USER_ID]" + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
+ "[KEY_ID]" + "[SKU_ID]" + sku_id + "[/SKU_ID]"
+ additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
+ "[/KEY_ID]" + "[/VISIBILITY_DAILOG]";*/
+ "[CATEGORY_ID]"
+ additionalVisibilitySkuList.get(k).getCategoryId() onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ "[/CATEGORY_ID]" + "[MID]" + mid + "[/MID]"
+ "[SKU_ID]" + "[USER_ID]" + userId + "[/USER_ID]"
+ additionalVisibilitySkuList.get(k).getSku_id() + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]"
+ "[/SKU_ID]" + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_ID]"
+ "[QUANTITY]" + "[SKU_ID]" + additionalVisibilitySkuList.get(k).getSku_id() + "[/SKU_ID]"
+ additionalVisibilitySkuList.get(k).getQuantity() + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]"
+ "[/QUANTITY]"
+ "[/VISIBILITY_DAILOG]"; + "[/VISIBILITY_DAILOG]";
additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
} }
} }
onXML = "[ADDITIONAL_VISIBILITY_NEW]" onXML = "[ADDITIONAL_VISIBILITY_NEW]"
+ "[MID]" + mid + "[/MID]" + "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + "[USER_ID]" + userId + "[/USER_ID]"
+ userId + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]"
+ "[/USER_ID]" + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]"
+ "[KEY_ID]" + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]"
+ additionalVisibilityList.get(J).getKey_id() /* + "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"*/
+ "[/KEY_ID]" + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]"
+ "[CATEGORY_ID]" + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]"
+ additionalVisibilityList.get(J).getCategoryId() + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]"
+ "[/CATEGORY_ID]" + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]"
+ "[ADDITIONAL_DISPLAY]" + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]"
+ 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]"; + "[/ADDITIONAL_VISIBILITY_NEW]";
@@ -774,11 +754,9 @@ public class UploadActivity extends AppCompatActivity {
additionalVisibilitySkuList.clear(); additionalVisibilitySkuList.clear();
additional_visibility_dialog_xml = ""; additional_visibility_dialog_xml = "";
} }
final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]"; final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml); request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW"); request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW");