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 b148112..cf6cb75 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -96,7 +96,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB619"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB620"; public static final int DATABASE_VERSION = 16; TableBean tableBean; private SQLiteDatabase db; @@ -6951,6 +6951,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("EMP_ID", Integer.parseInt(data.getEMP_ID().get(i))); values.put("SUPERVISOR", data.getSUPERVISOR().get(i)); values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i)); + values.put("COACHING_VISIT", data.getCOACHING_VISIT().get(i)); + values.put("CHECK_VISIT", data.getCHECK_VISIT().get(i)); db.insert("SUPERVISOR_LIST", null, values); @@ -6969,7 +6971,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST ", null); + // dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST ", null); + dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST where COACHING_VISIT = 1", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -6995,6 +6998,39 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } + public ArrayList getSupervisorcheckListData() { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + // dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST ", null); + dbcursor = db.rawQuery("SELECT * FROM SUPERVISOR_LIST where CHECK_VISIT = 1", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + SupervisorListGetterSetter sb = new SupervisorListGetterSetter(); + + sb.setEMP_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EMP_ID"))); + + sb.setSUPERVISOR(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUPERVISOR"))); + + list.add(sb); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + + } catch (Exception e) { + + return list; + } + + + return list; + } + public void insertCoachingVisitData(CoachingVisitGetterSetter data, String store_id) { db.delete("COACHING_VISIT", "STORE_ID" + "='" + store_id + "' AND EMP_ID ='" + data.getEmp_id() + "'", null); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index e77542b..632b9d7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -124,7 +124,6 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb Uri outputFileUri; private int factor, k; ArrayList geotaglist = new ArrayList(); - ArrayList geotaglistImage = new ArrayList(); Boolean markerflag = true; private TextView percentage, message; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index e1a4aa6..fae14ad 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -182,8 +182,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //populateAutoComplete(); mPasswordView = (EditText) findViewById(R.id.password); - museridView.setText("test.egypt"); - mPasswordView.setText("cpm123"); + // museridView.setText("test.egypt"); + // mPasswordView.setText("cpm123"); /* museridView.setText("egypt.1"); mPasswordView.setText("cpm123");*/ /* museridView.setText("DSR_Alex_61"); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index c7f9730..89d625a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -70,15 +70,10 @@ public class MainActivity extends AppCompatActivity String user_name, country_id, user_type; ArrayList storelist = new ArrayList(); View headerView; - ArrayList coverageList; - String error_msg; - Toolbar toolbar; - NavigationView navigationView; - private static final int MY_PERMISSIONS_REQUEST_CAMERA = 10; private static final int MY_PERMISSIONS_REQUEST_LOCATION = 11; private static final int MY_PERMISSIONS_REQUEST_STORAGE_READ = 12; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java index 8119126..a1a3106 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java @@ -44,12 +44,9 @@ public class AutoUpdateActivity extends AppCompatActivity { private ProgressBar pb; private TextView percentage, message; private Data data; - String path = "", p, s; - ProgressBar progressBar; private boolean status; - private SharedPreferences preferences; @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java index 5ae72d7..5e08b7a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java @@ -67,7 +67,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV ArrayList coachingVisitdata; boolean coaching_visit_camera_flag = false; MultiSpinnerSearch multi_spinner_supervisor; - ArrayList selectedSupervisorList = new ArrayList<>(); @Override @@ -274,9 +273,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV switch (v.getId()) { case R.id.img_cam: _pathforcheck = store_id + "CoachingVisit" + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg"; - _path = CommonString.FILE_PATH + _pathforcheck; - startCameraActivity(); break; @@ -334,8 +331,8 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV if (saved_flag || update_flag) { - //Intent i = new Intent(CoachingVisitActivity.this, StoreCheckoutImageActivity.class); - Intent i = new Intent(CoachingVisitActivity.this, CoachingVisitStoreActivity.class); + // Intent i = new Intent(CoachingVisitActivity.this, StoreCheckoutImageActivity.class); + Intent i = new Intent(CoachingVisitActivity.this, CoachingVisitStoreActivity.class); i.putExtra(CommonString.KEY_STORE_ID, store_id); i.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); startActivity(i); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitStoreActivity.java index 28c74c6..8ba5def 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitStoreActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitStoreActivity.java @@ -129,7 +129,7 @@ public class CoachingVisitStoreActivity extends AppCompatActivity implements Ada } - supervisorList = database.getSupervisorListData(); + supervisorList = database.getSupervisorcheckListData(); exist_adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item); 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 e15dd2a..eea7406 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -122,9 +122,7 @@ public class DownloadActivity extends AppCompatActivity { NonWorkingSubReasonGetterSetter nonWorkingSubReasonGetterSetter; SupervisorListGetterSetter supervisorListGetterSetter; ConfigurationMasterGetterSetter configurationMasterGetterSetter; - MappingPlanogramStorewiseGetterSetter mappingPlanogramStorewiseGetterSetter; - JourneyPlanGetterSetter additionalJcpGetterSetter; JourneyPlanGetterSetter additionalAdhocJcpGetterSetter; MappingStockGetterSetter mappingStockAdditionalGetterSetter; @@ -325,6 +323,41 @@ public class DownloadActivity extends AppCompatActivity { TableBean.setAdditionalJourneyPlan(additional_jcpTable); } + //SUPERVISOR_LIST + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "SUPERVISOR_LIST"); + 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(); + supervisorListGetterSetter = XMLHandlers.supervisorListXMLHandler(xpp, eventType); + + String table_sup_list = supervisorListGetterSetter.getTable_SUPERVISOR_LIST(); + if (table_sup_list != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setTable_SUPERVISOR_LIST(table_sup_list); + } + + if (supervisorListGetterSetter.getEMP_ID().size() > 0) { + data.value = 97; + data.name = "SUPERVISOR LIST DATA" + getResources().getString(R.string.download_data); + } + } + publishProgress(data); + + //ADHOC_JOURNEYPLAN_ADDITIONAL request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); @@ -1435,41 +1468,6 @@ public class DownloadActivity extends AppCompatActivity { } publishProgress(data); - //SUPERVISOR_LIST - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); - request.addProperty("UserName", userId); - request.addProperty("Type", "SUPERVISOR_LIST"); - 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(); - supervisorListGetterSetter = XMLHandlers.supervisorListXMLHandler(xpp, eventType); - - String table_sup_list = supervisorListGetterSetter.getTable_SUPERVISOR_LIST(); - if (table_sup_list != null) { - resultHttp = CommonString.KEY_SUCCESS; - TableBean.setTable_SUPERVISOR_LIST(table_sup_list); - } - - if (supervisorListGetterSetter.getEMP_ID().size() > 0) { - data.value = 97; - data.name = "SUPERVISOR LIST DATA" + getResources().getString(R.string.download_data); - } - } - publishProgress(data); - - //CONFIGURATION_MASTER request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); 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 cd11e96..3ba701d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -71,7 +71,6 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; public class PreviousDataUploadActivity extends AppCompatActivity { private Context context; - GSKOrangeDB db; ArrayList coverageList; String date, userId, app_version; @@ -89,7 +88,6 @@ public class PreviousDataUploadActivity extends AppCompatActivity { ArrayList additionalVisibilityList; ArrayList additionalVisibilitySkuList; ArrayList msl_availabilityStockFacingList; - private Dialog dialog; private ProgressBar pb; private TextView percentage, message; @@ -99,14 +97,10 @@ public class PreviousDataUploadActivity extends AppCompatActivity { ArrayList adddata = new ArrayList(); ArrayList listdat = new ArrayList(); ArrayList coachingVisitData; - Object result = ""; - ArrayList stockFacingPlanogramDataList; ArrayList storeWiseCameraDataGetterSetters; - ArrayList promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters; - ArrayList counterfeitProductGetterSetters, counterfeitProductExistsGetterSetters; ArrayList competitonGetterSetters, competitonExistsGetterSetters; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SupervisorListGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SupervisorListGetterSetter.java index b129c58..1528186 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SupervisorListGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SupervisorListGetterSetter.java @@ -10,6 +10,25 @@ public class SupervisorListGetterSetter { ArrayList SUPERVISOR = new ArrayList<>(); ArrayList COUNTRY_ID = new ArrayList<>(); + public ArrayList getCOACHING_VISIT() { + return COACHING_VISIT; + } + + public void setCOACHING_VISIT(String COACHING_VISIT) { + this.COACHING_VISIT.add(COACHING_VISIT); + } + + public ArrayList getCHECK_VISIT() { + return CHECK_VISIT; + } + + public void setCHECK_VISIT(String CHECK_VISIT) { + this.CHECK_VISIT.add(CHECK_VISIT); + } + + ArrayList COACHING_VISIT = new ArrayList<>(); + ArrayList CHECK_VISIT = new ArrayList<>(); + public String getTable_SUPERVISOR_LIST() { return table_SUPERVISOR_LIST; } 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 35873a8..02f9d50 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -1448,6 +1448,12 @@ public class XMLHandlers { if (xpp.getName().equals("SUPERVISOR")) { st.setSUPERVISOR(xpp.nextText()); } + if (xpp.getName().equals("COACHING_VISIT")) { + st.setCOACHING_VISIT(xpp.nextText()); + } + if (xpp.getName().equals("CHECK_VISIT")) { + st.setCHECK_VISIT(xpp.nextText()); + } } xpp.next(); diff --git a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java deleted file mode 100644 index 1e73f16..0000000 --- a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.androidbuts.multispinnerfilter; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter"; - public static final String BUILD_TYPE = "debug"; -}