From f4a8b065ea92386059472d7c61b3ada1b203214b Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 18 Jan 2017 15:40:45 +0530 Subject: [PATCH 1/7] newcode --- GSKMTOrange/src/main/AndroidManifest.xml | 4 ++-- .../cpm/com/gskmtorange/GeoTag/GeoTagActivity.java | 12 ++++++++++-- .../com/gskmtorange/dailyentry/NonWorkingReason.java | 2 +- .../cpm/com/gskmtorange/messgae/AlertMessage.java | 1 - GSKMTOrange/src/main/res/layout/nonworking.xml | 4 ++-- GSKMTOrange/src/main/res/values-tr/string.xml | 12 +++++++++--- GSKMTOrange/src/main/res/values/strings.xml | 4 +++- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 5543158..9d8b764 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -49,12 +49,12 @@ android:screenOrientation="portrait" /> @@ -120,7 +120,7 @@ android:layout_height="40sp" android:layout_centerInParent="true" android:background="@color/colorPrimary" - android:text="SAVE" + android:text="@string/save" android:textColor="#ffffff" android:textSize="17sp" /> diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 93cf68e..5256dbf 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -161,10 +161,16 @@ Veriler Paylaşılıyor , Veriler Paylaşılmadı , Sil - Click Yes To Add Data + Veri Eklemek İçin Evet tıklayın Teşhir Türü - - + Click Store Front Image + Brand Name + SKU Name + Teşhir Sayısı + Coğrafi Konum + Store List + Remark + Please fill Remark diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index e25072c..16b7bb4 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -50,7 +50,7 @@ Please select language Select Language - Store List + Store List Geo Tag @@ -218,6 +218,8 @@ Data Not Uploaded , Display Name Click Yes To Add Data + Remark + Please fill Remark From e7ca0ef7a5d2c93f57528b755b4d9cabb0f12589 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 18 Jan 2017 16:09:42 +0530 Subject: [PATCH 2/7] newcode --- .../gskmtorange/GeoTag/GeoTagActivity.java | 50 ++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 6c1fa7f..0a2e278 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -694,12 +694,25 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } catch (SocketException ex) { ex.printStackTrace(); + Intent intent = new Intent( + GeoTagActivity.this, + GeoTagStoreList.class); + startActivity(intent); + + GeoTagActivity.this.finish(); } catch (Exception ex) { ex.printStackTrace(); + Intent intent = new Intent( + GeoTagActivity.this, + GeoTagStoreList.class); + + startActivity(intent); + + GeoTagActivity.this.finish(); } @@ -719,13 +732,13 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb new GeoTagImageUpload(GeoTagActivity.this).execute(); - Intent intent = new Intent( + /* Intent intent = new Intent( GeoTagActivity.this, GeoTagStoreList.class); startActivity(intent); - GeoTagActivity.this.finish(); + GeoTagActivity.this.finish();*/ } else if(!result.equals(CommonString.KEY_SUCCESS)) @@ -843,11 +856,29 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb catch (SocketException ex) { ex.printStackTrace(); + + Intent intent = new Intent( + GeoTagActivity.this, + GeoTagStoreList.class); + + startActivity(intent); + + GeoTagActivity.this.finish(); + } catch (Exception ex) { ex.printStackTrace(); + + Intent intent = new Intent( + GeoTagActivity.this, + GeoTagStoreList.class); + + startActivity(intent); + + GeoTagActivity.this.finish(); + } return ""; @@ -883,10 +914,10 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb - AlertMessage message = new AlertMessage( + /* AlertMessage message = new AlertMessage( GeoTagActivity.this, getResources().getString(R.string.uploadeddata) + result, getResources().getString(R.string.success), null); - message.showMessage(); + message.showMessage();*/ Intent intent = new Intent( GeoTagActivity.this, @@ -896,17 +927,24 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb GeoTagActivity.this.finish(); + Toast.makeText(getApplicationContext(),getResources().getString(R.string.success),Toast.LENGTH_LONG).show(); } else if(!result.equals(CommonString.KEY_SUCCESS)) { - AlertMessage message = new AlertMessage( + /* AlertMessage message = new AlertMessage( GeoTagActivity.this, AlertMessage.MESSAGE_DATA_NOT + result, getResources().getString(R.string.failure), null); - message.showMessage(); + message.showMessage();*/ + Toast.makeText(getApplicationContext(),getResources().getString(R.string.failure),Toast.LENGTH_LONG).show(); + Intent intent = new Intent( + GeoTagActivity.this, + GeoTagStoreList.class); + startActivity(intent); + GeoTagActivity.this.finish(); } From c9f43af6d35d98a1f6e7f779154d2136c63e5db5 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Wed, 18 Jan 2017 18:06:22 +0530 Subject: [PATCH 3/7] newcode --- .../com/gskmtorange/Database/GSKOrangeDB.java | 8 ++++++ .../dailyentry/NonWorkingReason.java | 2 +- .../main/res/layout/nonworkingmainlayout.xml | 28 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 GSKMTOrange/src/main/res/layout/nonworkingmainlayout.xml 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 9a7fa32..c0c1d7f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -129,6 +129,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteTableWithStoreID(String storeid) { db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + + db.delete(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + + } @@ -3067,6 +3074,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setIMAGE_URL(cursordata.getString(cursordata.getColumnIndexOrThrow("IMAGE_URL"))); sb.setIMAGE_PATH(cursordata.getString(cursordata.getColumnIndexOrThrow("IMAGE_PATH"))); + Data.add(sb); cursordata.moveToNext(); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index b9f39ec..b05bf92 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -80,7 +80,7 @@ public class NonWorkingReason extends AppCompatActivity implements protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onCreate(savedInstanceState); - setContentView(R.layout.nonworking); + setContentView(R.layout.nonworkingmainlayout); reasonspinner = (Spinner) findViewById(R.id.spinner2); camera = (ImageButton) findViewById(R.id.imgcam); diff --git a/GSKMTOrange/src/main/res/layout/nonworkingmainlayout.xml b/GSKMTOrange/src/main/res/layout/nonworkingmainlayout.xml new file mode 100644 index 0000000..1e14574 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/nonworkingmainlayout.xml @@ -0,0 +1,28 @@ + + + + + + + + + + From d8a175e7b2404ab759e59bcb429ba01f112958c0 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Wed, 18 Jan 2017 18:07:59 +0530 Subject: [PATCH 4/7] //Stock_FacingActivity Changes today --- .../gsk_dailyentry/Stock_FacingActivity.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index f9c5e9d..45584f5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -92,6 +92,7 @@ public class Stock_FacingActivity extends AppCompatActivity { Uri outputFileUri = null; String gallery_package = ""; private SharedPreferences preferences; + boolean isExpand = true; private static boolean updateResources(Context context, String language) { @@ -215,12 +216,14 @@ public class Stock_FacingActivity extends AppCompatActivity { public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { int lastItem = firstVisibleItem + visibleItemCount; - if (firstVisibleItem == 0) { - fab.setVisibility(View.VISIBLE); - } else if (lastItem == totalItemCount) { - fab.setVisibility(View.INVISIBLE); - } else { - fab.setVisibility(View.VISIBLE); + if (isExpand) { + if (firstVisibleItem == 0) { + fab.setVisibility(View.VISIBLE); + } else if (lastItem == totalItemCount) { + fab.setVisibility(View.INVISIBLE); + } else { + fab.setVisibility(View.VISIBLE); + } } } @@ -256,6 +259,12 @@ public class Stock_FacingActivity extends AppCompatActivity { getCurrentFocus().clearFocus(); } + if (groupPosition == 0) { + isExpand = false; + } else { + isExpand = true; + } + fab.setVisibility(View.INVISIBLE); } }); @@ -271,6 +280,11 @@ public class Stock_FacingActivity extends AppCompatActivity { getCurrentFocus().clearFocus(); } + if (groupPosition == 0) { + isExpand = false; + } else { + isExpand = true; + } fab.setVisibility(View.VISIBLE); } }); @@ -692,6 +706,8 @@ public class Stock_FacingActivity extends AppCompatActivity { //Planogram Dialog if (id == R.id.action_planogram) { + expandableListView.clearFocus(); + //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen); final Dialog dialog = new Dialog(Stock_FacingActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); From e1c1c606fd9787b9872e3b718c5d394a36660514 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 19 Jan 2017 12:18:47 +0530 Subject: [PATCH 5/7] //Stock_FacingActivity Changes today --- .../com/gskmtorange/Database/GSKOrangeDB.java | 34 ++---- .../gsk_dailyentry/Stock_FacingActivity.java | 30 +++-- .../gskmtorange/upload/UploadActivity.java | 112 +++++++++++++----- .../MAPPING_PLANOGRAM_DataGetterSetter.java | 10 +- .../MAPPING_PLANOGRAM_MasterGetterSetter.java | 9 ++ .../gskmtorange/xmlHandlers/XMLHandlers.java | 3 + 6 files changed, 135 insertions(+), 63 deletions(-) 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 7a84793..0ddd15d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1869,21 +1869,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from Stock_Facing_Header_Data " + - "where Store_Id='" + store_id + "'", null); + dbcursor = db.rawQuery("Select H.BRAND_ID, H.IMAGE1, H.IMAGE2, C.SKU_ID, C.STOCK_VALUE, C.FACEUP_VALUE " + + "from Stock_Facing_Header_Data H " + + "INNER JOIN Stock_Facing_Child_Data C " + + "ON H.STORE_ID = C.STORE_ID AND H.CATEGORY_ID = C.CATEGORY_ID AND H.BRAND_ID = C.BRAND_ID " + + "WHERE H.STORE_ID = '" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter(); - cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id"))); - cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); - cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY"))); cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); - cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND"))); cd.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE1"))); cd.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE2"))); + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID"))); + cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK_VALUE"))); + cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACEUP_VALUE"))); list.add(cd); dbcursor.moveToNext(); @@ -1898,7 +1900,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public ArrayList getStockAndFacingSKUServerUploadData(String category_id, String brand_id) { + /*public ArrayList getStockAndFacingSKUServerUploadData(String category_id, String brand_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; @@ -1932,7 +1934,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } return list; - } + }*/ //Promo Compliance Promotion Data public ArrayList getPromoComplianceSkuServerUploadData(String store_id) { @@ -2234,10 +2236,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - - - public void deleteStockEntryMainTable(String storeid, String categoryid) { try { @@ -2252,14 +2250,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - - - - - - - public ArrayList getBrandMasterData(String store_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -2808,6 +2798,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i)); values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i)); values.put("CLASS_ID", data.getCLASS_ID().get(i)); + values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i)); values.put("PLANOGRAM_IMAGE", data.getPLANOGRAM_IMAGE().get(i)); values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i)); @@ -2822,7 +2813,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM", null); + dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM where CATEGORY_ID='" + category_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -2832,6 +2823,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { mp.setKEYACCOUNT_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEYACCOUNT_ID"))); mp.setSTORETYPE_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORETYPE_ID"))); mp.setCLASS_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CLASS_ID"))); + mp.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); mp.setPLANOGRAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM_IMAGE"))); mp.setIMAGE_PATH(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_PATH"))); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 45584f5..ed5352b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -716,11 +716,9 @@ public class Stock_FacingActivity extends AppCompatActivity { dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); dialog.setCancelable(false); - ArrayList mp = db.getMappingPlanogramData(""); + ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId); //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - WebView webView = (WebView) dialog.findViewById(R.id.webview); webView.setWebViewClient(new MyWebViewClient()); @@ -728,22 +726,28 @@ public class Stock_FacingActivity extends AppCompatActivity { webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setBuiltInZoomControls(true); - String planogram_image = mp.get(0).getPLANOGRAM_IMAGE(); - if (new File(str + planogram_image).exists()) { - Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); - // img_planogram.setRotation(90); - //img_planogram.setImageBitmap(bmp); + String planogram_image = ""; + if (mappingPlanogramList.size() > 0) { + planogram_image = mappingPlanogramList.get(0).getPLANOGRAM_IMAGE(); + } + if (!planogram_image.equals("")) { + if (new File(str + planogram_image).exists()) { + Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); + // img_planogram.setRotation(90); + //img_planogram.setImageBitmap(bmp); + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image; - String html = ""; - webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); + String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image; + String html = ""; + webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); - dialog.show(); - } /*else { + dialog.show(); + } /*else { //webView.loadUrl(String.valueOf(R.drawable.sad_cloud)); //img_planogram.setBackgroundResource(R.drawable.sad_cloud); }*/ + } ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel); 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 f5eef55..3d1cd91 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -262,7 +262,7 @@ public class UploadActivity extends AppCompatActivity { SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); envelope.dotNet = true; envelope.setOutputSoapObject(request); - + HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); @@ -342,21 +342,23 @@ public class UploadActivity extends AppCompatActivity { //Stock and Facing - String stock_facing_xml = ""; + /*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++) { + 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 stockChildXML = ""; + String onXML1 = ""; for (int j = 0; j < stock_facingChildList.size(); j++) { - stockChildXML = "[STOCK_FACING_DATA]" + onXML1 = "[STOCK_FACING_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" @@ -370,10 +372,64 @@ public class UploadActivity extends AppCompatActivity { + "[FACEUP]" + Integer.parseInt(stock_facingChildList.get(j).getFacing()) + "[/FACEUP]" + "[/STOCK_FACING_DATA]"; - onXML = onXML + stockChildXML; + stockChildXML = stockChildXML + onXML1; } - stock_facing_xml = stock_facing_xml + onXML; } + 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++) { + onXML = "[STOCK_FACING_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_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_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]" + + "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]" + + "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]" + + "[/STOCK_FACING_DATA]"; + + stock_facing_xml = stock_facing_xml + onXML; } final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]"; @@ -548,24 +604,24 @@ public class UploadActivity extends AppCompatActivity { for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { - onXMLdIALOG = "[VISIBILITY_DAILOG]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + additionalVisibilitySkuList.get(k).getCOMMON_ID() - + "[/KEY_ID]" - + "[CATEGORY_ID]" - + additionalVisibilitySkuList.get(k).getCategoryId() - + "[/CATEGORY_ID]" - + "[SKU_ID]" - + additionalVisibilitySkuList.get(k).getSku_id() - + "[/SKU_ID]" - + "[QUANTITY]" - + additionalVisibilitySkuList.get(k).getQuantity() - + "[/QUANTITY]" - + "[/VISIBILITY_DAILOG]"; + onXMLdIALOG = "[VISIBILITY_DAILOG]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + + userId + + "[/USER_ID]" + + "[KEY_ID]" + + additionalVisibilitySkuList.get(k).getCOMMON_ID() + + "[/KEY_ID]" + + "[CATEGORY_ID]" + + additionalVisibilitySkuList.get(k).getCategoryId() + + "[/CATEGORY_ID]" + + "[SKU_ID]" + + additionalVisibilitySkuList.get(k).getSku_id() + + "[/SKU_ID]" + + "[QUANTITY]" + + additionalVisibilitySkuList.get(k).getQuantity() + + "[/QUANTITY]" + + "[/VISIBILITY_DAILOG]"; additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; @@ -601,11 +657,11 @@ public class UploadActivity extends AppCompatActivity { + "[/ADDITIONAL_VISIBILITY_DATA]"; - additional_visibility_data_xml = additional_visibility_data_xml + onXML; - KeyID=""; - additionalVisibilitySkuList.clear(); + additional_visibility_data_xml = additional_visibility_data_xml + onXML; + KeyID = ""; + additionalVisibilitySkuList.clear(); - additional_visibility_dialog_xml=""; + additional_visibility_dialog_xml = ""; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java index e6c0b90..99581ea 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java @@ -7,7 +7,7 @@ import java.util.ArrayList; */ public class MAPPING_PLANOGRAM_DataGetterSetter { - String KEYACCOUNT_ID, STORETYPE_ID, CLASS_ID, PLANOGRAM_IMAGE, IMAGE_PATH; + String KEYACCOUNT_ID, STORETYPE_ID, CLASS_ID, PLANOGRAM_IMAGE, IMAGE_PATH,CATEGORY_ID; public String getKEYACCOUNT_ID() { return KEYACCOUNT_ID; @@ -48,4 +48,12 @@ public class MAPPING_PLANOGRAM_DataGetterSetter { public void setIMAGE_PATH(String IMAGE_PATH) { this.IMAGE_PATH = IMAGE_PATH; } + + public String getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID = CATEGORY_ID; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java index a68788d..12671d3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java @@ -11,6 +11,7 @@ public class MAPPING_PLANOGRAM_MasterGetterSetter { ArrayList KEYACCOUNT_ID = new ArrayList<>(); ArrayList STORETYPE_ID = new ArrayList<>(); + ArrayList CATEGORY_ID = new ArrayList<>(); ArrayList CLASS_ID = new ArrayList<>(); ArrayList PLANOGRAM_IMAGE = new ArrayList<>(); ArrayList IMAGE_PATH = new ArrayList<>(); @@ -62,4 +63,12 @@ public class MAPPING_PLANOGRAM_MasterGetterSetter { public void setIMAGE_PATH(String IMAGE_PATH) { this.IMAGE_PATH.add(IMAGE_PATH); } + + public ArrayList getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID.add(CATEGORY_ID); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index cffad97..38053ab 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -691,6 +691,9 @@ public class XMLHandlers { if (xpp.getName().equals("CLASS_ID")) { st.setCLASS_ID(xpp.nextText()); } + if (xpp.getName().equals("CATEGORY_ID")) { + st.setCATEGORY_ID(xpp.nextText()); + } if (xpp.getName().equals("PLANOGRAM_IMAGE")) { st.setPLANOGRAM_IMAGE(xpp.nextText()); } From 2898ac6382d6a720f92cc8bf01a3517f56c16a95 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Thu, 19 Jan 2017 12:42:16 +0530 Subject: [PATCH 6/7] newcode --- .idea/misc.xml | 2 +- .../main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 6 ++++++ .../java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b15ecee..b8dc4d6 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 c0c1d7f..1c223aa 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -141,6 +141,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteAllTables() { + db.delete(CommonString.TABLE_COVERAGE_DATA, null, null); + + db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG_MAIN, null, null); + db.delete(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY_MAIN, null, null); + db.delete(CommonString.CREATE_TABLE_STOCK_DIALOG, null, null); + db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, null, null); } public void InsertJCP(JourneyPlanGetterSetter data) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index 0a2e278..337a47e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -907,7 +907,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb db.updateDataStatus(geotaglistImage.get(i).getStoreid(), Statustag); - //db.deleteGeoTagData(geotaglistImage.get(i).getStoreid()); + db.deleteGeoTagData(geotaglistImage.get(i).getStoreid()); } From bc49d570b68720ea097e65f17436bed9aba92c48 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 19 Jan 2017 12:43:54 +0530 Subject: [PATCH 7/7] //Stock_FacingActivity Changes today --- .../com/gskmtorange/Database/GSKOrangeDB.java | 55 +++++++++++-------- .../gskmtorange/upload/UploadActivity.java | 23 ++++++++ GSKMTOrange/src/main/res/values-tr/string.xml | 18 ------ 3 files changed, 54 insertions(+), 42 deletions(-) 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 dcabaac..dc1c62d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -136,17 +136,31 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.delete(CommonString.CREATE_TABLE_STOCK_ADDITIONAL_STOCK_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); + + //Gagan start code + db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, "Store_Id='" + storeid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_HEADER, "Store_Id='" + storeid + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_CHILD, "Store_Id='" + storeid + "'", null); + db.delete(CommonString.TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE, "STORE_ID='" + storeid + "'", null); + db.delete(CommonString.TABLE_INSERT_PROMO_SKU, "STORE_ID='" + storeid + "'", null); + //Gagan end code } public void deleteAllTables() { - + //Gagan start code + db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY, null, null); + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_HEADER, null, null); + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_CHILD, null, null); + db.delete(CommonString.TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE, null, null); + db.delete(CommonString.TABLE_INSERT_PROMO_SKU, null, null); + //Gagan end code } public void InsertJCP(JourneyPlanGetterSetter data) { @@ -2630,21 +2644,20 @@ public class GSKOrangeDB extends SQLiteOpenHelper { long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, values); - if(skulist!=null) - { + 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()); + 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); - } + db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG_MAIN, null, values1); + } } } catch (Exception ex) { @@ -2762,8 +2775,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + - CommonString.KEY_STORE_ID + "='" + store_id + "'", null); + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); if (dbcursor != null) { @@ -3029,8 +3042,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - public ArrayList getAdditionalMainStock(String store_id, String categoryId) { Cursor cursordata = null; ArrayList productData = new ArrayList(); @@ -3099,7 +3110,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("DISPLAY", data.getDISPLAY().get(i)); values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i)); values.put("IMAGE_URL", data.getIMAGE_URL().get(i)); - db.insert("ADDITIONAL_DISPLAY_MASTER", null, values); + db.insert("ADDITIONAL_DISPLAY_MASTER", null, values); } } catch (Exception ex) { Log.d("Exception ", " ADDITIONAL_DISPLAY_MASTER " + ex.toString()); @@ -3140,8 +3151,4 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - - - } 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 3d1cd91..1d8fb83 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -1,7 +1,9 @@ package cpm.com.gskmtorange.upload; +import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; +import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.res.Configuration; import android.content.res.Resources; @@ -40,6 +42,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.download.DownloadActivity; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; @@ -1039,12 +1042,32 @@ public class UploadActivity extends AppCompatActivity { super.onPostExecute(result); dialog.dismiss(); + db.deleteAllTables(); if (result.equals("")) { + + showAlert(getString(R.string.menu_upload_data)); finish(); } } } + public void showAlert(String str) { + AlertDialog.Builder builder = new AlertDialog.Builder(UploadActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(str).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + /* Intent i = new Intent(activity, StorelistActivity.class); + activity.startActivity(i); + activity.finish();*/ + finish(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + @Override protected void onResume() { diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 191caf2..98b4fcb 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -126,27 +126,9 @@ Verileri silmek istiyor musun Silme için Evet tıklayın Please Select dropdown - Please Take a image - - Please fill sku data - Please enter Quantity - Do you want to save the data - Please click the image - GPS IS DISABLED... - Click ok to enable GPS. - Please Take Image Before Save - This device is not supported. - Uploading Data - Uploading Geotag Data... - failure - Uploading Geotag Images - success - Are you sure you want to Checkout - No Network - Please click image Veritabanı Aktar Servisler