From 7a771453c63744fa0d767f142a93635f6c64976d Mon Sep 17 00:00:00 2001 From: yadavendras Date: Mon, 11 Nov 2019 17:37:09 +0530 Subject: [PATCH] YSY commit --- GSKMTOrange/build.gradle | 12 ++-- .../com/gskmtorange/Database/GSKOrangeDB.java | 61 +++++++++++++++++- .../cpm/com/gskmtorange/LoginActivity.java | 2 +- .../cpm/com/gskmtorange/MainActivity.java | 18 ++++++ .../gskmtorange/constant/CommonString.java | 2 + .../dailyentry/CheckoutActivity.java | 4 +- .../dailyentry/NonWorkingReason.java | 5 +- .../dailyentry/StoreListActivity.java | 22 +++++-- .../dailyentry/StoreimageActivity.java | 14 ++-- .../download/DownloadActivity.java | 44 +++++++++++-- .../gskmtorange/upload/UploadActivity.java | 36 ++++++++++- .../upload/UploadImageWithRetrofit.java | 55 ++++++++++++++++ .../xmlGetterSetter/TableBean.java | 10 +++ .../main/res/menu/activity_main_drawer.xml | 7 ++ .../baseline_playlist_add_black_48.png | Bin 0 -> 124 bytes GSKMTOrange/src/main/res/values-ar/string.xml | 2 + GSKMTOrange/src/main/res/values/strings.xml | 2 + 17 files changed, 268 insertions(+), 28 deletions(-) create mode 100644 GSKMTOrange/src/main/res/mipmap-xhdpi/baseline_playlist_add_black_48.png diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 4bb0473..fda9071 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,12 +21,12 @@ android { targetSdkVersion 26 //For Egypt - /*versionCode 26 - versionName "3.8"*/ + /*versionCode 27 + versionName "3.9"*/ //For UAE - versionCode 24 - versionName "3.6" + /*versionCode 24 + versionName "3.6"*/ //For Turkey /*versionCode 23 @@ -37,8 +37,8 @@ android { versionName "3.7"*/ //For SA - /*versionCode 26 - versionName "3.7"*/ + versionCode 26 + versionName "3.7" multiDexEnabled true 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 fed07a0..3fb3f76 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -92,7 +92,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB59"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB60"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; @@ -228,6 +228,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getTable_MAPPING_PHARMA_MSL());//--Added 16.05.2019 db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_IMAGE_DATA);//--Added 20.05.2019 + db.execSQL(TableBean.getAdhocJourneyplanAdditional());//--Added 7.10.2019 + } catch (SQLException e) { e.printStackTrace(); Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show(); @@ -2035,6 +2037,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL; }else if (flag_from.equals(CommonString.FROM_PHARMA)) { table = CommonString.KEY_JOURNEY_PLAN_PHARMA; + }else if (flag_from.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { + table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL; } else { table = CommonString.KEY_ADHOC_JOURNEY_PLAN; } @@ -2065,6 +2069,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL; } else if (flag_from.equals(CommonString.FROM_PHARMA)) { table = CommonString.KEY_JOURNEY_PLAN_PHARMA; + }else if (flag_from.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { + table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL; }else{ table = CommonString.KEY_ADHOC_JOURNEY_PLAN; } @@ -8369,4 +8375,57 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } return list; } + + //Insert ADHOC_JOURNEYPLAN_ADDITIONAL + public void InsertAdditionalAdhocJCP(JourneyPlanGetterSetter data) { + db.delete("ADHOC_JOURNEYPLAN_ADDITIONAL", 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)); + values.put("POG_TYPE_ID", data.getPOG_TYPE_ID().get(i)); + + db.insert("ADHOC_JOURNEYPLAN_ADDITIONAL", null, values); + + } + + } catch (Exception ex) { + Log.d("Exception in ADHOC_Add_JCP", ex.toString()); + } + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 1e1552c..98991f7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -686,7 +686,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. if (result.equals(CommonString.KEY_SUCCESS)) { //set true for South Africa - boolean forSA = false; + boolean forSA = true; // database.open(); if(forSA){ diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index b023fd2..96150d0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -490,6 +490,24 @@ public class MainActivity extends AppCompatActivity startActivity(in); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + } + }else if (id == R.id.nav_additional_adhoc_stores) { + db.open(); + + if (db.getSKUMasterData(null).size() == 0) { + + Snackbar.make(webView, R.string.title_store_list_download_data, Snackbar.LENGTH_SHORT) + .setAction("Action", null).show(); + + // Toast.makeText(getBaseContext(), "Please Download Data First", Toast.LENGTH_LONG).show(); + } else { + + Intent in = new Intent(this, StoreListActivity.class); + in.putExtra(CommonString.KEY_STORE_FLAG, CommonString.FROM_ADDITIONAL_ADHOC); + + startActivity(in); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } }else if (id == R.id.nav_counterfeit_indicator) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 9f9ad25..da4f061 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -101,11 +101,13 @@ public class CommonString { public static final String KEY_ADHOC_JOURNEY_PLAN = "ADHOC_JOURNEYPLAN"; public static final String KEY_JOURNEY_PLAN_ADDITIONAL = "JOURNEY_PLAN_ADDITIONAL"; public static final String KEY_JOURNEY_PLAN_PHARMA = "JOURNEY_PLAN_PHARMA"; + public static final String KEY_ADHOC_JOURNEYPLAN_ADDITIONAL = "ADHOC_JOURNEYPLAN_ADDITIONAL"; public static final String KEY_STORE_FLAG = "STORE_FLAG"; public static final String FROM_DEVIATION = "DEVIATION"; public static final String FROM_JCP = "JCP"; public static final String FROM_ADDITIONAL = "ADDITIONAL"; public static final String FROM_PHARMA = "PHARMA"; + public static final String FROM_ADDITIONAL_ADHOC = "ADDITIONAL_ADHOC"; public static final String TABLE_INSERT_STOCK_DIALOG = "STOCK_DIALOG"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index 2380709..6b0ca12 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -145,7 +145,7 @@ public class CheckoutActivity extends AppCompatActivity { String service; - if(store_flag_str.equals(CommonString.FROM_ADDITIONAL)){ + if(store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){ service = CommonString.METHOD_UPLOAD_CHECKOUT_STATUS_ADDITIONAL; } else if(store_flag_str.equals(CommonString.FROM_PHARMA)){ @@ -211,6 +211,8 @@ public class CheckoutActivity extends AppCompatActivity { table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL; }else if(store_flag_str.equals(CommonString.FROM_PHARMA)){ table = CommonString.KEY_JOURNEY_PLAN_PHARMA; + }else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){ + table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL; } else{ table = CommonString.KEY_ADHOC_JOURNEY_PLAN; 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 9ece39d..b390d9a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -160,6 +160,9 @@ public class NonWorkingReason extends AppCompatActivity implements //Additional Journey Plan - Egypt storelist = database.getStoreData(visit_date,CommonString.KEY_JOURNEY_PLAN_PHARMA); + }else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){ + //Additional Adhoc Journey Plan - Egypt + storelist = database.getStoreData(visit_date,CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL); } coverage = database.getCoverageData(visit_date, CommonString.FROM_JCP); @@ -708,7 +711,7 @@ public class NonWorkingReason extends AppCompatActivity implements String service; - if(coverage.get(0).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){ + if(coverage.get(0).getFlag_from().equals(CommonString.FROM_ADDITIONAL) || coverage.get(0).getFlag_from().equals(CommonString.FROM_ADDITIONAL_ADHOC)){ service = CommonString.METHOD_UPLOAD_CURRENT_DATA_ADDITIONAL; } else if(coverage.get(0).getFlag_from().equals(CommonString.FROM_PHARMA)){ 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 5ff1d6c..3ee992f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -499,8 +499,11 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli //Pharma stores - Turkey toolbar.setTitle(getString(R.string.title_activity_store_list)); storelist = db.getStoreData(date,CommonString.KEY_JOURNEY_PLAN_PHARMA); - } - else{ + }else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){ + //Additional Journey Plan - Egypt + toolbar.setTitle(getString(R.string.title_activity_store_list)); + storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL); + }else{ toolbar.setTitle(getString(R.string.adhoc_store_list)); storelist = db.getStoreData(date,CommonString.KEY_ADHOC_JOURNEY_PLAN ); //fab.setVisibility(View.GONE); @@ -833,7 +836,9 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli if (enteryflag) { if(store_flag_str.equals(CommonString.FROM_PHARMA) && coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){ Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - }else if(store_flag_str.equals(CommonString.FROM_JCP) || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)){ + } /*if((store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC) || store_flag_str.equals(CommonString.FROM_ADDITIONAL)) && coverageObj.getStatus()!=null && coverageObj.getStatus().equalsIgnoreCase(CommonString.KEY_VALID)){ + Snackbar.make(v, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); + }*/else if(store_flag_str.equals(CommonString.FROM_JCP) || store_flag_str.equals(CommonString.FROM_PHARMA) || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC) || store_flag_str.equals(CommonString.FROM_ADDITIONAL)){ showMyDialog(store_id, current.getSTORE_NAME(), "Yes", current.getVISIT_DATE(), current.getCHECKOUT_STATUS(), current.getGEO_TAG(), current); } else { @@ -1000,7 +1005,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli boolean coaching_visit_flag=false; //Coaching visit will be not visible from Additional Stores - Egypt - if(!store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)){ + //if(!store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)){ //Enable disable According to Configuration ArrayList configurationData = db.getConfigurationMasterData(country_id); @@ -1014,7 +1019,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli } } } - } + //} //show Coaching visit if(coaching_visit_flag){ @@ -1110,7 +1115,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(R.layout.dialogbox); - RadioGroup radioGroup = (RadioGroup) dialog.findViewById(R.id.radiogrpvisit); + final RadioGroup radioGroup = (RadioGroup) dialog.findViewById(R.id.radiogrpvisit); radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @@ -1184,8 +1189,11 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); } else { + if(store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)){ + dialog.cancel(); + Snackbar.make(recyclerView, R.string.title_store_list_checkout_Already_filled, Snackbar.LENGTH_SHORT).setAction("Action", null).show(); - if(store_flag_str.equals(CommonString.FROM_PHARMA)){ + }else if(store_flag_str.equals(CommonString.FROM_PHARMA)){ Intent in = new Intent(StoreListActivity.this, PharmaActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index fa415f2..1619589 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -502,9 +502,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); String status; - - if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"") - || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) { +//if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"") +// || store_flag_str.equals(CommonString.FROM_ADDITIONAL) || store_flag_str.equals(CommonString.FROM_PHARMA)) { + if (store_flag_str.equals(CommonString.FROM_JCP) || country_id.equalsIgnoreCase("5") || store_flag_str.equals(CommonString.FROM_PHARMA)) { status = CommonString.KEY_INVALID; } else { status = CommonString.KEY_VALID; @@ -537,6 +537,8 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL; } else if (store_flag_str.equals(CommonString.FROM_PHARMA)) { table = CommonString.KEY_JOURNEY_PLAN_PHARMA; + }else if (store_flag_str.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { + table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL; } else{ table = CommonString.KEY_ADHOC_JOURNEY_PLAN; } @@ -934,9 +936,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic if (result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) { dialog.dismiss(); - - if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL) - || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")) { +//if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")|| store_flag_str.equals(CommonString.FROM_ADDITIONAL) +// || country_id.equalsIgnoreCase(CommonString.COUNTRY_ID_EGYPT +"")) { + if (store_flag_str.equals(CommonString.FROM_JCP)|| country_id.equalsIgnoreCase("5")) { Intent in = new Intent(StoreimageActivity.this, StoreWisePerformanceActivity.class); startActivity(in); finish(); 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 8577ab2..07f998e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -122,6 +122,7 @@ public class DownloadActivity extends AppCompatActivity { MappingPlanogramStorewiseGetterSetter mappingPlanogramStorewiseGetterSetter; JourneyPlanGetterSetter additionalJcpGetterSetter; + JourneyPlanGetterSetter additionalAdhocJcpGetterSetter; MappingStockGetterSetter mappingStockAdditionalGetterSetter; JourneyPlanGetterSetter pharmaJcpGetterSetter; MappingPharmaQuestionGetterSetter mappingPharmaQuestionGetterSetter; @@ -187,7 +188,7 @@ public class DownloadActivity extends AppCompatActivity { protected String doInBackground(Void... voids) { try { - boolean no_jcp_flag = false, no_adhoc_flag = false; + boolean no_jcp_flag = false, no_adhoc_flag = false, no_addtional_jcp_flag = false; String resultHttp = ""; data = new Data(); @@ -310,15 +311,49 @@ public class DownloadActivity extends AppCompatActivity { } else { - if (no_jcp_flag && no_adhoc_flag) { - return "JOURNEY_PLAN"; - } + no_addtional_jcp_flag = true; + } String additional_jcpTable = additionalJcpGetterSetter.getTable_journey_plan(); TableBean.setAdditionalJourneyPlan(additional_jcpTable); } + //ADHOC_JOURNEYPLAN_ADDITIONAL + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "ADHOC_JOURNEYPLAN_ADDITIONAL"); + 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(); + additionalAdhocJcpGetterSetter = XMLHandlers.JCPXMLHandler(xpp, eventType); + + if (additionalAdhocJcpGetterSetter.getSTORE_ID().size() > 0) { + resultHttp = CommonString.KEY_SUCCESS; + } + else { + + if (no_jcp_flag && no_adhoc_flag && no_addtional_jcp_flag) { + return "JOURNEY_PLAN"; + } + } + + String additional_jcpTable = additionalAdhocJcpGetterSetter.getTable_journey_plan(); + TableBean.setAdhocJourneyplanAdditional(additional_jcpTable); + } + //GEO_FENCING request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); @@ -1944,6 +1979,7 @@ public class DownloadActivity extends AppCompatActivity { db.insertMappingPahrmaQuestion(mappingPharmaQuestionGetterSetter); db.InsertPharmaJCP(pharmaJcpGetterSetter); db.InsertMAPPING_PHARMA_MSL(mappingPharmaMSLGetterSetter); + db.InsertAdditionalAdhocJCP(additionalAdhocJcpGetterSetter); } catch (MalformedURLException e) { 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 d546af8..3b709c8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -310,6 +310,40 @@ public class UploadActivity extends AppCompatActivity { } } + ArrayList additional_adhoc_coverageList = db.getCoverageData(date, CommonString.FROM_ADDITIONAL_ADHOC); + + if (additional_adhoc_coverageList.size() > 0) { + + for (int i = 0; i < additional_adhoc_coverageList.size(); i++) { + + String onXML = "[ADDITIONAL_ADHOC_JCP]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[VISIT_DATE]" + additional_adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]" + + "[STORE_CD]" + additional_adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]" + + "[/ADDITIONAL_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", "ADDITIONAL_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) { @@ -341,7 +375,7 @@ public class UploadActivity extends AppCompatActivity { String coverage_service, status_service; - if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)) { + if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL) || coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL_ADHOC)) { status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL; coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 172f365..0297821 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java @@ -712,6 +712,61 @@ public class UploadImageWithRetrofit { } } + //Additional Adhoc Stores Egypt + storeListAdditional = db.getStoreData(visitDate, CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL); + for (int i = 0; i < storeListAdditional.size(); i++) { + if (storeListAdditional.get(i).getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) { + // SET COVERAGE STATUS + String final_xml = ""; + String onXML = ""; + onXML = "[COVERAGE_STATUS]" + + "[STORE_ID]" + storeListAdditional.get(i).getSTORE_ID() + "[/STORE_ID]" + + "[VISIT_DATE]" + storeListAdditional.get(i).getVISIT_DATE()+ "[/VISIT_DATE]" + + "[USER_ID]" + userID + "[/USER_ID]" + + "[STATUS]" + CommonString.KEY_U + "[/STATUS]" + + "[/COVERAGE_STATUS]"; + + final_xml = final_xml + onXML; + + final String sos_xml = "[DATA]" + final_xml + "[/DATA]"; + + SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL); + request.addProperty("onXML", sos_xml); + + 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_COVERAGE_STATUS_ADDITIONAL, envelope); + + Object result = envelope.getResponse(); + + //If Result is success then status of that store is update + if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + + db.open(); + + final CoverageBean coverageObj = db.getCoverageSpecificData(storeListAdditional.get(i).getVISIT_DATE(), storeListAdditional.get(i).getSTORE_ID()); + + String uploadStatus; + if(coverageObj.getReasonid().equalsIgnoreCase("0")){ + uploadStatus = CommonString.KEY_U; + } + else { + uploadStatus = CommonString.KEY_UN; + } + + db.updateCoverageStatus(storeListAdditional.get(i).getSTORE_ID(), uploadStatus); + db.updateStoreStatusOnLeave(storeListAdditional.get(i).getSTORE_ID(), storeListAdditional.get(i).getVISIT_DATE(), + uploadStatus, CommonString.FROM_ADDITIONAL_ADHOC); + + db.deleteTableWithStoreID(storeListAdditional.get(i).getSTORE_ID()); + } + + } + } + } catch (MalformedURLException e) { e.printStackTrace(); } catch (IOException e) { 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 bd5d838..a7e104e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -83,6 +83,16 @@ public class TableBean { public static String ADDITIONAL_JOURNEY_PLAN; + public static String getAdhocJourneyplanAdditional() { + return ADHOC_JOURNEYPLAN_ADDITIONAL; + } + + public static void setAdhocJourneyplanAdditional(String adhocJourneyplanAdditional) { + ADHOC_JOURNEYPLAN_ADDITIONAL = adhocJourneyplanAdditional; + } + + public static String ADHOC_JOURNEYPLAN_ADDITIONAL; + public static String getMappingStockAdditional() { return MAPPING_STOCK_ADDITIONAL; } diff --git a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml index 5d14531..9c7029e 100644 --- a/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml +++ b/GSKMTOrange/src/main/res/menu/activity_main_drawer.xml @@ -62,6 +62,13 @@ android:visible="false" /> + + d literal 0 HcmV?d00001 diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 7b30434..986222d 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -333,4 +333,6 @@ إضافي محل الأدوية او المنتجات المقلدة + زيارات التحصيل الغير مخطط لها + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 094dacc..8e84e07 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -452,4 +452,6 @@ Please fill Stock Count Counterfeit Indicators + Additional Stores - Adhoc +