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..50c98df 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -51,7 +51,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB"; public static final int DATABASE_VERSION = 13; TableBean tableBean; private SQLiteDatabase db; @@ -130,6 +130,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { 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); + } public void deleteAllTables() { @@ -191,7 +197,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null); + dbcursor = db.rawQuery("Select BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -210,6 +216,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { t2p.setDisplay(dbcursor.getString(dbcursor .getColumnIndexOrThrow("DISPLAY"))); + t2p.setRef_image_url(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("IMAGE_URL"))); + + t2p.setRef_image_path(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("IMAGE_PATH"))); + t2p.setImage(""); t2p.setRemark(""); @@ -483,6 +495,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i)); values.put("DISPLAY", data.getDISPLAY().get(i)); values.put("IMAGE_URL", data.getIMAGE_URL().get(i)); + values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i)); db.insert("DISPLAY_MASTER", null, values); } @@ -2471,6 +2484,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_BRAND_ID, data.get(i).getBrand_id()); values.put(CommonString.KEY_BRAND, data.get(i).getBrand()); values.put(CommonString.KEY_DISPLAY, data.get(i).getDisplay()); + values.put(CommonString.KEY_IMAGE_URL, data.get(i).getRef_image_url()); + values.put(CommonString.KEY_IMAGE_PATH, data.get(i).getRef_image_path()); values.put(CommonString.KEY_IMAGE, data.get(i).getImage()); values.put(CommonString.KEY_REMARK, data.get(i).getRemark()); values.put(CommonString.KEY_PRESENT, data.get(i).isPresent()); @@ -2512,6 +2527,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + public boolean additionalVisibilitydata(String store_id, String category_id) { Log.d("AdditionalVisibility ", "AdditionalVisibility data--------------->Start<------------"); ArrayList list = new ArrayList<>(); @@ -2712,6 +2728,47 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + T2PGetterSetter tp = new T2PGetterSetter(); + + tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID))); + tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID))); + tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); + tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND))); + tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY))); + tp.setRef_image_url(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_URL))); + tp.setRef_image_path(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_PATH))); + tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))); + tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK))); + tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); + tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); + + list.add(tp); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + return list; + } + return list; + } + + // get T2P Compliance store wise data + public ArrayList getT2pComplianceStorewiseData(String store_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + + + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); + + if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { 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 8c9d341..2764e2e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -50,6 +50,7 @@ public class CommonString { public static final String KEY_COVERAGE_REMARK = "REMARK"; public static final String KEY_IMAGE = "IMAGE"; public static final String KEY_IMAGE_URL = "IMAGE_URL"; + public static final String KEY_IMAGE_PATH = "IMAGE_PATH"; public static final String KEY_ID = "Id"; public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID"; @@ -493,6 +494,8 @@ public class CommonString { + KEY_BRAND_ID + " INTEGER," + KEY_DISPLAY_ID + " INTEGER," + KEY_BRAND + " VARCHAR," + + KEY_IMAGE_URL + " VARCHAR," + + KEY_IMAGE_PATH+ " VARCHAR," + KEY_DISPLAY + " VARCHAR," + KEY_IMAGE + " VARCHAR," + KEY_REMARK + " VARCHAR," 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 7797fbd..82ce641 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -257,7 +257,7 @@ public class NonWorkingReason extends AppCompatActivity implements if (_pathforcheck != null && !_pathforcheck.equals("")) { if (new File(str + _pathforcheck).exists()) { - camera.setImageDrawable(getResources().getDrawable(R.drawable.cam_deactive)); + camera.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green)); image1 = _pathforcheck; 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 cf8477c..1bf6f63 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -528,17 +528,13 @@ public class StoreListActivity extends AppCompatActivity { public boolean setcheckedmenthod(String store_cd) { - + boolean result_flag = false; for (int i = 0; i < coverage.size(); i++) { if (store_cd.equals(coverage.get(i).getStoreId())) { if (coverage.get(i).getOutTime() != null) { result_flag = true; break; } - } else { - - result_flag = false; - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 9d7632c..9990de6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -102,7 +102,7 @@ public class T2PComplianceActivity extends AppCompatActivity { //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); @@ -174,7 +174,7 @@ public class T2PComplianceActivity extends AppCompatActivity { protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } @@ -218,7 +218,18 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onClick(View v) { - mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))); + if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) { + mItem.setPresent(true); + } else { + mItem.setPresent(false); + mItem.getGapsChecklist().clear(); + mItem.getSkulist().clear(); + if (!mItem.getImage().equals("")) { + new File(str + mItem.getImage()).delete(); + mItem.setImage(""); + } + + } t2PAdapter.notifyDataSetChanged(); } @@ -239,7 +250,14 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - if(camera_allow.equals("1")){ + holder.btn_ref_img.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + } + }); + + if (camera_allow.equals("1")) { holder.img_cam.setOnClickListener(new View.OnClickListener() { @Override @@ -253,28 +271,49 @@ public class T2PComplianceActivity extends AppCompatActivity { }); if (mItem.getImage().equals("")) { - holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + if (mItem.isPresent()) { + holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); + } else { + //if not present camera disabled + holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + } + } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_green); } - } - else { + } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); } - holder.toggle_btn.setChecked(mItem.isPresent()); + boolean is_enabled = mItem.isPresent(); + + holder.toggle_btn.setChecked(is_enabled); + holder.img_cam.setEnabled(is_enabled); + holder.btn_gaps.setEnabled(is_enabled); + holder.btn_sku.setEnabled(is_enabled); + if (mItem.getGapsChecklist().size() > 0) { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); } else { - holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + if(mItem.isPresent()){ + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + else { + holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.grey_background)); + } } if (mItem.getSkulist().size() > 0) { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); } else { - holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + if(mItem.isPresent()){ + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); + } + else { + holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background)); + } } } @@ -635,19 +674,22 @@ public class T2PComplianceActivity extends AppCompatActivity { for (int i = 0; i < t2PGetterSetters.size(); i++) { - if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { - flag = false; - error_msg = getResources().getString(R.string.click_image); - break; - } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { - flag = false; - error_msg = getResources().getString(R.string.fill_gaps_data); - break; - } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { - flag = false; - error_msg = getResources().getString(R.string.fill_sku_data); - break; + if(t2PGetterSetters.get(i).isPresent()){ + if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { + flag = false; + error_msg = getResources().getString(R.string.click_image); + break; + } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_gaps_data); + break; + } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) { + flag = false; + error_msg = getResources().getString(R.string.fill_sku_data); + break; + } } + } return flag; @@ -914,15 +956,13 @@ public class T2PComplianceActivity 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/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 1667e7d..f7a6d1f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -772,6 +772,61 @@ public class DownloadActivity extends AppCompatActivity { //Gagan end code + //Display Master Image save into folder + if (displayMasterGetterSetter != null) { + + for (int i = 0; i < displayMasterGetterSetter.getIMAGE_URL().size(); i++) { + //publishing image download + data.value = data.value + 1; + if (data.value < 100) { + publishProgress(data); + } + + String image_name = displayMasterGetterSetter.getIMAGE_URL().get(i); + String img_url = displayMasterGetterSetter.getIMAGE_PATH().get(i); + + if (!img_url.equalsIgnoreCase("") && !image_name.equalsIgnoreCase("")) { + URL url = new URL(img_url + image_name); + HttpURLConnection c = (HttpURLConnection) url.openConnection(); + c.setRequestMethod("GET"); + c.getResponseCode(); + c.connect(); + + if (c.getResponseCode() == 200) { + int length = c.getContentLength(); + + String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB"; + + //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/"; + String PATH = CommonString.FILE_PATH; + File file = new File(PATH); + if (!file.isDirectory()) { + file.mkdir(); + } + + // Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1; + if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) { + File outputFile = new File(file, image_name); + FileOutputStream fos = new FileOutputStream(outputFile); + InputStream is1 = c.getInputStream(); + + int bytes = 0; + byte[] buffer = new byte[1024]; + int len1 = 0; + + while ((len1 = is1.read(buffer)) != -1) { + bytes = (bytes + len1); + // data.value = (int) ((double) (((double) + // bytes) / length) * 100); + fos.write(buffer, 0, len1); + } + fos.close(); + is1.close(); + } + } + } + } + } db.open(); db.InsertJCP(jcpgettersetter); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java index a07c1c1..01d3d4c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java @@ -13,6 +13,7 @@ public class DisplayMasterGetterSetter { ArrayList DISPLAY_ID = new ArrayList<>(); ArrayList DISPLAY = new ArrayList<>(); ArrayList IMAGE_URL = new ArrayList<>(); + ArrayList IMAGE_PATH = new ArrayList<>(); public String getTable_DISPLAY_MASTER() { return table_DISPLAY_MASTER; @@ -45,4 +46,12 @@ public class DisplayMasterGetterSetter { public void setIMAGE_URL(String IMAGE_URL) { this.IMAGE_URL.add(IMAGE_URL); } + + public ArrayList getIMAGE_PATH() { + return IMAGE_PATH; + } + + public void setIMAGE_PATH(String IMAGE_PATH) { + this.IMAGE_PATH.add(IMAGE_PATH); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java index b040e6b..63b2c3f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java @@ -8,7 +8,7 @@ import java.util.ArrayList; public class T2PGetterSetter { - String brand_id, display_id, brand, display, image, remark, key_id, category_id; + String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path; boolean isPresent; ArrayList gapsChecklist = new ArrayList<>(); @@ -101,4 +101,20 @@ public class T2PGetterSetter { public void setCategory_id(String category_id) { this.category_id = category_id; } + + public String getRef_image_url() { + return ref_image_url; + } + + public void setRef_image_url(String ref_image_url) { + this.ref_image_url = ref_image_url; + } + + public String getRef_image_path() { + return ref_image_path; + } + + public void setRef_image_path(String ref_image_path) { + this.ref_image_path = ref_image_path; + } } 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 540baa1..a92fe34 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -363,6 +363,10 @@ public class XMLHandlers { if (xpp.getName().equals("IMAGE_URL")) { display.setIMAGE_URL(xpp.nextText()); } + if (xpp.getName().equals("IMAGE_PATH")) { + display.setIMAGE_PATH(xpp.nextText()); + } + } xpp.next(); } diff --git a/GSKMTOrange/src/main/res/layout/nonworking.xml b/GSKMTOrange/src/main/res/layout/nonworking.xml index 40e9007..5deff41 100644 --- a/GSKMTOrange/src/main/res/layout/nonworking.xml +++ b/GSKMTOrange/src/main/res/layout/nonworking.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:background="@null" - android:src="@drawable/cam_active" /> + android:src="@mipmap/camera_orange" /> 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 + En az bir fotoğraf çekiniz Ürün ekle @@ -175,7 +200,6 @@ Parinaam -