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

Merge branch 'master' into saturdayNEWAC

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-21 13:40:05 +05:30
committed by GitHub
parent 2321b02268 25343167d4
commit 12ef109266
18 changed files with 399 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+120 -10
View File
@@ -17,12 +17,14 @@ import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.GeotaggingBeans;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryWisePerformaceGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -124,6 +126,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getMappingPlanogram());
db.execSQL(TableBean.getAdditionalDisplay());
db.execSQL(TableBean.getMappingSosTarget());
} catch (SQLException e) {
e.printStackTrace();
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
@@ -910,7 +914,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
//MSL_Availability
public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilityHeaderData(String category_id) {
public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilityHeaderData(String category_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<MSL_AvailabilityGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
@@ -925,7 +929,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"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 + "' " +
"where M.MUST_HAVE=1 AND CA.CATEGORY_ID='" + category_id +
"' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
"' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" +
"order by SB.SUB_CATEGORY,BR.BRAND", null);
if (dbcursor != null) {
@@ -951,7 +957,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilitySKUData(String category_id, String brand_id) {
public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilitySKUData(String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<MSL_AvailabilityGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
@@ -967,7 +973,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"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 + "'", null);
"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();
@@ -1113,12 +1121,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
//Stock_facing
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingHeaderData(String category_id) {
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingHeaderData(String category_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " +
/*dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " +
"from MAPPING_STOCK M " +
"inner join SKU_MASTER SK " +
"on M.SKU_ID=SK.SKU_ID " +
@@ -1129,6 +1137,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' " +
"order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);*/
dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," +
" (SELECT SUM(SOS_TARGET) FROM MAPPING_SOS_TARGET WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
"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 CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id +
"' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" +
"order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
if (dbcursor != null) {
@@ -1144,6 +1167,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setImage1("");
cd.setImage2("");
if (dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS_TARGET")) != null) {
if (!dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS_TARGET")).equals("")) {
cd.setSos_target(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS_TARGET")));
}
} else {
cd.setSos_target("-");
}
list.add(cd);
dbcursor.moveToNext();
}
@@ -1157,7 +1189,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingSKUData(String category_id, String brand_id) {
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingSKUData(String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id) {
ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
@@ -1172,7 +1204,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on BR.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 + "'", null);
"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 + "'", null);
if (dbcursor != null) {
@@ -1221,6 +1255,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
values1.put("BRAND", data1.getBrand());
values1.put("IMAGE1", data1.getImage1());
values1.put("IMAGE2", data1.getImage2());
values1.put("SOS_TARGET", data1.getSos_target());
db.insert(CommonString.TABLE_INSERT_STOCK_FACING_HEADER, null, values1);
@@ -1268,6 +1303,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
cd.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE1")));
cd.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE2")));
cd.setSos_target(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOS_TARGET")));
list.add(cd);
dbcursor.moveToNext();
@@ -1501,7 +1537,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
Promo_Compliance_DataGetterSetter promo = new Promo_Compliance_DataGetterSetter();
promo.setPromo_id("0");
promo.setPromo("Select");
promo.setPromo(context.getResources().getString(R.string.select_promo));
list.add(promo);
@@ -2306,7 +2342,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
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, 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);
if (cursordata != null) {
cursordata.moveToFirst();
@@ -3306,4 +3342,78 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
return filled;
}
public boolean isMappingAdditionalPromotionData() {
boolean filled = false;
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * FROM MAPPING_ADDITIONAL_PROMOTION ", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
int icount = dbcursor.getInt(0);
dbcursor.close();
if (icount > 0) {
filled = true;
} else {
filled = false;
}
}
} catch (Exception e) {
Log.d("Exception ", " when fetching Records!!!!!!!!!!!!!!!!!!!!! " + e.toString());
return filled;
}
return filled;
}
public boolean checkAdditionalPromoComplianceData(String store_id, String category_id) {
Log.d("PromoCompliance ", "AdditionalPromoCompliance data--------------->Start<------------");
ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data " +
"where CATEGORY_ID='" + category_id + "' and STORE_ID='" + store_id + "'", null);
if (dbcursor != null) {
if (dbcursor.moveToFirst()) {
do {
Promo_Compliance_DataGetterSetter sb = new Promo_Compliance_DataGetterSetter();
sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
list.add(sb);
} while (dbcursor.moveToNext());
}
dbcursor.close();
return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
return false;
}
Log.d("Stock_Facing ", "midday---------------------->Stop<-----------");
return false;
}
public void InsertMAPPING_SOS_TARGET(MAPPING_SOS_TARGET_MasterGetterSetter data) {
db.delete("MAPPING_SOS_TARGET", 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("BRAND_ID", data.getBRAND_ID().get(i));
values.put("SOS_TARGET", data.getSOS_TARGET().get(i));
db.insert("MAPPING_SOS_TARGET", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " MAPPING_SOS_TARGET " + ex.toString());
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+27 -8
View File
@@ -247,7 +247,7 @@ public class LoginActivity extends AppCompatActivity {
View focusView = null;
// Check for a valid password, if the user entered one.
if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) {
if (TextUtils.isEmpty(password)) {
mPasswordView.setError(getString(R.string.error_invalid_password));
focusView = mPasswordView;
cancel = true;
@@ -268,26 +268,45 @@ public class LoginActivity extends AppCompatActivity {
// There was an error; don't attempt login and focus the first
// form field with an error.
focusView.requestFocus();
} else {
} else if(!isuseridValid(userid)){
Snackbar.make(museridView,getString(R.string.error_incorrect_username),Snackbar.LENGTH_SHORT).show();
}else if(!isPasswordValid(password)){
Snackbar.make(museridView,getString(R.string.error_incorrect_password),Snackbar.LENGTH_SHORT).show();
}else{
// Show a progress spinner, and kick off a background task to
// perform the user login attempt.
//showProgress(true);
/* mAuthTask = new UserLoginTask(userid, password);
mAuthTask.execute((Void) null);*/
new AuthenticateTask().execute();
}
}
private boolean isuseridValid(String userid) {
//TODO: Replace this with your own logic
return userid.contains("@");
boolean flag = true;
String u_id = preferences.getString(CommonString.KEY_USERNAME, "");
if (!u_id.equals("") && !userid.equals(u_id)) {
flag = false;
}
return flag;
}
private boolean isPasswordValid(String password) {
//TODO: Replace this with your own logic
return password.length() > 4;
boolean flag = true;
String pw = preferences.getString(CommonString.KEY_PASSWORD, "");
if(!pw.equals("") &&!password.equals(pw)){
flag = false;
}
return flag;
}
/**
GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+1
View File
@@ -76,6 +76,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
intent.putExtra(CommonString.KEY_LOGIN_DATA, login_data);
startActivity(intent);
finish();
} else {
Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+3
View File
@@ -254,6 +254,9 @@ public class CommonString {
+ "BRAND"
+ " VARCHAR,"
+ "SOS_TARGET"
+ " VARCHAR,"
+ "IMAGE1"
+ " VARCHAR,"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+39 -3
View File
@@ -48,6 +48,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_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
@@ -79,6 +80,7 @@ public class DownloadActivity extends AppCompatActivity {
MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter mapping_additional_promotion_masterGetterSetter;
STORE_PERFORMANCE_MasterGetterSetter store_performance_masterGetterSetter;
ADDITIONAL_DISPLAY_MASTERGetterSetter additional_display_getter_setter;
MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter;
MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter;
private Dialog dialog;
@@ -613,8 +615,6 @@ public class DownloadActivity extends AppCompatActivity {
data.value = 75;
data.name = "MAPPING_ADDITIONAL_PROMOTION " + getResources().getString(R.string.download_data);
}
}
publishProgress(data);
@@ -692,6 +692,7 @@ public class DownloadActivity extends AppCompatActivity {
}
publishProgress(data);
//MAPPING_PLANOGRAM
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
@@ -724,7 +725,42 @@ public class DownloadActivity extends AppCompatActivity {
} else {
//return "MAPPING_PLANOGRAM";
}
}
publishProgress(data);
// MAPPING_SOS_TARGET
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "MAPPING_SOS_TARGET");
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_sos_target_masterGetterSetter = XMLHandlers.MAPPING_SOS_TARGETXMLHandler(xpp, eventType);
//if (mapping_additional_promotion_masterGetterSetter.getSTORE_ID().size() > 0) {
String table_mapping_sos_target = mapping_sos_target_masterGetterSetter.getTable_MAPPING_SOS_TARGET();
if (table_mapping_sos_target != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingSosTarget(table_mapping_sos_target);
}
if (mapping_sos_target_masterGetterSetter.getSTORE_ID().size() > 0) {
data.value = 75;
data.name = "MAPPING_SOS_TARGET " + getResources().getString(R.string.download_data);
}
}
publishProgress(data);
@@ -864,7 +900,7 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter);
db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter);
db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter);
db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter);
} catch (MalformedURLException e) {
/*final AlertMessage message = new AlertMessage(
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+5 -4
View File
@@ -163,8 +163,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
//data.setCategory_name("Promo Compliance");
data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance));
if (db.isMappingPromotionData()) {
if (db.checkPromoComplianceData(store_id, categoryId)) {
if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) {
if (db.checkPromoComplianceData(store_id, categoryId) ||
db.checkAdditionalPromoComplianceData(store_id, categoryId)) {
data.setCategory_img(R.mipmap.promo_compliance_done);
} else {
data.setCategory_img(R.mipmap.promo_compliance);
@@ -259,7 +260,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
}
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
if (db.isMappingPromotionData()) {
if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) {
holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
} else {
holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
@@ -291,7 +292,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
}
} else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
if (db.isMappingPromotionData()) {
if (db.isMappingPromotionData() || db.isMappingAdditionalPromotionData()) {
Intent intent = new Intent(DailyDataMenuActivity.this, PromoComplianceActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+2 -2
View File
@@ -235,7 +235,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
hashMapListChildData = new HashMap<>();
//Header
headerDataList = db.getMSL_AvailabilityHeaderData(categoryId);
headerDataList = db.getMSL_AvailabilityHeaderData(categoryId, keyAccount_id, storeType_id, class_id);
if (headerDataList.size() > 0) {
for (int i = 0; i < headerDataList.size(); i++) {
@@ -244,7 +244,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
//childDataList = new ArrayList<>();
childDataList = db.getMSL_AvailabilitySKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
childDataList = db.getMSL_AvailabilitySKUData(categoryId, headerDataList.get(i).getBrand_id());
childDataList = db.getMSL_AvailabilitySKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id);
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+47 -34
View File
@@ -39,7 +39,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
ToggleButton toggle_add_InStock, toggle_add_promoAnnouncer, toggle_add_runningPos;
Button btn_add;
ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData, promoSkuListAfterData;
ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData;
ArrayList<Promo_Compliance_DataGetterSetter> promoSpinnerListData;
ArrayList<Promo_Compliance_DataGetterSetter> additionalPromoListData;
@@ -218,10 +218,11 @@ public class PromoComplianceActivity extends AppCompatActivity {
public void onClick(final View v) {
if (!cd.getSp_promo().equals("0")) {
AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this);
builder.setMessage("Are you sure you want to add")
builder.setMessage(getResources().getString(R.string.want_add))
.setCancelable(false)
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.InsertAdditionalPromoData(cd, categoryId);
AdditionalPromoListView();
@@ -230,11 +231,11 @@ public class PromoComplianceActivity extends AppCompatActivity {
toggle_add_promoAnnouncer.setChecked(true);
toggle_add_runningPos.setChecked(true);
Snackbar.make(v, "promo is added", Snackbar.LENGTH_LONG).setAction("Action", null).show();
Snackbar.make(v, getResources().getString(R.string.promo_add), Snackbar.LENGTH_LONG).setAction("Action", null).show();
//Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show();
}
})
.setNegativeButton("No", new DialogInterface.OnClickListener() {
.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
@@ -242,7 +243,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
AlertDialog alert = builder.create();
alert.show();
} else {
Snackbar.make(v, "Select the promo value", Snackbar.LENGTH_LONG).setAction("Action", null).show();
Snackbar.make(v, getResources().getString(R.string.select_promo_value), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
}
});
@@ -251,31 +252,43 @@ public class PromoComplianceActivity extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View view) {
AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this);
builder.setMessage("Are you sure you want to save")
.setCancelable(false)
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
if (db.checkPromoComplianceData(store_id, categoryId)) {
db.updatePromoComplianceSKU(promoSkuListData, categoryId, store_id);
Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertPromoSkuData(promoSkuListData, categoryId);
Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
boolean flag = true;
if (promoSkuListData.size() <= 0) {
if (additionalPromoListData.size() <= 0) {
flag = false;
Snackbar.make(view, getResources().getString(R.string.fill_data), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
}
if (flag) {
AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this);
builder.setMessage(getResources().getString(R.string.want_add))
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
if (db.checkPromoComplianceData(store_id, categoryId)) {
db.updatePromoComplianceSKU(promoSkuListData, categoryId, store_id);
Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else {
db.InsertPromoSkuData(promoSkuListData, categoryId);
Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
alert.show();
}
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
})
.setNegativeButton("No", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
alert.show();
}
});
@@ -421,23 +434,23 @@ public class PromoComplianceActivity extends AppCompatActivity {
//In Stock
if (data.getIn_stock().equals("1")) {
txt_inStock.setText("Yes");
txt_inStock.setText(getResources().getString(R.string.yes));
} else {
txt_inStock.setText("No");
txt_inStock.setText(getResources().getString(R.string.no));
}
//Promo Announcer
if (data.getPromo_announcer().equals("1")) {
txt_promoAnnouncer.setText("Yes");
txt_promoAnnouncer.setText(getResources().getString(R.string.yes));
} else {
txt_promoAnnouncer.setText("No");
txt_promoAnnouncer.setText(getResources().getString(R.string.no));
}
//Running on POS
if (data.getRunning_pos().equals("1")) {
txt_runningPos.setText("Yes");
txt_runningPos.setText(getResources().getString(R.string.yes));
} else {
txt_runningPos.setText("No");
txt_runningPos.setText(getResources().getString(R.string.no));
}
lin_addtional_promo.addView(view);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+21 -15
View File
@@ -311,7 +311,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
//Header Data
headerDataList = db.getStockAndFacingHeader_AfterSaveData(categoryId, store_id);
if (!(headerDataList.size() > 0)) {
headerDataList = db.getStockAndFacingHeaderData(categoryId);
headerDataList = db.getStockAndFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id);
}
if (headerDataList.size() > 0) {
@@ -322,7 +322,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
//Child Data
childDataList = db.getStockAndFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
childDataList = db.getStockAndFacingSKUData(categoryId, headerDataList.get(i).getBrand_id());
childDataList = db.getStockAndFacingSKUData(categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id);
}
hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList);
@@ -405,7 +405,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
flag = false;
Error_Message = "Please fill all the data";
Error_Message = getResources().getString(R.string.fill_data);
break;
}
} else {
@@ -415,7 +415,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
flag = false;
Error_Message = "Please fill all the data";
Error_Message = getResources().getString(R.string.fill_data);
break;
}
}
@@ -427,7 +427,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
flag = false;
Error_Message = "Please fill all the data";
Error_Message = getResources().getString(R.string.fill_data);
break;
}
}
@@ -852,18 +852,24 @@ public class Stock_FacingActivity extends AppCompatActivity {
TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader);
TextView txt_sosHeader = (TextView) convertView.findViewById(R.id.txt_sosHeader);
LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader);
ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1);
ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2);
//ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference);
//ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit);
LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader);
txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
if (headerTitle.getCompany_id().equals("1")) {
txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
if (!headerTitle.getSos_target().equals("") && !headerTitle.getSos_target().equals("-")) {
headerTitle.setSos_target(headerTitle.getSos_target());
} else if (headerTitle.getSos_target().equals("-")) {
headerTitle.setSos_target("-");
}
txt_sosHeader.setText(headerTitle.getSos_target().toString());
txt_sosHeader.setVisibility(View.VISIBLE);
img_camera1.setVisibility(View.VISIBLE);
img_camera2.setVisibility(View.VISIBLE);
@@ -1110,9 +1116,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
if (isDialogOpen) {
isDialogOpen = !isDialogOpen;
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
builder.setMessage("Faceup can not be greater than stock value")
builder.setMessage(getString(R.string.check_faceup))
.setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
isDialogOpen = !isDialogOpen;
@@ -1129,9 +1135,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
if (isDialogOpen) {
isDialogOpen = !isDialogOpen;
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
builder.setMessage("First fill the stock value")
builder.setMessage(getString(R.string.fill_stock_value))
.setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
isDialogOpen = !isDialogOpen;
@@ -1157,14 +1163,14 @@ public class Stock_FacingActivity extends AppCompatActivity {
if (holder.ed_stock.getText().toString().equals("")) {
holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white));
holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.ed_stock.setHint("Empty");
holder.ed_stock.setHint(getString(R.string.empty));
tempflag = true;
}
if (holder.ed_facing.getText().toString().equals("")) {
holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.ed_facing.setHint("Empty");
holder.ed_facing.setHint(getString(R.string.empty));
tempflag = true;
}
@@ -1177,7 +1183,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
if (holder.ed_facing.getText().toString().equals("")) {
holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.ed_facing.setHint("Empty");
holder.ed_facing.setHint(getString(R.string.empty));
tempflag = true;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_SOS_TARGET_MasterGetterSetter.java
+47
View File
@@ -0,0 +1,47 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
/**
* Created by gagang on 21-01-2017.
*/
public class MAPPING_SOS_TARGET_MasterGetterSetter {
String table_MAPPING_SOS_TARGET;
ArrayList<String> STORE_ID = new ArrayList<>();
ArrayList<String> BRAND_ID = new ArrayList<>();
ArrayList<String> SOS_TARGET = new ArrayList<>();
public String getTable_MAPPING_SOS_TARGET() {
return table_MAPPING_SOS_TARGET;
}
public void setTable_MAPPING_SOS_TARGET(String table_MAPPING_SOS_TARGET) {
this.table_MAPPING_SOS_TARGET = table_MAPPING_SOS_TARGET;
}
public ArrayList<String> getSTORE_ID() {
return STORE_ID;
}
public void setSTORE_ID(String STORE_ID) {
this.STORE_ID.add(STORE_ID);
}
public ArrayList<String> getBRAND_ID() {
return BRAND_ID;
}
public void setBRAND_ID(String BRAND_ID) {
this.BRAND_ID.add(BRAND_ID);
}
public ArrayList<String> getSOS_TARGET() {
return SOS_TARGET;
}
public void setSOS_TARGET(String SOS_TARGET) {
this.SOS_TARGET.add(SOS_TARGET);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_FacingGetterSetter.java
+9 -1
View File
@@ -6,7 +6,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
public class Stock_FacingGetterSetter {
String category_id, sub_category_id, sub_category, brand_id, brand,
sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2;
sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target;
public String getSub_category_id() {
return sub_category_id;
@@ -127,4 +127,12 @@ public class Stock_FacingGetterSetter {
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
public String getSos_target() {
return sos_target;
}
public void setSos_target(String sos_target) {
this.sos_target = sos_target;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+12 -1
View File
@@ -23,6 +23,9 @@ public class TableBean {
public static String MAPPING_ADDITIONAL_PROMOTION;
public static String STORE_PERFORMANCE;
public static String MAPPING_PLANOGRAM;
public static String MAPPING_SOS_TARGET;
public static String getAdditionalDisplay() {
return ADDITIONAL_DISPLAY;
@@ -158,5 +161,13 @@ public class TableBean {
MAPPING_PLANOGRAM = mappingPlanogram;
}
//Gagan end code
public static String getMappingSosTarget() {
return MAPPING_SOS_TARGET;
}
public static void setMappingSosTarget(String mappingSosTarget) {
MAPPING_SOS_TARGET = mappingSosTarget;
}
//Gagan end code
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+28 -5
View File
@@ -16,6 +16,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_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
@@ -752,13 +753,35 @@ public class XMLHandlers {
return st;
}
public static MAPPING_SOS_TARGET_MasterGetterSetter MAPPING_SOS_TARGETXMLHandler(XmlPullParser xpp, int eventType) {
MAPPING_SOS_TARGET_MasterGetterSetter st = new MAPPING_SOS_TARGET_MasterGetterSetter();
try {
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
if (xpp.getEventType() == XmlPullParser.START_TAG) {
if (xpp.getName().equals("META_DATA")) {
st.setTable_MAPPING_SOS_TARGET(xpp.nextText());
}
if (xpp.getName().equals("STORE_ID")) {
st.setSTORE_ID(xpp.nextText());
}
if (xpp.getName().equals("BRAND_ID")) {
st.setBRAND_ID(xpp.nextText());
}
if (xpp.getName().equals("SOS_TARGET")) {
st.setSOS_TARGET(xpp.nextText());
}
}
xpp.next();
}
} catch (XmlPullParserException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return st;
}
}
GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+3 -1
View File
@@ -9,7 +9,9 @@
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
card_view:cardCornerRadius="10dp">
<LinearLayout
GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+2 -2
View File
@@ -77,12 +77,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:hint="@string/stock_facing_stock"
android:inputType="number"
android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<!--android:hint="@string/stock_facing_stock"-->
</LinearLayout>
<LinearLayout
@@ -106,12 +106,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:hint="@string/stock_facing_faceup"
android:inputType="number"
android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<!--android:hint="@string/stock_facing_faceup"-->
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+1 -1
View File
@@ -46,7 +46,7 @@
android:layout_height="match_parent"
android:layout_weight=".6"
android:paddingRight="5dp"
android:text="@string/stock_facing_sos"
android:text="-"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
GSKMTOrange/src/main/res/values-tr/string.xml
+16
View File
@@ -190,12 +190,28 @@
<!--Gagan end new code 2-->
<string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
<string name="error_incorrect_username">Bu kullanıcı adı yanlış</string>
<string name="error">Hata! paylaşılıyor</string>
<string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string>
<string name="data_downloaded_successfully">Veri başarıyla indirildi</string>
<string name="DELETE_ALERT_MESSAGE">Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz?</string>
<string name="NodataAvailable">Veri yok</string>
<string name="Pleasedownaloaddata">Lütfen verileri indirin</string>
<!--Gagan start code 3-->
<string name="cancel">İptal etmek</string>
<string name="empty">Boş</string>
<string name="check_faceup">Raf Payı, stoktan daha az veya eşit olmalıdır</string>
<string name="fill_stock_value">Önce stok değerini doldurun</string>
<string name="want_add">Verileri eklemek istiyor musunuz?</string>
<string name="promo_add">Promosyon eklendi</string>
<string name="select_promo_value">Promosyon değerini seçin</string>
<string name="select_promo">Seçiniz</string>
<!--Gagan end code 3-->
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+16
View File
@@ -228,9 +228,25 @@
<string name="uploadeddata">Uploaded Data</string>
<string name="previous_data_upload">Please Upload Previous Data First</string>
<string name="error_incorrect_username">This username is incorrect</string>
<string name="error">Error Uploading</string>
<string name="DELETE_ALERT_MESSAGE">Saved data will be lost - Do you want to continue?</string>
<string name="NodataAvailable">No data available</string>
<string name="Pleasedownaloaddata">Please download data</string>
<!--Gagan start code 3-->
<string name="empty">Empty</string>
<string name="check_faceup">Faceup can not be greater than stock value</string>
<string name="fill_stock_value">First fill the stock value</string>
<string name="want_add">Are you sure you want to add</string>
<string name="promo_add">promo is added</string>
<string name="select_promo_value">Select the promo value</string>
<string name="select_promo">Select</string>
<!--Gagan end code 3-->
</resources>