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