diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 9b3f37f..26edea9 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -25,15 +25,15 @@ android {
versionName "2.6"*/
//For UAE
- versionCode 15
- versionName "2.7"
-
- //For Turkey
/*versionCode 15
versionName "2.7"*/
+ //For Turkey
+ versionCode 15
+ versionName "2.7"
+
//For KSA
- /* versionCode 16
+ /* versionCode 16
versionName "2.8"*/
multiDexEnabled true
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 1194bbb..30c2a6a 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -266,13 +266,36 @@
+ android:label="@string/title_activity_store_list_map"
+ android:configChanges="screenSize|orientation|keyboardHidden"
+ android:screenOrientation="portrait"
+ android:windowSoftInputMode="adjustPan"/>
+ android:label="@string/title_activity_store_list_route"
+ android:configChanges="screenSize|orientation|keyboardHidden"
+ android:screenOrientation="portrait"
+ android:windowSoftInputMode="adjustPan"/>
+ android:label="@string/title_activity_store_route"
+ android:configChanges="screenSize|orientation|keyboardHidden"
+ android:screenOrientation="portrait"
+ android:windowSoftInputMode="adjustPan"/>
+
+
\ No newline at end of file
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 8d01b99..9c22e48 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -18,6 +18,7 @@ import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
+import cpm.com.gskmtorange.GetterSetter.ChatMessageGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
@@ -31,6 +32,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryImagesAllowed;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
@@ -49,6 +52,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
@@ -72,7 +76,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/
public class GSKOrangeDB extends SQLiteOpenHelper {
- public static final String DATABASE_NAME = "GSK_ORANGE_DB26";
+ public static final String DATABASE_NAME = "GSK_ORANGE_DB30";
public static final int DATABASE_VERSION = 15;
TableBean tableBean;
private SQLiteDatabase db;
@@ -98,6 +102,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
db.execSQL(TableBean.getJourneyPlan());
+ db.execSQL(TableBean.getAdhocJourneyPlan());
//Gagan Start
db.execSQL(TableBean.getBrandMaster());
db.execSQL(TableBean.getSkuMaster());
@@ -165,6 +170,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getTable_ADDITIONAL_QUESTION());
db.execSQL(TableBean.getTable_POG_QUESTION());
+ db.execSQL(TableBean.getTable_NON_T2P_REASON());
+ db.execSQL(TableBean.getTable_CONFIGURATION_COUNTRY_WISE());
//15-03-2017
db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING);
@@ -184,6 +191,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL("DROP TABLE IF EXISTS " + TableBean.getJourneyPlan());
}
+ public void createTable(String table_query){
+ db.execSQL(table_query);
+ }
+
public void deleteTableWithStoreID(String storeid) {
db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
@@ -501,13 +512,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return skuList;
}
- public ArrayList getStoreData(String date) {
+ public ArrayList getStoreData(String date, String table_name) {
ArrayList list = new ArrayList();
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
- "where VISIT_DATE ='" + date + "' ORDER BY VISIT_ORDER", null);
+ dbcursor = db.rawQuery("SELECT * from "+ table_name +
+ " where VISIT_DATE ='" + date + "' ORDER BY VISIT_ORDER", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -678,7 +689,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
- public void updateCheckoutStatus(String id, String status) {
+ public void updateCheckoutStatus(String id, String status, String table) {
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
@@ -687,7 +698,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
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);
+ db.update(table, values, CommonString.KEY_STORE_ID + "='" + id + "'", null);
} catch (Exception ex) {
Log.e("Exception", "checkOut Status" + ex.toString());
}
@@ -782,16 +793,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
- public ArrayList getCoverageData(String visitdate) {
+ public ArrayList getCoverageData(String visitdate, String flag_from) {
ArrayList list = new ArrayList();
Cursor dbcursor = null;
try {
- dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
- + CommonString.KEY_VISIT_DATE + "='" + visitdate + "'",
- null);
+ if(flag_from!=null){
+ dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
+ + CommonString.KEY_VISIT_DATE + "='" + visitdate + "' AND "+CommonString.KEY_STORE_FLAG + "='"+ flag_from +"'",
+ null);
+ }
+ else {
+ dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
+ + CommonString.KEY_VISIT_DATE + "='" + visitdate + "'",
+ null);
+ }
if (dbcursor != null) {
@@ -832,6 +850,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))))));
}
sb.setCheckOut_Image(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKOUT_IMAGE)));
+ sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG)));
list.add(sb);
@@ -1473,6 +1492,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
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());
+ values.put(CommonString.KEY_STORE_FLAG, data.getFlag_from());
return db.insert(CommonString.TABLE_COVERAGE_DATA, null, values);
@@ -1870,13 +1890,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void updateStoreStatusOnLeave(String storeid, String visitdate,
- String status) {
+ String status, String flag_from) {
try {
+
+ String table;
+
+ if(flag_from.equals(CommonString.FROM_JCP)){
+ table = CommonString.KEY_JOURNEY_PLAN;
+ }
+ else {
+ table = CommonString.KEY_ADHOC_JOURNEY_PLAN;
+ }
+
ContentValues values = new ContentValues();
values.put("UPLOAD_STATUS", status);
- db.update("JOURNEY_PLAN", values,
+ db.update(table, values,
CommonString.KEY_STORE_ID + "='" + storeid + "' AND "
+ CommonString.KEY_VISIT_DATE + "='" + visitdate
+ "'", null);
@@ -1886,15 +1916,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
//get specific store data
- public StoreBean getSpecificStoreData(String date, String store_id) {
+ public StoreBean getSpecificStoreData(String date, String store_id, String flag_from) {
//ArrayList list = new ArrayList();
StoreBean sb = new StoreBean();
Cursor dbcursor = null;
+ String table;
+
+ if(flag_from.equals(CommonString.FROM_JCP)){
+ table = CommonString.KEY_JOURNEY_PLAN;
+ }
+ else {
+ table = CommonString.KEY_ADHOC_JOURNEY_PLAN;
+ }
try {
- dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
- "where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null);
+ dbcursor = db.rawQuery("SELECT * from "+ table +
+ " where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null);
if (dbcursor != null) {
@@ -2696,6 +2734,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put(CommonString.KEY_REMARK, data.get(i).getRemark());
values.put(CommonString.KEY_PRESENT, data.get(i).getPresent());
values.put(CommonString.KEY_CATEGORY_FIXTURE, data.get(i).getCategory_fixture());
+ values.put(CommonString.KEY_NON_T2P_REASON_ID, data.get(i).getNon_t2p_reason_id());
l = db.insert(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, values);
@@ -3017,6 +3056,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
tp.setPresent(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT))));
tp.setCategory_fixture(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_FIXTURE)));
+ tp.setNon_t2p_reason_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_NON_T2P_REASON_ID)));
list.add(tp);
dbcursor.moveToNext();
@@ -6009,4 +6049,270 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
+
+ //NON_T2P_REASON
+ public void InsertNON_T2P_REASON(NonT2pReasonGetterSetter data) {
+ db.delete("NON_T2P_REASON", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+ for (int i = 0; i < data.getTREASON_ID().size(); i++) {
+
+ values.put("TREASON_ID", data.getTREASON_ID().get(i));
+ values.put("TREASON", data.getTREASON().get(i));
+
+ db.insert("NON_T2P_REASON", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " in NON_T2P_REASON " + ex.toString());
+ }
+ }
+
+ // get Non T2P Reason data
+ public ArrayList getNonT2pReasonData() {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+ try {
+ dbcursor = db.rawQuery("SELECT * FROM NON_T2P_REASON", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ NonT2pReasonGetterSetter BG = new NonT2pReasonGetterSetter();
+
+ BG.setTREASON_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TREASON_ID")));
+ BG.setTREASON(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TREASON")));
+
+ list.add(BG);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+
+ Log.d("Exception ", "get NON_T2P_REASON!" + e.toString());
+ }
+ return list;
+ }
+
+ public void InsertAdhoc_JCP(JourneyPlanGetterSetter data) {
+ db.delete("ADHOC_JOURNEYPLAN", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+
+ for (int i = 0; i < data.getSTORE_ID().size(); i++) {
+
+ values.put("STORE_ID", data.getSTORE_ID().get(i));
+ values.put("EMP_ID", data.getEMP_ID().get(i));
+
+ values.put("STORE_NAME", data.getSTORE_NAME().get(i));
+
+ values.put("CITY", data.getCITY().get(i));
+
+ values.put("VISIT_DATE", data.getVISIT_DATE().get(i));
+
+ values.put("ADDRESS", data.getADDRESS().get(i));
+
+ values.put("UPLOAD_STATUS", data.getUPLOAD_STATUS().get(i));
+
+ values.put("STORETYPE", data.getSTORETYPE().get(i));
+
+ values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
+
+
+ values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
+
+ values.put("CHECKOUT_STATUS", data.getCHECKOUT_STATUS().get(i));
+
+ values.put("CLASSIFICATION", data.getCLASSIFICATION().get(i));
+
+ values.put("KEYACCOUNT", data.getKEYACCOUNT().get(i));
+ values.put("CLASS_ID", data.getCLASS_ID().get(i));
+
+ values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i));
+ values.put("GEO_TAG", data.getGEO_TAG().get(i));
+
+ values.put("VISIT_ORDER", data.getVISIT_ORDER().get(i));
+ values.put("LATITUDE", data.getLATITUDE().get(i));
+ values.put("LONGITUDE", data.getLONGITUDE().get(i));
+
+ db.insert("ADHOC_JOURNEYPLAN", null, values);
+
+ }
+
+ } catch (Exception ex) {
+ Log.d("Exception in ADHOC_JCP", ex.toString());
+ }
+ }
+
+ public void InserChatMessage(ChatMessageDownloadGetterSetter data) {
+ db.delete("CHAT_MESSAGE", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+
+ for (int i = 0; i < data.getSENDERID().size(); i++) {
+
+ values.put("REC_ID", data.getREC_ID().get(i));
+ values.put("CHAT_ID", data.getCHAT_ID().get(i));
+
+ values.put("MESSAGE", data.getMESSAGE().get(i));
+
+ values.put("MESSAGEDATE", data.getMESSAGEDATE().get(i));
+
+ values.put("SENDERID", data.getSENDERID().get(i));
+
+ values.put("SENDER", data.getSENDER().get(i));
+
+ /*values.put("RECEIVERID", data.getRECEIVERID().get(i));
+
+ values.put("RECEIVER", data.getRECEIVER().get(i));*/
+
+ try{
+ values.put("COMMENTDATE", data.getCOMMENTDATE().get(i));
+
+ values.put("COMMENT", data.getCOMMENT().get(i));
+ }
+ catch (IndexOutOfBoundsException e){
+ System.out.println(e.toString());
+ }
+
+ values.put("STOREID", data.getSTOREID().get(i));
+
+ values.put("ORDERID", data.getORDERID().get(i));
+ values.put("SENDER_USERID", data.getSENDER_USERID().get(i));
+
+ db.insert("CHAT_MESSAGE", null, values);
+
+ }
+
+ } catch (Exception ex) {
+ Log.d("Excep in CHAT_MESSAGE", ex.toString());
+ }
+ }
+
+ // get Chat Message data
+ public ArrayList getChatMessageData(String store_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ //dbcursor = db.rawQuery("SELECT DISTINCT CHAT_ID, MESSAGE, MESSAGEDATE, SENDERID, SENDER, STOREID FROM CHAT_MESSAGE WHERE STOREID='" + store_id +"' ORDER BY ORDERID", null);
+ dbcursor = db.rawQuery("SELECT DISTINCT CHAT_ID, MESSAGE, MESSAGEDATE, STOREID FROM CHAT_MESSAGE WHERE STOREID='" + store_id +"' ORDER BY ORDERID", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ ChatMessageGetterSetter msg = new ChatMessageGetterSetter();
+
+ msg.setCHAT_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CHAT_ID")));
+ msg.setMESSAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MESSAGE")));
+ msg.setMESSAGEDATE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MESSAGEDATE")));
+ /*msg.setSENDERID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SENDERID")));
+ msg.setSENDER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SENDER")));*/
+ /*msg.setRECEIVERID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RECEIVERID")));
+ msg.setRECEIVER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RECEIVER")));*/
+ msg.setSTOREID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOREID")));
+
+ list.add(msg);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+
+ Log.d("Exception ", "get Chat Message" + e.toString());
+ }
+ return list;
+ }
+
+ // get Chat Message data
+ public ArrayList getChatMessageCommentsData(String store_id, String chat_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("SELECT CHAT_ID, MESSAGE, MESSAGEDATE, SENDERID, SENDER, STOREID, COMMENTDATE, COMMENT, SENDER_USERID FROM CHAT_MESSAGE WHERE STOREID='" + store_id +"' AND CHAT_ID ='"+ chat_id +"' AND COMMENT <>'' ORDER BY ORDERID", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ ChatMessageGetterSetter msg = new ChatMessageGetterSetter();
+
+ msg.setCHAT_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CHAT_ID")));
+ msg.setMESSAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MESSAGE")));
+ msg.setMESSAGEDATE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MESSAGEDATE")));
+ msg.setSENDERID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SENDERID")));
+ msg.setSENDER(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SENDER")));
+ msg.setSTOREID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOREID")));
+ msg.setCOMMENTDATE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMMENTDATE")));
+ msg.setCOMMENT(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMMENT")));
+ msg.setSENDER_USERID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SENDER_USERID")));
+
+ list.add(msg);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+
+ Log.d("Exception ", "get Chat Message" + e.toString());
+ }
+ return list;
+ }
+
+ //CONFIGURATION_COUNTRY_WISE
+ public void InsertCONFIGURATION_COUNTRY_WISE(ConfigurationContrywiseGetterSetter data) {
+ db.delete("CONFIGURATION_COUNTRY_WISE", null, null);
+
+ ContentValues values = new ContentValues();
+ try {
+ for (int i = 0; i < data.getCOUNTRY_ID().size(); i++) {
+
+ values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+ values.put("ADHOC_REPORTING", data.getADHOC_REPORTING().get(i));
+
+ db.insert("CONFIGURATION_COUNTRY_WISE", null, values);
+ }
+ } catch (Exception ex) {
+ Log.d("Exception ", " in CONFIGURATION_COUNTRY_WISE " + ex.toString());
+ }
+ }
+
+ // get Chat Message data
+ public ArrayList getConfigurationData(String country_id) {
+
+ ArrayList list = new ArrayList<>();
+ Cursor dbcursor = null;
+
+ try {
+ dbcursor = db.rawQuery("SELECT * FROM CONFIGURATION_COUNTRY_WISE WHERE COUNTRY_ID='" + country_id +"'", null);
+
+ if (dbcursor != null) {
+ dbcursor.moveToFirst();
+ while (!dbcursor.isAfterLast()) {
+ ConfigurationContrywiseGetterSetter msg = new ConfigurationContrywiseGetterSetter();
+
+ msg.setCOUNTRY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COUNTRY_ID")));
+ msg.setADHOC_REPORTING(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ADHOC_REPORTING")));
+
+ list.add(msg);
+ dbcursor.moveToNext();
+ }
+ dbcursor.close();
+ return list;
+ }
+ } catch (Exception e) {
+
+ Log.d("Exception ", "get Chat Message" + e.toString());
+ }
+ return list;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
index f5c9720..9baece1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
@@ -91,7 +91,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
}
});
- storelist = db.getStoreData(date);
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN);
if (storelist.size() > 0) {
adapter = new ValueAdapter(getApplicationContext(), storelist);
@@ -229,7 +229,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
}
}
- public List getdata() {
+ /*public List getdata() {
List data = new ArrayList<>();
storelist = db.getStoreData(date);
@@ -244,7 +244,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
}
return data;
- }
+ }*/
@Override
public void onClick(View arg0) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/ChatMessageGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/ChatMessageGetterSetter.java
new file mode 100644
index 0000000..c0c5c2d
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/ChatMessageGetterSetter.java
@@ -0,0 +1,110 @@
+package cpm.com.gskmtorange.GetterSetter;
+
+public class ChatMessageGetterSetter {
+
+ String REC_ID, CHAT_ID, MESSAGE, MESSAGEDATE , SENDERID, SENDER, RECEIVERID, RECEIVER, COMMENTDATE, COMMENT, STOREID, ORDERID, SENDER_USERID;
+
+ public String getREC_ID() {
+ return REC_ID;
+ }
+
+ public void setREC_ID(String REC_ID) {
+ this.REC_ID = REC_ID;
+ }
+
+ public String getCHAT_ID() {
+ return CHAT_ID;
+ }
+
+ public void setCHAT_ID(String CHAT_ID) {
+ this.CHAT_ID = CHAT_ID;
+ }
+
+ public String getMESSAGE() {
+ return MESSAGE;
+ }
+
+ public void setMESSAGE(String MESSAGE) {
+ this.MESSAGE = MESSAGE;
+ }
+
+ public String getMESSAGEDATE() {
+ return MESSAGEDATE;
+ }
+
+ public void setMESSAGEDATE(String MESSAGEDATE) {
+ this.MESSAGEDATE = MESSAGEDATE;
+ }
+
+ public String getSENDERID() {
+ return SENDERID;
+ }
+
+ public void setSENDERID(String SENDERID) {
+ this.SENDERID = SENDERID;
+ }
+
+ public String getSENDER() {
+ return SENDER;
+ }
+
+ public void setSENDER(String SENDER) {
+ this.SENDER = SENDER;
+ }
+
+ public String getRECEIVERID() {
+ return RECEIVERID;
+ }
+
+ public void setRECEIVERID(String RECEIVERID) {
+ this.RECEIVERID = RECEIVERID;
+ }
+
+ public String getRECEIVER() {
+ return RECEIVER;
+ }
+
+ public void setRECEIVER(String RECEIVER) {
+ this.RECEIVER = RECEIVER;
+ }
+
+ public String getCOMMENTDATE() {
+ return COMMENTDATE;
+ }
+
+ public void setCOMMENTDATE(String COMMENTDATE) {
+ this.COMMENTDATE = COMMENTDATE;
+ }
+
+ public String getCOMMENT() {
+ return COMMENT;
+ }
+
+ public void setCOMMENT(String COMMENT) {
+ this.COMMENT = COMMENT;
+ }
+
+ public String getSTOREID() {
+ return STOREID;
+ }
+
+ public void setSTOREID(String STOREID) {
+ this.STOREID = STOREID;
+ }
+
+ public String getORDERID() {
+ return ORDERID;
+ }
+
+ public void setORDERID(String ORDERID) {
+ this.ORDERID = ORDERID;
+ }
+
+ public String getSENDER_USERID() {
+ return SENDER_USERID;
+ }
+
+ public void setSENDER_USERID(String SENDER_USERID) {
+ this.SENDER_USERID = SENDER_USERID;
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 0740e13..1ef8ee6 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -19,6 +19,7 @@ import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.webkit.WebView;
@@ -44,6 +45,7 @@ import cpm.com.gskmtorange.dailyentry.StoreListActivity;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.upload.PreviousDataUploadActivity;
import cpm.com.gskmtorange.upload.UploadActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
import io.fabric.sdk.android.Fabric;
public class MainActivity extends AppCompatActivity
@@ -54,7 +56,7 @@ public class MainActivity extends AppCompatActivity
String date, visit_status;
private SharedPreferences preferences = null;
GSKOrangeDB db;
- String user_name, user_type;
+ String user_name, country_id, user_type;
ArrayList storelist = new ArrayList();
View headerView;
@@ -64,6 +66,8 @@ public class MainActivity extends AppCompatActivity
Toolbar toolbar;
+ NavigationView navigationView;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -86,6 +90,7 @@ public class MainActivity extends AppCompatActivity
String url = preferences.getString(CommonString.KEY_NOTICE_BOARD_LINK, "");
user_name = preferences.getString(CommonString.KEY_USERNAME, null);
+ country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
Crashlytics.setString(CommonString.KEY_USER_ID, user_name);
//user_type = preferences.getString(CommonString.KEY_USER_TYPE, null);
@@ -117,7 +122,7 @@ public class MainActivity extends AppCompatActivity
drawer.setDrawerListener(toggle);
toggle.syncState();
- NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+ navigationView = (NavigationView) findViewById(R.id.nav_view);
headerView = LayoutInflater.from(this).inflate(R.layout.nav_header_main, navigationView, false);
@@ -141,9 +146,18 @@ public class MainActivity extends AppCompatActivity
db.open();
- coverageList = db.getCoverageData(date);
+ //Deviation - Ad hoc Stores - enable
+ ArrayList configuration_data = db.getConfigurationData(country_id);
+ if(configuration_data.size()>0){
+ if(configuration_data.get(0).getADHOC_REPORTING().get(0).equals("1")){
+ Menu nav_Menu = navigationView.getMenu();
+ nav_Menu.findItem(R.id.nav_deviation).setVisible(true);
+ }
+ }
- storelist = db.getStoreData(date);
+ coverageList = db.getCoverageData(date, null);
+
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN);
}
@@ -153,7 +167,7 @@ public class MainActivity extends AppCompatActivity
if (drawer.isDrawerOpen(GravityCompat.START)) {
drawer.closeDrawer(GravityCompat.START);
} else {
- // super.onBackPressed();
+ // super.onBackPressed();
}
}
@@ -187,8 +201,9 @@ public class MainActivity extends AppCompatActivity
if (id == R.id.nav_route_plan) {
- Intent startDownload = new Intent(this, StoreListActivity.class);
- startActivity(startDownload);
+ Intent in_jcp = new Intent(this, StoreListActivity.class);
+ in_jcp.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_JCP);
+ startActivity(in_jcp);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
@@ -200,11 +215,10 @@ public class MainActivity extends AppCompatActivity
boolean previousflag = false;
if (db.isPreviousCoverageDataFilled(date)) {
- if(isPreviousValid(date)){
- previousflag =true;
- }
- else{
- db.deletePreviousCoverageData(date);
+ if (isPreviousValid(date)) {
+ previousflag = true;
+ } else {
+ db.deletePreviousCoverageData(date);
}
}
@@ -238,7 +252,7 @@ public class MainActivity extends AppCompatActivity
if (checkNetIsAvailable()) {
- storelist = db.getStoreData(date);
+ storelist = db.getStoreData(date, CommonString.KEY_JOURNEY_PLAN);
if (storelist.size() == 0) {
@@ -276,7 +290,6 @@ public class MainActivity extends AppCompatActivity
} else if (id == R.id.nav_geotag) {
-
if (storelist.size() > 0) {
Intent startDownload = new Intent(this, GeoTagStoreList.class);
startActivity(startDownload);
@@ -301,7 +314,7 @@ public class MainActivity extends AppCompatActivity
Integer.parseInt("");
*/
- // finish();
+ // finish();
Intent startDownload = new Intent(this, LoginActivity.class);
startActivity(startDownload);
@@ -328,24 +341,31 @@ public class MainActivity extends AppCompatActivity
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- }else if(id == R.id.nav_future_jcp){
+ } else if (id == R.id.nav_future_jcp) {
Intent startDownload = new Intent(this, FutureJCPActivity.class);
startActivity(startDownload);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- }else if(id == R.id.nav_planogram){
+ } else if (id == R.id.nav_planogram) {
- if(checkNetIsAvailable()){
+ if (checkNetIsAvailable()) {
Intent planogram_pdf = new Intent(this, PlanogramPDFActivity.class);
startActivity(planogram_pdf);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
- }else {
+ } else {
Snackbar.make(webView, getResources().getString(R.string.nonetwork), Snackbar.LENGTH_SHORT)
.setAction("Action", null).show();
}
+ }else if(id == R.id.nav_deviation){
+ Intent in = new Intent(this, StoreListActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_DEVIATION);
+
+ startActivity(in);
+
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -410,8 +430,10 @@ public class MainActivity extends AppCompatActivity
String storestatus;
for (int i = 0; i < coverageList.size(); i++) {
- storestatus = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()).getUPLOAD_STATUS();
- String coverage_status = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()).getCHECKOUT_STATUS();
+ StoreBean store_data = db.getSpecificStoreData(date, coverageList.get(i).getStoreId(), coverageList.get(i).getFlag_from());
+
+ storestatus = store_data.getUPLOAD_STATUS();
+ String coverage_status = store_data.getCHECKOUT_STATUS();
if (!storestatus.equalsIgnoreCase(CommonString.KEY_U)) {
if ((coverage_status.equalsIgnoreCase(CommonString.KEY_Y) || storestatus.equalsIgnoreCase(CommonString.KEY_P) ||
@@ -429,21 +451,21 @@ public class MainActivity extends AppCompatActivity
return flag;
}
- public boolean isPreviousValid(String visit_date){
- boolean isvalid= false;
+ public boolean isPreviousValid(String visit_date) {
+ boolean isvalid = false;
ArrayList coverage_list = db.getPreviousCoverageData(visit_date);
- for(int i=0;i conversation_list = new ArrayList<>();
+
+ MyRecyclerAdapter adapter;
+ RecyclerView rec;
+
+ EditText et_reply;
+ private Dialog dialog;
+ private ProgressBar pb;
+ private TextView percentage, message;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_conversation);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ db = new GSKOrangeDB(ConversationActivity.this);
+ db.open();
+
+ rec = (RecyclerView) findViewById(R.id.rec_conversation);
+ et_reply = (EditText) findViewById(R.id.et_reply);
+
+ chat_id = getIntent().getStringExtra(CommonString.KEY_CHAT_ID);
+ message_main = getIntent().getStringExtra(CommonString.KEY_MESSAGE);
+
+ setTitle(message_main);
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ userId = preferences.getString(CommonString.KEY_USERNAME, null);
+ culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+ visit_date = preferences.getString(CommonString.KEY_DATE, null);
+
+ conversation_list = db.getChatMessageCommentsData(store_id, chat_id);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ String reply = et_reply.getText().toString();
+ if (reply.equals("")) {
+ Snackbar.make(et_reply, R.string.reply_alert, Snackbar.LENGTH_SHORT).show();
+ } else {
+
+ /* ChatMessageGetterSetter msg = new ChatMessageGetterSetter();
+ msg.setCHAT_ID("0");
+ msg.setMESSAGE("");
+ msg.setMESSAGEDATE(visit_date);
+ msg.setSENDERID("0");
+ msg.setSENDER(userId);
+ msg.setRECEIVERID("0");
+ msg.setRECEIVER(userId);
+ msg.setSTOREID(store_id);
+ msg.setCOMMENTDATE(visit_date);
+ msg.setCOMMENT(reply);
+ msg.setSENDER_USERID(userId);
+
+ conversation_list.add(msg);
+
+ adapter.notifyDataSetChanged();
+
+ et_reply.setText("");*/
+
+ // Check if no view has focus:
+ View v = getCurrentFocus();
+ if (v != null) {
+ InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+ }
+
+ new GeoTagUpload(ConversationActivity.this).execute(reply);
+ }
+ }
+ });
+
+ //if (conversation_list.size() > 0) {
+ adapter = new MyRecyclerAdapter(getApplicationContext(), conversation_list);
+ rec.setAdapter(adapter);
+ rec.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ //}
+
+ }
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+
+ class MyRecyclerAdapter extends RecyclerView.Adapter {
+
+ private LayoutInflater inflator;
+
+ ArrayList data = new ArrayList<>();
+
+ public MyRecyclerAdapter(Context context, ArrayList data) {
+
+ inflator = LayoutInflater.from(context);
+ this.data = data;
+
+ }
+
+ @Override
+ public MyRecyclerAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = inflator.inflate(R.layout.conversation_item, parent, false);
+
+ MyRecyclerAdapter.MyViewHolder holder = new MyRecyclerAdapter.MyViewHolder(view);
+
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(MyRecyclerAdapter.MyViewHolder holder, final int position) {
+
+ //final MappingPlanogramCountrywiseGetterSetter current = data.get(position);
+
+ final String msg_topic_str = data.get(position).getCOMMENT();
+ final String latest_msg_str = data.get(position).getRECEIVER();
+ final String date_time_str = data.get(position).getCOMMENTDATE();
+ final String msg_from_str = data.get(position).getSENDER();
+ final String sender_user_id = data.get(position).getSENDER_USERID();
+
+ if (sender_user_id.equals(userId)) {
+ LinearLayout.LayoutParams buttonLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+ buttonLayoutParams.setMargins(100, 10, 5, 0);
+ holder.parent_item.setLayoutParams(buttonLayoutParams);
+ holder.card_view.setCardBackgroundColor(getResources().getColor(R.color.char_card_bg));
+ } else {
+ LinearLayout.LayoutParams buttonLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+ buttonLayoutParams.setMargins(5, 10, 100, 0);
+ holder.parent_item.setLayoutParams(buttonLayoutParams);
+ holder.card_view.setCardBackgroundColor(getResources().getColor(R.color.white));
+ }
+
+ holder.msg_topic.setText(msg_topic_str);
+ holder.latest_msg.setText(latest_msg_str);
+ holder.date_time.setText(date_time_str);
+ holder.msg_from.setText(msg_from_str);
+ //holder.detail.setText(current.getDocument_descriiption().get(0));
+
+ holder.parent_layout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return conversation_list.size();
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+
+ TextView msg_topic, latest_msg, date_time, msg_from;
+ LinearLayout parent_layout, parent_item;
+ CardView card_view;
+
+ public MyViewHolder(View itemView) {
+ super(itemView);
+ msg_topic = (TextView) itemView.findViewById(R.id.tv_msg_topic);
+ latest_msg = (TextView) itemView.findViewById(R.id.tv_latest_msg);
+ date_time = (TextView) itemView.findViewById(R.id.tv_date_time);
+ msg_from = (TextView) itemView.findViewById(R.id.tv_from);
+
+ parent_layout = (LinearLayout) itemView.findViewById(R.id.layout_parent);
+ parent_item = (LinearLayout) itemView.findViewById(R.id.parent_item);
+ card_view = (CardView) itemView.findViewById(R.id.card_view);
+
+ }
+
+ }
+ }
+
+ public class GeoTagUpload extends AsyncTask {
+
+ private Context context;
+
+ GeoTagUpload(Context context) {
+ this.context = context;
+ }
+
+ @Override
+ protected void onPreExecute() {
+
+ super.onPreExecute();
+
+ dialog = new Dialog(context);
+ dialog.setContentView(R.layout.custom);
+ dialog.setTitle(getResources().getString(R.string.dialog_title));
+ dialog.setCancelable(false);
+ dialog.show();
+ pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ percentage = (TextView) dialog.findViewById(R.id.percentage);
+ message = (TextView) dialog.findViewById(R.id.message);
+ }
+
+ @Override
+ protected String doInBackground(String... params) {
+
+ boolean flag_success = false;
+ String strflag = "";
+ try {
+
+ GSKOrangeDB db = new GSKOrangeDB(ConversationActivity.this);
+ db.open();
+ String reply = params[0];
+
+ SAXParserFactory saxPF = SAXParserFactory.newInstance();
+ SAXParser saxP = saxPF.newSAXParser();
+ XMLReader xmlR = saxP.getXMLReader();
+
+
+ String current_xml = "";
+
+ String onXML = "[CHAT_REPLY][CHAT_ID]"
+ + chat_id
+ + "[/CHAT_ID]"
+ + "[SENDER_ID]"
+ + "0"
+ + "[/SENDER_ID]"
+ + "[RECIEVER_ID]"
+ + "0"
+ + "[/RECIEVER_ID]"
+ + "[STORE_ID]"
+ + store_id
+ + "[/STORE_ID]"
+ + "[MESSAGE]"
+ + reply
+ + "[/MESSAGE]"
+ + "[USER_ID]"
+ + userId
+ + "[/USER_ID]"
+ + "[/CHAT_REPLY]";
+
+ current_xml = "[DATA]" + onXML
+ + "[/DATA]";
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE,
+ CommonString.METHOD_UPLOAD_CHAT_DATA);
+ //request.addProperty("MID", "0");
+ // request.addProperty("KEYS", "CURRENT_DATA");
+ // request.addProperty("USERNAME", username);
+
+ request.addProperty("onXML", current_xml);
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
+ SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(
+ CommonString.URL);
+ androidHttpTransport.call(
+ CommonString.SOAP_ACTION_UPLOAD_CHAT_DATA, envelope);
+ Object result = (Object) envelope.getResponse();
+
+ if (result.toString().contains(
+ CommonString.KEY_SUCCESS)) {
+ flag_success = true;
+ } else {
+ flag_success = false;
+ }
+
+
+ } catch (MalformedURLException e) {
+
+ flag_success = false;
+ strflag = CommonString.MESSAGE_EXCEPTION;
+
+ } catch (SocketTimeoutException e) {
+ flag_success = false;
+ strflag = CommonString.MESSAGE_SOCKETEXCEPTION;
+
+ } catch (InterruptedIOException e) {
+
+ flag_success = false;
+ strflag = CommonString.MESSAGE_EXCEPTION;
+
+ } catch (IOException e) {
+ flag_success = false;
+ strflag = CommonString.MESSAGE_SOCKETEXCEPTION;
+ } catch (XmlPullParserException e) {
+ Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+ Crashlytics.logException(e.getCause());
+ Crashlytics.logException(new Exception(e.getCause()));
+
+ flag_success = false;
+ strflag = CommonString.MESSAGE_XmlPull;
+ } catch (Exception e) {
+ Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+ Crashlytics.logException(e.getCause());
+ Crashlytics.logException(new Exception(e.getCause()));
+
+ flag_success = false;
+ strflag = CommonString.MESSAGE_EXCEPTION;
+ }
+
+ if (flag_success) {
+ return CommonString.KEY_SUCCESS;
+ } else {
+ return strflag;
+ }
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ super.onPostExecute(result);
+
+ dialog.dismiss();
+
+ if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ dialog.dismiss();
+
+ String reply = et_reply.getText().toString();
+
+ ChatMessageGetterSetter msg = new ChatMessageGetterSetter();
+ msg.setCHAT_ID("0");
+ msg.setMESSAGE("");
+ msg.setMESSAGEDATE(visit_date);
+ msg.setSENDERID("0");
+ msg.setSENDER(userId);
+ msg.setRECEIVERID("0");
+ msg.setRECEIVER(userId);
+ msg.setSTOREID(store_id);
+ msg.setCOMMENTDATE(visit_date);
+ msg.setCOMMENT(reply);
+ msg.setSENDER_USERID(userId);
+
+ conversation_list.add(msg);
+
+ adapter.notifyDataSetChanged();
+
+ et_reply.setText("");
+ //showAlert(getString(R.string.data_downloaded_successfully));
+ } else {
+
+ showAlert(getString(R.string.DataNot) + " " + result);
+ }
+ }
+
+ }
+
+ public void showAlert(String str) {
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(ConversationActivity.this);
+ builder.setTitle("Parinaam");
+ builder.setMessage(str).setCancelable(false)
+ .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+
+
+ finish();
+
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java
new file mode 100644
index 0000000..051fa2e
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java
@@ -0,0 +1,433 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.crashlytics.android.Crashlytics;
+
+import org.ksoap2.SoapEnvelope;
+import org.ksoap2.SoapFault;
+import org.ksoap2.serialization.SoapObject;
+import org.ksoap2.serialization.SoapSerializationEnvelope;
+import org.ksoap2.transport.HttpTransportSE;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.GetterSetter.ChatMessageGetterSetter;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
+import cpm.com.gskmtorange.gsk_dailyentry.CategoryWisePerformanceActivity;
+import cpm.com.gskmtorange.gsk_dailyentry.DailyDataMenuActivity;
+import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
+import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
+
+public class MessageActivity extends AppCompatActivity {
+
+ //ArrayList messages;
+
+ String categoryName = "", categoryId;
+
+ MyRecyclerAdapter adapter;
+ RecyclerView rec;
+
+ private Dialog dialog;
+ private ProgressBar pb;
+ private TextView percentage, message;
+ private Data data;
+ int eventType;
+
+ String userId, culture_id, store_id;
+ private SharedPreferences preferences = null;
+
+ GSKOrangeDB db;
+ ArrayList chatmessagelist = new ArrayList<>();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_message);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+ rec = (RecyclerView)findViewById(R.id.rec);
+
+
+
+ db = new GSKOrangeDB(MessageActivity.this);
+ db.open();
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ userId = preferences.getString(CommonString.KEY_USERNAME, null);
+ culture_id = preferences.getString(CommonString.KEY_CULTURE_ID, "");
+ store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(MessageActivity.this, CategoryListActivity.class);
+ startActivity(intent);
+ finish();
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ });
+
+ //messages = getMessages();
+
+ /* if(messages.size()>0){
+ adapter = new MyRecyclerAdapter(getApplicationContext(), messages);
+ rec.setAdapter(adapter);
+ rec.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ }*/
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ new DowloadAsync(MessageActivity.this).execute();
+ }
+
+ /*ArrayList getMessages(){
+ ArrayList messages = new ArrayList<>();
+
+ for(int i=0; i<5;i++){
+ MessageGetterSetter msg = new MessageGetterSetter();
+
+ msg.setMessage("Store data need to be filled");
+ msg.setFrom("Superviser"+(i+1));
+ msg.setDate("11:20:32 11/06/2018");
+ msg.setLatest_msg("Working on it");
+
+ messages.add(msg);
+ }
+ return messages;
+ }*/
+
+ /*class MessageGetterSetter{
+
+ String message="", from, date, latest_msg;
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getFrom() {
+ return from;
+ }
+
+ public void setFrom(String from) {
+ this.from = from;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public String getLatest_msg() {
+ return latest_msg;
+ }
+
+ public void setLatest_msg(String latest_msg) {
+ this.latest_msg = latest_msg;
+ }
+ }
+*/
+ class MyRecyclerAdapter extends RecyclerView.Adapter {
+
+ private LayoutInflater inflator;
+
+ ArrayList data = new ArrayList<>();
+
+ public MyRecyclerAdapter(Context context, ArrayList data) {
+
+ inflator = LayoutInflater.from(context);
+ this.data = data;
+
+ }
+
+ @Override
+ public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = inflator.inflate(R.layout.message_topic_item, parent, false);
+
+ MyRecyclerAdapter.MyViewHolder holder = new MyRecyclerAdapter.MyViewHolder(view);
+
+ return holder;
+ }
+
+ @Override
+ public void onBindViewHolder(MyViewHolder holder, final int position) {
+
+ //final MappingPlanogramCountrywiseGetterSetter current = data.get(position);
+
+ final String msg_topic_str = data.get(position).getMESSAGE();
+ //final String latest_msg_str = data.get(position).getRECEIVER();
+ final String date_time_str = data.get(position).getMESSAGEDATE();
+ final String msg_from_str = data.get(position).getSENDER();
+
+ holder.msg_topic.setText(msg_topic_str);
+ //holder.latest_msg.setText(latest_msg_str);
+ holder.date_time.setText(date_time_str);
+ holder.msg_from.setText(msg_from_str);
+ //holder.detail.setText(current.getDocument_descriiption().get(0));
+
+ holder.parent_layout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent in = new Intent(MessageActivity.this, ConversationActivity.class);
+ in.putExtra(CommonString.KEY_CHAT_ID, data.get(position).getCHAT_ID());
+ in.putExtra(CommonString.KEY_MESSAGE, data.get(position).getMESSAGE());
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return chatmessagelist.size();
+ }
+
+ class MyViewHolder extends RecyclerView.ViewHolder {
+
+ TextView msg_topic, latest_msg, date_time, msg_from;
+ LinearLayout parent_layout;
+
+ public MyViewHolder(View itemView) {
+ super(itemView);
+ msg_topic = (TextView) itemView.findViewById(R.id.tv_msg_topic);
+ latest_msg = (TextView) itemView.findViewById(R.id.tv_latest_msg);
+ date_time = (TextView) itemView.findViewById(R.id.tv_date_time);
+ msg_from = (TextView) itemView.findViewById(R.id.tv_from);
+
+ parent_layout = (LinearLayout) itemView.findViewById(R.id.layout_parent);
+
+ }
+
+ }
+ }
+
+ //region Download doc
+ private class DowloadAsync extends AsyncTask {
+
+ private Context context;
+
+ DowloadAsync(Context context) {
+ this.context = context;
+ }
+
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+
+ dialog = new Dialog(MessageActivity.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setContentView(R.layout.custom);
+ //dialog.setTitle("Download Files");
+ dialog.setCancelable(false);
+ dialog.show();
+ pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
+ percentage = (TextView) dialog.findViewById(R.id.percentage);
+ message = (TextView) dialog.findViewById(R.id.message);
+ }
+
+ @Override
+ protected String doInBackground(Void... params) {
+
+ data = new Data();
+ String resultHttp = "";
+ boolean flag = true;
+ // JCP
+
+ try {
+
+ XmlPullParserFactory factory = null;
+ factory = XmlPullParserFactory
+ .newInstance();
+
+ factory.setNamespaceAware(true);
+ XmlPullParser xpp = factory.newPullParser();
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE,
+ CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "CHAT_MESSAGE");
+ request.addProperty("cultureid", culture_id);
+
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
+ SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(
+ CommonString.URL);
+
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL,
+ envelope);
+ Object result = (Object) envelope.getResponse();
+
+ if (result.toString() != null) {
+
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+
+ ChatMessageDownloadGetterSetter chatmsg = XMLHandlers.CHAT_MESSAGE_XMLHandler(xpp, eventType);
+
+ if (chatmsg.getSENDERID().size() > 0) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ String document_Table = chatmsg.getTable_CHAT_MESSAGE();
+
+ db.createTable(document_Table);
+ db.InserChatMessage(chatmsg);
+
+ } else {
+ return "CHAT_MESSAGE";
+ }
+
+ data.value = 10;
+ data.name = "Message Data Downloading";
+
+ /* db.open();
+ db.InsertMappingCountrywisePlanogram(document);*/
+
+ }
+
+ publishProgress(data);
+
+ } catch (XmlPullParserException e) {
+ Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+ Crashlytics.logException(e.getCause());
+ Crashlytics.logException(new Exception(e.getCause()));
+ e.printStackTrace();
+ resultHttp = getString(R.string.nonetwork);
+ flag = false;
+ } catch (SoapFault soapFault) {
+ soapFault.printStackTrace();
+ resultHttp = getString(R.string.nonetwork);
+ flag = false;
+ } catch (IOException e) {
+ e.printStackTrace();
+ resultHttp = getString(R.string.nonetwork);
+ flag = false;
+ }
+ catch ( Exception e){
+ Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
+ Crashlytics.logException(e.getCause());
+ Crashlytics.logException(new Exception(e.getCause()));
+ resultHttp = getString(R.string.nonetwork);
+ flag = false;
+ }
+
+ if(flag)
+ return CommonString.KEY_SUCCESS;
+ else
+ return resultHttp;
+ }
+
+ @Override
+ protected void onPostExecute(String result) {
+ super.onPostExecute(result);
+
+ dialog.cancel();
+
+ if (result.contains(CommonString.KEY_SUCCESS)) {
+
+ /* if(document.getPLANOGRAM_URL().size()>0){
+ adapter = new PlanogramPDFActivity.MyRecyclerAdapter(getApplicationContext(), document);
+ rec.setAdapter(adapter);
+ rec.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ }
+*/
+
+ } else {
+ //Snackbar.make(fab, result, Toast.LENGTH_SHORT).show();
+ }
+
+ db.open();
+ chatmessagelist = db.getChatMessageData(store_id);
+
+ if(chatmessagelist.size()>0){
+ adapter = new MyRecyclerAdapter(getApplicationContext(), chatmessagelist);
+ rec.setAdapter(adapter);
+ rec.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+ }
+
+ //finish();
+ }
+
+ @Override
+ protected void onProgressUpdate(Data... values) {
+ // TODO Auto-generated method stub
+
+ pb.setProgress(values[0].value);
+ percentage.setText(values[0].value + "%");
+ message.setText(values[0].name);
+
+ }
+ }
+ //endregion
+
+ class Data {
+ int value;
+ String name;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ finish();
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
index f1aae7f..360abac 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java
@@ -571,11 +571,11 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
// Check condition
if (item.getSKUGROUP_ID().equals("-1")) {
iterator.remove();
- current_id.setTotal_unit(current_id.getTotal_unit()- getWidth(item.isVertical(),item.getFacing()));
+ ids.get(i).setTotal_unit(ids.get(i).getTotal_unit()- getWidth(item.isVertical(),item.getFacing()));
}
else if(item.getSKUGROUP_ID().equals("21")){
iterator.remove();
- current_id.setTotal_unit(current_id.getTotal_unit()- getWidth(item.isVertical(),item.getFacing()));
+ ids.get(i).setTotal_unit(ids.get(i).getTotal_unit()- getWidth(item.isVertical(),item.getFacing()));
}
}
@@ -689,7 +689,11 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
List customListMyTarget = adapterMYTarget.getList();*/
- showAddFacingDialog(parent_item, v, view_id);
+ //if it is valid for add
+ if(isAddValid(parent_item, v, view_id)){
+ showAddFacingDialog(parent_item, v, view_id);
+ }
+
}
@@ -738,6 +742,7 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
final CheckBox vertical = (CheckBox)dialog.findViewById(R.id.cb_vertical);
final CheckBox horizontal =(CheckBox)dialog.findViewById(R.id.cb_horizontal);
+ final LinearLayout layout_placement = (LinearLayout) dialog.findViewById(R.id.lay_placement);
horizontal.setChecked(true);
vertical.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -760,6 +765,10 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
}
});
+ if(parent_item.getSKUGROUP_ID().equals("25")){
+ layout_placement.setVisibility(View.GONE);
+ }
+
btn_ok.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -816,17 +825,25 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
/* if (max < customListMyTarget.size()) {
max = customListMyTarget.size();
} */
- if (max < ids.get(i).getTotal_unit()) {
- max = ids.get(i).getTotal_unit();
+
+ if(customListMyTarget.size()>0 && !customListMyTarget.get(0).getSKUGROUP_ID().equals("25")){
+ if (max < ids.get(i).getTotal_unit()) {
+ max = ids.get(i).getTotal_unit();
+ }
}
+
+
}
for (int i = 0; i < ids.size(); i++) {
List customList = biglistMap.get(ids.get(i));
- //if (customList.size() < max) {
- if (ids.get(i).getTotal_unit() < max) {
- //int count = max - customList.size();
- int count = max - ids.get(i).getTotal_unit();
+
+ if(customList.size()>0 && !customList.get(0).getSKUGROUP_ID().equals("25")){
+
+ //if (customList.size() < max) {
+ if (ids.get(i).getTotal_unit() < max) {
+ //int count = max - customList.size();
+ int count = max - ids.get(i).getTotal_unit();
/*for (int j = 0; j < count; j++) {
@@ -837,46 +854,47 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
customList.add(item);
}*/
+ NoCameraDataGetterSetter item = new NoCameraDataGetterSetter();
+ item.setSKUGROUP_ID("-1");
+ item.setSKUGROUP_NAME("");
+ item.setFacing(count/CommonString.UNIT_VERTICAL);
+ item.setVertical(true);
+ customList.add(item);
+
+ ids.get(i).setTotal_unit(ids.get(i).getTotal_unit() + count);
+
+ }
+ int facing_int = Integer.parseInt(facing);
+ parent_item.setFacing(facing_int);
NoCameraDataGetterSetter item = new NoCameraDataGetterSetter();
- item.setSKUGROUP_ID("-1");
- item.setSKUGROUP_NAME("");
- item.setFacing(count/CommonString.UNIT_VERTICAL);
- item.setVertical(true);
+ item.setSKUGROUP_ID(parent_item.getSKUGROUP_ID());
+ item.setSKUGROUP_NAME(parent_item.getSKUGROUP_NAME());
+ item.setFacing(facing_int);
+ item.setVertical(isVertical);
customList.add(item);
+ int width;
+ if(isVertical){
+ width = facing_int* CommonString.UNIT_VERTICAL;
+ }
+ else {
+ width = facing_int* CommonString.UNIT_HORIZONTAL;
+ }
+ ids.get(i).setTotal_unit(ids.get(i).getTotal_unit() + width);
- ids.get(i).setTotal_unit(ids.get(i).getTotal_unit() + count);
+ RecyclerView target = (RecyclerView) view.getRootView().findViewById(rv_id);
+ MyAdapter adapterMYTarget = (MyAdapter) target.getAdapter();
+
+ adapterMYTarget.notifyDataSetChanged();
+
+ target.scrollToPosition(customList.size() - 1);
+
+ ((TextView) findViewById(ids.get(i).getTextview_id())).setVisibility(View.GONE);
+ ((RecyclerView) findViewById(ids.get(i).getRecycler_id())).setVisibility(View.VISIBLE);
}
- int facing_int = Integer.parseInt(facing);
- parent_item.setFacing(facing_int);
- NoCameraDataGetterSetter item = new NoCameraDataGetterSetter();
- item.setSKUGROUP_ID(parent_item.getSKUGROUP_ID());
- item.setSKUGROUP_NAME(parent_item.getSKUGROUP_NAME());
- item.setFacing(facing_int);
- item.setVertical(isVertical);
- customList.add(item);
- int width;
- if(isVertical){
- width = facing_int* CommonString.UNIT_VERTICAL;
- }
- else {
- width = facing_int* CommonString.UNIT_HORIZONTAL;
- }
- ids.get(i).setTotal_unit(ids.get(i).getTotal_unit() + width);
-
- RecyclerView target = (RecyclerView) view.getRootView().findViewById(rv_id);
-
- MyAdapter adapterMYTarget = (MyAdapter) target.getAdapter();
-
- adapterMYTarget.notifyDataSetChanged();
-
- target.scrollToPosition(customList.size() - 1);
-
- ((TextView) findViewById(ids.get(i).getTextview_id())).setVisibility(View.GONE);
- ((RecyclerView) findViewById(ids.get(i).getRecycler_id())).setVisibility(View.VISIBLE);
}
- } else {
+ } else{
RecyclerView target;
target = (RecyclerView) view.getRootView().findViewById(rv_id);
@@ -946,6 +964,39 @@ public class NoCameraActivity extends AppCompatActivity implements Listener {
}
+ boolean isAddValid(final NoCameraDataGetterSetter parent_item, final View view, final int view_id){
+ boolean flag = true;
+
+ if (!(view instanceof TextView)) {
+ RecyclerView target;
+ target = (RecyclerView) view.getRootView().findViewById(view_id);
+
+ MyAdapter adapterMYTarget = (MyAdapter) target.getAdapter();
+ List customListMyTarget = adapterMYTarget.getList();
+
+ //if dropped item is Horizontal Separator
+ if(parent_item.getSKUGROUP_ID().equals("25")){
+ if(customListMyTarget.size()>0){
+ flag = false;
+ Snackbar.make(scroll_no_camera, R.string.cannot_add_horizontal_to_filled_row, Snackbar.LENGTH_SHORT).show();
+ }
+ }
+ else {
+ for (int i = 0; i < customListMyTarget.size(); i++) {
+ if(customListMyTarget.get(i).getSKUGROUP_ID().equals("25")){
+ Snackbar.make(scroll_no_camera, R.string.cannot_add_to_horizontal_seperatore, Snackbar.LENGTH_SHORT).show();
+
+ flag = false;
+ break;
+ }
+ }
+ }
+
+ }
+
+ return flag;
+ }
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index ee38b46..d313426 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -97,12 +97,13 @@ public class NonWorkingReason extends AppCompatActivity implements
boolean leave_flag = false;
ArrayList coverage = new ArrayList();
ArrayList storelist = new ArrayList();
- ArrayList jcp;
+ //ArrayList jcp;
private Dialog dialog;
private TextView percentage, message;
private ProgressBar pb;
private FailureGetterSetter failureGetterSetter = null;
boolean nonflag=true;
+ String store_flag_str;
@Override
protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
@@ -126,6 +127,8 @@ public class NonWorkingReason extends AppCompatActivity implements
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
+
_UserId = preferences.getString(CommonString.KEY_USERNAME, "");
visit_date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
@@ -136,9 +139,9 @@ public class NonWorkingReason extends AppCompatActivity implements
database.open();
str = CommonString.FILE_PATH;
- storelist = database.getStoreData(visit_date);
+ storelist = database.getStoreData(visit_date,CommonString.KEY_JOURNEY_PLAN );
- coverage = database.getCoverageData(visit_date);
+ coverage = database.getCoverageData(visit_date, CommonString.FROM_JCP);
for(int i=0;i coverage_list;
Toolbar toolbar;
@@ -124,13 +124,14 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
checkOutStore_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID);
+ store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
str = CommonString.FILE_PATH;
database = new GSKOrangeDB(this);
database.open();
- coverage_list = database.getCoverageData(date);
+ coverage_list = database.getCoverageData(date, store_flag_str);
img_cam.setOnClickListener(this);
img_clicked.setOnClickListener(this);
@@ -203,8 +204,11 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
Intent i = new Intent(StoreCheckoutImageActivity.this, CheckoutActivity.class);
+ i.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
i.putExtra(CommonString.KEY_STORE_ID, checkOutStore_id);
i.putExtra(CommonString.KEY_CHECKOUT_IMAGE, img_str);
+ i.putExtra(CommonString.KEY_LATITUDE, lat);
+ i.putExtra(CommonString.KEY_LONGITUDE, lon);
startActivity(i);
finish();
}
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 52ecaab..e113281 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -69,9 +69,10 @@ public class StoreListActivity extends AppCompatActivity {
private Dialog dialog;
boolean result_flag = false, leaveflag = false;
FloatingActionButton fab;
- String storeid;
+ //String storeid;
Toolbar toolbar;
String language;
+ String store_flag_str;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -85,6 +86,8 @@ public class StoreListActivity extends AppCompatActivity {
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+ store_flag_str = getIntent().getStringExtra(CommonString.KEY_STORE_FLAG);
+
date = preferences.getString(CommonString.KEY_DATE, null);
visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
language = preferences.getString(CommonString.KEY_LANGUAGE, "");
@@ -115,10 +118,19 @@ public class StoreListActivity extends AppCompatActivity {
super.onResume();
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
- toolbar.setTitle(getString(R.string.title_activity_store_list));
+ //toolbar.setTitle(getString(R.string.title_activity_store_list));
db.open();
- storelist = db.getStoreData(date);
- coverage = db.getCoverageData(date);
+ if(store_flag_str.equals(CommonString.FROM_JCP)){
+ toolbar.setTitle(getString(R.string.title_activity_store_list));
+ storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN );
+ }
+ else {
+ toolbar.setTitle(getString(R.string.adhoc_store_list));
+ storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEY_PLAN );
+ //fab.setVisibility(View.GONE);
+ }
+
+ coverage = db.getCoverageData(date, store_flag_str);
if (storelist.size() > 0) {
@@ -131,7 +143,10 @@ public class StoreListActivity extends AppCompatActivity {
recyclerView.setVisibility(View.INVISIBLE);
linearlay.setVisibility(View.VISIBLE);
- fab.setVisibility(View.VISIBLE);
+ if(store_flag_str.equals(CommonString.FROM_JCP)){
+ fab.setVisibility(View.VISIBLE);
+ }
+
}
}
@@ -215,8 +230,8 @@ public class StoreListActivity extends AppCompatActivity {
viewHolder.chkbtn.setBackgroundResource(R.mipmap.checkout);
}
- storeid = current.getSTORE_ID();
- CoverageBean coverageObj = db.getCoverageSpecificData(date,storeid);
+ final String storeid = current.getSTORE_ID();
+ final CoverageBean coverageObj = db.getCoverageSpecificData(date,storeid);
//viewHolder.txt.setText(current.txt);
viewHolder.txt.setText(current.getSTORE_NAME());
@@ -391,30 +406,56 @@ public class StoreListActivity extends AppCompatActivity {
// showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS());
- if (!setcheckedmenthod(store_id)) {
- boolean enteryflag = true;
- if (coverage.size() > 0) {
- int i;
- for (i = 0; i < coverage.size(); i++) {
+ if(checkotherCheckedIn(store_flag_str)){
+ String from;
+ if (store_flag_str.equals(CommonString.FROM_JCP)) {
+ from = getString(R.string.adhoc);
+ }else {
+ from = getString(R.string.jcp);
+ }
+ Snackbar.make(v, getString(R.string.title_store_list_checkout_current) + " - " + from, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ }
+ else {
+ if (!setcheckedmenthod(store_id)) {
+ boolean enteryflag = true;
+ if (coverage.size() > 0) {
+ int i;
+ for (i = 0; i < coverage.size(); i++) {
- if (coverage.get(i).getInTime() != null) {
+ if (coverage.get(i).getInTime() != null) {
- if (coverage.get(i).getOutTime() == null) {
- if (!store_id.equals(coverage.get(i).getStoreId())) {
- Snackbar.make(v, R.string.title_store_list_checkout_current, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
- enteryflag = false;
+ if (coverage.get(i).getOutTime() == null) {
+ if (!store_id.equals(coverage.get(i).getStoreId())) {
+ Snackbar.make(v, R.string.title_store_list_checkout_current, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ enteryflag = false;
+ }
+ break;
}
- break;
}
}
}
- }
- if (enteryflag) {
- showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
+ if (enteryflag) {
+ if(store_flag_str.equals(CommonString.FROM_JCP)){
+ showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current);
+ }
+ else {
+ if(coverageObj.getStatus().equals("N") ){
+
+ Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ in.putExtra(CommonString.KEY_STORE_ID, store_id);
+ startActivity(in);
+ overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
+ }
+ else {
+ Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+ }
+ }
+ }
+ } else {
+ Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
}
- } else {
- Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
}
}
}
@@ -453,6 +494,7 @@ public class StoreListActivity extends AppCompatActivity {
Intent i = new Intent(StoreListActivity.this, StoreCheckoutImageActivity.class);
i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ i.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
startActivity(i);
} else {
Snackbar.make(recyclerView, R.string.nonetwork, Snackbar.LENGTH_SHORT)
@@ -566,6 +608,8 @@ public class StoreListActivity extends AppCompatActivity {
if (flag == true) {
Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
+ in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
+ in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel();
@@ -587,7 +631,6 @@ public class StoreListActivity extends AppCompatActivity {
int id) {
dialog1.cancel();
-
}
});
@@ -623,6 +666,7 @@ public class StoreListActivity extends AppCompatActivity {
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
+ in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_DEVIATION);
startActivity(in);
}
@@ -720,8 +764,15 @@ public class StoreListActivity extends AppCompatActivity {
int id) {
UpdateStore(current.getSTORE_ID());
- storelist = db.getStoreData(date);
- coverage = db.getCoverageData(date);
+
+ if(store_flag_str.equals(CommonString.FROM_JCP)){
+ storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN );
+ }
+ else {
+ storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEY_PLAN );
+ }
+
+ coverage = db.getCoverageData(date, store_flag_str);
adapter.notifyDataSetChanged();
}
@@ -740,6 +791,30 @@ public class StoreListActivity extends AppCompatActivity {
alert.show();
}
}
+
+ boolean checkotherCheckedIn(String store_flag_str){
+
+ boolean flag_checked_in = false;
+ ArrayList other_coverage_list;
+
+ if(store_flag_str.equals(CommonString.FROM_JCP)){
+ other_coverage_list = db.getCoverageData(date,CommonString.FROM_DEVIATION );
+ }
+ else {
+
+ other_coverage_list = db.getCoverageData(date,CommonString.FROM_JCP );
+ }
+
+ for(int i=0; i non_t2p_reason = db.getNonT2pReasonData();
+
+ NonT2pReasonGetterSetter nonT2p = new NonT2pReasonGetterSetter();
+
+ nonT2p.setTREASON("Select Reason");
+ nonT2p.setTREASON_ID("0");
+ non_t2p_reason.add(0, nonT2p);
+ t2PGetterSetters.get(i).setnon_t2p_reason_list(non_t2p_reason);
+ }
+
if (t2PGetterSetters.size() > 0) {
rec_t2p.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
@@ -266,6 +279,24 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.spinner.setAdapter(skuadapter);
holder.spinner.setSelection(0);
+ final ArrayList non_t2p_reason_list = list.get(position).getnon_t2p_reason_list();
+ CustomSpinnerNonT2pAdapter non_t2p_reason_Adapter = new CustomSpinnerNonT2pAdapter(T2PComplianceActivity.this, R.layout.custom_t2p_spinner_item, non_t2p_reason_list);
+ holder.spinner_t2p_non_reason.setAdapter(non_t2p_reason_Adapter);
+
+ holder.spinner_t2p_non_reason.setSelection(0);
+
+ holder.spinner_t2p_non_reason.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView parent, View view, int position, long id) {
+
+ mItem.setNon_t2p_reason_id(non_t2p_reason_list.get(position).getTREASON_ID().get(0));
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView parent) {
+
+ }
+ });
//holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME));
@@ -294,7 +325,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
case 0:
if (mItem.getPresent() == 1) {
flag_clear = true;
- } else {
+ } else if(mItem.getPresent() == 0){
+ mItem.setNon_t2p_reason_id("0");
+ mItem.setPresent(-1);
+ t2PAdapter.notifyDataSetChanged();
+ }
+ else {
mItem.setPresent(-1);
t2PAdapter.notifyDataSetChanged();
}
@@ -303,6 +339,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
break;
case 1:
mItem.setPresent(1);
+ mItem.setNon_t2p_reason_id("0");
t2PAdapter.notifyDataSetChanged();
break;
case 2:
@@ -337,6 +374,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
mItem.setPresent(finalPresent);
mItem.getGapsChecklist().clear();
mItem.getSkulist().clear();
+ mItem.getBrandlist().clear();
//Camera
if (!mItem.getImage().equals("")) {
@@ -381,6 +419,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
});
+
holder.btn_gaps.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -643,6 +682,13 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.img_cam2.setEnabled(is_enabled);
holder.btn_gaps.setEnabled(is_enabled);
+ if(mItem.getPresent()==0){
+ holder.layout_t2p_non_reason.setVisibility(View.VISIBLE);
+ }
+ else {
+ holder.layout_t2p_non_reason.setVisibility(View.GONE);
+ }
+
if (is_enabled && mItem.getCategory_fixture().equals("0")) {
holder.btn_sku.setEnabled(true);
} else {
@@ -681,6 +727,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
holder.spinner.setSelection(1);
break;
}
+
+ for(int i=0;i {
+
+ NonT2pReasonGetterSetter tempValues = null;
+ LayoutInflater inflater;
+ private Activity activity;
+ private ArrayList data;
+
+ /*************
+ * CustomAdapter Constructor
+ *****************/
+ public CustomSpinnerNonT2pAdapter(
+ T2PComplianceActivity activitySpinner,
+ int textViewResourceId,
+ ArrayList objects
+
+ ) {
+ super(activitySpinner, textViewResourceId, objects);
+
+ /********** Take passed values **********/
+ activity = activitySpinner;
+ data = objects;
+ /*********** Layout inflator to call external xml layout () **********************/
+ inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+ }
+
+ @Override
+ public View getDropDownView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ return getCustomView(position, convertView, parent);
+ }
+
+ // This funtion called for each row ( Called data.size() times )
+ public View getCustomView(int position, View convertView, ViewGroup parent) {
+
+ /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
+ View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
+
+ /***** Get each Model object from Arraylist ********/
+ tempValues = null;
+ tempValues = (NonT2pReasonGetterSetter) data.get(position);
+
+ TextView label = (TextView) row.findViewById(R.id.tv_text);
+
+ if (position == 0) {
+
+ // Default selected Spinner item
+ label.setText(getString(R.string.select));
+ //sub.setText("");
+ } else {
+ // Set values for spinner each row
+ label.setText(tempValues.getTREASON().get(0));
+ }
+
+ return row;
+ }
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index 446a10c..1da4e42 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -45,6 +45,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter
import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
@@ -58,6 +59,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSett
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
@@ -75,6 +77,7 @@ public class DownloadActivity extends AppCompatActivity {
GSKOrangeDB db;
String userId, culture_id;
JourneyPlanGetterSetter jcpgettersetter;
+ JourneyPlanGetterSetter adhoc_jcpgettersetter;
SkuMasterGetterSetter skumastergettersetter;
BrandMasterGetterSetter brandMasterGetterSetter;
SubCategoryMasterGetterSetter subCategoryMasterGetterSetter;
@@ -98,6 +101,8 @@ public class DownloadActivity extends AppCompatActivity {
SkuGroupMasterGetterSetter skuGroupMasterGetterSetter;
AdditionalQuestiongetterSetter additionalQuestiongetterSetter;
POGQuestionGetterSetter pogQuestionGetterSetter;
+ NonT2pReasonGetterSetter nonT2pReasonGetterSetter;
+ ConfigurationContrywiseGetterSetter configurationContrywiseGetterSetter;
private Dialog dialog;
private ProgressBar pb;
@@ -157,6 +162,9 @@ public class DownloadActivity extends AppCompatActivity {
@Override
protected String doInBackground(Void... voids) {
try {
+
+ boolean no_jcp_flag = false;
+
String resultHttp = "";
data = new Data();
@@ -198,7 +206,8 @@ public class DownloadActivity extends AppCompatActivity {
String jcpTable = jcpgettersetter.getTable_journey_plan();
TableBean.setJourneyPlan(jcpTable);
} else {
- return "JOURNEY_PLAN";
+ //return "JOURNEY_PLAN";
+ no_jcp_flag = true;
}
data.value = 10;
@@ -206,6 +215,49 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
+ //ADHOC_JOURNEYPLAN
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "ADHOC_JOURNEYPLAN");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ // xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+ // xpp.setInput(stream,"UTF-8");
+ xpp.next();
+ eventType = xpp.getEventType();
+
+ adhoc_jcpgettersetter = XMLHandlers.JCPXMLHandler(xpp, eventType);
+
+ if (adhoc_jcpgettersetter.getSTORE_ID().size() > 0) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ }
+
+ String adhoc_jcpTable = adhoc_jcpgettersetter.getTable_journey_plan();
+ TableBean.setAdhocJourneyPlan(adhoc_jcpTable);
+
+ if (adhoc_jcpgettersetter.getSTORE_ID().size() > 0) {
+ data.value = 15;
+ data.name = "ADHOC JOURNEYPLAN " + getResources().getString(R.string.download_data);
+ }
+ else {
+ if(no_jcp_flag){
+ return "JOURNEY_PLAN";
+ }
+ }
+ }
+ publishProgress(data);
+
// Store List Master
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
@@ -994,6 +1046,76 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
+ //NON_T2P_REASON
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "NON_T2P_REASON");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+ nonT2pReasonGetterSetter = XMLHandlers.nonT2pReasonXMLHandler(xpp, eventType);
+
+ String table_non_t2p_table = nonT2pReasonGetterSetter.getTable_NON_T2P_REASON();
+ if (table_non_t2p_table != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setTable_NON_T2P_REASON(table_non_t2p_table);
+ }
+
+ if (pogQuestionGetterSetter.getQUESTION_ID().size() > 0) {
+ data.value = 97;
+ data.name = "NON T2P REASON " + getResources().getString(R.string.download_data);
+ }
+ }
+ publishProgress(data);
+
+ //CONFIGURATION_COUNTRY_WISE
+ request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+ request.addProperty("UserName", userId);
+ request.addProperty("Type", "CONFIGURATION_COUNTRY_WISE");
+ request.addProperty("cultureid", culture_id);
+
+ envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+ result = envelope.getResponse();
+
+ if (result.toString() != null) {
+ xpp.setInput(new StringReader(result.toString()));
+ xpp.next();
+ eventType = xpp.getEventType();
+ configurationContrywiseGetterSetter = XMLHandlers.configurationCountryWiseXMLHandler(xpp, eventType);
+
+ String table_configuration = configurationContrywiseGetterSetter.getTable_CONFIGURATION_COUNTRY_WISE();
+ if (table_configuration != null) {
+ resultHttp = CommonString.KEY_SUCCESS;
+ TableBean.setTable_CONFIGURATION_COUNTRY_WISE(table_configuration);
+ }
+
+ if (configurationContrywiseGetterSetter.getCOUNTRY_ID().size() > 0) {
+ data.value = 97;
+ data.name = "CONFIGURATION COUNTRY WISE" + getResources().getString(R.string.download_data);
+ }
+ }
+ publishProgress(data);
+
+
+
/* //MAPPING_COUNTRYWISE_PLANOGRAM
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -1263,6 +1385,7 @@ public class DownloadActivity extends AppCompatActivity {
db.open();
db.InsertJCP(jcpgettersetter);
+ db.InsertAdhoc_JCP(adhoc_jcpgettersetter);
db.InsertCategory(categoryMasterGetterSetter);
db.InsertSubCategoryMaster(subCategoryMasterGetterSetter);
db.InsertBrandMaster(brandMasterGetterSetter);
@@ -1289,6 +1412,8 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertSkuGroupMaster(skuGroupMasterGetterSetter);
db.InsertADDITIONALQUESTION(additionalQuestiongetterSetter);
db.InsertPOGQUESTION(pogQuestionGetterSetter);
+ db.InsertNON_T2P_REASON(nonT2pReasonGetterSetter);
+ db.InsertCONFIGURATION_COUNTRY_WISE(configurationContrywiseGetterSetter);
} catch (MalformedURLException e) {
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 968e0c6..e2f1dac 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gettersetter/CoverageBean.java
@@ -4,6 +4,8 @@ public class CoverageBean {
protected int MID;
protected String process_id;
+ public String flag_from;
+
public String getGEO_TAG() {
return GEO_TAG;
}
@@ -228,4 +230,12 @@ public class CoverageBean {
public void setCheckOut_Image(String checkOut_Image) {
CheckOut_Image = checkOut_Image;
}
+
+ public String getFlag_from() {
+ return flag_from;
+ }
+
+ public void setFlag_from(String flag_from) {
+ this.flag_from = flag_from;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
index 6c7b776..ca875a4 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
@@ -374,7 +374,7 @@ public class CategoryListActivity extends AppCompatActivity {
}
if (flag_filled) {
- db.updateCheckoutStatus(store_id, CommonString.KEY_VALID);
+ db.updateCheckoutStatus(store_id, CommonString.KEY_VALID, CommonString.KEY_JOURNEY_PLAN);
}
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
index e63bef9..4a080b0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
@@ -28,6 +28,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.MessageActivity;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
public class CategoryWisePerformanceActivity extends AppCompatActivity {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
index 23c1f2f..b6b680f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
@@ -28,6 +28,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.dailyentry.MessageActivity;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter;
@@ -76,7 +77,8 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class);
+ //Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class);
+ Intent intent = new Intent(StoreWisePerformanceActivity.this, MessageActivity.class);
startActivity(intent);
finish();
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
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 ee23fd6..50823b8 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -248,7 +248,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
for (int i = 0; i < coverageList.size(); i++) {
- storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
+ storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId(), coverageList.get(i).getFlag_from());
if (storeData.getSTORE_ID() != null) {
if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) ||
@@ -295,7 +295,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
if (validity.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_P);
- db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P);
+ db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P, coverageList.get(i).getFlag_from());
} else {
continue;
//return CommonString.METHOD_UPLOAD_COVERAGE;
@@ -1626,7 +1626,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
db.open();
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U);
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
- .getVisitDate(), CommonString.KEY_U);
+ .getVisitDate(), CommonString.KEY_U, coverageList.get(i).getFlag_from());
db.deleteTableWithStoreID(coverageList.get(i).getStoreId());
}
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 86b69be..fed019f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -264,7 +264,42 @@ public class UploadActivity extends AppCompatActivity {
protected String doInBackground(Void... params) {
try {
data = new Data();
- coverageList = db.getCoverageData(date);
+
+ ArrayList adhoc_coverageList = db.getCoverageData(date, CommonString.FROM_DEVIATION);
+
+ if (adhoc_coverageList.size() > 0) {
+
+ for (int i = 0; i < adhoc_coverageList.size(); i++) {
+
+ String onXML = "[ADHOC_JCP]"
+ + "[USER_ID]" + userId + "[/USER_ID]"
+ + "[VISIT_DATE]" + adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
+ + "[STORE_CD]" + adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]"
+ + "[/ADHOC_JCP]";
+
+ final String adhoc_xml = "[DATA]" + onXML + "[/DATA]";
+
+ SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+ request.addProperty("XMLDATA", adhoc_xml);
+ request.addProperty("KEYS", "ADHOC_JOURNEY_PLAN");
+ request.addProperty("USERNAME", userId);
+ request.addProperty("MID", 0);
+
+ SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+ envelope.dotNet = true;
+ envelope.setOutputSoapObject(request);
+
+ HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+ androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+
+ result = envelope.getResponse();
+ if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+ return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
+ }
+ }
+ }
+
+ coverageList = db.getCoverageData(date, null);
if (coverageList.size() > 0) {
if (coverageList.size() == 1) {
@@ -276,7 +311,7 @@ public class UploadActivity extends AppCompatActivity {
for (int i = 0; i < coverageList.size(); i++) {
- storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
+ storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId(), coverageList.get(i).getFlag_from());
if (storeData.getSTORE_ID() != null) {
if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) ||
@@ -284,6 +319,13 @@ public class UploadActivity extends AppCompatActivity {
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {
String camera_allow = storeData.getCAMERA_ALLOW();
+ String adhoc;
+ if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_DEVIATION)){
+ adhoc ="1";
+ }
+ else {
+ adhoc ="0";
+ }
String onXML = "[DATA]"
+ "[USER_DATA]"
@@ -301,6 +343,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]"
+ "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]"
+ "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]"
+ + "[ADHOC]" + adhoc + "[/ADHOC]"
+ "[/USER_DATA]"
+ "[/DATA]";
@@ -323,7 +366,7 @@ public class UploadActivity extends AppCompatActivity {
if (validity.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_P);
- db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P);
+ db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P, coverageList.get(i).getFlag_from());
} else {
continue;
//return CommonString.METHOD_UPLOAD_COVERAGE;
@@ -792,6 +835,10 @@ public class UploadActivity extends AppCompatActivity {
+ "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]"
+ "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]"
+ "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]"
+
+ //Non t2p reason id added - 21-6-2018
+ + "[TREASON_ID]" + t2PGetterSetters.get(i1).getNon_t2p_reason_id() + "[/TREASON_ID]"
+
+ "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]"
+ "[SKU_DATA]" + sku_xml + "[/SKU_DATA]"
+ "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]"
@@ -805,7 +852,7 @@ public class UploadActivity extends AppCompatActivity {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", t2p_final_xml);
- request.addProperty("KEYS", "T2P_DATA_FIXTURE");
+ request.addProperty("KEYS", "T2P_DATA_FIXTURE_NEW");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
@@ -1670,7 +1717,7 @@ public class UploadActivity extends AppCompatActivity {
db.open();
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U);
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
- .getVisitDate(), CommonString.KEY_U);
+ .getVisitDate(), CommonString.KEY_U, coverageList.get(i).getFlag_from());
db.deleteTableWithStoreID(coverageList.get(i).getStoreId());
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ChatMessageDownloadGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ChatMessageDownloadGetterSetter.java
new file mode 100644
index 0000000..742a22e
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ChatMessageDownloadGetterSetter.java
@@ -0,0 +1,135 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class ChatMessageDownloadGetterSetter {
+
+ String table_CHAT_MESSAGE;
+
+ ArrayList REC_ID = new ArrayList<>();
+ ArrayList CHAT_ID = new ArrayList<>();
+ ArrayList MESSAGE = new ArrayList<>();
+ ArrayList MESSAGEDATE = new ArrayList<>();
+ ArrayList SENDERID = new ArrayList<>();
+ ArrayList SENDER = new ArrayList<>();
+ ArrayList RECEIVERID = new ArrayList<>();
+ ArrayList RECEIVER = new ArrayList<>();
+ ArrayList COMMENTDATE = new ArrayList<>();
+ ArrayList COMMENT = new ArrayList<>();
+ ArrayList STOREID = new ArrayList<>();
+ ArrayList ORDERID = new ArrayList<>();
+ ArrayList SENDER_USERID = new ArrayList<>();
+
+
+ public String getTable_CHAT_MESSAGE() {
+ return table_CHAT_MESSAGE;
+ }
+
+ public void setTable_CHAT_MESSAGE(String table_CHAT_MESSAGE) {
+ this.table_CHAT_MESSAGE = table_CHAT_MESSAGE;
+ }
+
+ public ArrayList getREC_ID() {
+ return REC_ID;
+ }
+
+ public void setREC_ID(String REC_ID) {
+ this.REC_ID.add(REC_ID);
+ }
+
+ public ArrayList getCHAT_ID() {
+ return CHAT_ID;
+ }
+
+ public void setCHAT_ID(String CHAT_ID) {
+ this.CHAT_ID.add(CHAT_ID);
+ }
+
+ public ArrayList getMESSAGE() {
+ return MESSAGE;
+ }
+
+ public void setMESSAGE(String MESSAGE) {
+ this.MESSAGE.add(MESSAGE);
+ }
+
+ public ArrayList getMESSAGEDATE() {
+ return MESSAGEDATE;
+ }
+
+ public void setMESSAGEDATE(String MESSAGEDATE) {
+ this.MESSAGEDATE.add(MESSAGEDATE);
+ }
+
+ public ArrayList getSENDERID() {
+ return SENDERID;
+ }
+
+ public void setSENDERID(String SENDERID) {
+ this.SENDERID.add(SENDERID);
+ }
+
+ public ArrayList getSENDER() {
+ return SENDER;
+ }
+
+ public void setSENDER(String SENDER) {
+ this.SENDER.add(SENDER);
+ }
+
+ public ArrayList getRECEIVERID() {
+ return RECEIVERID;
+ }
+
+ public void setRECEIVERID(String RECEIVERID) {
+ this.RECEIVERID.add(RECEIVERID);
+ }
+
+ public ArrayList getRECEIVER() {
+ return RECEIVER;
+ }
+
+ public void setRECEIVER(String RECEIVER) {
+ this.RECEIVER.add(RECEIVER);
+ }
+
+ public ArrayList getCOMMENTDATE() {
+ return COMMENTDATE;
+ }
+
+ public void setCOMMENTDATE(String COMMENTDATE) {
+ this.COMMENTDATE.add(COMMENTDATE);
+ }
+
+ public ArrayList getCOMMENT() {
+ return COMMENT;
+ }
+
+ public void setCOMMENT(String COMMENT) {
+ this.COMMENT.add(COMMENT);
+ }
+
+ public ArrayList getSTOREID() {
+ return STOREID;
+ }
+
+ public void setSTOREID(String STOREID) {
+ this.STOREID.add(STOREID);
+ }
+
+ public ArrayList getORDERID() {
+ return ORDERID;
+ }
+
+ public void setORDERID(String ORDERID) {
+ this.ORDERID.add(ORDERID);
+ }
+
+ public ArrayList getSENDER_USERID() {
+ return SENDER_USERID;
+ }
+
+ public void setSENDER_USERID(String SENDER_USERID) {
+ this.SENDER_USERID.add(SENDER_USERID);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationContrywiseGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationContrywiseGetterSetter.java
new file mode 100644
index 0000000..818ca09
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ConfigurationContrywiseGetterSetter.java
@@ -0,0 +1,35 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class ConfigurationContrywiseGetterSetter {
+
+ String table_CONFIGURATION_COUNTRY_WISE;
+
+ ArrayList COUNTRY_ID = new ArrayList<>();
+ ArrayList ADHOC_REPORTING = new ArrayList<>();
+
+ public String getTable_CONFIGURATION_COUNTRY_WISE() {
+ return table_CONFIGURATION_COUNTRY_WISE;
+ }
+
+ public void setTable_CONFIGURATION_COUNTRY_WISE(String table_CONFIGURATION_COUNTRY_WISE) {
+ this.table_CONFIGURATION_COUNTRY_WISE = table_CONFIGURATION_COUNTRY_WISE;
+ }
+
+ public ArrayList getCOUNTRY_ID() {
+ return COUNTRY_ID;
+ }
+
+ public void setCOUNTRY_ID(String COUNTRY_ID) {
+ this.COUNTRY_ID.add(COUNTRY_ID);
+ }
+
+ public ArrayList getADHOC_REPORTING() {
+ return ADHOC_REPORTING;
+ }
+
+ public void setADHOC_REPORTING(String ADHOC_REPORTING) {
+ this.ADHOC_REPORTING.add(ADHOC_REPORTING);
+ }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonT2pReasonGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonT2pReasonGetterSetter.java
new file mode 100644
index 0000000..a833694
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/NonT2pReasonGetterSetter.java
@@ -0,0 +1,35 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+public class NonT2pReasonGetterSetter {
+
+ String table_NON_T2P_REASON;
+
+ ArrayList TREASON_ID = new ArrayList<>();
+ ArrayList TREASON = new ArrayList<>();
+
+ public String getTable_NON_T2P_REASON() {
+ return table_NON_T2P_REASON;
+ }
+
+ public void setTable_NON_T2P_REASON(String table_NON_T2P_REASON) {
+ this.table_NON_T2P_REASON = table_NON_T2P_REASON;
+ }
+
+ public ArrayList getTREASON_ID() {
+ return TREASON_ID;
+ }
+
+ public void setTREASON_ID(String TREASON_ID) {
+ this.TREASON_ID.add(TREASON_ID);
+ }
+
+ public ArrayList getTREASON() {
+ return TREASON;
+ }
+
+ public void setTREASON(String TREASON) {
+ this.TREASON.add(TREASON);
+ }
+}
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 68fad20..ce4680f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
@@ -10,7 +10,7 @@ import cpm.com.gskmtorange.GetterSetter.BrandAvabilityGetterSetter;
public class T2PGetterSetter {
- String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2, category_fixture;
+ String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2, category_fixture, non_t2p_reason_id="0";
boolean isPresent;
int present = -1;
@@ -18,6 +18,16 @@ public class T2PGetterSetter {
ArrayList gapsChecklist = new ArrayList<>();
ArrayList skulist = new ArrayList<>();
+ public ArrayList getnon_t2p_reason_list() {
+ return non_t2p_reason_list;
+ }
+
+ public void setnon_t2p_reason_list(ArrayList non_t2p_reason) {
+ this.non_t2p_reason_list = non_t2p_reason;
+ }
+
+ ArrayList non_t2p_reason_list = new ArrayList<>();
+
public ArrayList getBrandlist() {
return brandlist;
}
@@ -163,4 +173,12 @@ public class T2PGetterSetter {
public void setPresent(int present) {
this.present = present;
}
+
+ public String getNon_t2p_reason_id() {
+ return non_t2p_reason_id;
+ }
+
+ public void setNon_t2p_reason_id(String non_t2p_reason_id) {
+ this.non_t2p_reason_id = non_t2p_reason_id;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
index 0c7b990..e4ac77b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -7,6 +7,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
public class TableBean {
public static String JOURNEY_PLAN;
+ public static String ADHOC_JOURNEY_PLAN;
public static String SKU_MASTER;
public static String BRAND_MASTER;
public static String SUB_CATEGORY_MASTER;
@@ -33,6 +34,8 @@ public class TableBean {
public static String MAPPING_COUNTRYWISE_PLANOGRAM;
public static String Table_ADDITIONAL_QUESTION;
public static String Table_POG_QUESTION;
+ public static String Table_NON_T2P_REASON;
+ public static String Table_CONFIGURATION_COUNTRY_WISE;
public static String getAdditionalDisplay() {
@@ -235,4 +238,28 @@ public class TableBean {
public static void setTable_POG_QUESTION(String table_POG_QUESTION) {
Table_POG_QUESTION = table_POG_QUESTION;
}
+
+ public static String getTable_NON_T2P_REASON() {
+ return Table_NON_T2P_REASON;
+ }
+
+ public static void setTable_NON_T2P_REASON(String table_NON_T2P_REASON) {
+ Table_NON_T2P_REASON = table_NON_T2P_REASON;
+ }
+
+ public static String getAdhocJourneyPlan() {
+ return ADHOC_JOURNEY_PLAN;
+ }
+
+ public static void setAdhocJourneyPlan(String adhocJourneyPlan) {
+ ADHOC_JOURNEY_PLAN = adhocJourneyPlan;
+ }
+
+ public static String getTable_CONFIGURATION_COUNTRY_WISE() {
+ return Table_CONFIGURATION_COUNTRY_WISE;
+ }
+
+ public static void setTable_CONFIGURATION_COUNTRY_WISE(String table_CONFIGURATION_COUNTRY_WISE) {
+ Table_CONFIGURATION_COUNTRY_WISE = table_CONFIGURATION_COUNTRY_WISE;
+ }
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
index de97c08..28a2476 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -9,6 +9,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter
import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ChatMessageDownloadGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
@@ -24,6 +26,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSett
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
@@ -1088,4 +1091,121 @@ public class XMLHandlers {
}
return st;
}
+
+ //POG_QUESTION
+ public static NonT2pReasonGetterSetter nonT2pReasonXMLHandler(XmlPullParser xpp, int eventType) {
+ NonT2pReasonGetterSetter st = new NonT2pReasonGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_NON_T2P_REASON(xpp.nextText());
+ }
+ if (xpp.getName().equals("TREASON")) {
+ st.setTREASON(xpp.nextText());
+ }
+ if (xpp.getName().equals("TREASON_ID")) {
+ st.setTREASON_ID(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
+
+ //CHAT_MESSAGE
+ public static ChatMessageDownloadGetterSetter CHAT_MESSAGE_XMLHandler(XmlPullParser xpp, int eventType) {
+ ChatMessageDownloadGetterSetter st = new ChatMessageDownloadGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_CHAT_MESSAGE(xpp.nextText());
+ }
+ if (xpp.getName().equals("REC_ID")) {
+ st.setREC_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("CHAT_ID")) {
+ st.setCHAT_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("MESSAGE")) {
+ st.setMESSAGE(xpp.nextText());
+ }
+ if (xpp.getName().equals("MESSAGEDATE")) {
+ st.setMESSAGEDATE(xpp.nextText());
+ }
+ if (xpp.getName().equals("SENDERID")) {
+ st.setSENDERID(xpp.nextText());
+ }
+ if (xpp.getName().equals("SENDER")) {
+ st.setSENDER(xpp.nextText());
+ }
+ if (xpp.getName().equals("RECEIVERID")) {
+ st.setRECEIVERID(xpp.nextText());
+ }
+ if (xpp.getName().equals("RECEIVER")) {
+ st.setRECEIVER(xpp.nextText());
+ }
+ if (xpp.getName().equals("COMMENTDATE")) {
+ st.setCOMMENTDATE(xpp.nextText());
+ }
+ if (xpp.getName().equals("COMMENT")) {
+ st.setCOMMENT(xpp.nextText());
+ }
+ if (xpp.getName().equals("STOREID")) {
+ st.setSTOREID(xpp.nextText());
+ }
+ if (xpp.getName().equals("ORDERID")) {
+ st.setORDERID(xpp.nextText());
+ }
+ if (xpp.getName().equals("SENDER_USERID")) {
+ st.setSENDER_USERID(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
+
+ //CONFIGURATION_COUNTRY_WISE
+ public static ConfigurationContrywiseGetterSetter configurationCountryWiseXMLHandler(XmlPullParser xpp, int eventType) {
+ ConfigurationContrywiseGetterSetter st = new ConfigurationContrywiseGetterSetter();
+
+ try {
+ while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+ if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+ if (xpp.getName().equals("META_DATA")) {
+ st.setTable_CONFIGURATION_COUNTRY_WISE(xpp.nextText());
+ }
+ if (xpp.getName().equals("COUNTRY_ID")) {
+ st.setCOUNTRY_ID(xpp.nextText());
+ }
+ if (xpp.getName().equals("ADHOC_REPORTING")) {
+ st.setADHOC_REPORTING(xpp.nextText());
+ }
+ }
+ xpp.next();
+ }
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return st;
+ }
}
diff --git a/GSKMTOrange/src/main/res/drawable/cancel.png b/GSKMTOrange/src/main/res/drawable/cancel.png
new file mode 100644
index 0000000..caf17f5
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/cancel.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/chat_background.jpg b/GSKMTOrange/src/main/res/drawable/chat_background.jpg
new file mode 100644
index 0000000..eb7f0a5
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/chat_background.jpg differ
diff --git a/GSKMTOrange/src/main/res/drawable/chat_wallpaper.png b/GSKMTOrange/src/main/res/drawable/chat_wallpaper.png
new file mode 100644
index 0000000..843b4c7
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/chat_wallpaper.png differ
diff --git a/GSKMTOrange/src/main/res/drawable/ic_send_white_24dp.png b/GSKMTOrange/src/main/res/drawable/ic_send_white_24dp.png
new file mode 100644
index 0000000..f02b645
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/ic_send_white_24dp.png differ
diff --git a/GSKMTOrange/src/main/res/layout/activity_conversation.xml b/GSKMTOrange/src/main/res/layout/activity_conversation.xml
new file mode 100644
index 0000000..dd0c94b
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_conversation.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/activity_message.xml b/GSKMTOrange/src/main/res/layout/activity_message.xml
new file mode 100644
index 0000000..c5b9ff4
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_message.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml b/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml
index 5a1e471..65df40c 100644
--- a/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml
+++ b/GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml
@@ -59,6 +59,7 @@
diff --git a/GSKMTOrange/src/main/res/layout/content_conversation.xml b/GSKMTOrange/src/main/res/layout/content_conversation.xml
new file mode 100644
index 0000000..a941102
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_conversation.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/content_message.xml b/GSKMTOrange/src/main/res/layout/content_message.xml
new file mode 100644
index 0000000..8cae33a
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/content_message.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/conversation_item.xml b/GSKMTOrange/src/main/res/layout/conversation_item.xml
new file mode 100644
index 0000000..6b9f5c0
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/conversation_item.xml
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/message_topic_item.xml b/GSKMTOrange/src/main/res/layout/message_topic_item.xml
new file mode 100644
index 0000000..4ca3a9b
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/message_topic_item.xml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/storelist.xml b/GSKMTOrange/src/main/res/layout/storelist.xml
index d0970ac..156724a 100644
--- a/GSKMTOrange/src/main/res/layout/storelist.xml
+++ b/GSKMTOrange/src/main/res/layout/storelist.xml
@@ -49,8 +49,6 @@
android:orientation="vertical"
android:weightSum="10"
android:visibility="gone"
-
-
>
+
+
+
+
+
+
+
+
+
+
+
+
+
-