AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check_visit_upload

Browse Source
This commit is contained in:
upendrakushwaha1991
2021-07-06 05:55:02 -07:00
parent 71839404f4
commit beb6932f20
12 changed files with 103 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+38 -2
View File
@@ -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<SupervisorListGetterSetter> 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<SupervisorListGetterSetter> getSupervisorcheckListData() {
ArrayList<SupervisorListGetterSetter> 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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
-1
View File
@@ -124,7 +124,6 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
Uri outputFileUri;
private int factor, k;
ArrayList<GeotaggingBeans> geotaglist = new ArrayList<GeotaggingBeans>();
ArrayList<GeotaggingBeans> geotaglistImage = new ArrayList<GeotaggingBeans>();
Boolean markerflag = true;
private TextView percentage, message;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+2 -2
View File
@@ -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");
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
-5
View File
@@ -70,15 +70,10 @@ public class MainActivity extends AppCompatActivity
String user_name, country_id, user_type;
ArrayList<StoreBean> storelist = new ArrayList<StoreBean>();
View headerView;
ArrayList<CoverageBean> 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;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
-3
View File
@@ -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
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java
-3
View File
@@ -67,7 +67,6 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV
ArrayList<CoachingVisitGetterSetter> coachingVisitdata;
boolean coaching_visit_camera_flag = false;
MultiSpinnerSearch multi_spinner_supervisor;
ArrayList<String> 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;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitStoreActivity.java
+1 -1
View File
@@ -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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+35 -37
View File
@@ -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);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
-6
View File
@@ -71,7 +71,6 @@ import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class PreviousDataUploadActivity extends AppCompatActivity {
private Context context;
GSKOrangeDB db;
ArrayList<CoverageBean> coverageList;
String date, userId, app_version;
@@ -89,7 +88,6 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
ArrayList<AddittionalGetterSetter> additionalVisibilityList;
ArrayList<AdditionalDialogGetterSetter> additionalVisibilitySkuList;
ArrayList<MSL_AvailabilityStockFacingGetterSetter> msl_availabilityStockFacingList;
private Dialog dialog;
private ProgressBar pb;
private TextView percentage, message;
@@ -99,14 +97,10 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
ArrayList<CategoryPictureGetterSetter> adddata = new ArrayList<CategoryPictureGetterSetter>();
ArrayList<CategoryPictureGetterSetter> listdat = new ArrayList<CategoryPictureGetterSetter>();
ArrayList<CoachingVisitGetterSetter> coachingVisitData;
Object result = "";
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> stockFacingPlanogramDataList;
ArrayList<Store_wise_camera_DataGetterSetter> storeWiseCameraDataGetterSetters;
ArrayList<PromoComplianceSkuwiseGetterSetter> promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters;
ArrayList<CounterfeitProductGetterSetter> counterfeitProductGetterSetters, counterfeitProductExistsGetterSetters;
ArrayList<CompetitonPromoGetterSetter> competitonGetterSetters, competitonExistsGetterSetters;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SupervisorListGetterSetter.java
+19
View File
@@ -10,6 +10,25 @@ public class SupervisorListGetterSetter {
ArrayList<String> SUPERVISOR = new ArrayList<>();
ArrayList<String> COUNTRY_ID = new ArrayList<>();
public ArrayList<String> getCOACHING_VISIT() {
return COACHING_VISIT;
}
public void setCOACHING_VISIT(String COACHING_VISIT) {
this.COACHING_VISIT.add(COACHING_VISIT);
}
public ArrayList<String> getCHECK_VISIT() {
return CHECK_VISIT;
}
public void setCHECK_VISIT(String CHECK_VISIT) {
this.CHECK_VISIT.add(CHECK_VISIT);
}
ArrayList<String> COACHING_VISIT = new ArrayList<>();
ArrayList<String> CHECK_VISIT = new ArrayList<>();
public String getTable_SUPERVISOR_LIST() {
return table_SUPERVISOR_LIST;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+6
View File
@@ -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();
library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java
-10
View File
@@ -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";
}