From f86f832b615d5c598b5093308a28b6ef332a4599 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 31 Jan 2017 18:01:49 +0530 Subject: [PATCH] //Stock_FacingActivity Changes today --- GSKMTOrange/build.gradle | 4 +- .../com/gskmtorange/Database/GSKOrangeDB.java | 6 + .../gskmtorange/constant/CommonString.java | 17 +- .../dailyentry/T2PComplianceActivity.java | 201 +++++++++++++++--- .../upload/PreviousDataUploadActivity.java | 66 ++---- .../gskmtorange/upload/UploadActivity.java | 110 +++++----- .../xmlGetterSetter/T2PGetterSetter.java | 18 +- .../src/main/res/layout/t2p_item_layout.xml | 148 ++++++++----- 8 files changed, 375 insertions(+), 195 deletions(-) diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 213644a..64b4c27 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -14,8 +14,8 @@ android { applicationId "cpm.com.gskmtorange" minSdkVersion 15 targetSdkVersion 22 - versionCode 2 - versionName "1.1" + versionCode 3 + versionName "1.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { 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 0da6951..6e838d6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -261,6 +261,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { .getColumnIndexOrThrow("IMAGE_PATH"))); t2p.setImage(""); + t2p.setImage1(""); + t2p.setImage2(""); t2p.setRemark(""); @@ -2576,6 +2578,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { 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_IMAGE1, data.get(i).getImage1()); + values.put(CommonString.KEY_IMAGE2, data.get(i).getImage2()); values.put(CommonString.KEY_REMARK, data.get(i).getRemark()); values.put(CommonString.KEY_PRESENT, data.get(i).isPresent()); @@ -2829,6 +2833,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { 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.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE1))); + tp.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE2))); 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"))); 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 836be10..1757463 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -49,12 +49,14 @@ public class CommonString { public static final String KEY_REASON = "REASON"; public static final String KEY_COVERAGE_REMARK = "REMARK"; public static final String KEY_IMAGE = "IMAGE"; + public static final String KEY_IMAGE1 = "IMAGE1"; + public static final String KEY_IMAGE2 = "IMAGE2"; 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"; - public static final String KEY_LOOGIN_PREF ="LOGIN_PREF"; + public static final String KEY_LOOGIN_PREF = "LOGIN_PREF"; //KEYS RELATED TO T2P COMPLIANCE @@ -306,12 +308,11 @@ public class CommonString { + ")"; - public static final String CREATE_TABLE_STOCK_DIALOG = "CREATE TABLE " + TABLE_INSERT_STOCK_DIALOG + " (" + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + KEY_STORE_ID + " VARCHAR," + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR," - + KEY_DISPLAY_ID +" VARCHAR," + + KEY_DISPLAY_ID + " VARCHAR," + KEY_SKU_ID + " VARCHAR," + KEY_QUANTITY + " VARCHAR," + KEY_Common_ID + " VARCHAR," + "categoryId" + " VARCHAR," + KEY_SKUNAME + " VARCHAR," @@ -478,7 +479,7 @@ public class CommonString { + TABLE_INSERT_STOCK_DIALOG_MAIN + " (" + KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + KEY_STORE_ID + " VARCHAR," + KEY_BRAND_ID + " VARCHAR," + KEY_BRAND + " VARCHAR," - + KEY_DISPLAY_ID +" VARCHAR," + + KEY_DISPLAY_ID + " VARCHAR," + KEY_SKU_ID + " VARCHAR," + KEY_QUANTITY + " VARCHAR," + KEY_Common_ID + " VARCHAR," + "categoryId" + " VARCHAR," + KEY_SKUNAME + " VARCHAR," @@ -498,9 +499,11 @@ public class CommonString { + KEY_DISPLAY_ID + " INTEGER," + KEY_BRAND + " VARCHAR," + KEY_IMAGE_URL + " VARCHAR," - + KEY_IMAGE_PATH+ " VARCHAR," + + KEY_IMAGE_PATH + " VARCHAR," + KEY_DISPLAY + " VARCHAR," + KEY_IMAGE + " VARCHAR," + + KEY_IMAGE1 + " VARCHAR," + + KEY_IMAGE2 + " VARCHAR," + KEY_REMARK + " VARCHAR," + KEY_PRESENT + " VARCHAR" @@ -517,7 +520,7 @@ public class CommonString { + KEY_CHECKLIST_ID + " INTEGER," + KEY_DISPLAY_ID + " INTEGER," + KEY_CHECKLIST + " VARCHAR," - + KEY_PRESENT + " VARCHAR" + + KEY_PRESENT + " VARCHAR" + ")"; @@ -531,7 +534,7 @@ public class CommonString { + KEY_SKU_ID + " INTEGER," + KEY_BRAND_ID + " INTEGER," + KEY_STOCK + " INTEGER," - + KEY_BRAND+ " VARCHAR," + + KEY_BRAND + " VARCHAR," + KEY_SKU + " VARCHAR" + ")"; 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 95136c7..112648b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -72,8 +72,11 @@ public class T2PComplianceActivity extends AppCompatActivity { String categoryName, categoryId; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; - String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = ""; - int child_position = -1; + String str = CommonString.FILE_PATH, + path = "", path1 = "", path2 = "", + _pathforcheck = "", _pathforcheck1 = "", _pathforcheck2 = "", + img = "", img1 = "", img2 = ""; + int child_position = -1, child_position1 = -1, child_position2 = -1; String error_msg; private SharedPreferences preferences; @@ -164,9 +167,9 @@ public class T2PComplianceActivity extends AppCompatActivity { } - rec_t2p.addOnScrollListener(new RecyclerView.OnScrollListener(){ + rec_t2p.addOnScrollListener(new RecyclerView.OnScrollListener() { @Override - public void onScrolled(RecyclerView recyclerView, int dx, int dy){ + public void onScrolled(RecyclerView recyclerView, int dx, int dy) { if (dy > 0) fab.hide(); else if (dy < 0) @@ -194,8 +197,7 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.t2p_item_layout, parent, false); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.t2p_item_layout, parent, false); return new ViewHolder(view); } @@ -214,9 +216,7 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.btn_gaps.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showGapsDialog(mItem); - } }); @@ -230,11 +230,25 @@ public class T2PComplianceActivity extends AppCompatActivity { mItem.setPresent(false); mItem.getGapsChecklist().clear(); mItem.getSkulist().clear(); + + //Camera if (!mItem.getImage().equals("")) { new File(str + mItem.getImage()).delete(); mItem.setImage(""); } + //Camera 1 + if (!mItem.getImage1().equals("")) { + new File(str + mItem.getImage1()).delete(); + mItem.setImage1(""); + } + + //Camera 2 + if (!mItem.getImage2().equals("")) { + new File(str + mItem.getImage2()).delete(); + mItem.setImage2(""); + } + } t2PAdapter.notifyDataSetChanged(); @@ -249,6 +263,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } }); + //Camera if (!img.equalsIgnoreCase("")) { if (position == child_position) { mItem.setImage(img); @@ -256,6 +271,22 @@ public class T2PComplianceActivity extends AppCompatActivity { } } + //Camera 1 + if (!img1.equalsIgnoreCase("")) { + if (position == child_position1) { + mItem.setImage1(img1); + img1 = ""; + } + } + + //Camera 2 + if (!img2.equalsIgnoreCase("")) { + if (position == child_position2) { + mItem.setImage2(img2); + img2 = ""; + } + } + holder.btn_ref_img.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -263,16 +294,20 @@ public class T2PComplianceActivity extends AppCompatActivity { } }); + if (camera_allow.equals("1")) { + //Camera holder.img_cam.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + + getCurrentTime().replace(":", "") + ".jpg"; child_position = position; path = str + _pathforcheck; - startCameraActivity(); + startCameraActivity(1); } }); @@ -287,8 +322,62 @@ public class T2PComplianceActivity extends AppCompatActivity { } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_green); } + + //Camera 1 + holder.img_cam1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck1 = "T2P_Image1_" + store_id + "_" + mItem.getBrand_id() + + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + + getCurrentTime().replace(":", "") + ".jpg"; + child_position1 = position; + path = str + _pathforcheck1; + + startCameraActivity(2); + } + }); + + if (mItem.getImage1().equals("")) { + if (mItem.isPresent()) { + holder.img_cam1.setBackgroundResource(R.mipmap.camera_orange); + } else { + //if not present camera disabled + holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey); + } + + } else { + holder.img_cam1.setBackgroundResource(R.mipmap.camera_green); + } + + //Camera 2 + holder.img_cam2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck2 = "T2P_Image2_" + store_id + "_" + mItem.getBrand_id() + + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + + getCurrentTime().replace(":", "") + ".jpg"; + child_position2 = position; + path = str + _pathforcheck2; + + startCameraActivity(3); + } + }); + + if (mItem.getImage2().equals("")) { + if (mItem.isPresent()) { + holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange); + } else { + //if not present camera disabled + holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey); + } + + } else { + holder.img_cam2.setBackgroundResource(R.mipmap.camera_green); + } } else { holder.img_cam.setBackgroundResource(R.mipmap.camera_grey); + holder.img_cam1.setBackgroundResource(R.mipmap.camera_grey); + holder.img_cam2.setBackgroundResource(R.mipmap.camera_grey); } @@ -296,6 +385,8 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.toggle_btn.setChecked(is_enabled); holder.img_cam.setEnabled(is_enabled); + holder.img_cam1.setEnabled(is_enabled); + holder.img_cam2.setEnabled(is_enabled); holder.btn_gaps.setEnabled(is_enabled); holder.btn_sku.setEnabled(is_enabled); @@ -303,10 +394,9 @@ public class T2PComplianceActivity extends AppCompatActivity { if (mItem.getGapsChecklist().size() > 0) { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); } else { - if(mItem.isPresent()){ + if (mItem.isPresent()) { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - else { + } else { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.grey_background)); } } @@ -314,10 +404,9 @@ public class T2PComplianceActivity extends AppCompatActivity { if (mItem.getSkulist().size() > 0) { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); } else { - if(mItem.isPresent()){ + if (mItem.isPresent()) { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); - } - else { + } else { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background)); } } @@ -333,7 +422,9 @@ public class T2PComplianceActivity extends AppCompatActivity { public final View mView; public final LinearLayout parentLayout; public final TextView tv_brand, tv_display; - public final ImageView img_cam, img_remark; + public final ImageView img_cam; + public ImageView img_cam1, img_cam2; + //public ImageView img_remark; public final Button btn_gaps, btn_sku, btn_ref_img; public final ToggleButton toggle_btn; @@ -346,7 +437,9 @@ public class T2PComplianceActivity extends AppCompatActivity { tv_brand = (TextView) mView.findViewById(R.id.tv_brand); tv_display = (TextView) mView.findViewById(R.id.tv_display); img_cam = (ImageView) mView.findViewById(R.id.img_cam); - img_remark = (ImageView) mView.findViewById(R.id.img_remark); + img_cam1 = (ImageView) mView.findViewById(R.id.img_cam1); + img_cam2 = (ImageView) mView.findViewById(R.id.img_cam2); + // img_remark = (ImageView) mView.findViewById(R.id.img_remark); btn_gaps = (Button) mView.findViewById(R.id.btn_gaps); btn_sku = (Button) mView.findViewById(R.id.btn_sku); btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); @@ -600,7 +693,7 @@ public class T2PComplianceActivity extends AppCompatActivity { return cdate; } - private void startCameraActivity() { + private void startCameraActivity(int pos) { try { Log.i("Stock & Facing ", "startCameraActivity()"); @@ -638,7 +731,8 @@ public class T2PComplianceActivity extends AppCompatActivity { Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(defaultCameraPackage); - startActivityForResult(intent, 1); + //startActivityForResult(intent, 1); + startActivityForResult(intent, pos); //startActivityForResult(intent, position); } catch (ActivityNotFoundException e) { @@ -647,7 +741,8 @@ public class T2PComplianceActivity extends AppCompatActivity { Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); intent.setPackage(gallery_package); - startActivityForResult(intent, 0); + //startActivityForResult(intent, 0); + startActivityForResult(intent, pos); } catch (Exception e) { e.printStackTrace(); @@ -656,8 +751,8 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.e("Stock & Facing", "resultCode: " + resultCode); - switch (resultCode) { + Log.e("Stock & Facing", "resultCode: " + resultCode + " requestCode: " + requestCode); + /*switch (resultCode) { case 0: Log.e("Stock & Facing", "User cancelled"); @@ -671,6 +766,49 @@ public class T2PComplianceActivity extends AppCompatActivity { } } break; + }*/ + + switch (requestCode) { + case 1: + if (resultCode == 0) { + Log.e("Stock & Facing", "User cancelled"); + } else if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img = _pathforcheck; + t2PAdapter.notifyDataSetChanged(); + _pathforcheck = ""; + } + } + } + break; + case 2: + if (resultCode == 0) { + Log.e("Stock & Facing", "User cancelled"); + } else if (resultCode == -1) { + if (_pathforcheck1 != null && !_pathforcheck1.equals("")) { + if (new File(str + _pathforcheck1).exists()) { + img1 = _pathforcheck1; + t2PAdapter.notifyDataSetChanged(); + _pathforcheck1 = ""; + } + } + } + break; + + case 3: + if (resultCode == 0) { + Log.e("Stock & Facing", "User cancelled"); + } else if (resultCode == -1) { + if (_pathforcheck2 != null && !_pathforcheck2.equals("")) { + if (new File(str + _pathforcheck2).exists()) { + img2 = _pathforcheck2; + t2PAdapter.notifyDataSetChanged(); + _pathforcheck2 = ""; + } + } + } + break; } super.onActivityResult(requestCode, resultCode, data); @@ -681,12 +819,9 @@ public class T2PComplianceActivity extends AppCompatActivity { for (int i = 0; i < t2PGetterSetters.size(); i++) { - 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) { + if (t2PGetterSetters.get(i).isPresent()) { + //if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { + if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { flag = false; error_msg = getResources().getString(R.string.fill_gaps_data); break; @@ -694,6 +829,12 @@ public class T2PComplianceActivity extends AppCompatActivity { flag = false; error_msg = getResources().getString(R.string.fill_sku_data); break; + } else if (camera_allow.equals("1") && (t2PGetterSetters.get(i).getImage().equals("") && + t2PGetterSetters.get(i).getImage1().equals("") && + t2PGetterSetters.get(i).getImage2().equals(""))) { + flag = false; + error_msg = getResources().getString(R.string.click_image); + break; } } @@ -986,7 +1127,7 @@ public class T2PComplianceActivity extends AppCompatActivity { return true; } - public void showPlanogram(String planogram_image){ + public void showPlanogram(String planogram_image) { final Dialog dialog = new Dialog(T2PComplianceActivity.this); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); 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 d41b982..64ef413 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -730,18 +730,10 @@ public class PreviousDataUploadActivity extends AppCompatActivity { gaps_child = "[GAPS]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[CHECK_LIST_ID]" - + gapsList.get(l).getChecklist_id() - + "[/CHECK_LIST_ID]" - + "[DISPLAY_ID]" - + gapsList.get(l).getDisplay_id() - + "[/DISPLAY_ID]" - + "[PRESENT]" - + present - + "[/PRESENT]" - + "[COMMON_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) - + "[/COMMON_ID]" + + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]" + + "[DISPLAY_ID]" + gapsList.get(l).getDisplay_id() + "[/DISPLAY_ID]" + + "[PRESENT]" + present + "[/PRESENT]" + + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/GAPS]"; gaps_xml = gaps_xml + gaps_child; } @@ -754,18 +746,10 @@ public class PreviousDataUploadActivity extends AppCompatActivity { sku_child = "[SKU]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[SKU_ID]" - + skuList.get(k).getSKU_ID() - + "[/SKU_ID]" - + "[BRAND_ID]" - + skuList.get(k).getBRAND_ID() - + "[/BRAND_ID]" - + "[STOCK]" - + skuList.get(k).getSTOCK() - + "[/STOCK]" - + "[COMMON_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) - + "[/COMMON_ID]" + + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]" + + "[BRAND_ID]" + skuList.get(k).getBRAND_ID() + "[/BRAND_ID]" + + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]" + + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/SKU]"; sku_xml = sku_xml + sku_child; } @@ -780,30 +764,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity { onXML = "[T2P_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[CATEGORY_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) - + "[/CATEGORY_ID]" - + "[BRAND_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) - + "[/BRAND_ID]" - + "[DISPLAY_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) - + "[/DISPLAY_ID]" - + "[COMMON_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) - + "[/COMMON_ID]" - + "[IMAGE]" - + t2PGetterSetters.get(i1).getImage() - + "[/IMAGE]" - + "[PRESENT]" - + present - + "[/PRESENT]" - + "[GAPS_DATA]" - + gaps_xml - + "[/GAPS_DATA]" - + "[SKU_DATA]" - + sku_xml - + "[/SKU_DATA]" + + "[CATEGORY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + + "[BRAND_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]" + + "[DISPLAY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + "[/DISPLAY_ID]" + + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]" + + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]" + + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]" + + "[PRESENT]" + present + "[/PRESENT]" + + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[/T2P_DATA]"; t2p_data_xml = t2p_data_xml + onXML; 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 fdd6098..0198846 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -736,18 +736,10 @@ public class UploadActivity extends AppCompatActivity { gaps_child = "[GAPS]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[CHECK_LIST_ID]" - + gapsList.get(l).getChecklist_id() - + "[/CHECK_LIST_ID]" - + "[DISPLAY_ID]" - + gapsList.get(l).getDisplay_id() - + "[/DISPLAY_ID]" - + "[PRESENT]" - + present - + "[/PRESENT]" - + "[COMMON_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) - + "[/COMMON_ID]" + + "[CHECK_LIST_ID]" + gapsList.get(l).getChecklist_id() + "[/CHECK_LIST_ID]" + + "[DISPLAY_ID]" + gapsList.get(l).getDisplay_id() + "[/DISPLAY_ID]" + + "[PRESENT]" + present + "[/PRESENT]" + + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/GAPS]"; gaps_xml = gaps_xml + gaps_child; } @@ -760,18 +752,10 @@ public class UploadActivity extends AppCompatActivity { sku_child = "[SKU]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[SKU_ID]" - + skuList.get(k).getSKU_ID() - + "[/SKU_ID]" - + "[BRAND_ID]" - + skuList.get(k).getBRAND_ID() - + "[/BRAND_ID]" - + "[STOCK]" - + skuList.get(k).getSTOCK() - + "[/STOCK]" - + "[COMMON_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) - + "[/COMMON_ID]" + + "[SKU_ID]" + skuList.get(k).getSKU_ID() + "[/SKU_ID]" + + "[BRAND_ID]" + skuList.get(k).getBRAND_ID() + "[/BRAND_ID]" + + "[STOCK]" + skuList.get(k).getSTOCK() + "[/STOCK]" + + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/SKU]"; sku_xml = sku_xml + sku_child; } @@ -786,30 +770,16 @@ public class UploadActivity extends AppCompatActivity { onXML = "[T2P_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[CATEGORY_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) - + "[/CATEGORY_ID]" - + "[BRAND_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) - + "[/BRAND_ID]" - + "[DISPLAY_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) - + "[/DISPLAY_ID]" - + "[COMMON_ID]" - + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) - + "[/COMMON_ID]" - + "[IMAGE]" - + t2PGetterSetters.get(i1).getImage() - + "[/IMAGE]" - + "[PRESENT]" - + present - + "[/PRESENT]" - + "[GAPS_DATA]" - + gaps_xml - + "[/GAPS_DATA]" - + "[SKU_DATA]" - + sku_xml - + "[/SKU_DATA]" + + "[CATEGORY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + + "[BRAND_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id()) + "[/BRAND_ID]" + + "[DISPLAY_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id()) + "[/DISPLAY_ID]" + + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]" + + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]" + + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]" + + "[PRESENT]" + present + "[/PRESENT]" + + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[/T2P_DATA]"; t2p_data_xml = t2p_data_xml + onXML; @@ -981,6 +951,46 @@ public class UploadActivity extends AppCompatActivity { } } + if (t2PGetterSetters.get(m).getImage1() != null && !t2PGetterSetters.get(m).getImage1().equals("")) { + if (new File(CommonString.FILE_PATH + t2PGetterSetters.get(m).getImage1()).exists()) { + + try { + result = UploadImage(t2PGetterSetters.get(m).getImage1(), "T2PImages1"); + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "T2PImages1"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("T2P Images1 Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (t2PGetterSetters.get(m).getImage2() != null && !t2PGetterSetters.get(m).getImage2().equals("")) { + if (new File(CommonString.FILE_PATH + t2PGetterSetters.get(m).getImage2()).exists()) { + + try { + result = UploadImage(t2PGetterSetters.get(m).getImage2(), "T2PImages2"); + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "T2PImages2"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("T2P Images2 Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } @@ -1040,7 +1050,7 @@ public class UploadActivity extends AppCompatActivity { e.printStackTrace(); } catch (XmlPullParserException e) { e.printStackTrace(); - }catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } @@ -1055,7 +1065,7 @@ public class UploadActivity extends AppCompatActivity { if (result.contains(CommonString.KEY_SUCCESS)) { db.deleteAllTables(); - showAlert(getString(R.string.menu_upload_data)); + showAlert(getString(R.string.menu_upload_data)); //showAlert(getString(R.string.menu_upload_data)); 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 63b2c3f..b9f6616 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, ref_image_url, ref_image_path; + String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2; boolean isPresent; ArrayList gapsChecklist = new ArrayList<>(); @@ -117,4 +117,20 @@ public class T2PGetterSetter { public void setRef_image_path(String ref_image_path) { this.ref_image_path = ref_image_path; } + + public String getImage1() { + return image1; + } + + public void setImage1(String image1) { + this.image1 = image1; + } + + public String getImage2() { + return image2; + } + + public void setImage2(String image2) { + this.image2 = image2; + } } diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml index 1963196..bd829e1 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml @@ -29,7 +29,7 @@ android:layout_weight="1" android:padding="@dimen/custom_margin" android:text="@string/brand" - android:textStyle="bold"/> + android:textStyle="bold" /> - - + android:textStyle="bold" /> - - - + android:textStyle="bold" /> - - + android:textOff="@string/no" + android:textOn="@string/yes" /> - - - + android:orientation="horizontal"> - + + + + android:layout_weight="2" + android:orientation="horizontal" + android:weightSum="3"> - + - + + - + + + + + + + + + + + android:layout_marginTop="5dp" + android:orientation="horizontal" + android:weightSum="3"> + android:textSize="@dimen/text_size_xsmall" /> @@ -190,11 +228,11 @@ android:id="@+id/btn_sku" android:layout_width="wrap_content" android:layout_height="30dp" + android:layout_centerInParent="true" + android:background="@color/colorPrimary" android:text="@string/sku" android:textColor="@color/white" - android:background="@color/colorPrimary" - android:layout_centerInParent="true" - android:textSize="@dimen/text_size_xsmall"/> + android:textSize="@dimen/text_size_xsmall" /> @@ -207,20 +245,16 @@ android:id="@+id/btn_ref_image" android:layout_width="wrap_content" android:layout_height="30dp" + android:layout_centerInParent="true" + android:background="@color/colorPrimary" android:text="@string/ref_image" android:textColor="@color/white" - android:background="@color/colorPrimary" - android:layout_centerInParent="true" - android:textSize="@dimen/text_size_xsmall"/> + android:textSize="@dimen/text_size_xsmall" /> - - - - \ No newline at end of file