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

Merge pull request #76 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/YSY_t2p_updated

Browse Source 
T2P upload data newss
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-20 12:55:42 +05:30
committed by GitHub
parent dc2d5a4b31 5677d6df11
commit ddb9845b9e
7 changed files with 148 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+15 -2
View File
@@ -3,9 +3,11 @@ package cpm.com.gskmtorange.Database;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.HashMap;
@@ -55,9 +57,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public static final int DATABASE_VERSION = 13;
TableBean tableBean;
private SQLiteDatabase db;
Context context;
public GSKOrangeDB(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
this.context = context;
}
public void open() {
@@ -71,6 +76,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
@Override
public void onCreate(SQLiteDatabase db) {
try {
db.execSQL(TableBean.getJourneyPlan());
//Gagan Start
@@ -118,6 +124,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getMappingPlanogram());
db.execSQL(TableBean.getAdditionalDisplay());
} catch (SQLException e) {
e.printStackTrace();
Toast.makeText(context,"Error -" +e.toString(),Toast.LENGTH_SHORT).show();
}
}
@@ -142,6 +152,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_INSERT_PROMO_SKU, "STORE_ID='" + storeid + "'", null);
//Gagan end code
db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, "STORE_ID='" + storeid + "'", null);
}
public void deleteAllTables() {
@@ -161,6 +172,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.delete(CommonString.TABLE_INSERT_PROMO_SKU, null, null);
//Gagan end code
db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, null);
}
public void InsertJCP(JourneyPlanGetterSetter data) {
@@ -310,7 +323,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
//get Brand data for T2P
public ArrayList<BrandMasterGetterSetter> getBrandT2PData(String store_type_id, String class_id, String key_account_id) {
public ArrayList<BrandMasterGetterSetter> getBrandT2PData(String store_type_id, String class_id, String key_account_id, String category_id) {
ArrayList<BrandMasterGetterSetter> brandList = new ArrayList<>();
Cursor dbcursor = null;
@@ -318,7 +331,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT 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 MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1' ORDER BY SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE) As Brand", null);
dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT 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 MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1' AND SCM.CATEGORY_ID = '"+ category_id +"' ORDER BY SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE ) As Brand", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+2
View File
@@ -1008,7 +1008,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
public void showSkuDialog() {
final ArrayList<BrandMasterGetterSetter> brandList = db.getBrandT2PData(store_type_id, class_id, key_account_id);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
brand.setBRAND(getResources().getString(R.string.select));
brandList.add(0, brand);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+1 -1
View File
@@ -413,7 +413,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
final SkuGetterSetter[] sku_selected = new SkuGetterSetter[1];
final BrandMasterGetterSetter[] brand_selected = new BrandMasterGetterSetter[1];
final ArrayList<BrandMasterGetterSetter> brandList = db.getBrandT2PData(storeType_id, class_id, keyAccount_id);
final ArrayList<BrandMasterGetterSetter> brandList = db.getBrandT2PData(storeType_id, class_id, keyAccount_id, categoryId);
BrandMasterGetterSetter brand = new BrandMasterGetterSetter();
brand.setBRAND("select");
brandList.add(0, brand);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+43 -31
View File
@@ -35,6 +35,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.text.DecimalFormat;
import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
@@ -102,7 +103,6 @@ public class DownloadActivity extends AppCompatActivity {
}
class Data {
int value;
String name;
@@ -359,7 +359,6 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
// MAPPING_STOCK
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -380,17 +379,20 @@ public class DownloadActivity extends AppCompatActivity {
xpp.next();
eventType = xpp.getEventType();
mappingStockGetterSetter = XMLHandlers.mappingStockXMLHandler(xpp, eventType);
if (mappingStockGetterSetter.getSKU_ID().size() > 0) {
String stocktable = mappingStockGetterSetter.getTable_MAPPING_STOCK();
if (stocktable != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingStock(stocktable);
}
} else {
return "MAPPING_STOCK";
}
if (mappingStockGetterSetter.getSKU_ID().size() > 0) {
data.value = 45;
data.name = "MAPPING_STOCK " + getResources().getString(R.string.download_data);
} else {
// return "MAPPING_STOCK";
}
}
publishProgress(data);
@@ -415,17 +417,21 @@ public class DownloadActivity extends AppCompatActivity {
xpp.next();
eventType = xpp.getEventType();
mappingt2PGetterSetter = XMLHandlers.mappingT2pXMLHandler(xpp, eventType);
if (mappingt2PGetterSetter.getSTORE_ID().size() > 0) {
String t2ptable = mappingt2PGetterSetter.getTable_MAPPING_T2P();
if (t2ptable != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingT2p(t2ptable);
}
if (mappingt2PGetterSetter.getSTORE_ID().size() > 0) {
data.value = 50;
data.name = "MAPPING_T2P " + getResources().getString(R.string.download_data);
} else {
//return "MAPPING_T2P";
}
data.value = 50;
data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -483,17 +489,20 @@ public class DownloadActivity extends AppCompatActivity {
xpp.next();
eventType = xpp.getEventType();
mappingChecklistGetterSetter = XMLHandlers.mappingMappingDisplayChecklistXMLHandler(xpp, eventType);
if (mappingChecklistGetterSetter.getCHECKLIST_ID().size() > 0) {
String mapping_display_checklisttable = mappingChecklistGetterSetter.getTable_MAPPING_DISPLAY_CHECKLIST();
if (mapping_display_checklisttable != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingDisplayChecklist(mapping_display_checklisttable);
}
if (mappingChecklistGetterSetter.getCHECKLIST_ID().size() > 0) {
data.value = 60;
data.name = "MAPPING_DISPLAY_CHECKLIST " + getResources().getString(R.string.download_data);
} else {
//return "MAPPING_DISPLAY_CHECKLIST";
}
data.value = 60;
data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data);
}
publishProgress(data);
@@ -553,18 +562,20 @@ public class DownloadActivity extends AppCompatActivity {
xpp.next();
eventType = xpp.getEventType();
mappingPromotionGetterSetter = XMLHandlers.mappingPromotionXMLHandler(xpp, eventType);
//if (mappingPromotionGetterSetter.getSTORE_ID().size() > 0) {
String mapping_promotion_table = mappingPromotionGetterSetter.getTable_MAPPING_PROMOTION();
if (mapping_promotion_table != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingPromotion(mapping_promotion_table);
}
/*} else {
//return "MAPPING_PROMOTION";
}*/
if (mappingPromotionGetterSetter.getSTORE_ID().size() > 0) {
data.value = 70;
data.name = "MAPPING_PROMOTION " + getResources().getString(R.string.download_data);
}
}
publishProgress(data);
@@ -597,12 +608,14 @@ public class DownloadActivity extends AppCompatActivity {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingAdditionalPromotion(mapping_additional_promotion_table);
}
/*} else {
//return "MAPPING_ADDITIONAL_PROMOTION";
}*/
if (mapping_additional_promotion_masterGetterSetter.getSTORE_ID().size() > 0) {
data.value = 75;
data.name = "MAPPING_ADDITIONAL_PROMOTION " + getResources().getString(R.string.download_data);
}
}
publishProgress(data);
@@ -627,22 +640,23 @@ public class DownloadActivity extends AppCompatActivity {
eventType = xpp.getEventType();
store_performance_masterGetterSetter = XMLHandlers.STORE_PERFORMANCEXMLHandler(xpp, eventType);
if (store_performance_masterGetterSetter.getSTORE_ID().size() > 0) {
String table_store_performace = store_performance_masterGetterSetter.getTable_STORE_PERFORMANCE();
if (table_store_performace != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setStorePerformance(table_store_performace);
}
if (store_performance_masterGetterSetter.getSTORE_ID().size() > 0) {
data.value = 80;
data.name = "STORE_PERFORMANCE Data Download";
} else {
//return "STORE_PERFORMANCE";
}
data.value = 80;
data.name = "STORE_PERFORMANCE Data Download";
}
publishProgress(data);
//ADDITIONAL_DISPLAY_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -699,17 +713,18 @@ public class DownloadActivity extends AppCompatActivity {
eventType = xpp.getEventType();
mapping_planogram_masterGetterSetter = XMLHandlers.MAPPING_PLANOGRAM_XMLHandler(xpp, eventType);
if (mapping_planogram_masterGetterSetter.getKEYACCOUNT_ID().size() > 0) {
String table_mapping_planogram = mapping_planogram_masterGetterSetter.getTable_MAPPING_PLANOGRAM();
if (table_mapping_planogram != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingPlanogram(table_mapping_planogram);
}
if (mapping_planogram_masterGetterSetter.getKEYACCOUNT_ID().size() > 0) {
data.value = 85;
data.name = "MAPPING_PLANOGRAM Data Download";
} else {
//return "MAPPING_PLANOGRAM";
}
data.value = 85;
data.name = "MAPPING_PLANOGRAM Data Download";
}
publishProgress(data);
@@ -851,7 +866,6 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter);
} catch (MalformedURLException e) {
/*final AlertMessage message = new AlertMessage(
CompleteDownloadActivity.this,
@@ -933,11 +947,9 @@ public class DownloadActivity extends AppCompatActivity {
if (language.equalsIgnoreCase("English")) {
lang = "EN";
}
else if(language.equalsIgnoreCase("UAE")) {
} else if (language.equalsIgnoreCase("UAE")) {
lang = "AR";
}
else {
} else {
lang = "TR";
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+3 -1
View File
@@ -1043,14 +1043,16 @@ public class UploadActivity extends AppCompatActivity {
dialog.dismiss();
db.deleteAllTables();
showAlert(getString(R.string.menu_upload_data));
if (result.equals("")) {
showAlert(getString(R.string.menu_upload_data));
//showAlert(getString(R.string.menu_upload_data));
}
}
}
@Override
protected void onResume() {
super.onResume();
GSKMTOrange/src/main/res/values-tr/string.xml
+3 -3
View File
@@ -159,9 +159,9 @@
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
<string name="title_store_list_checkout_current">Lütfen önce mağazadan çık</string>
<string name="title_store_list_checkout_Already_filled">Doldurulmuş veriler</string>
<string name="NetworkError">Bağlantı kurulamıyor ,</string>
<string name="uploadeddata">Veriler Paylaşılıyor ,</string>
<string name="DataNot">Veriler Paylaşılmadı ,</string>
<string name="NetworkError">Bağlantı kurulamıyor</string>
<string name="uploadeddata">Veriler Paylaşılıyor</string>
<string name="DataNot">Veriler Paylaşılmadı</string>
<string name="delete">Sil</string>
<string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
<string name="displayname">Teşhir Türü</string>
GSKMTOrange/src/main/res/values/strings.xml
+3
View File
@@ -224,6 +224,9 @@
<string name="data_downloaded_successfully">Data downloaded successfully</string>
<string name="export_database">Export Database</string>
<string name="data_exported_successfully">Database Exported Successfully</string>
<string name="uploadeddata">Uploaded Data</string>
<string name="previous_data_upload">Please Upload Previous Data First</string>
</resources>