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 8d5fb97..fe1bdc8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -630,22 +630,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void updateCheckoutStatus(String id, String status) { - ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); try { - values.put("CHECKOUT_STATUS", status); values1.put(CommonString.KEY_COVERAGE_STATUS, status); + db.update(CommonString.TABLE_COVERAGE_DATA, values1, CommonString.KEY_STORE_ID + "='" + id + "'", null); db.update(CommonString.KEY_JOURNEY_PLAN, values, CommonString.KEY_STORE_ID + "='" + id + "'", null); - - } catch (Exception ex) { - + Log.e("Exception", "checkOut Status" + ex.toString()); } - } @@ -786,6 +782,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setRemark((((dbcursor.getString(dbcursor .getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK)))))); } + sb.setCheckOut_Image(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKOUT_IMAGE))); + list.add(sb); dbcursor.moveToNext(); @@ -1403,13 +1401,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } public long InsertCoverageData(CoverageBean data) { - //db.delete(CommonString1.TABLE_COVERAGE_DATA, "STORE_ID" + "='" + data.getStoreId() + "'", null); - ContentValues values = new ContentValues(); try { - values.put(CommonString.KEY_STORE_ID, data.getStoreId()); values.put(CommonString.KEY_USER_ID, data.getUserId()); values.put(CommonString.KEY_IN_TIME, data.getInTime()); @@ -1425,6 +1420,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_REASON_ID, data.getReasonid()); values.put(CommonString.KEY_REASON, data.getReason()); values.put(CommonString.KEY_GEO_TAG, data.getGEO_TAG()); + values.put(CommonString.KEY_CHECKOUT_IMAGE, data.getCheckOut_Image()); return db.insert(CommonString.TABLE_COVERAGE_DATA, null, values); @@ -3182,21 +3178,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } //update out time - public void updateCheckoutOuttime(String id, String out_time, String status) { - + public void updateCheckoutOuttime(String id, String out_time, String status, String checkOutImagePath) { ContentValues values = new ContentValues(); try { - values.put(CommonString.KEY_OUT_TIME, out_time); values.put(CommonString.KEY_COVERAGE_STATUS, status); + values.put(CommonString.KEY_CHECKOUT_IMAGE, checkOutImagePath); db.update(CommonString.TABLE_COVERAGE_DATA, values, CommonString.KEY_STORE_ID + "='" + id + "'", null); - } catch (Exception ex) { - + Log.d("Exception in ", "checkOutTime! " + ex.toString()); } - } @@ -4171,7 +4164,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { " INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" + " INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" + " INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" + - " INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID "+ + " INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID " + " WHERE M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null); 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 9278119..113cc16 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_REASON_ID = "REASON_ID"; public static final String KEY_REASON = "REASON"; public static final String KEY_COVERAGE_REMARK = "REMARK"; + public static final String KEY_CHECKOUT_IMAGE = "Checkout_Image"; public static final String KEY_IMAGE = "IMAGE"; public static final String KEY_IMAGE1 = "IMAGE1"; public static final String KEY_IMAGE2 = "IMAGE2"; @@ -126,7 +127,6 @@ public class CommonString { + METHOD_UPLOAD_STOCK_XML_DATA; - public static final String METHOD_UPLOAD_ASSET = "Upload_Stock_Availiablity_V1"; public static final String METHOD_Get_DR_POSM_IMAGES = "GetImageNew"; public static final String SOAP_ACTION_Get_DR_POSM_IMAGES = "http://tempuri.org/" @@ -135,7 +135,7 @@ public class CommonString { public static final String SOAP_ACTION_DR_STORE_IMAGES_GEO = "http://tempuri.org/" + METHOD_Get_DR_STORE_IMAGES_GEO; - public static final String METHOD_UPLOAD_COVERAGE = "UPLOAD_COVERAGE"; + public static final String METHOD_UPLOAD_COVERAGE = "UPLOAD_COVERAGENEW"; public static final String METHOD_UPLOAD_COVERAGE_STATUS = "UploadCoverage_Status"; @@ -163,16 +163,23 @@ public class CommonString { public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA"; - public static final String CREATE_TABLE_COVERAGE_DATA = "CREATE TABLE IF NOT EXISTS " - + TABLE_COVERAGE_DATA + " (" + KEY_ID - + " INTEGER PRIMARY KEY AUTOINCREMENT ," + KEY_STORE_ID - + " VARCHAR,USER_ID VARCHAR, " + KEY_IN_TIME + " VARCHAR," - + KEY_OUT_TIME + " VARCHAR," + KEY_VISIT_DATE + " VARCHAR," - + KEY_LATITUDE + " VARCHAR," + KEY_LONGITUDE + " VARCHAR," + KEY_MERCHANDISER_ID + " VARCHAR," - + KEY_COVERAGE_STATUS + " VARCHAR," + KEY_IMAGE + " VARCHAR," + public static final String CREATE_TABLE_COVERAGE_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_COVERAGE_DATA + + " (" + + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + KEY_STORE_ID + " VARCHAR,USER_ID VARCHAR, " + + KEY_IN_TIME + " VARCHAR," + + KEY_OUT_TIME + " VARCHAR," + + KEY_VISIT_DATE + " VARCHAR," + + KEY_LATITUDE + " VARCHAR," + + KEY_LONGITUDE + " VARCHAR," + + KEY_MERCHANDISER_ID + " VARCHAR," + + KEY_COVERAGE_STATUS + " VARCHAR," + + KEY_IMAGE + " VARCHAR," + KEY_GEO_TAG + " VARCHAR," - + KEY_REASON_ID + " VARCHAR," + KEY_COVERAGE_REMARK - + " VARCHAR," + KEY_REASON + " VARCHAR)"; + + KEY_REASON_ID + " VARCHAR," + + KEY_COVERAGE_REMARK + " VARCHAR," + + KEY_CHECKOUT_IMAGE + " VARCHAR," + + KEY_REASON + " VARCHAR)"; public static final String CREATE_TABLE_STORE_GEOTAGGING = "CREATE TABLE IF NOT EXISTS " @@ -661,24 +668,21 @@ public class CommonString { public static final String TABLE_INSERT_BRAND_AVAIBILITY_DATA = "Camera_Not_Allowed"; public static final String CREATE_TABLE_INSERT_BRAND_AVAIBILITY_DATA = "CREATE TABLE IF NOT EXISTS " - + TABLE_INSERT_BRAND_AVAIBILITY_DATA - + "(" - + "KEY_ID" - + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + TABLE_INSERT_BRAND_AVAIBILITY_DATA + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," - + "COMMON_ID" - + " INTEGER," - - + "BRAND_NAME" - + " VARCHAR," - - + "BRAND_ID" - + " INTEGER" - - + ")"; + + "COMMON_ID" + + " INTEGER," + + "BRAND_NAME" + + " VARCHAR," + + "BRAND_ID" + + " INTEGER" + + ")"; public static final String TABLE_INSERT_CATEGORY_PICTURE = "Stock_CATEGORY_PICTURE"; @@ -711,7 +715,6 @@ public class CommonString { + ")"; - public static final String TABLE_INSERT_CATEGORY_PICTURE_LIST = "Stock_CATEGORY_PICTURE_LIST"; public static final String CREATE_TABLE_INSERT_CATEGORY_PICTURE_LIST = "CREATE TABLE IF NOT EXISTS " 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 65849bb..abe9262 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -41,7 +41,7 @@ public class CheckoutActivity extends AppCompatActivity { private Dialog dialog; private ProgressBar pb; private TextView percentage, message; - private String username, visit_date, store_id, store_intime;; + private String username, visit_date, store_id, store_intime; private Data data; private SharedPreferences preferences = null; @@ -50,7 +50,7 @@ public class CheckoutActivity extends AppCompatActivity { CoverageBean coverageBean; - String lat,lon; + String lat, lon, checkOutImagePath = ""; @Override protected void onCreate(Bundle savedInstanceState) { @@ -66,17 +66,18 @@ public class CheckoutActivity extends AppCompatActivity { visit_date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID); + checkOutImagePath = getIntent().getStringExtra(CommonString.KEY_CHECKOUT_IMAGE); - coverageBean = db.getCoverageSpecificData(visit_date,store_id); + coverageBean = db.getCoverageSpecificData(visit_date, store_id); lat = coverageBean.getLatitude(); lon = coverageBean.getLongitude(); - if (lat==null || lat.equals("")){ + if (lat == null || lat.equals("")) { lat = "0.0"; } - if (lon==null || lon.equals("")){ + if (lon == null || lon.equals("")) { lon = "0.0"; } /* FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); @@ -100,7 +101,6 @@ public class CheckoutActivity extends AppCompatActivity { @Override protected void onPreExecute() { - // TODO Auto-generated method stub super.onPreExecute(); dialog = new Dialog(context); @@ -111,16 +111,12 @@ public class CheckoutActivity extends AppCompatActivity { pb = (ProgressBar) dialog.findViewById(R.id.progressBar1); percentage = (TextView) dialog.findViewById(R.id.percentage); message = (TextView) dialog.findViewById(R.id.message); - } @SuppressWarnings("deprecation") @Override protected String doInBackground(Void... params) { - // TODO Auto-generated method stub - try { - //String result = ""; data = new Data(); @@ -128,72 +124,52 @@ public class CheckoutActivity extends AppCompatActivity { data.name = "Checked out Data Uploading"; publishProgress(data); - String onXML = "[STORE_CHECK_OUT_STATUS][USER_ID]" - + username - + "[/USER_ID]" + "[STORE_ID]" - + store_id - + "[/STORE_ID][LATITUDE]" - + lat - + "[/LATITUDE][LOGITUDE]" - + lon - + "[/LOGITUDE][CHECKOUT_DATE]" - + visit_date - + "[/CHECKOUT_DATE][CHECK_OUTTIME]" - + getCurrentTime() - + "[/CHECK_OUTTIME][CHECK_INTIME]" - + coverageBean.getInTime() - + "[/CHECK_INTIME][CREATED_BY]" - + username - + "[/CREATED_BY][/STORE_CHECK_OUT_STATUS]"; + String onXML = + "[STORE_CHECK_OUT_STATUS]" + + "[USER_ID]" + username + "[/USER_ID]" + + "[STORE_ID]" + store_id + "[/STORE_ID]" + + "[LATITUDE]" + lat + "[/LATITUDE]" + + "[LOGITUDE]" + lon + "[/LOGITUDE]" + + "[CHECKOUT_DATE]" + visit_date + "[/CHECKOUT_DATE]" + + "[CHECK_OUTTIME]" + getCurrentTime() + "[/CHECK_OUTTIME]" + + "[CHECK_INTIME]" + coverageBean.getInTime() + "[/CHECK_INTIME]" + + "[CREATED_BY]" + username + "[/CREATED_BY]" + + "[/STORE_CHECK_OUT_STATUS]"; - final String sos_xml = "[DATA]" + onXML - + "[/DATA]"; + final String sos_xml = "[DATA]" + onXML + "[/DATA]"; - SoapObject request = new SoapObject( - CommonString.NAMESPACE, - "Upload_Store_ChecOut_Status"); + SoapObject request = new SoapObject(CommonString.NAMESPACE, "Upload_Store_ChecOut_Status"); request.addProperty("onXML", sos_xml); - /*request.addProperty("KEYS", "CHECKOUT_STATUS"); - request.addProperty("USERNAME", username);*/ + /*request.addProperty("KEYS", "CHECKOUT_STATUS"); + request.addProperty("USERNAME", username);*/ //request.addProperty("MID", mid); - SoapSerializationEnvelope envelope = new SoapSerializationEnvelope( - SoapEnvelope.VER11); + SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); envelope.dotNet = true; envelope.setOutputSoapObject(request); - HttpTransportSE androidHttpTransport = new HttpTransportSE( - CommonString.URL); + HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + "Upload_Store_ChecOut_Status", envelope); - androidHttpTransport.call( - CommonString.SOAP_ACTION+"Upload_Store_ChecOut_Status", - envelope); Object result = (Object) envelope.getResponse(); - if (!result.toString().equalsIgnoreCase( - CommonString.KEY_SUCCESS)) { + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "Upload_Store_ChecOut_Status"; } - - if (result.toString().equalsIgnoreCase( - CommonString.KEY_NO_DATA)) { + if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { return "Upload_Store_ChecOut_Status"; } - - if (result.toString().equalsIgnoreCase( - CommonString.KEY_FAILURE)) { + if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { return "Upload_Store_ChecOut_Status"; } - data.value = 100; data.name = "Checkout Done"; publishProgress(data); - if (result.toString() - .equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - db.updateCheckoutOuttime(store_id, getCurrentTime(),CommonString.KEY_Y); + db.updateCheckoutOuttime(store_id, getCurrentTime(), CommonString.KEY_Y, checkOutImagePath); SharedPreferences.Editor editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_ID, ""); @@ -213,15 +189,9 @@ public class CheckoutActivity extends AppCompatActivity { db.updateCheckoutStatus(store_id, CommonString.KEY_Y); } else { - - - - if (result.toString().equalsIgnoreCase( - CommonString.KEY_FALSE)) { + if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { return "Upload_Store_ChecOut_Status"; } - - } return CommonString.KEY_SUCCESS; @@ -238,17 +208,15 @@ public class CheckoutActivity extends AppCompatActivity { }); } catch (IOException e) { - // counter++; runOnUiThread(new Runnable() { @Override public void run() { - showAlert(CommonString.MESSAGE_SOCKETEXCEPTION); // TODO Auto-generated method stub - /* - * if (counter < 10) { new + /* + * if (counter < 10) { new * BackgroundTask(CheckOutUploadActivity * .this).execute(); } else { message.showMessage(); * counter =1; } @@ -256,9 +224,7 @@ public class CheckoutActivity extends AppCompatActivity { } }); } catch (Exception e) { - runOnUiThread(new Runnable() { - @Override public void run() { // TODO Auto-generated method stub @@ -293,10 +259,9 @@ public class CheckoutActivity extends AppCompatActivity { finish(); - } - else if (!result.equals("")) { - /*AlertMessage message = new AlertMessage( - CheckOutStoreActivity.this, CommonString1.ERROR + result, "success", null); + } else if (!result.equals("")) { + /*AlertMessage message = new AlertMessage( + CheckOutStoreActivity.this, CommonString1.ERROR + result, "success", null); message.showMessage();*/ Toast.makeText(getApplicationContext(), "Network Error Try Again", Toast.LENGTH_SHORT).show(); @@ -316,13 +281,11 @@ public class CheckoutActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } - private static boolean updateResources(Context context, String language) { - String lang; @@ -337,7 +300,7 @@ public class CheckoutActivity extends AppCompatActivity { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; - }else{ + } else { lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java index 0b3f147..06087c6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java @@ -95,14 +95,16 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie ArrayList coverage_list; Toolbar toolbar; boolean ResultFlag = true; + String checkOutStore_id = ""; ArrayList coverage = new ArrayList(); protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_storeimage); + setContentView(R.layout.activity_store_checkout_image); preferences = PreferenceManager.getDefaultSharedPreferences(this); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setHomeButtonEnabled(true); @@ -114,13 +116,14 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie btn_save = (Button) findViewById(R.id.btn_save_selfie); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); - visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); _UserId = preferences.getString(CommonString.KEY_USERNAME, ""); intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + checkOutStore_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID); + str = CommonString.FILE_PATH; database = new GSKOrangeDB(this); @@ -175,27 +178,21 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie @Override public void onClick(View v) { - int id = v.getId(); switch (id) { - case R.id.img_cam_selfie: - _pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - + _pathforcheck = checkOutStore_id + "CHK_SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; - intime = getCurrentTime(); startCameraActivity(); - break; case R.id.btn_save_selfie: if (img_str != null) { - AlertDialog.Builder builder = new AlertDialog.Builder(StoreCheckoutImageActivity.this); builder.setMessage(getResources().getString(R.string.title_activity_save_data)) .setCancelable(false) @@ -204,34 +201,11 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); - CoverageBean cdata = new CoverageBean(); - cdata.setStoreId(store_id); - cdata.setVisitDate(visit_date); - cdata.setUserId(username); - cdata.setInTime(intime); - cdata.setReason(""); - cdata.setReasonid("0"); - cdata.setLatitude(lat); - cdata.setLongitude(lon); - cdata.setImage(img_str); - cdata.setRemark(""); - cdata.setStatus(CommonString.KEY_INVALID); - - database.InsertCoverageData(cdata); - - database.updateCheckoutStatus(store_id, CommonString.KEY_INVALID); - - /* SharedPreferences.Editor editor = preferences.edit(); - - editor.putString(CommonString.KEY_STOREVISITED_STATUS, ""); - editor.putString(CommonString.KEY_STORE_IN_TIME, ""); - - editor.commit();*/ - - - //Intent in = new Intent(StoreimageActivity.this, CategoryListActivity.class); - new StoreCheckoutImageActivity.GeoTagUpload(StoreCheckoutImageActivity.this).execute(); - + Intent i = new Intent(StoreCheckoutImageActivity.this, CheckoutActivity.class); + i.putExtra(CommonString.KEY_STORE_ID, checkOutStore_id); + i.putExtra(CommonString.KEY_CHECKOUT_IMAGE, img_str); + startActivity(i); + finish(); } }) .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { @@ -242,10 +216,10 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie alert = builder.create(); alert.show(); - } else { Toast.makeText(getApplicationContext(), getResources().getString(R.string.clickimage), Toast.LENGTH_SHORT).show(); } + break; } } @@ -276,18 +250,18 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie //temp value in case camera is gallery app above jellybean 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; } if (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; break; } } else { - if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) { defaultCameraPackage = list.get(n).packageName; break; @@ -378,7 +352,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie protected void onResume() { super.onResume(); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); - toolbar.setTitle(R.string.title_activity_store_image); + toolbar.setTitle(R.string.title_activity_store_checkout_image); } protected void onStart() { @@ -655,7 +629,6 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie alert.show(); } - private static String arabicToenglish(String number) { char[] chars = new char[number.length()]; for (int i = 0; i < number.length(); i++) { 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 9397e66..7c69180 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -238,51 +238,42 @@ public class StoreListActivity extends AppCompatActivity { }*/ else if (coverage.size() > 0) { - String statusleave=""; + String statusleave = ""; - for (int i = 0; i < coverage.size(); i++) { + for (int i = 0; i < coverage.size(); i++) { - if (storeid.equals(coverage.get(i).getStoreId())) { - statusleave=coverage.get(i).getStatus(); + if (storeid.equals(coverage.get(i).getStoreId())) { + statusleave = coverage.get(i).getStatus(); - if(statusleave.equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)){ + if (statusleave.equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { - viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); - viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.imageview.setVisibility(View.VISIBLE); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); + viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } + } else if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_VALID)) { + viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); + viewHolder.chkbtn.setVisibility(View.VISIBLE); + viewHolder.imageview.setVisibility(View.INVISIBLE); - else if(coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_VALID)) - { - viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); - viewHolder.chkbtn.setVisibility(View.VISIBLE); - viewHolder.imageview.setVisibility(View.INVISIBLE); + } else if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)) { - } - else if(coverage.get(i).getStatus().equalsIgnoreCase(CommonString.KEY_INVALID)){ + viewHolder.imageview.setVisibility(View.INVISIBLE); + viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green)); + } else { - viewHolder.imageview.setVisibility(View.INVISIBLE); - viewHolder.chkbtn.setVisibility(View.INVISIBLE); - viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green)); - } + viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); + viewHolder.imageview.setVisibility(View.INVISIBLE); + viewHolder.chkbtn.setVisibility(View.INVISIBLE); + } + + break; - else { - - viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); - viewHolder.imageview.setVisibility(View.INVISIBLE); - viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } - - break; - - - - - } + } /* if (coverage.get(i).getInTime() != null) { @@ -301,9 +292,9 @@ public class StoreListActivity extends AppCompatActivity { }*/ - } + } - }else { + } else { viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange)); viewHolder.imageview.setVisibility(View.INVISIBLE); @@ -333,9 +324,7 @@ public class StoreListActivity extends AppCompatActivity { Snackbar.make(v, R.string.title_store_list_activity_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - - else if (checkleavestatus(store_id)) { + } else if (checkleavestatus(store_id)) { Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); @@ -368,7 +357,7 @@ public class StoreListActivity extends AppCompatActivity { } if (enteryflag) { - showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(),current.getGEO_TAG(),current); + showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current); } } else { Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); @@ -381,42 +370,33 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.chkbtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - AlertDialog.Builder builder = new AlertDialog.Builder( - StoreListActivity.this); + AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); builder.setMessage(R.string.wantcheckout) .setCancelable(false) - .setPositiveButton(R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick( - DialogInterface dialog, int id) { - if (CheckNetAvailability()) { + .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + if (CheckNetAvailability()) { + /*Intent i = new Intent(StoreListActivity.this, CheckoutActivity.class); + i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + startActivity(i);*/ - Intent i = new Intent(StoreListActivity.this, CheckoutActivity.class); - - i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); - - startActivity(i); - } else { - - Snackbar.make(recyclerView, R.string.nonetwork, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - - } - - } - }) - .setNegativeButton(R.string.closed, - new DialogInterface.OnClickListener() { - public void onClick( - DialogInterface dialog, int id) { - dialog.cancel(); - } - }); + Intent i = new Intent(StoreListActivity.this, StoreCheckoutImageActivity.class); + i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + startActivity(i); + } else { + Snackbar.make(recyclerView, R.string.nonetwork, Snackbar.LENGTH_SHORT) + .setAction("Action", null).show(); + } + } + }) + .setNegativeButton(R.string.closed, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); AlertDialog alert = builder.create(); alert.show(); - - } }); @@ -471,7 +451,7 @@ public class StoreListActivity extends AppCompatActivity { } - void showMyDialog(final String storeCd, final String storeName, final String status, final String visitDate, final String checkout_status,final String GeotagStatus,final StoreBean current) { + void showMyDialog(final String storeCd, final String storeName, final String status, final String visitDate, final String checkout_status, final String GeotagStatus, final StoreBean current) { dialog = new Dialog(this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(R.layout.dialogbox); @@ -485,7 +465,7 @@ public class StoreListActivity extends AppCompatActivity { // find which radio button is selected if (checkedId == R.id.yes) { - if(!GeotagStatus.equalsIgnoreCase("N")){ + if (!GeotagStatus.equalsIgnoreCase("N")) { editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); @@ -503,30 +483,29 @@ public class StoreListActivity extends AppCompatActivity { editor.commit(); - boolean flag = true; - if (coverage.size() > 0) { - for (int i = 0; i < coverage.size(); i++) { - if (store_id.equals(coverage.get(i).getStoreId())) { - flag = false; - break; + boolean flag = true; + if (coverage.size() > 0) { + for (int i = 0; i < coverage.size(); i++) { + if (store_id.equals(coverage.get(i).getStoreId())) { + flag = false; + break; + } } } - } - if (flag == true) { + if (flag == true) { + + Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); + startActivity(in); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + dialog.cancel(); + } else { + Intent in = new Intent(StoreListActivity.this, StoreWisePerformanceActivity.class); + startActivity(in); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + dialog.cancel(); + } - Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); - startActivity(in); - overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - dialog.cancel(); } else { - Intent in = new Intent(StoreListActivity.this, StoreWisePerformanceActivity.class); - startActivity(in); - overridePendingTransition(R.anim.activity_in, R.anim.activity_out); - dialog.cancel(); - } - - } - else{ dialog.cancel(); AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); builder.setTitle(getResources().getString(R.string.dialog_title)); @@ -549,7 +528,7 @@ public class StoreListActivity extends AppCompatActivity { } - }else if (checkedId == R.id.no) { + } else if (checkedId == R.id.no) { dialog.cancel(); @@ -560,48 +539,47 @@ public class StoreListActivity extends AppCompatActivity { if (coverage.size() > 0) { - if (coverage.get(0).getStatus().equals(CommonString.KEY_INVALID) || coverage.get(0).getStatus().equals(CommonString.KEY_VALID)) { - AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); - builder.setMessage(R.string.DELETE_ALERT_MESSAGE) - .setCancelable(false) - .setPositiveButton(getResources().getString(R.string.yes), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int id) { + if (coverage.get(0).getStatus().equals(CommonString.KEY_INVALID) || coverage.get(0).getStatus().equals(CommonString.KEY_VALID)) { + AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); + builder.setMessage(R.string.DELETE_ALERT_MESSAGE) + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int id) { - UpdateStore(store_id); + UpdateStore(store_id); - Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); - in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); - startActivity(in); + Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + startActivity(in); - } - }) - .setNegativeButton(getResources().getString(R.string.no), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int id) { + } + }) + .setNegativeButton(getResources().getString(R.string.no), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int id) { - dialog.cancel(); - } - }); - AlertDialog alert = builder.create(); + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); - alert.show(); - } - else{ - Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); - in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID()); - startActivity(in); - } + alert.show(); + } else { + Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + startActivity(in); + } - }else { + } else { Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); - in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID()); + in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); startActivity(in); } @@ -656,7 +634,7 @@ public class StoreListActivity extends AppCompatActivity { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; - }else{ + } else { lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index d769b59..69c2468 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -217,6 +217,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic cdata.setImage(img_str); cdata.setRemark(""); cdata.setStatus(CommonString.KEY_INVALID); + cdata.setCheckOut_Image(""); database.InsertCoverageData(cdata); @@ -277,18 +278,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic //temp value in case camera is gallery app above jellybean 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; } 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; break; } } else { - if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) { defaultCameraPackage = list.get(n).packageName; break; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java index 6a61582..968e0c6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java @@ -1,223 +1,231 @@ package cpm.com.gskmtorange.GetterSetter; -public class CoverageBean -{ - protected int MID; - protected String process_id; +public class CoverageBean { + protected int MID; + protected String process_id; - public String getGEO_TAG() { - return GEO_TAG; - } + public String getGEO_TAG() { + return GEO_TAG; + } - public void setGEO_TAG(String GEO_TAG) { - this.GEO_TAG = GEO_TAG; - } + public void setGEO_TAG(String GEO_TAG) { + this.GEO_TAG = GEO_TAG; + } - protected String GEO_TAG; - public String getProcess_id() { - return process_id; - } + protected String GEO_TAG; - public void setProcess_id(String process_id) { - this.process_id = process_id; - } + public String getProcess_id() { + return process_id; + } - protected String storeId; - protected String storename; - - public String getStorename() { - return storename; - } + public void setProcess_id(String process_id) { + this.process_id = process_id; + } - public void setStorename(String storename) { - this.storename = storename; - } + protected String storeId; + protected String storename; - protected String Remark; - - public String getRemark() { - return Remark; - } + public String getStorename() { + return storename; + } - public void setRemark(String remark) { - Remark = remark; - } + public void setStorename(String storename) { + this.storename = storename; + } - protected String userId; - protected String app_version; - protected String image_allow; - - public String getImage_allow() { - return image_allow; - } + protected String Remark; - public void setImage_allow(String image_allow) { - this.image_allow = image_allow; - } + public String getRemark() { + return Remark; + } - public String getApp_version() { - return app_version; - } + public void setRemark(String remark) { + Remark = remark; + } - public void setApp_version(String app_version) { - this.app_version = app_version; - } + protected String userId; + protected String app_version; + protected String image_allow; - protected String inTime; - - protected String outTime; - - protected String visitDate; - - protected String keycontactId; - - protected String isdDeploy; - - protected String uploadStatus; - - private String latitude; - - private String longitude; - - private String reasonid=""; - - private String sub_reasonId=""; - - public String getSub_reasonId() { - return sub_reasonId; - } + public String getImage_allow() { + return image_allow; + } - public void setSub_reasonId(String sub_reasonId) { - this.sub_reasonId = sub_reasonId; - } + public void setImage_allow(String image_allow) { + this.image_allow = image_allow; + } - private String reason=""; - - private String status="N"; - - private String image=""; - + public String getApp_version() { + return app_version; + } - public String getImage() { - return image; - } + public void setApp_version(String app_version) { + this.app_version = app_version; + } - public void setImage(String image) { - this.image = image; - } + protected String inTime; - public String getStatus() { - return status; - } + protected String outTime; - public void setStatus(String status) { - this.status = status; - } + protected String visitDate; - public int getMID() { - return MID; - } + protected String keycontactId; - public void setMID(int mID) { - MID = mID; - } + protected String isdDeploy; - public String getStoreId() { - return storeId; - } + protected String uploadStatus; - public void setStoreId(String storeId) { - this.storeId = storeId; - } + private String latitude; - public String getUserId() { - return userId; - } + private String longitude; - public void setUserId(String userId) { - this.userId = userId; - } + private String reasonid = ""; - public String getInTime() { - return inTime; - } + private String sub_reasonId = ""; - public void setInTime(String inTime) { - this.inTime = inTime; - } + public String getSub_reasonId() { + return sub_reasonId; + } - public String getOutTime() { - return outTime; - } + public void setSub_reasonId(String sub_reasonId) { + this.sub_reasonId = sub_reasonId; + } - public void setOutTime(String outTime) { - this.outTime = outTime; - } + private String reason = ""; - public String getVisitDate() { - return visitDate; - } + private String status = "N"; - public void setVisitDate(String visitDate) { - this.visitDate = visitDate; - } + private String image = ""; - public String getKeycontactId() { - return keycontactId; - } - public void setKeycontactId(String keycontactId) { - this.keycontactId = keycontactId; - } + public String getImage() { + return image; + } - public String getIsdDeploy() { - return isdDeploy; - } + public void setImage(String image) { + this.image = image; + } - public void setIsdDeploy(String isdDeploy) { - this.isdDeploy = isdDeploy; - } + public String getStatus() { + return status; + } - public String getUploadStatus() { - return uploadStatus; - } + public void setStatus(String status) { + this.status = status; + } - public void setUploadStatus(String uploadStatus) { - this.uploadStatus = uploadStatus; - } + public int getMID() { + return MID; + } - public String getLatitude() { - return latitude; - } + public void setMID(int mID) { + MID = mID; + } - public void setLatitude(String latitude) { - this.latitude = latitude; - } + public String getStoreId() { + return storeId; + } - public String getLongitude() { - return longitude; - } + public void setStoreId(String storeId) { + this.storeId = storeId; + } - public void setLongitude(String longitude) { - this.longitude = longitude; - } + public String getUserId() { + return userId; + } - public String getReasonid() { - return reasonid; - } + public void setUserId(String userId) { + this.userId = userId; + } - public void setReasonid(String reasonid) { - this.reasonid = reasonid; - } + public String getInTime() { + return inTime; + } - public String getReason() { - return reason; - } + public void setInTime(String inTime) { + this.inTime = inTime; + } - public void setReason(String reason) { - this.reason = reason; - } - - - + public String getOutTime() { + return outTime; + } + + public void setOutTime(String outTime) { + this.outTime = outTime; + } + + public String getVisitDate() { + return visitDate; + } + + public void setVisitDate(String visitDate) { + this.visitDate = visitDate; + } + + public String getKeycontactId() { + return keycontactId; + } + + public void setKeycontactId(String keycontactId) { + this.keycontactId = keycontactId; + } + + public String getIsdDeploy() { + return isdDeploy; + } + + public void setIsdDeploy(String isdDeploy) { + this.isdDeploy = isdDeploy; + } + + public String getUploadStatus() { + return uploadStatus; + } + + public void setUploadStatus(String uploadStatus) { + this.uploadStatus = uploadStatus; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getReasonid() { + return reasonid; + } + + public void setReasonid(String reasonid) { + this.reasonid = reasonid; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + String CheckOut_Image = ""; + + + public String getCheckOut_Image() { + return CheckOut_Image; + } + + public void setCheckOut_Image(String checkOut_Image) { + CheckOut_Image = checkOut_Image; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 7e1838d..05f6f83 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -265,6 +265,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { + "[REASON_ID]" + coverageList.get(i).getReasonid() + "[/REASON_ID]" + "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]" + "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]" + + "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]" + "[/USER_DATA]" + "[/DATA]"; @@ -1541,6 +1542,33 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } + //CheckOut Store Image + if (coverageList.size() > 0) { + for (int i1 = 0; i1 < coverageList.size(); i1++) { + + if (coverageList.get(i1).getCheckOut_Image() != null && !coverageList.get(i1).getCheckOut_Image().equals("")) { + if (new File(CommonString.FILE_PATH + coverageList.get(i1).getCheckOut_Image()).exists()) { + + try { + result = UploadImage(coverageList.get(i1).getCheckOut_Image(), "StoreImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StoreImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StoreImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + //T2p Images for (int m = 0; m < t2PGetterSetters.size(); m++) { @@ -1685,7 +1713,6 @@ public class PreviousDataUploadActivity extends AppCompatActivity { updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } - private static boolean updateResources(Context context, String language) { /*String lang; 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 4a6d5a0..d54af91 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -269,6 +269,7 @@ public class UploadActivity extends AppCompatActivity { + "[REASON_ID]" + coverageList.get(i).getReasonid() + "[/REASON_ID]" + "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]" + "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]" + + "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]" + "[/USER_DATA]" + "[/DATA]"; @@ -1530,6 +1531,34 @@ public class UploadActivity extends AppCompatActivity { } + //CheckOut Store Image + if (coverageList.size() > 0) { + for (int i1 = 0; i1 < coverageList.size(); i1++) { + + if (coverageList.get(i1).getCheckOut_Image() != null && !coverageList.get(i1).getCheckOut_Image().equals("")) { + if (new File(CommonString.FILE_PATH + coverageList.get(i1).getCheckOut_Image()).exists()) { + + try { + result = UploadImage(coverageList.get(i1).getCheckOut_Image(), "StoreImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StoreImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StoreImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + + //T2p Images for (int m = 0; m < t2PGetterSetters.size(); m++) { diff --git a/GSKMTOrange/src/main/res/layout/activity_store_checkout_image.xml b/GSKMTOrange/src/main/res/layout/activity_store_checkout_image.xml new file mode 100644 index 0000000..8de9457 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_store_checkout_image.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/contentstore_checkout_image.xml b/GSKMTOrange/src/main/res/layout/contentstore_checkout_image.xml new file mode 100644 index 0000000..547491e --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/contentstore_checkout_image.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + +