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

Merge pull request #27 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Update_Manifest

Browse Source 
Gg update manifest
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-10 17:49:53 +05:30
committed by GitHub
parent d8b4050c9a 084cfd7b70
commit 98a9749b23
23 changed files with 843 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/AndroidManifest.xml
+4 -2
View File
@@ -115,8 +115,10 @@
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".gsk_dailyentry.PromoComplianceActivity"
android:label="@string/title_activity_promo_compliance"
android:theme="@style/AppTheme.NoActionBar" />
android:configChanges="screenSize|orientation|keyboardHidden"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<!-- Gagan End Declaration -->
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+194 -8
View File
@@ -1239,7 +1239,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
public long InsertCoverageData(CoverageBean data) {
//db.delete(CommonString1.TABLE_COVERAGE_DATA, "STORE_ID" + "='" + data.getStoreId() + "'", null);
@@ -1272,7 +1271,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return 0;
}
public boolean checkStockAndFacingData(String store_id, String category_id) {
Log.d("Stock_Facing ", "Stock data--------------->Start<------------");
ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
@@ -1440,6 +1438,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
while (!dbcursor.isAfterLast()) {
Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
@@ -1456,11 +1456,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
public void InsertAdditionalPromoData(Promo_Compliance_DataGetterSetter data) {
public void InsertAdditionalPromoData(Promo_Compliance_DataGetterSetter data, String category_id) {
try {
ContentValues values = new ContentValues();
values.put("STORE_ID", Integer.parseInt(data.getStore_id()));
values.put("CATEGORY_ID", Integer.parseInt(category_id));
values.put("SKU_ID", Integer.parseInt(data.getSku_id()));
values.put("SKU", data.getSku());
values.put("PROMO_ID", Integer.parseInt(data.getPromo_id()));
values.put("PROMO", data.getPromo());
values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock()));
@@ -1473,12 +1476,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
public ArrayList<Promo_Compliance_DataGetterSetter> getAdditionalPromoData() {
public ArrayList<Promo_Compliance_DataGetterSetter> getAdditionalPromoData(String store_id, String category_id) {
ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data ", null);
dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data " +
"where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -1486,6 +1490,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
@@ -1652,9 +1659,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " +
"where VISIT_DATE ='" + date + "' AND STORE_ID'="+ store_id +"'", null);
"where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -1706,7 +1712,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setGEO_TAG(dbcursor.getString(dbcursor
.getColumnIndexOrThrow("GEO_TAG")));
//dbcursor.moveToNext();
dbcursor.moveToNext();
}
dbcursor.close();
return sb;
@@ -1742,6 +1748,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//Gagan start new code 1
//Promo Compliance update data
public void updatePromoComplianceSKU(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData,
String categoryId, String storeId) {
ContentValues values = new ContentValues();
@@ -1801,6 +1808,185 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
return list;
}
//MSL_Availability Server Upload Data
public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilityUploadServerData(String store_id) {
ArrayList<MSL_AvailabilityGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Msl_Availability_Data " +
"where Store_Id='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityGetterSetter cd = new MSL_AvailabilityGetterSetter();
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Brand_Id")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
return list;
}
return list;
}
//Stock Facing Server Upload Data
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingHeaderServerUploadData(String store_id) {
ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Header_Data " +
"where Store_Id='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
cd.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE1")));
cd.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE2")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get Stock_FacingHeader server upload !" + e.toString());
return list;
}
return list;
}
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingSKUServerUploadData(String category_id, String brand_id) {
ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Child_Data " +
"where category_id='" + category_id + "' and Brand_Id='" + brand_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK_VALUE")));
cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACEUP_VALUE")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get Stock_Facing Sku After Save Data!" + e.toString());
return list;
}
return list;
}
//Promo Compliance Promotion Data
public ArrayList<Promo_Compliance_DataGetterSetter> getPromoComplianceSkuServerUploadData(String store_id) {
ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Promo_SKU_Data " +
"where STORE_ID='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE")));
cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "getPromoComplianceSkuAfterData!" + e.toString());
return list;
}
return list;
}
public ArrayList<Promo_Compliance_DataGetterSetter> getAdditionalPromotionServerUploadData(String store_id) {
ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data " +
"where STORE_ID='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE")));
cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString());
return list;
}
return list;
}
//Gagan end new code 1
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+8 -9
View File
@@ -194,19 +194,18 @@ public class MainActivity extends AppCompatActivity
.setAction("Action", null).show();
} else {
if (isStoreCheckedIn()&& isValid()) {
//if (isStoreCheckedIn()&& isValid()) {
Intent i = new Intent(getBaseContext(),
UploadActivity.class);
startActivity(i);
Intent i = new Intent(getBaseContext(), UploadActivity.class);
startActivity(i);
finish();
//finish();
} else {
/*} else {
Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT)
.setAction("Action", null).show();
}
}*/
}
@@ -374,7 +373,7 @@ public class MainActivity extends AppCompatActivity
return result_flag;
}
public boolean isValid(){
public boolean isValid() {
boolean flag = false;
String storestatus;
for (int i = 0; i < coverageList.size(); i++) {
@@ -393,7 +392,7 @@ public class MainActivity extends AppCompatActivity
}
}
if(!flag)
if (!flag)
error_msg = getResources().getString(R.string.no_data_for_upload);
return flag;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+9 -2
View File
@@ -102,6 +102,10 @@ public class CommonString {
public static final String SOAP_ACTION_UPLOAD_STORE_COVERAGE = "http://tempuri.org/"
+ METHOD_UPLOAD_COVERAGE;
public static final String METHOD_UPLOAD_IMAGE = "GetImageWithFolderName";
public static final String SOAP_ACTION_UPLOAD_IMAGE = "http://tempuri.org/" + METHOD_UPLOAD_IMAGE;
//Alert Messages
@@ -278,11 +282,14 @@ public class CommonString {
+ "STORE_ID"
+ " INTEGER,"
/*+ "SKU_ID"
+ "CATEGORY_ID"
+ " INTEGER,"
+ "SKU_ID"
+ " INTEGER,"
+ "SKU"
+ " VARCHAR,"*/
+ " VARCHAR,"
+ "PROMO_ID"
+ " INTEGER,"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+6 -6
View File
@@ -47,9 +47,6 @@ public class CategoryListActivity extends AppCompatActivity {
setContentView(R.layout.activity_category_list);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
db = new GSKOrangeDB(this);
db.open();
@@ -65,9 +62,12 @@ public class CategoryListActivity extends AppCompatActivity {
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
//txt_categoryName.setText("Category List");
txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list));
/*txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list));*/
toolbar.setTitle(getResources().getString(R.string.title_activity_category_list));
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
fab.setOnClickListener(new View.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+6 -6
View File
@@ -37,18 +37,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
setContentView(R.layout.activity_category_wise_performance);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
//txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
//txt_categoryName.setText("CategoryWise Performance " + categoryName);
txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
//txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+6 -6
View File
@@ -48,12 +48,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
setContentView(R.layout.activity_daily_data_menu);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
//txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
db = new GSKOrangeDB(this);
db.open();
@@ -73,8 +70,11 @@ public class DailyDataMenuActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
//txt_categoryName.setText("Daily Data Menu - " + categoryName);
txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
//txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
toolbar.setTitle(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
/*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+5 -6
View File
@@ -65,9 +65,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
setContentView(R.layout.activity_msl__availability);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
@@ -90,9 +87,11 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
//txt_mslAvailabilityName.setText(categoryName);
txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
//txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability));
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
prepareList();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+7 -2
View File
@@ -52,6 +52,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
setContentView(R.layout.activity_promo_compliance);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar.setTitle(getResources().getString(R.string.title_activity_promo_compliance));
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -95,6 +96,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
cd.setStore_id(store_id);
cd.setPromo_id("");
cd.setPromo("");
cd.setSku_id("");
cd.setSku("");
cd.setIn_stock("1");
cd.setPromo_announcer("1");
cd.setRunning_pos("1");
@@ -160,6 +163,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
for (int i = 0; i < promoSpinnerListData.size(); i++) {
if (position == i) {
cd.setSku_id(promoSpinnerListData.get(i).getSku_id());
cd.setSku(promoSpinnerListData.get(i).getSku());
cd.setSp_promo(promoSpinnerListData.get(i).getPromo_id());
cd.setPromo(promoSpinnerListData.get(i).getPromo());
cd.setPromo_id(promoSpinnerListData.get(i).getPromo_id());
@@ -188,7 +193,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.InsertAdditionalPromoData(cd);
db.InsertAdditionalPromoData(cd, categoryId);
AdditionalPromoListView();
sp_promo.setSelection(0);
@@ -359,7 +364,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
lin_addtional_promo.removeAllViews();
//Additional Promo List
additionalPromoListData = db.getAdditionalPromoData();
additionalPromoListData = db.getAdditionalPromoData(store_id, categoryId);
View view;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+6 -6
View File
@@ -81,15 +81,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
setContentView(R.layout.activity_stock_facing);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
db = new GSKOrangeDB(this);
db.open();
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName);
//txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName);
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -105,8 +102,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
//txt_stockFacingName.setText(categoryName);
txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing));
//txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing));
toolbar.setTitle(getResources().getString(R.string.title_activity_stock_facing));
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
prepareList();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+466 -127
View File
@@ -3,10 +3,13 @@ package cpm.com.gskmtorange.upload;
import android.app.Dialog;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.WindowManager;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -14,16 +17,29 @@ import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xmlpull.v1.XmlPullParserException;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class UploadActivity extends AppCompatActivity {
@@ -33,6 +49,7 @@ public class UploadActivity extends AppCompatActivity {
GSKOrangeDB db;
ArrayList<CoverageBean> coverageList;
private FailureGetterSetter failureGetterSetter = null;
private SharedPreferences preferences;
String date, userId, app_version;
@@ -41,25 +58,34 @@ public class UploadActivity extends AppCompatActivity {
String[] words;
String validity;
int mid;
private int factor, k=0;
private int factor, k = 0;
String errormsg = "", Path;
Data data;
ArrayList<MSL_AvailabilityGetterSetter> msl_availabilityList;
ArrayList<Stock_FacingGetterSetter> stock_facingHeaderList, stock_facingChildList;
ArrayList<Promo_Compliance_DataGetterSetter> promotionSkuList, additionalPromotionList;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_upload);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
date = preferences.getString(CommonString.KEY_DATE, null);
userId = preferences.getString(CommonString.KEY_USERNAME, null);
app_version = preferences.getString(CommonString.KEY_VERSION, null);
db = new GSKOrangeDB(getApplicationContext());
db = new GSKOrangeDB(this);
db.open();
Path = CommonString.FILE_PATH;
//start upload
new UploadTask(getApplicationContext()).execute();
new UploadTask(this).execute();
}
class Data {
@@ -68,7 +94,6 @@ public class UploadActivity extends AppCompatActivity {
}
private class UploadTask extends AsyncTask<Void, Data, String> {
private Context context;
UploadTask(Context context) {
@@ -78,12 +103,12 @@ public class UploadActivity extends AppCompatActivity {
@Override
protected void onPreExecute() {
super.onPreExecute();
dialog = new Dialog(context);
dialog.setContentView(R.layout.custom);
dialog.setTitle("Uploading Data");
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);
@@ -96,24 +121,18 @@ public class UploadActivity extends AppCompatActivity {
pb.setProgress(values[0].value);
percentage.setText(values[0].value + "%");
message.setText(values[0].name);
}
@Override
protected String doInBackground(Void... params) {
try {
data = new Data();
coverageList = db.getCoverageData(date);
if (coverageList.size() > 0) {
if (coverageList.size() == 1) {
factor = 50;
} else {
factor = 100 / (coverageList.size());
}
}
@@ -123,165 +142,405 @@ public class UploadActivity extends AppCompatActivity {
storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
if (storeData.getSTORE_ID() != null) {
if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {
/*if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {*/
String camera_allow = storeData.getCAMERA_ALLOW();
String camera_allow = storeData.getCAMERA_ALLOW();
String onXML = "[DATA][USER_DATA][STORE_CD]"
+ coverageList.get(i).getStoreId()
+ "[/STORE_CD]" + "[VISIT_DATE]"
+ coverageList.get(i).getVisitDate()
+ "[/VISIT_DATE][LATITUDE]"
+ coverageList.get(i).getLatitude()
+ "[/LATITUDE][APP_VERSION]"
+ app_version
+ "[/APP_VERSION][LONGITUDE]"
+ coverageList.get(i).getLongitude()
+ "[/LONGITUDE][IN_TIME]"
+ coverageList.get(i).getInTime()
+ "[/IN_TIME][OUT_TIME]"
+ coverageList.get(i).getOutTime()
+ "[/OUT_TIME][UPLOAD_STATUS]"
+ "N"
+ "[/UPLOAD_STATUS][USER_ID]" + userId
+ "[/USER_ID][IMAGE_URL]" + coverageList.get(i).getImage()
+ "[/IMAGE_URL][REASON_ID]"
+ coverageList.get(i).getReasonid()
+ "[/REASON_ID][REASON_REMARK]"
+ coverageList.get(i).getRemark()
+ "[/REASON_REMARK][CAMERA_ALLOWED]"
+ camera_allow
+ "[/CAMERA_ALLOWED][/USER_DATA][/DATA]";
String onXML = "[DATA]"
+ "[USER_DATA]"
+ "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]"
+ "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
+ "[LATITUDE]" + coverageList.get(i).getLatitude() + "[/LATITUDE]"
+ "[APP_VERSION]" + app_version + "[/APP_VERSION]"
+ "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
+ "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
//+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
+ "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+ "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
+ "[REASON_ID]" + coverageList.get(i).getReasonid() + "[/REASON_ID]"
+ "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]"
+ "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]"
+ "[/USER_DATA]"
+ "[/DATA]";
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE);
request.addProperty("onXML", onXML);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
SoapObject request = new SoapObject(
CommonString.NAMESPACE,
CommonString.METHOD_UPLOAD_COVERAGE);
request.addProperty("onXML", onXML);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
Object result = (Object) envelope.getResponse();
HttpTransportSE androidHttpTransport = new HttpTransportSE(
CommonString.URL);
datacheck = result.toString();
words = datacheck.split("\\;");
validity = (words[0]);
if (validity.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_P);
androidHttpTransport
.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE,
envelope);
Object result = (Object) envelope.getResponse();
datacheck = result.toString();
words = datacheck.split("\\;");
validity = (words[0]);
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);
} else {
return CommonString.METHOD_UPLOAD_COVERAGE;
}
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P);
} else {
return CommonString.METHOD_UPLOAD_COVERAGE;
}
mid = Integer.parseInt((words[1]));
k = k + factor;
data.value = k;
data.name = "Uploading";
//MSL_Availability
String mslAvailability_xml = "";
onXML = "";
msl_availabilityList = db.getMSL_AvailabilityUploadServerData(coverageList.get(i).getStoreId());
if (msl_availabilityList.size() > 0) {
for (int j = 0; j < msl_availabilityList.size(); j++) {
if (!msl_availabilityList.get(j).getSku_id().equals("0")) {
onXML = "[MSL_AVAILABILITY_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]"
+ "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]"
//+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
+ "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+ "[/MSL_AVAILABILITY_DATA]";
mslAvailability_xml = mslAvailability_xml + onXML;
}
}
final String sos_xml = "[DATA]" + mslAvailability_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "MSL_AVAILABILITY_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 10;
data.name = "MSL_Availability Uploading";
publishProgress(data);
String final_xml = "";
// Add below------------------
//Stock and Facing
String stock_facing_xml = "";
onXML = "";
stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId());
if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
if (!stock_facingHeaderList.get(i1).getCategory_id().equals("0")) {
stock_facingChildList = db.getStockAndFacingSKUServerUploadData(
stock_facingHeaderList.get(i1).getCategory_id(), stock_facingHeaderList.get(i1).getBrand_id());
String stockChildXML = "";
for (int j = 0; j < stock_facingChildList.size(); j++) {
stockChildXML = "[STOCK_FACING_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ "[SUB_CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]"
+ "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]"
+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]"
+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]"
+ "[SKU_ID]" + Integer.parseInt(stock_facingChildList.get(j).getSku_id()) + "[/SKU_ID]"
//+ "[SKU]" + stock_facingChildList.get(j).getSku() + "[/SKU]"
+ "[STOCK]" + Integer.parseInt(stock_facingChildList.get(j).getStock()) + "[/STOCK]"
+ "[FACEUP]" + Integer.parseInt(stock_facingChildList.get(j).getFacing()) + "[/FACEUP]"
+ "[/STOCK_FACING_DATA]";
onXML = onXML + stockChildXML;
}
stock_facing_xml = stock_facing_xml + onXML;
}
}
final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STOCK_FACING_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 20;
data.name = "Stock Facing Uploading";
publishProgress(data);
//Promo Compliance - Promotion Data
String promoition_data_xml = "";
onXML = "";
promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
if (promotionSkuList.size() > 0) {
for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
onXML = "[PROMOTION_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
//+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
+ "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
+ "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+ "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+ "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+ "[/PROMOTION_DATA]";
promoition_data_xml = promoition_data_xml + onXML;
}
}
final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "PROMOTION_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 30;
data.name = "Promotion Data Uploading";
publishProgress(data);
//Promo Compliance -Additional Promotion Data
String additional_promoition_data_xml = "";
onXML = "";
additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
if (additionalPromotionList.size() > 0) {
for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
onXML = "[ADDITIONAL_PROMOTION_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+ "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+ "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
//+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
+ "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+ "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+ "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+ "[/ADDITIONAL_PROMOTION_DATA]";
additional_promoition_data_xml = additional_promoition_data_xml + onXML;
}
}
final String sos_xml = "[DATA]" + additional_promoition_data_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 35;
data.name = "Additional Promotion Data Uploading";
publishProgress(data);
//Image Upload
//Stock Facing Images Upload
if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) {
if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage1()).exists()) {
try {
result = UploadImage(stock_facingHeaderList.get(i1).getImage1(), "StockImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (stock_facingHeaderList.get(i1).getImage2() != null && !stock_facingHeaderList.get(i1).getImage2().equals("")) {
if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage2()).exists()) {
try {
result = UploadImage(stock_facingHeaderList.get(i1).getImage2(), "StockImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StockImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("StockFacing Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
// SET COVERAGE STATUS
final_xml = "";
String onXML = "";
onXML = "[COVERAGE_STATUS][STORE_ID]"
+ coverageList.get(i).getStoreId()
+ "[/STORE_ID]"
+ "[VISIT_DATE]"
+ coverageList.get(i).getVisitDate()
+ "[/VISIT_DATE]"
+ "[USER_ID]"
+ coverageList.get(i).getUserId()
+ "[/USER_ID]"
+ "[STATUS]"
+ CommonString.KEY_U
+ "[/STATUS]"
String final_xml = "";
onXML = "";
onXML = "[COVERAGE_STATUS]"
+ "[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]"
+ "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
+ "[USER_ID]" + coverageList.get(i).getUserId() + "[/USER_ID]"
+ "[STATUS]" + CommonString.KEY_U + "[/STATUS]"
+ "[/COVERAGE_STATUS]";
final_xml = final_xml + onXML;
final String sos_xml = "[DATA]" + final_xml
+ "[/DATA]";
final String sos_xml = "[DATA]" + final_xml + "[/DATA]";
SoapObject request = new SoapObject(
CommonString.NAMESPACE,
CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
request.addProperty("onXML", sos_xml);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
SoapEnvelope.VER11);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(
CommonString.URL);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION+CommonString.METHOD_UPLOAD_COVERAGE_STATUS,
envelope);
Object result = (Object) envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(
CommonString.KEY_SUCCESS)) {
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
}
if (result.toString().equalsIgnoreCase(
CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
}
if (result.toString().equalsIgnoreCase(
CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
}
k = k + factor;
data.value = k;
data.name = "Uploading";
publishProgress(data);
db.open();
db.updateCoverageStatus(coverageList.get(i)
.getStoreId(), CommonString.KEY_U);
db.updateStoreStatusOnLeave(coverageList.get(i)
.getStoreId(), coverageList.get(i)
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U);
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
.getVisitDate(), CommonString.KEY_U);
// }
}
}
} catch (IOException e) {
e.printStackTrace();
} catch (XmlPullParserException e) {
e.printStackTrace();
}
return "";
}
@@ -289,9 +548,89 @@ public class UploadActivity extends AppCompatActivity {
protected void onPostExecute(String result) {
super.onPostExecute(result);
if(result.equals("")){
dialog.dismiss();
if (result.equals("")) {
finish();
}
}
}
public String UploadImage(String path, String folder_name) throws Exception {
errormsg = "";
BitmapFactory.Options o = new BitmapFactory.Options();
o.inJustDecodeBounds = true;
BitmapFactory.decodeFile(Path + path, o);
// The new size we want to scale to
final int REQUIRED_SIZE = 1639;
// Find the correct scale value. It should be the power of 2.
int width_tmp = o.outWidth, height_tmp = o.outHeight;
int scale = 1;
while (true) {
if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
break;
width_tmp /= 2;
height_tmp /= 2;
scale *= 2;
}
// Decode with inSampleSize
BitmapFactory.Options o2 = new BitmapFactory.Options();
o2.inSampleSize = scale;
Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao);
byte[] ba = bao.toByteArray();
String ba1 = Base64.encodeBytes(ba);
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
String[] split = path.split("/");
String path1 = split[split.length - 1];
request.addProperty("img", ba1);
request.addProperty("name", path1);
request.addProperty("FolderName", folder_name);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
Object result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
return CommonString.KEY_FALSE;
}
SAXParserFactory saxPF = SAXParserFactory.newInstance();
SAXParser saxP = saxPF.newSAXParser();
XMLReader xmlR = saxP.getXMLReader();
// for failure
FailureXMLHandler failureXMLHandler = new FailureXMLHandler();
xmlR.setContentHandler(failureXMLHandler);
InputSource is = new InputSource();
is.setCharacterStream(new StringReader(result.toString()));
xmlR.parse(is);
failureGetterSetter = failureXMLHandler.getFailureGetterSetter();
if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
errormsg = failureGetterSetter.getErrorMsg();
return CommonString.KEY_FAILURE;
}
} else {
//new File(Path + path).delete();
}
return result.toString();
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityGetterSetter.java
+9 -1
View File
@@ -6,7 +6,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
public class MSL_AvailabilityGetterSetter {
String sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, toggleValue,mbq;
sku_id, sku, mrp, sku_sequence, toggleValue,mbq,category_id;
public String getSub_category_id() {
return sub_category_id;
@@ -87,4 +87,12 @@ public class MSL_AvailabilityGetterSetter {
public void setMbq(String mbq) {
this.mbq = mbq;
}
public String getCategory_id() {
return category_id;
}
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java
+9 -1
View File
@@ -7,7 +7,7 @@ import java.util.ArrayList;
*/
public class Promo_Compliance_DataGetterSetter {
String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, running_pos, sp_promo;
String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, running_pos, sp_promo, category_id;
public String getStore_id() {
return store_id;
@@ -80,4 +80,12 @@ public class Promo_Compliance_DataGetterSetter {
public void setSp_promo(String sp_promo) {
this.sp_promo = sp_promo;
}
public String getCategory_id() {
return category_id;
}
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_FacingGetterSetter.java
+9 -1
View File
@@ -5,7 +5,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
*/
public class Stock_FacingGetterSetter {
String sub_category_id, sub_category, brand_id, brand,
String category_id, sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2;
public String getSub_category_id() {
@@ -119,4 +119,12 @@ public class Stock_FacingGetterSetter {
public void setImage2(String image2) {
this.image2 = image2;
}
public String getCategory_id() {
return category_id;
}
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/FailureXMLHandler.java
+36 -42
View File
@@ -1,53 +1,47 @@
package cpm.com.gskmtorange.xmlHandlers;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
public class FailureXMLHandler extends DefaultHandler{
private String elementValue;
private FailureGetterSetter failureGetterSetter = null;
public FailureGetterSetter getFailureGetterSetter()
{
return failureGetterSetter;
}
public class FailureXMLHandler extends DefaultHandler {
@Override
public void startDocument() throws SAXException {
// TODO Auto-generated method stub
super.startDocument();
failureGetterSetter = new FailureGetterSetter();
}
private String elementValue;
private FailureGetterSetter failureGetterSetter = null;
@Override
public void characters(char[] ch, int start, int length)
throws SAXException {
// TODO Auto-generated method stub
super.characters(ch, start, length);
elementValue = new String(ch, start, length);
}
@Override
public void endElement(String uri, String localName, String qName)
throws SAXException {
// TODO Auto-generated method stub
super.endElement(uri, localName, qName);
if(qName.equals("STATUS"))
{
failureGetterSetter.setStatus(elementValue);
}
else if(qName.equals("ERRORMSG"))
{
failureGetterSetter.setErrorMsg(elementValue);
}
}
public FailureGetterSetter getFailureGetterSetter() {
return failureGetterSetter;
}
@Override
public void startDocument() throws SAXException {
// TODO Auto-generated method stub
super.startDocument();
failureGetterSetter = new FailureGetterSetter();
}
@Override
public void characters(char[] ch, int start, int length)
throws SAXException {
// TODO Auto-generated method stub
super.characters(ch, start, length);
elementValue = new String(ch, start, length);
}
@Override
public void endElement(String uri, String localName, String qName)
throws SAXException {
// TODO Auto-generated method stub
super.endElement(uri, localName, qName);
if (qName.equals("STATUS")) {
failureGetterSetter.setStatus(elementValue);
} else if (qName.equals("ERRORMSG")) {
failureGetterSetter.setErrorMsg(elementValue);
}
}
}
GSKMTOrange/src/main/res/layout/content_category_list.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp"
android:text="Category Performance"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView"
GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp"
android:text="Category Performance"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView"
GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp"
android:text="Daily Data Menu"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView"
GSKMTOrange/src/main/res/layout/content_msl__availability.xml
+2 -1
View File
@@ -24,7 +24,8 @@
android:paddingTop="10dp"
android:text="Must Have Availability"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/lin_category"
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+2 -1
View File
@@ -25,7 +25,8 @@
android:paddingTop="10dp"
android:text="@string/title_activity_promo_compliance"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:visibility="gone" />
<ScrollView
android:id="@+id/scrollView_promoCompliance"
GSKMTOrange/src/main/res/layout/content_stock_facing.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp"
android:text="Stock Facing"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/lin_category"
GSKMTOrange/src/main/res/layout/custom.xml
+51 -3
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="fill_parent">
<ProgressBar
<!--<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
@@ -25,6 +25,54 @@
android:layout_height="wrap_content"
android:layout_below="@+id/progressBar1"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true" />
android:layout_centerHorizontal="true" />-->
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
android:text="Uploading Data"
android:textSize="@dimen/text_size_small" />
<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_title"
android:paddingLeft="5dp"
android:paddingRight="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/progressBar1"
android:orientation="horizontal"
android:weightSum="2">
<TextView
android:id="@+id/percentage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:paddingBottom="10dp"
android:paddingLeft="5dp" />
<TextView
android:id="@+id/message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:gravity="right"
android:paddingBottom="10dp"
android:paddingRight="5dp" />
</LinearLayout>
</RelativeLayout>
GSKMTOrange/src/main/res/values/strings.xml
-3
View File
@@ -101,9 +101,6 @@
<string name="title_store_list_download_data">Please Download Data First</string>
<string name="enter_the_values">Enter the values</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="title_activity_upload">Upload Data</string>
<string name="no_data_for_upload">No Data For Upload</string>
<string name="first_checkout_store">First checkout of store</string>