diff --git a/.idea/modules.xml b/.idea/modules.xml
index a329b11..ad566b9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,6 @@
-
-
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index bcb6ebb..0f5e959 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -77,9 +77,9 @@
@@ -130,19 +130,24 @@
+ android:configChanges="screenSize|orientation|keyboardHidden"
+ android:label="@string/title_activity_upload"
+ android:screenOrientation="portrait" />
+
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 aaca1e8..e43ec00 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -276,7 +276,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
- dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "') As Brand", null);
+ dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1') As Brand", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -2468,14 +2468,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
// get T2P Compliance data
- public ArrayList getT2pComplianceData(String store_id, String common_id) {
+ public ArrayList getT2pComplianceData(String store_id, String category_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 + "' AND " +
- CommonString.KEY_CATEGORY_ID + "='" + common_id + "'", null);
+
+ if(category_id == null){
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
+ CommonString.KEY_STORE_ID + "='" + store_id + "'", null);
+ }
+ else{
+ dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
+ CommonString.KEY_STORE_ID + "='" + store_id + "' AND " +
+ CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null);
+ }
+
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -2489,6 +2497,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY)));
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);
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 1ae2a9e..9f1ab57 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -74,7 +74,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
String categoryName, categoryId;
private SharedPreferences preferences;
- String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+ 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;
@@ -109,7 +109,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
-
+ camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p);
@@ -221,16 +221,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
});
- 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";
- child_position = position;
- path = str + _pathforcheck;
-
- startCameraActivity();
- }
- });
holder.btn_sku.setOnClickListener(new View.OnClickListener() {
@Override
@@ -246,11 +236,29 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
}
- if (mItem.getImage().equals("")) {
- holder.img_cam.setBackgroundResource(R.mipmap.camera);
- } else {
- holder.img_cam.setBackgroundResource(R.mipmap.camera_done);
+ if(camera_allow.equals("1")){
+
+ 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";
+ child_position = position;
+ path = str + _pathforcheck;
+
+ startCameraActivity();
+ }
+ });
+
+ if (mItem.getImage().equals("")) {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+ } else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+ }
}
+ else {
+ holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
+ }
+
holder.toggle_btn.setChecked(mItem.isPresent());
@@ -841,7 +849,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
for (int i = 0; i < t2PGetterSetters.size(); i++) {
- if (t2PGetterSetters.get(i).getImage().equals("")) {
+ if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
flag = false;
error_msg = getResources().getString(R.string.click_image);
break;
@@ -869,9 +877,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
- /* Intent i = new Intent(activity, StorelistActivity.class);
- activity.startActivity(i);
- activity.finish();*/
+ finish();
+ }
+ })
+ .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
}
});
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 ca542bb..b1a29e7 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -38,9 +38,12 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class UploadActivity extends AppCompatActivity {
@@ -68,9 +71,11 @@ public class UploadActivity extends AppCompatActivity {
ArrayList msl_availabilityList;
ArrayList stock_facingHeaderList, stock_facingChildList;
ArrayList promotionSkuList, additionalPromotionList;
+ ArrayList t2PGetterSetters;
ArrayList additionalVisibilityList;
ArrayList additionalVisibilitySkuList;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -440,6 +445,7 @@ public class UploadActivity extends AppCompatActivity {
data.name = "Additional Promotion Data Uploading";
publishProgress(data);
+
////ashish open
//Additional Visibility Data
@@ -540,17 +546,144 @@ public class UploadActivity extends AppCompatActivity {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
+
+
data.value = 35;
data.name = "Additional Visibility Data";
publishProgress(data);
-
-
/////ashish close
+ //T2p Upload Data
+ String t2p_data_xml = "";
+ onXML = "";
+ t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
+ if (t2PGetterSetters.size() > 0) {
+ for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
+ ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
+ ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
+
+ String gaps_xml = "";
+ String gaps_child;
+
+ for (int l = 0; l < gapsList.size(); l++) {
+
+ String present = "";
+ if (gapsList.get(l).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+
+ gaps_child = "[GAPS]"
+ + "[CHECK_LIST_ID]"
+ + gapsList.get(l).getChecklist_id()
+ + "[/CHECK_LIST_ID]"
+ + "[DISPLAY_ID]"
+ + gapsList.get(l).getDisplay_id()
+ + "[/DISPLAY_ID]"
+ + "[PRESENT]"
+ + present
+ + "[/PRESENT]"
+ + "[/GAPS]";
+ gaps_xml = gaps_xml + gaps_child;
+ }
+
+ String sku_xml = "";
+ String sku_child;
+
+ for (int k = 0; k < skuList.size(); k++) {
+
+ sku_child = "[SKU]"
+ + "[SKU_ID]"
+ + skuList.get(k).getSKU_ID()
+ + "[/SKU_ID]"
+ + "[BRAND_ID]"
+ + skuList.get(k).getBRAND_ID()
+ + "[/BRAND_ID]"
+ + "[STOCK]"
+ + skuList.get(k).getSTOCK()
+ + "[/STOCK]"
+ + "[/SKU]";
+ sku_xml = sku_xml + sku_child;
+ }
+
+ String present = "";
+ if (t2PGetterSetters.get(i1).isPresent()) {
+ present = "1";
+ } else {
+ present = "0";
+ }
+
+ 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]"
+ + "[/T2P_DATA]";
+
+ t2p_data_xml = t2p_data_xml + onXML;
+
+ }
+
+ final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]";
+
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", t2p_final_xml);
+ request.addProperty("KEYS", "T2P_DATA");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", mid);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = (Object) envelope.getResponse();
+
+ if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+
+ if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+ }
+
+ data.value = 40;
+ data.name = "T2P Data Uploading";
+ publishProgress(data);
//Image Upload
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 430728a..b040e6b 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;
+ String brand_id, display_id, brand, display, image, remark, key_id, category_id;
boolean isPresent;
ArrayList gapsChecklist = new ArrayList<>();
@@ -93,4 +93,12 @@ public class T2PGetterSetter {
public void setKey_id(String key_id) {
this.key_id = key_id;
}
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public void setCategory_id(String category_id) {
+ this.category_id = category_id;
+ }
}
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png
new file mode 100644
index 0000000..4f3e781
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility.png b/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility.png
index f65dcae..09b47e6 100644
Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png
index 95e50f1..c578330 100644
Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png
new file mode 100644
index 0000000..4c58759
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/camera_grey.png b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_grey.png
new file mode 100644
index 0000000..331626b
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_grey.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/camera_orange.png b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_orange.png
new file mode 100644
index 0000000..84322f1
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/camera_orange.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/exclamation.png b/GSKMTOrange/src/main/res/mipmap-hdpi/exclamation.png
new file mode 100644
index 0000000..c2eeda2
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/exclamation.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png
index 24a4d07..c7fe3de 100644
Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png b/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png
new file mode 100644
index 0000000..a17a037
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png
new file mode 100644
index 0000000..57e71b7
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png b/GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png
new file mode 100644
index 0000000..fd0e1b0
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png
index 0f0f6c6..7cc5ea5 100644
Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png b/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png
new file mode 100644
index 0000000..d883850
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png
new file mode 100644
index 0000000..fc99b1e
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png b/GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png
index bf2006c..c85db65 100644
Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/tick.png
new file mode 100644
index 0000000..b6e1809
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/tick.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png b/GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png
new file mode 100644
index 0000000..6e7f59b
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png differ
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/wellness_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/wellness_tick.png
new file mode 100644
index 0000000..909b07a
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/wellness_tick.png differ