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

PRICING_ADD_STCOK

Browse Source
This commit is contained in:
CPM
2021-03-03 13:56:53 +05:30
parent 864c690d52
commit e7a068e7b8
28 changed files with 594 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/caches/build_file_checksums.ser
Generated
BIN
View File
Binary file not shown.
.idea/modules.xml
Generated
+3 -3
View File
@@ -2,9 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKORANGEV2.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKORANGEV2.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2.GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2.library.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKORANGEV2-TURKEY.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKORANGEV2-TURKEY.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2-TURKEY.GSKMTOrange.iml" filepath="$PROJECT_DIR$/.idea/modules/GSKMTOrange/GSKORANGEV2-TURKEY.GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2-TURKEY.library.iml" filepath="$PROJECT_DIR$/.idea/modules/library/GSKORANGEV2-TURKEY.library.iml" />
</modules>
</component>
</project>
GSKMTOrange/build.gradle
+8 -9
View File
@@ -28,26 +28,25 @@ android {
versionName "4.3"*/
//For UAE
versionCode 26
versionName "3.8"
/* versionCode 25
versionName "3.7"*/
//For Turkey
/* versionCode 25
versionName "3.6"*/
/* versionCode 26
versionName "3.8"*/
//For KSA
/* versionCode 28
versionName "4.0"*/
/* versionCode 27
versionName "3.8"*/
versionCode 27
versionName "3.8"
//For SA
/* versionCode 28
versionName "3.9"
*/
versionName "3.9"*/
//sa
/* versionCode 22
/* versionCode 22
versionName "3.4"*/
//Kenya
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+143 -17
View File
@@ -49,6 +49,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SKU_PRICING_ENABLEGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
@@ -231,6 +232,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getTable_MAPPING_PHARMA_MSL());//--Added 16.05.2019
db.execSQL(TableBean.getTable_PROMOTION_TYPE_MASTER());//--Added 18.12.2019
db.execSQL(TableBean.getCategoryWiseSos());//--Added 01.06.2020
db.execSQL(TableBean.getTable_MAPPING_SKU_PRICING_ENABLE());//--Added 01.03.2021
db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_IMAGE_DATA);//--Added 20.05.2019
db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO);//--Added 17.12.2019
db.execSQL(CommonString.CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS);//--Added 17.12.2019
@@ -2717,6 +2719,68 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<BrandMasterGetterSetter> getBrandMasterDataNew(String key_account_id, String category_id,String store_type_id,String class_id) {
Cursor cursordata = null;
ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
try {
/* cursordata = db.rawQuery("SELECT BR.BRAND_ID, SB.SUB_CATEGORY ||'-'|| BR.BRAND AS BRAND FROM BRAND_MASTER BR " +
"INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " +
"INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID =CA.CATEGORY_ID WHERE COMPANY_ID =1 AND SB.CATEGORY_ID ='" + category_id + "'", null);
*/
cursordata = db.rawQuery(" SELECT BR.BRAND_ID, SCM.SUB_CATEGORY ||'-'|| BR.BRAND AS BRAND FROM MAPPING_STOCK MS " +
"INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID " +
"INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID " +
"INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID " +
// "WHERE COMPANY_ID =1 AND SB.CATEGORY_ID ='" + category_id + "'", null);
"WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND SCM.CATEGORY_ID='" + category_id + "' " +
"AND MS.SHOW_ADDITIONAL_VISIBILITY='1'", null);
/* dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM "+ tableName +" MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID " +
"INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID " +
"WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND SM.BRAND_ID='" + brand_id + "' " +
"AND MS.SHOW_ADDITIONAL_VISIBILITY='1' ORDER BY SM.PROMO_SKU, SM.SKU", null);
SELECT BR.BRAND_ID, SCM.SUB_CATEGORY ||'-'|| BR.BRAND AS BRAND FROM MAPPING_STOCK MS
INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID
INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID
INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID
WHERE COMPANY_ID =1 AND MS.KEYACCOUNT_ID ='2332' AND STORETYPE_ID ='51' AND CLASS_ID = '303'
AND SCM.CATEGORY_ID='9' AND MS.SHOW_ADDITIONAL_VISIBILITY='1'*/
if (cursordata != null) {
cursordata.moveToFirst();
while (!cursordata.isAfterLast()) {
BrandMasterGetterSetter sb = new BrandMasterGetterSetter();
sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND")));
/*sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
sb.setCOMPANY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("COMPANY_ID")));
sb.setBRAND_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_SEQUENCE")));*/
Data.add(sb);
cursordata.moveToNext();
}
cursordata.close();
}
} catch (Exception ex) {
}
return Data;
}
public ArrayList<SkuMasterGetterSetter> getSKUMasterData(String brand_id) {
Cursor cursordata = null;
ArrayList<SkuMasterGetterSetter> Data = new ArrayList<SkuMasterGetterSetter>();
@@ -5227,7 +5291,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getMSL_Availability_StockFacingSKUData(
String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName) {
String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
@@ -5235,6 +5299,30 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
if(keyAccount_id!=null){
dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
"from "+ tableName +" M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
"inner join BRAND_MASTER BR " +
"on SK.BRAND_ID=BR.BRAND_ID " +
"inner join SUB_CATEGORY_MASTER SB " +
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
"' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
/* Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE, ifnull(PE.SUB_CATEGORY_ID,0) as PRICING from MAPPING_STOCK M
inner join SKU_MASTER SK on M.SKU_ID=SK.SKU_ID inner join BRAND_MASTER BR on SK.BRAND_ID=BR.BRAND_ID
inner join SUB_CATEGORY_MASTER SB on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID
left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID = 1024 AND SUB_CATEGORY_ID = 3)AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID
inner join CATEGORY_MASTER CA on SB.CATEGORY_ID=CA.CATEGORY_ID
where CA.CATEGORY_ID='2' AND BR.BRAND_ID='24' AND M.KEYACCOUNT_ID = '47' AND M.STORETYPE_ID = '6' AND M.CLASS_ID = '193'
order by M.MUST_HAVE DESC*/
/*
dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE " +
"from "+ tableName +" M " +
"inner join SKU_MASTER SK " +
@@ -5248,9 +5336,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
"' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null);
*/
}
else {
dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE " +
/* dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE " +
"from MAPPING_STOCK_STOREWISE M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -5262,24 +5351,24 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null);
//"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);
//"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);*/
dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " +
"from MAPPING_STOCK_STOREWISE M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
"inner join BRAND_MASTER BR " +
"on SK.BRAND_ID=BR.BRAND_ID " +
"inner join SUB_CATEGORY_MASTER SB " +
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null);
//"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);
}
/*dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ " +
"from MAPPING_STOCK M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
"inner join BRAND_MASTER BR " +
"on SK.BRAND_ID=BR.BRAND_ID " +
"inner join SUB_CATEGORY_MASTER SB " +
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where M.MUST_HAVE=1 AND " +
"CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
"' AND M.CLASS_ID = '" + class_id + "'", null);*/
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -5293,6 +5382,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
cd.setToggleValue("1");
cd.setFacing("");
cd.setStock("");
@@ -5334,6 +5424,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
list.add(cd);
dbcursor.moveToNext();
@@ -5376,6 +5468,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("STOCK", data.getStock());
values.put("COMPANY_ID", data.getCompany_id());
values.put("MUST_HAVE", data.getMust_have());
values.put("PRICING_DEFAULT", data.getPricing());
if (data.getPricingStock().equals("")) {
values.put("PRICING", "0");
} else {
values.put("PRICING", data.getPricingStock());
}
db.insert(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, values);
}
@@ -5402,12 +5500,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values.put("TOGGLE_VALUE", data.getToggleValue());
values.put("STOCK", data.getStock());
values.put("PRICING_DEFAULT", data.getPricing());
if (data.getFacing().equals("")) {
values.put("FACING", "0");
} else {
values.put("FACING", data.getFacing());
}
if (data.getPricingStock().equals("")) {
values.put("PRICING", "0");
} else {
values.put("PRICING", data.getPricingStock());
}
db.update(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, values,
"Brand_Id ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
@@ -5477,6 +5581,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
cd.setPricingStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING_DEFAULT")));
cd.setPricing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PRICING")));
list.add(cd);
dbcursor.moveToNext();
@@ -8794,4 +8900,24 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public void InsertMAPPING_SKU_PRICING_ENABLE(MAPPING_SKU_PRICING_ENABLEGetterSetter data) {
db.delete("MAPPING_SKU_PRICING_ENABLE", 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("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
db.insert("MAPPING_SKU_PRICING_ENABLE", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", "MAPPING_SKU_PRICING_ENABLE!" + ex.toString());
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+7 -7
View File
@@ -202,7 +202,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mPasswordView.setText("cpm123");*/
//UAE
/*museridView.setText("testuae");
/* museridView.setText("testuae");
mPasswordView.setText("cpm123");*/
@@ -211,14 +211,15 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mPasswordView.setText("cpm@123");*/
/* museridView.setText("testksa");
mPasswordView.setText("cpm123");*/
/* museridView.setText("Ahmed.saied");
/* museridView.setText("Ahmed.saied");
mPasswordView.setText("cpm@123");*/
museridView.setText("testksa");
mPasswordView.setText("cpm123");
//turkey
/* museridView.setText("testmer");
mPasswordView.setText("cpm123");
*/
/*museridView.setText("testmer");
mPasswordView.setText("cpm123");*/
//sa
/* museridView.setText("testsa");
mPasswordView.setText("cpm123");
@@ -753,8 +754,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
}
} else {
//for other than SA
if (preferences.getString(CommonString.KEY_VERSION, "").equals(
Integer.toString(versionCode))) {
if (preferences.getString(CommonString.KEY_VERSION, "").equals(Integer.toString(versionCode))) {
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+6
View File
@@ -981,6 +981,12 @@ public class CommonString {
+ "STOCK"
+ " INTEGER,"
+ "PRICING"
+ " INTEGER,"
+ "PRICING_DEFAULT"
+ " VARCHAR,"
+ "TOGGLE_VALUE"
+ " VARCHAR,"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+2 -1
View File
@@ -188,7 +188,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
///band List
brand_list = db.getBrandMasterData(store_id, categoryId);
//brand_list = db.getBrandMasterData(store_type_id, class_id,key_account_id,categoryId,store_id);
brand_list = db.getBrandMasterDataNew(key_account_id,categoryId,store_type_id,class_id);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
String str = getResources().getString(R.string.select);
brand.setBRAND(str);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java
+1
View File
@@ -124,6 +124,7 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad
imgCam1.setOnClickListener(this);
imgCam2.setOnClickListener(this);
// brand_list = db.getBrandMasterData(store_id, categoryId);
brand_list = db.getBrandMasterData(store_id, categoryId);
//brand_list = db.getBrandData(categoryId);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java
+3 -3
View File
@@ -684,11 +684,11 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa
childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
if (country_id.equals("7")) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java
+4 -4
View File
@@ -265,13 +265,13 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi
childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
if (country_id.equals("7")) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL);
} else {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java
+2 -2
View File
@@ -272,10 +272,10 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba
if (!(childDataList.size() > 0)) {
if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC);
}
else {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class StockPricingActivity extends AppCompatActivity {
childDataList = new ArrayList<>();
//childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (childDataList.size() == 0) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+39 -114
View File
@@ -55,6 +55,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SKU_PRICING_ENABLEGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
@@ -132,6 +133,7 @@ public class DownloadActivity extends AppCompatActivity {
MappingPharmaMSLGetterSetter mappingPharmaMSLGetterSetter;
PROMOTION_TYPE_MASTERGetterSetter promotion_type_masterGetterSetter;
STORE_CATEGORY_WISEGetterSetter store_category_wiseGetterSetter;
MAPPING_SKU_PRICING_ENABLEGetterSetter mapping_sku_pricing_enableGetterSetter;
private Dialog dialog;
private ProgressBar pb;
@@ -1673,6 +1675,42 @@ public class DownloadActivity extends AppCompatActivity {
}
}
publishProgress(data);
//
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "MAPPING_SKU_PRICING_ENABLE");
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();
mapping_sku_pricing_enableGetterSetter = XMLHandlers.mappingMAPPING_SKU_PRICING_ENABLEXMLHandler(xpp, eventType);
String stocktable = mapping_sku_pricing_enableGetterSetter.getTable_MAPPING_SKU_PRICING_ENABLE();
if (stocktable != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setTable_MAPPING_SKU_PRICING_ENABLE(stocktable);
}
if (mapping_sku_pricing_enableGetterSetter.getSTORE_ID().size() > 0) {
data.value = 99;
data.name = "MAPPING_SKU_PRICING_ENABLE " + getResources().getString(R.string.download_data);
} else {
// return "MAPPING_PHARMA_MSL";
}
}
publishProgress(data);
@@ -1900,120 +1938,6 @@ public class DownloadActivity extends AppCompatActivity {
}
}
/* //MAPPING_PLANOGRAM Image save into folder
if (mapping_planogram_masterGetterSetter != null) {
for (int i = 0; i < mapping_planogram_masterGetterSetter.getIMAGE_PATH().size(); i++) {
//publishing image download
if (data.value < 100) {
data.value = data.value + 1;
publishProgress(data);
}
String image_name = mapping_planogram_masterGetterSetter.getPLANOGRAM_IMAGE().get(i);
String path = mapping_planogram_masterGetterSetter.getIMAGE_PATH().get(i);
if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) {
URL url = new URL(path + "/" + image_name);
HttpURLConnection c = (HttpURLConnection) url.openConnection();
c.setRequestMethod("GET");
c.getResponseCode();
c.connect();
if (c.getResponseCode() == 200) {
int length = c.getContentLength();
String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB";
//String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/";
String PATH = CommonString.FILE_PATH_PLANOGRAM;
File file = new File(PATH);
if (!file.isDirectory()) {
file.mkdir();
}
// Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1;
if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) {
File outputFile = new File(file, image_name);
FileOutputStream fos = new FileOutputStream(outputFile);
InputStream is1 = c.getInputStream();
int bytes = 0;
byte[] buffer = new byte[1024];
int len1 = 0;
while ((len1 = is1.read(buffer)) != -1) {
bytes = (bytes + len1);
// data.value = (int) ((double) (((double)
// bytes) / length) * 100);
fos.write(buffer, 0, len1);
}
fos.close();
is1.close();
}
}
}
}
}*/
//MAPPING_COUNTRYWISE_PLANOGRAM file save into folder
/*if (mappingPlanogramCountrywiseGetterSetter != null) {
for (int i = 0; i < mappingPlanogramCountrywiseGetterSetter.getFILE_PATH().size(); i++) {
//publishing image download
if (data.value < 100) {
data.value = data.value + 1;
publishProgress(data);
}
String file_name = mappingPlanogramCountrywiseGetterSetter.getPLANOGRAM_URL().get(i);
String path = mappingPlanogramCountrywiseGetterSetter.getFILE_PATH().get(i);
if (!file_name.equalsIgnoreCase("NA") && !file_name.equalsIgnoreCase("")) {
URL url = new URL(path + "/" + file_name);
HttpURLConnection c = (HttpURLConnection) url.openConnection();
c.setRequestMethod("GET");
c.getResponseCode();
c.connect();
if (c.getResponseCode() == 200) {
int length = c.getContentLength();
String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB";
//String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/";
String PATH = CommonString.FILE_PATH_PDF;
File file = new File(PATH);
if (!file.isDirectory()) {
file.mkdir();
}
// Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1;
if (!new File(PATH + file_name).exists() && !size.equalsIgnoreCase("0 KB")) {
File outputFile = new File(file, file_name);
FileOutputStream fos = new FileOutputStream(outputFile);
InputStream is1 = c.getInputStream();
int bytes = 0;
byte[] buffer = new byte[1024];
int len1 = 0;
while ((len1 = is1.read(buffer)) != -1) {
bytes = (bytes + len1);
// data.value = (int) ((double) (((double)
// bytes) / length) * 100);
fos.write(buffer, 0, len1);
}
fos.close();
is1.close();
}
}
}
}
}*/
db.open();
db.InsertJCP(jcpgettersetter);
db.InsertAdhoc_JCP(adhoc_jcpgettersetter);
@@ -2060,6 +1984,7 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertAdditionalAdhocJCP(additionalAdhocJcpGetterSetter);
db.InsertPROMOTION_TYPE_MASTER(promotion_type_masterGetterSetter);
db.InsertCATEGORYWISE_SOS_TARGET(store_category_wiseGetterSetter);
db.InsertMAPPING_SKU_PRICING_ENABLE(mapping_sku_pricing_enableGetterSetter);
} catch (MalformedURLException e) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
+110 -52
View File
@@ -673,7 +673,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
hashMapListChildData = new HashMap<>();
//Header
if (country_id.equals("7")||country_id.equals("8")) {
if (country_id.equals("7") || country_id.equals("8")) {
headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC);
@@ -689,12 +689,12 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
//childDataList = new ArrayList<>();
childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
if (country_id.equals("7")||country_id.equals("8")) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
if (country_id.equals("7") || country_id.equals("8")) {
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC);
} else {
childDataList = db.getMSL_Availability_StockFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK);
}
}
@@ -717,68 +717,62 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
boolean validateData(List<MSL_AvailabilityStockFacingGetterSetter> listDataHeader,
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> listDataChild) {
boolean flag = true, child_flag = true, all_flag = true;
checkHeaderArray.clear();
int childCount = 0;
//temp list data for empty only
List<MSL_AvailabilityStockFacingGetterSetter> listDataHeaderTemp = new ArrayList<>();
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> listDataChildTemp = new HashMap<>();
for (int i = 0; i < listDataHeader.size(); i++) {
flag = true;
List<MSL_AvailabilityStockFacingGetterSetter> listTemp = new ArrayList<>();
for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) {
child_flag = true;
MSL_AvailabilityStockFacingGetterSetter data = listDataChild.get(listDataHeader.get(i)).get(j);
String stock = data.getStock();
String faceup = data.getFacing();
String defaultpricing = data.getPricing();
String pricing = data.getPricingStock();
//Company_id
if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
if (data.getMust_have().equals("1")) {
/*if (!camera_allow.equalsIgnoreCase("1")) {
if (!(planogramShelfHeaderDataList.size() > 0)) {
//usk
if (!defaultpricing.equals("0")) {
if (pricing.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
Error_Message = getResources().getString(R.string.stock_planogram_data_noCamera_data);
break;
child_flag = false;
Error_Message = getResources().getString(R.string.title_activity_stock_pricing);
}
}*/
}
if (faceup.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.faceup_value);
//break;
} else {
if (data.getToggleValue().equals("0")) {
if (stock.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.stock_value);
//break;
}
} else {
//for Egypt
@@ -787,14 +781,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.stock_value);
// break;
}
}
}
@@ -805,30 +796,57 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
//expandableListView.smoothScrollToPosition(i);
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.faceup_value);
// break;
}
//usk
if (!defaultpricing.equals("0")) {
if (pricing.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.title_activity_stock_pricing);
}
}
}
//usk
/*
if (defaultpricing.equals("0")) {
if (pricing.equals("")) {
if (!checkHeaderArray.contains(i)) {
checkHeaderArray.add(i);
}
scrollPosition = i + j + childCount;
all_flag = false;
flag = false;
child_flag = false;
Error_Message = getResources().getString(R.string.title_activity_stock_pricing);
}
}
*/
if (!child_flag)
listTemp.add(data);
}
if (flag == false) {
//checkflag = false;
listDataHeaderTemp.add(listDataHeader.get(i));
listDataChildTemp.put(listDataHeader.get(i), listTemp);
//break;
} else {
childCount = childCount + listDataChild.get(listDataHeader.get(i)).size();
//checkflag = true;
}
}
@@ -1010,21 +1028,34 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
holder = new ViewHolder();
holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
holder.facing = (EditText) convertView.findViewById(R.id.ed_facing);
holder.facing.setFilters(new InputFilter[]{new DecimalDigitsInputFilter(3, 1)});
holder.stock = (EditText) convertView.findViewById(R.id.ed_stock);
holder.ed_pricing = (EditText) convertView.findViewById(R.id.ed_pricing);
holder.stock_view = convertView.findViewById(R.id.stock_view);
holder.pricing_view = convertView.findViewById(R.id.pricing_view);
convertView.setTag(holder);
} else {
holder = (ViewHolder) convertView.getTag();
}
//usk
if (childData.getPricing().equals("0")) {
holder.ed_pricing.setVisibility(View.GONE);
holder.pricing_view.setVisibility(View.GONE);
holder.ed_pricing.setId(childPosition);
holder.pricing_view.setId(childPosition);
} else {
holder.ed_pricing.setVisibility(View.VISIBLE);
holder.pricing_view.setVisibility(View.VISIBLE);
holder.ed_pricing.setId(childPosition);
holder.pricing_view.setId(childPosition);
}
holder.txt_skuName.setText(childData.getSku());
holder.txt_mbq.setText(childData.getMbq());
@@ -1033,7 +1064,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
holder.txt_mbq.setVisibility(View.VISIBLE);
holder.toggle_available.setVisibility(View.VISIBLE);
holder.facing.setVisibility(View.VISIBLE);
// holder.facing.setVisibility(View.VISIBLE);
if (country_id.equals("6")) {
holder.stock.setVisibility(View.VISIBLE);
@@ -1054,7 +1085,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
holder.txt_mbq.setVisibility(View.GONE);
holder.toggle_available.setVisibility(View.GONE);
holder.facing.setVisibility(View.VISIBLE);
// holder.facing.setVisibility(View.VISIBLE);
holder.stock.setVisibility(View.GONE);
holder.stock_view.setVisibility(View.GONE);
}
@@ -1072,17 +1103,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
}
/* if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
*//*holder.txt_mbq.setVisibility(View.GONE);
holder.toggle_available.setVisibility(View.GONE);
holder.facing.setVisibility(View.VISIBLE);
holder.stock.setVisibility(View.GONE);*//*
}*/
final ViewHolder finalHolder = holder;
holder.toggle_available.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
@@ -1259,6 +1279,33 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
});
holder.stock.setText(childData.getStock());
holder.ed_pricing.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
/*final EditText caption = (EditText) v;
String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", "");
if (!edStock.equals("")) {
String stock = edStock;
}*/
if (!hasFocus) {
final EditText Caption = (EditText) v;
String value1 = Caption.getText().toString().replaceFirst("^0+(?!$)", "");
if (value1.equals("")) {
childData.setPricingStock("");
finalHolder.ed_pricing.setText("");
finalHolder.ed_pricing.setId(childPosition);
} else {
childData.setPricingStock(value1);
finalHolder.ed_pricing.setText(value1);
finalHolder.ed_pricing.setId(childPosition);
}
}
}
});
holder.ed_pricing.setText(childData.getPricingStock());
final ViewHolder finalHolder1 = holder;
final ViewHolder finalHolder2 = holder;
@@ -1479,6 +1526,17 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
if (!checkflag) {
boolean tempflag = false;
//usk pricing
if (!childData.getPricing().equals("0")) {
if (holder.ed_pricing.getText().toString().equals("")) {
holder.ed_pricing.setBackgroundColor(getResources().getColor(R.color.white));
holder.ed_pricing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.ed_pricing.setHint(getString(R.string.empty));
tempflag = true;
}
}
if (childData.getCompany_id().equals("1")) {
if (childData.getToggleValue().equals("0")) {
@@ -1578,8 +1636,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
TextView txt_skuName, txt_mbq;
ToggleButton toggle_available;
LinearLayout lin_category;
EditText facing, stock;
View stock_view;
EditText facing, stock, ed_pricing;
View stock_view, pricing_view;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+8 -2
View File
@@ -602,12 +602,17 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
String stock;
String stock,pricing;
if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
stock = msl_availabilityStockFacingList.get(j).getStock();
} else {
stock = "0";
}
if (!msl_availabilityStockFacingList.get(j).getPricingStock().equals("")) {
pricing = msl_availabilityStockFacingList.get(j).getPricingStock();
} else {
pricing = "-1";
}
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
//+ "[USERID]" + userId + "[/USERID]"
@@ -616,6 +621,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
+ "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
+ "[SK]" + Integer.parseInt(stock) + "[/SK]"
+ "[PRICING]" + Integer.parseInt(pricing) + "[/PRICING]"
+ "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
"[/ST]";
@@ -627,7 +633,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST");
request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST_NEW");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+9 -589
View File
@@ -834,12 +834,17 @@ public class UploadActivity extends AppCompatActivity {
for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) {
if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) {
String stock;
String stock,pricing;
if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) {
stock = msl_availabilityStockFacingList.get(j).getStock();
} else {
stock = "0";
}
if (!msl_availabilityStockFacingList.get(j).getPricingStock().equals("")) {
pricing = msl_availabilityStockFacingList.get(j).getPricingStock();
} else {
pricing = "-1";
}
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
//+ "[USERID]" + userId + "[/USERID]"
@@ -848,6 +853,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
+ "[SK]" + Integer.parseInt(stock) + "[/SK]"
+ "[PRICING]" + Integer.parseInt(pricing) + "[/PRICING]"
+ "[ML]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/ML]" +
"[/ST]";
@@ -859,7 +865,7 @@ public class UploadActivity extends AppCompatActivity {
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST");
request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST_NEW");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
@@ -1814,589 +1820,13 @@ public class UploadActivity extends AppCompatActivity {
publishProgress(data);
db.open();
//db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_D);
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
.getVisitDate(), CommonString.KEY_D, coverageList.get(i).getFlag_from());
//db.deleteTableWithStoreID(coverageList.get(i).getStoreId());
}
data.value = 90;
publishProgress(data);
//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
// Images Upload
// ashish visibility image start
/* if (additionalVisibilityList.size() > 0) {
for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) {
if (additionalVisibilityList.get(i1).getImage() != null && !additionalVisibilityList.get(i1).getImage().equals("")) {
if (new File(CommonString.FILE_PATH + additionalVisibilityList.get(i1).getImage()).exists()) {
try {
result = UploadImage(additionalVisibilityList.get(i1).getImage(), "AdditionalVisibilityImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "AdditionalVisibilityImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("AdditionalVisibilityImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (additionalVisibilityList.get(i1).getImage2() != null && !additionalVisibilityList.get(i1).getImage2().equals("")) {
if (new File(CommonString.FILE_PATH + additionalVisibilityList.get(i1).getImage2()).exists()) {
try {
result = UploadImage(additionalVisibilityList.get(i1).getImage2(), "AdditionalVisibilityImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "AdditionalVisibilityImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("AdditionalVisibilityImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (additionalVisibilityList.get(i1).getImage3() != null && !additionalVisibilityList.get(i1).getImage3().equals("")) {
if (new File(CommonString.FILE_PATH + additionalVisibilityList.get(i1).getImage3()).exists()) {
try {
result = UploadImage(additionalVisibilityList.get(i1).getImage3(), "AdditionalVisibilityImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "AdditionalVisibilityImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("AdditionalVisibilityImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 64;
publishProgress(data);
// ashish close image
// ashish SUB_CATEGORY_PICTURE start
if (adddata.size() > 0) {
for (int J = 0; J < adddata.size(); J++) {
String KeyID = adddata.get(J).getKEY_ID();
db.open();
listdat = db.getCategoryPictureListUploaded(KeyID);
if (listdat.size() > 0) {
for (int i1 = 0; i1 < listdat.size(); i1++) {
if (listdat.get(i1).getSubCategoryCamera1() != null && !listdat.get(i1).getSubCategoryCamera1().equals("")) {
if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera1()).exists()) {
try {
result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (listdat.get(i1).getSubCategoryCamera2() != null && !listdat.get(i1).getSubCategoryCamera2().equals("")) {
if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera2()).exists()) {
try {
result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
}
}
data.value = 70;
publishProgress(data);
// ashish CATEGORY_PICTURE start
if (adddata.size() > 0) {
for (int i1 = 0; i1 < adddata.size(); i1++) {
if (adddata.get(i1).getCategoryImage1() != null && !adddata.get(i1).getCategoryImage1().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage1()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage1(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (adddata.get(i1).getCategoryImage2() != null && !adddata.get(i1).getCategoryImage2().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage2()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage2(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (adddata.get(i1).getCategoryImage3() != null && !adddata.get(i1).getCategoryImage3().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage3()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage3(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (adddata.get(i1).getCategoryImage4() != null && !adddata.get(i1).getCategoryImage4().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage4()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage4(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 75;
publishProgress(data);
if (adddata.size() > 0) {
for (int i1 = 0; i1 < adddata.size(); i1++) {
if (adddata.get(i1).getCategoryImage1() != null && !adddata.get(i1).getCategoryImage1().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage1()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage1(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (adddata.get(i1).getCategoryImage2() != null && !adddata.get(i1).getCategoryImage2().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage2()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage2(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (adddata.get(i1).getCategoryImage3() != null && !adddata.get(i1).getCategoryImage3().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage3()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage3(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (adddata.get(i1).getCategoryImage4() != null && !adddata.get(i1).getCategoryImage4().equals("")) {
if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage4()).exists()) {
try {
result = UploadImage(adddata.get(i1).getCategoryImage4(), "CategoryImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 75;
publishProgress(data);
//Start store images
if (coverageList.size() > 0) {
for (int i1 = 0; i1 < coverageList.size(); i1++) {
if (coverageList.get(i1).getImage() != null && !coverageList.get(i1).getImage().equals("")) {
if (new File(CommonString.FILE_PATH + coverageList.get(i1).getImage()).exists()) {
try {
result = UploadImage(coverageList.get(i1).getImage(), "StoreImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StoreImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("StoreImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 80;
publishProgress(data);
//PromoCompliance Image
if (promotionSkuList.size() > 0) {
for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
if (promotionSkuList.get(i1).getImage_promotion() != null && !promotionSkuList.get(i1).getImage_promotion().equals("")) {
if (new File(CommonString.FILE_PATH + promotionSkuList.get(i1).getImage_promotion()).exists()) {
try {
result = UploadImage(promotionSkuList.get(i1).getImage_promotion(), "PromotionImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StoreImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("PromotionImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 85;
publishProgress(data);
//Additional PromoCompliance Image
if (additionalPromotionList.size() > 0) {
for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
if (additionalPromotionList.get(i1).getImage_promotion() != null && !additionalPromotionList.get(i1).getImage_promotion().equals("")) {
if (new File(CommonString.FILE_PATH + additionalPromotionList.get(i1).getImage_promotion()).exists()) {
try {
result = UploadImage(additionalPromotionList.get(i1).getImage_promotion(), "AdditionalPromotionImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StoreImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("AdditionalPromotionImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 88;
publishProgress(data);
//CheckOut Store Image
if (coverageList.size() > 0) {
for (int i1 = 0; i1 < coverageList.size(); i1++) {
if (coverageList.get(i1).getCheckOut_Image() != null && !coverageList.get(i1).getCheckOut_Image().equals("")) {
if (new File(CommonString.FILE_PATH + coverageList.get(i1).getCheckOut_Image()).exists()) {
try {
result = UploadImage(coverageList.get(i1).getCheckOut_Image(), "StoreImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "StoreImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("StoreImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
data.value = 85;
publishProgress(data);
//T2p Images
for (int m = 0; m < t2PGetterSetters.size(); m++) {
if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) {
if (new File(CommonString.FILE_PATH + t2PGetterSetters.get(m).getImage()).exists()) {
try {
result = UploadImage(t2PGetterSetters.get(m).getImage(), "T2PImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "T2PImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("T2P Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (t2PGetterSetters.get(m).getImage1() != null && !t2PGetterSetters.get(m).getImage1().equals("")) {
if (new File(CommonString.FILE_PATH + t2PGetterSetters.get(m).getImage1()).exists()) {
try {
result = UploadImage(t2PGetterSetters.get(m).getImage1(), "T2PImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "T2PImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("T2P Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (t2PGetterSetters.get(m).getImage2() != null && !t2PGetterSetters.get(m).getImage2().equals("")) {
if (new File(CommonString.FILE_PATH + t2PGetterSetters.get(m).getImage2()).exists()) {
try {
result = UploadImage(t2PGetterSetters.get(m).getImage2(), "T2PImages");
*//*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "T2PImages";
}*//*
runOnUiThread(new Runnable() {
public void run() {
message.setText("T2P Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
//Audit Answer Image
for (int m = 0; m < audit_data.size(); m++) {
if (audit_data.get(m).getCAM_IMAGE() != null && !audit_data.get(m).getCAM_IMAGE().equals("")) {
if (new File(CommonString.FILE_PATH + audit_data.get(m).getCAM_IMAGE()).exists()) {
try {
result = UploadImage(audit_data.get(m).getCAM_IMAGE(), "AuditImages");
runOnUiThread(new Runnable() {
public void run() {
message.setText("Audit Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (audit_data.get(m).getCAM_IMAGE2() != null && !audit_data.get(m).getCAM_IMAGE2().equals("")) {
if (new File(CommonString.FILE_PATH + audit_data.get(m).getCAM_IMAGE2()).exists()) {
try {
result = UploadImage(audit_data.get(m).getCAM_IMAGE2(), "AuditImages");
runOnUiThread(new Runnable() {
public void run() {
message.setText("Audit Images Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}*/
data.value = 90;
publishProgress(data);
// SET COVERAGE 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]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
request.addProperty("onXML", sos_xml);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope);
result = envelope.getResponse();
//If Result is success then status of that store is update
if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
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)
.getVisitDate(), CommonString.KEY_U, coverageList.get(i).getFlag_from());
db.deleteTableWithStoreID(coverageList.get(i).getStoreId());
}
data.value = 100;
publishProgress(data);*/
}
}
}
@@ -2406,16 +1836,10 @@ public class UploadActivity extends AppCompatActivity {
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (IOException e) {
// Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
//Crashlytics.logException(e.getCause());
//Crashlytics.logException(new Exception(e.getCause()));
e.printStackTrace();
} catch (XmlPullParserException e) {
e.printStackTrace();
} catch (Exception e) {
// Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString());
// Crashlytics.logException(e.getCause());
// Crashlytics.logException(new Exception(e.getCause()));
e.printStackTrace();
}
@@ -2437,11 +1861,7 @@ public class UploadActivity extends AppCompatActivity {
UploadImageWithRetrofit.totalFiles = file.length;
UploadImageWithRetrofit uploadImg = new UploadImageWithRetrofit(date, userId, UploadActivity.this);
uploadImg.UploadImageRecursiveNew(UploadActivity.this);
/* }
else {
showAlert(getString(R.string.data_uploaded_successfully));
}*/
//showAlert(getString(R.string.menu_upload_data));
} else {
showAlert(getString(R.string.error) + result.toString());
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
+4 -124
View File
@@ -81,130 +81,8 @@ public class UploadImageWithRetrofit {
pd.show();
}
/*public void UploadImageRecursive(final Context context) {
try {
status = 0;
String filename = null, foldername = null;
int totalfiles = 0;
File f = new File(CommonString.FILE_PATH_OLD);
File file[] = f.listFiles();
count = file.length;
if (file.length > 0) {
filename = "";
totalfiles = f.listFiles().length;
pd.setMessage(context.getString(R.string.uploaddata)+" - " +context.getString(R.string.image) + " (" + uploadedFiles + "/" + totalFiles + ")");
for (int i = 0; i < file.length; i++) {
if (new File(CommonString.FILE_PATH_OLD + file[i].getName()).exists()) {
if (file[i].getName().contains("SI_") || file[i].getName().contains("CHK_SI_") || file[i].getName().contains("NonWorking")) {
foldername = "StoreImages";
} else if (file[i].getName().contains("GeoTag")) {
foldername = "GeotagImages";
} else if (file[i].getName().contains("T2P_Image")) {
foldername = "T2PImages";
} else if (file[i].getName().contains("AddPromo_Image")) {
foldername = "AdditionalPromotionImages";
} else if (file[i].getName().contains("Promo_Image")) {
foldername = "PromotionImages";
} else if (file[i].getName().contains("CategoryPicture")) {
foldername = "CategoryImages";
} else if (file[i].getName().contains("AuditAnsPic")) {
foldername = "AuditImages";
} else {
foldername = "Bulkimages";
}
filename = file[i].getName();
}
break;
}
File originalFile = new File(CommonString.FILE_PATH_OLD + filename);
final File finalFile = saveBitmapToFileSmaller(originalFile);
OkHttpClient okHttpClient = new OkHttpClient();
okHttpClient.setConnectTimeout(20, TimeUnit.SECONDS);
okHttpClient.setWriteTimeout(20, TimeUnit.SECONDS);
okHttpClient.setReadTimeout(20, TimeUnit.SECONDS);
com.squareup.okhttp.RequestBody photo = com.squareup.okhttp.RequestBody.create(com.squareup.okhttp.MediaType.parse("application/octet-stream"), finalFile);
body1 = new MultipartBuilder()
.type(MultipartBuilder.FORM)
.addFormDataPart("file", finalFile.getName(), photo)
.addFormDataPart("FolderName", foldername)
.build();
adapter = new retrofit.Retrofit.Builder()
.baseUrl(CommonString.URL + "/")
.addConverterFactory(new StringConverterFactory())
.build();
PostApiForFile api = adapter.create(PostApiForFile.class);
retrofit.Call<String> call = api.getUploadImage(body1);
call.enqueue(new retrofit.Callback<String>() {
@Override
public void onResponse(retrofit.Response<String> response) {
if (response.isSuccess() && response.body().contains("Success")) {
finalFile.delete();
status = 1;
uploadedFiles++;
} else {
status = 0;
//uploadedFiles = 0;
}
if (status == 0) {
pd.dismiss();
if (!((Activity) context).isFinishing()) {
showAlert((Activity) context, context.getString(R.string.DataNot),false);
}
} else {
UploadImageRecursive(context);
}
}
@Override
public void onFailure(Throwable t) {
if (t instanceof IOException || t instanceof SocketTimeoutException || t instanceof SocketException) {
status = -1;
//uploadedFiles = 0;
pd.dismiss();
// AlertandMessages.showAlert((Activity) context, "Network Error in upload", false);
if (!((Activity) context).isFinishing()) {
showAlert((Activity) context, context.getString(R.string.NetworkError),false);
}
}
}
});
} else {
if (totalFiles == uploadedFiles) {
//region Coverage upload status Data
//new StatusUpload().execute();
//endregion
pd.cancel();
showAlert((Activity) context, context.getString(R.string.data_uploaded_successfully),true);
}
}
} catch (JsonSyntaxException e) {
e.printStackTrace();
showAlert((Activity) context, "Invalid Json",false);
} catch (Exception e) {
e.printStackTrace();
if (totalFiles == uploadedFiles) {
showAlert((Activity) context, context.getString(R.string.data_uploaded_successfully),true);
} else {
showAlert((Activity) context, CommonString.KEY_FAILURE,false);
}
}
}*/
public void UploadImageRecursiveNew(final Context context) {
try {
status = 0;
String filename = null, foldername = null;
int totalfiles = 0;
@@ -450,7 +328,8 @@ public class UploadImageWithRetrofit {
in = new FileInputStream(file2);
options = new BitmapFactory.Options();
// calc rough re-size (this is no exact resize)
options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224);
//usk commonet code
// options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224);
// decode full image
Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options);
@@ -465,7 +344,8 @@ public class UploadImageWithRetrofit {
Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true);
// save image
FileOutputStream out = new FileOutputStream(file2);
resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 80, out);
// resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 80, out);
resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
} catch (Exception e) {
Log.e("Image", e.toString(), e);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_SKU_PRICING_ENABLEGetterSetter.java
+41
View File
@@ -0,0 +1,41 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
/**
* Created by upendra on 01-03-2021.
*/
public class MAPPING_SKU_PRICING_ENABLEGetterSetter {
String table_MAPPING_SKU_PRICING_ENABLE;
ArrayList<String> STORE_ID = new ArrayList<>();
ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
public String getTable_MAPPING_SKU_PRICING_ENABLE() {
return table_MAPPING_SKU_PRICING_ENABLE;
}
public void setTable_MAPPING_SKU_PRICING_ENABLE(String table_MAPPING_SKU_PRICING_ENABLE) {
this.table_MAPPING_SKU_PRICING_ENABLE = table_MAPPING_SKU_PRICING_ENABLE;
}
public ArrayList<String> getSTORE_ID() {
return STORE_ID;
}
public void setSTORE_ID(String STORE_ID) {
this.STORE_ID.add(STORE_ID);
}
public ArrayList<String> getSUB_CATEGORY_ID() {
return SUB_CATEGORY_ID;
}
public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java
+35 -2
View File
@@ -7,8 +7,41 @@ import java.io.Serializable;
*/
public class MSL_AvailabilityStockFacingGetterSetter implements Serializable{
String sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, toggleValue, mbq, category_id, facing="", stock,company_id,must_have;
String sub_category_id;
String sub_category;
String brand_id;
String brand;
String sku_id;
String sku;
String mrp;
String sku_sequence;
String toggleValue;
String mbq;
String category_id;
String facing="";
String stock;
String company_id;
String must_have;
public String getPricing() {
return pricing;
}
public void setPricing(String pricing) {
this.pricing = pricing;
}
String pricing;
public String getPricingStock() {
return pricingStock;
}
public void setPricingStock(String pricingStock) {
this.pricingStock = pricingStock;
}
String pricingStock="";
public String getImgPath() {
return imgPath;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+10
View File
@@ -55,6 +55,16 @@ public class TableBean {
public static String Table_MAPPING_PLANOGRAM_STORE_WISE;
public static String Table_PROMOTION_TYPE_MASTER;
public static String getTable_MAPPING_SKU_PRICING_ENABLE() {
return Table_MAPPING_SKU_PRICING_ENABLE;
}
public static void setTable_MAPPING_SKU_PRICING_ENABLE(String table_MAPPING_SKU_PRICING_ENABLE) {
Table_MAPPING_SKU_PRICING_ENABLE = table_MAPPING_SKU_PRICING_ENABLE;
}
public static String Table_MAPPING_SKU_PRICING_ENABLE;
public static String getTable_PROMOTION_TYPE_MASTER() {
return Table_PROMOTION_TYPE_MASTER;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+31
View File
@@ -21,6 +21,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.LoginGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SKU_PRICING_ENABLEGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
@@ -1657,4 +1658,34 @@ public class XMLHandlers {
return st;
}
public static MAPPING_SKU_PRICING_ENABLEGetterSetter mappingMAPPING_SKU_PRICING_ENABLEXMLHandler(XmlPullParser xpp,
int eventType) {
MAPPING_SKU_PRICING_ENABLEGetterSetter stock = new MAPPING_SKU_PRICING_ENABLEGetterSetter();
try {
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
if (xpp.getEventType() == XmlPullParser.START_TAG) {
if (xpp.getName().equals("META_DATA")) {
stock.setTable_MAPPING_SKU_PRICING_ENABLE(xpp.nextText());
}
if (xpp.getName().equals("STORE_ID")) {
stock.setSTORE_ID(xpp.nextText());
}
if (xpp.getName().equals("SUB_CATEGORY_ID")) {
stock.setSUB_CATEGORY_ID(xpp.nextText());
}
}
xpp.next();
}
} catch (XmlPullParserException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return stock;
}
}
GSKMTOrange/src/main/res/layout/content_msl__availability_stock_facing.xml
+22 -4
View File
@@ -142,7 +142,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
@@ -159,7 +159,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
@@ -176,7 +176,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
@@ -193,7 +193,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
@@ -206,6 +206,24 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/pricing"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
</LinearLayout>
<ExpandableListView
GSKMTOrange/src/main/res/layout/fragment_first2.xml
+28
View File
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".First2Fragment">
<TextView
android:id="@+id/textview_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hello_first_fragment"
app:layout_constraintBottom_toTopOf="@id/button_first"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_first" />
</androidx.constraintlayout.widget.ConstraintLayout>
GSKMTOrange/src/main/res/layout/fragment_second2.xml
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Second2Fragment">
<TextView
android:id="@+id/textview_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/button_second"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/previous"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_second" />
</androidx.constraintlayout.widget.ConstraintLayout>
GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml
+35 -4
View File
@@ -52,7 +52,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:layout_weight=".20"
android:orientation="vertical">
<TextView
@@ -69,7 +69,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:layout_weight=".20"
android:orientation="vertical">
<ToggleButton
@@ -87,7 +87,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight=".25"
android:layout_weight=".20"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -115,7 +115,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="5dp"
android:layout_weight=".25"
android:layout_weight=".20"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -141,6 +141,37 @@
android:background="@color/black" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight=".20"
android:gravity="center_vertical"
android:orientation="vertical">
<EditText
android:id="@+id/ed_pricing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:gravity="center"
android:inputType="numberDecimal"
android:maxLength="3"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<View
android:id="@+id/pricing_view"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storelist_child.xml
+2 -3
View File
@@ -81,10 +81,9 @@
android:id="@+id/navigate"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:background="@mipmap/baseline_directions_black_48"
android:visibility="visible"
/>
android:visibility="visible" />
</RelativeLayout>
GSKMTOrange/src/main/res/values/strings.xml
+1 -1
View File
@@ -406,6 +406,7 @@
<string name="additional_stores">Additional Stores</string>
<string name="gsk">GSK</string>
<string name="sos_detail">SOS Detail</string>
<string name="pricing">Pricing</string>
<string name="title_activity_stock_pricing">Stock Pricing</string>
<!--Stock Pricing-->
<string name="price">Price</string>
@@ -431,5 +432,4 @@
<string name="title_activity_stock_avalability">StockAvalability</string>
<string name="title_posm">POSM</string>
</resources>
library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java
+12
View File
@@ -0,0 +1,12 @@
/**
* 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";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}