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 11f19a6..cd83fb0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1198,13 +1198,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - public ArrayList getStockAndFacingHeader_AfterSaveData(String category_id) { + public ArrayList getStockAndFacingHeader_AfterSaveData(String category_id, String store_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { dbcursor = db.rawQuery("Select * from Stock_Facing_Header_Data " + - "where category_id='" + category_id + "'", null); + "where category_id='" + category_id + "' AND Store_Id='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -2216,15 +2216,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - public void deleteStockEntryall(String storeid,String categoryid) { + + public void deleteStockEntryall(String storeid, String categoryid) { try { - 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_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_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); } catch (Exception e) { System.out.println("" + e); @@ -2314,7 +2315,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog,String categoryId) { + public void InsertAdditionalData(AddittionalGetterSetter data, ArrayList dialog, String categoryId) { ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); @@ -2352,13 +2353,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getAdditionalStock(String store_id,String categoryId) { + public ArrayList getAdditionalStock(String store_id, String categoryId) { Cursor cursordata = null; ArrayList productData = new ArrayList(); 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); if (cursordata != null) { @@ -2520,7 +2521,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility_Main WHERE Store_Id = '"+store_id +"'", null); + cursordata = db.rawQuery("SELECT * FROM Stock_Additional_visibility_Main WHERE Store_Id = '" + store_id + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2570,37 +2571,34 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertMainListAdditionalData(AddittionalGetterSetter Mainlist,ArrayList skulist,String categoryId) { + public void InsertMainListAdditionalData(AddittionalGetterSetter Mainlist, ArrayList skulist, String categoryId) { ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); try { - values.put("Store_Id", Mainlist.getStore_id()); - values.put("categoryId", categoryId); - values.put("brand_name", Mainlist.getBrand()); - values.put("brand_id", Mainlist.getBrand_id()); - values.put("image_url", Mainlist.getImage()); - values.put("sku_id", Mainlist.getSku_id()); - values.put("sku_name", Mainlist.getSku()); - values.put("toggle_value", Mainlist.getBtn_toogle()); + values.put("Store_Id", Mainlist.getStore_id()); + values.put("categoryId", categoryId); + values.put("brand_name", Mainlist.getBrand()); + values.put("brand_id", Mainlist.getBrand_id()); + values.put("image_url", Mainlist.getImage()); + values.put("sku_id", Mainlist.getSku_id()); + values.put("sku_name", Mainlist.getSku()); + values.put("toggle_value", Mainlist.getBtn_toogle()); - long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_MAIN, null, values); - - for(int j=0;j getT2pComplianceData(String store_id, String category_id) { @@ -2869,7 +2866,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where " - + CommonString.KEY_VISIT_DATE + "='" + visitdate + "' AND " + CommonString.KEY_STORE_ID +" ='" + store_id +"'", + + CommonString.KEY_VISIT_DATE + "='" + visitdate + "' AND " + CommonString.KEY_STORE_ID + " ='" + store_id + "'", null); @@ -2877,7 +2874,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { - // CoverageBean sb = new CoverageBean(); + // CoverageBean sb = new CoverageBean(); sb.setStoreId(dbcursor.getString(dbcursor .getColumnIndexOrThrow(CommonString.KEY_STORE_ID))); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 4564e5b..0c5c891 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -75,7 +75,7 @@ public class MainActivity extends AppCompatActivity preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); date = preferences.getString(CommonString.KEY_DATE, null); imageView = (ImageView) findViewById(R.id.img_main); @@ -134,7 +134,7 @@ public class MainActivity extends AppCompatActivity protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } @Override @@ -206,24 +206,19 @@ public class MainActivity extends AppCompatActivity } else { if (coverageList.size() == 0) { + Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - Snackbar.make(webView, R.string.no_data_for_upload, Snackbar.LENGTH_SHORT) - .setAction("Action", null).show(); Intent i = new Intent(getBaseContext(), UploadActivity.class); startActivity(i); - } else { - if (isStoreCheckedIn()&& isValid()) { + if (isStoreCheckedIn() && isValid()) { - Intent i = new Intent(getBaseContext(), UploadActivity.class); - startActivity(i); + Intent i = new Intent(getBaseContext(), UploadActivity.class); + startActivity(i); - //finish(); - - } else { - - Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT) - .setAction("Action", null).show(); + //finish(); + } else { + Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); } } @@ -282,7 +277,7 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_setting) { - Intent startDownload = new Intent(this,SettingsActivity.class); + Intent startDownload = new Intent(this, SettingsActivity.class); startActivity(startDownload); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); @@ -411,12 +406,10 @@ public class MainActivity extends AppCompatActivity for (int i = 0; i < coverageList.size(); i++) { storestatus = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()).getUPLOAD_STATUS(); - String coverage_status = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()).getCHECKOUT_STATUS(); + String coverage_status = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()).getCHECKOUT_STATUS(); if (!storestatus.equalsIgnoreCase(CommonString.KEY_U)) { - if ((coverage_status.equalsIgnoreCase( - CommonString.KEY_C) - || storestatus.equalsIgnoreCase(CommonString.KEY_P) || + if ((coverage_status.equalsIgnoreCase(CommonString.KEY_Y) || storestatus.equalsIgnoreCase(CommonString.KEY_P) || storestatus.equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE))) { flag = true; break; @@ -433,15 +426,13 @@ public class MainActivity extends AppCompatActivity private static boolean updateResources(Context context, String language) { - String lang ; + String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 71f2a7f..8c9d341 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -83,6 +83,7 @@ public class CommonString { public static final String KEY_D = "D"; public static final String KEY_U = "U"; public static final String KEY_C = "C"; + public static final String KEY_Y = "Y"; public static final String KEY_L = "Leave"; public static final String KEY_N = "NOT_VISITED"; public static final String KEY_INVALID = "INVALID"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index ffa5673..e8909fc 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -193,7 +193,7 @@ public class CheckoutActivity extends AppCompatActivity { if (result.toString() .equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - db.updateCheckoutOuttime(store_id, getCurrentTime(),CommonString.KEY_C); + db.updateCheckoutOuttime(store_id, getCurrentTime(),CommonString.KEY_Y); SharedPreferences.Editor editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_ID, ""); @@ -210,7 +210,7 @@ public class CheckoutActivity extends AppCompatActivity { editor.commit(); - db.updateCheckoutStatus(store_id, CommonString.KEY_C); + db.updateCheckoutStatus(store_id, CommonString.KEY_Y); } else { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 04461fe..6ae10af 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -203,7 +203,7 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_C)) { + } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_Y)) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); @@ -267,7 +267,7 @@ public class StoreListActivity extends AppCompatActivity { } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) { Snackbar.make(v, R.string.title_store_list_activity_store_data_uploaded, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_C)) { + } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_Y)) { Snackbar.make(v, R.string.title_store_list_activity_store_already_checkout, Snackbar.LENGTH_LONG).setAction("Action", null).show(); 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 bb1e86a..51dc9e7 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 @@ -89,15 +89,13 @@ public class Stock_FacingActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } @@ -127,11 +125,11 @@ public class Stock_FacingActivity extends AppCompatActivity { expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); //txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); - + //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -291,7 +289,7 @@ public class Stock_FacingActivity extends AppCompatActivity { hashMapListChildData = new HashMap<>(); //Header Data - headerDataList = db.getStockAndFacingHeader_AfterSaveData(categoryId); + headerDataList = db.getStockAndFacingHeader_AfterSaveData(categoryId, store_id); if (!(headerDataList.size() > 0)) { headerDataList = db.getStockAndFacingHeaderData(categoryId); } @@ -747,7 +745,7 @@ public class Stock_FacingActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } public class ExpandableListAdapter extends BaseExpandableListAdapter { @@ -952,7 +950,6 @@ public class Stock_FacingActivity extends AppCompatActivity { holder.ed_stock.setVisibility(View.GONE); } - if (childData.getStock().equals("0")) { holder.ed_facing.setEnabled(false); } else { @@ -971,9 +968,9 @@ public class Stock_FacingActivity extends AppCompatActivity { String stock = edStock.replaceFirst("^0+(?!$)", ""); childData.setStock(stock); - if (edStock.equals("0")) { + if (stock.equals("0")) { childData.setFacing("0"); - + finalHolder.ed_facing.setText("0"); finalHolder.ed_facing.setEnabled(false); } else { childData.setFacing(childData.getFacing()); @@ -981,12 +978,13 @@ public class Stock_FacingActivity extends AppCompatActivity { } } else { childData.setStock(""); + childData.setFacing(""); finalHolder.ed_facing.setEnabled(true); } } }); - /*holder.ed_stock.addTextChangedListener(new TextWatcher() { + /* holder.ed_stock.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -1007,8 +1005,9 @@ public class Stock_FacingActivity extends AppCompatActivity { childData.setStock(stock); if (edStock.equals("0")) { - childData.setFacing("0"); - + if (childData.getCompany_id().equals("1")) { + childData.setFacing("0"); + } finalHolder.ed_facing.setEnabled(false); } else { childData.setFacing(childData.getFacing()); @@ -1016,10 +1015,10 @@ public class Stock_FacingActivity extends AppCompatActivity { } } else { childData.setStock(""); + childData.setFacing(""); finalHolder.ed_facing.setEnabled(true); } - - expandableListView.invalidateViews(); + //expandableListView.invalidateViews(); } });*/ 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 775adbf..f6a4f11 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -231,7 +231,8 @@ public class UploadActivity extends AppCompatActivity { storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()); if (storeData.getSTORE_ID() != null) { - if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) || + if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) || + storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) || !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) { String camera_allow = storeData.getCAMERA_ALLOW();