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

Merge pull request #60 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Additional_PromoCompliance_Vlidationa

Browse Source 
//Stock_FacingActivity Changes today
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-16 18:05:20 +05:30
committed by GitHub
parent a3a0bbe64b b340e292e5
commit 4b764fd7d7
4 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+4 -4
View File
@@ -974,13 +974,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
} }
} }
public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilitySKU_AfterSaveData(String category_id, String brand_id) { public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilitySKU_AfterSaveData(String category_id, String brand_id, String store_id) {
ArrayList<MSL_AvailabilityGetterSetter> list = new ArrayList<>(); ArrayList<MSL_AvailabilityGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null; Cursor dbcursor = null;
try { try {
dbcursor = db.rawQuery("Select * from Msl_Availability_Data " + dbcursor = db.rawQuery("Select * from Msl_Availability_Data " +
"where category_id='" + category_id + "' and Brand_Id='" + brand_id + "'", null); "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'", null);
if (dbcursor != null) { if (dbcursor != null) {
dbcursor.moveToFirst(); dbcursor.moveToFirst();
@@ -1232,13 +1232,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list; return list;
} }
public ArrayList<Stock_FacingGetterSetter> getStockAndFacingSKU_AfterSaveData(String category_id, String brand_id) { public ArrayList<Stock_FacingGetterSetter> getStockAndFacingSKU_AfterSaveData(String category_id, String brand_id, String store_id) {
ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>(); ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null; Cursor dbcursor = null;
try { try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Child_Data " + dbcursor = db.rawQuery("Select * from Stock_Facing_Child_Data " +
"where category_id='" + category_id + "' and Brand_Id='" + brand_id + "'", null); "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'", null);
if (dbcursor != null) { if (dbcursor != null) {
dbcursor.moveToFirst(); dbcursor.moveToFirst();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+8 -10
View File
@@ -72,11 +72,11 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
db = new GSKOrangeDB(this); db = new GSKOrangeDB(this);
db.open(); db.open();
//preference data //preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null); store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null);
@@ -226,7 +226,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
} }
private void prepareList() { private void prepareList() {
@@ -242,7 +242,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
hashMapListHeaderData.add(headerDataList.get(i)); hashMapListHeaderData.add(headerDataList.get(i));
//childDataList = new ArrayList<>(); //childDataList = new ArrayList<>();
childDataList = db.getMSL_AvailabilitySKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id()); childDataList = db.getMSL_AvailabilitySKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) { if (!(childDataList.size() > 0)) {
childDataList = db.getMSL_AvailabilitySKUData(categoryId, headerDataList.get(i).getBrand_id()); childDataList = db.getMSL_AvailabilitySKUData(categoryId, headerDataList.get(i).getBrand_id());
} }
@@ -491,15 +491,13 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
private static boolean updateResources(Context context, String language) { private static boolean updateResources(Context context, String language) {
String lang ; String lang;
if(language.equalsIgnoreCase("English")){ if (language.equalsIgnoreCase("English")) {
lang = "EN"; lang = "EN";
} } else if (language.equalsIgnoreCase("UAE")) {
else if(language.equalsIgnoreCase("UAE")) {
lang = "AR"; lang = "AR";
} } else {
else {
lang = "TR"; lang = "TR";
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+33 -32
View File
@@ -50,15 +50,13 @@ public class PromoComplianceActivity extends AppCompatActivity {
private static boolean updateResources(Context context, String language) { private static boolean updateResources(Context context, String language) {
String lang ; String lang;
if(language.equalsIgnoreCase("English")){ if (language.equalsIgnoreCase("English")) {
lang = "EN"; lang = "EN";
} } else if (language.equalsIgnoreCase("UAE")) {
else if(language.equalsIgnoreCase("UAE")) {
lang = "AR"; lang = "AR";
} } else {
else {
lang = "TR"; lang = "TR";
} }
@@ -99,11 +97,11 @@ public class PromoComplianceActivity extends AppCompatActivity {
btn_add = (Button) findViewById(R.id.btn_add); btn_add = (Button) findViewById(R.id.btn_add);
db = new GSKOrangeDB(this); db = new GSKOrangeDB(this);
db.open(); db.open();
//preference data //preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null); store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null);
@@ -218,31 +216,34 @@ public class PromoComplianceActivity extends AppCompatActivity {
btn_add.setOnClickListener(new View.OnClickListener() { btn_add.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(final View v) { public void onClick(final View v) {
AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this); if (!cd.getSp_promo().equals("0")) {
builder.setMessage("Are you sure you want to add") AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this);
.setCancelable(false) builder.setMessage("Are you sure you want to add")
.setPositiveButton("Yes", new DialogInterface.OnClickListener() { .setCancelable(false)
public void onClick(DialogInterface dialog, int id) { .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.InsertAdditionalPromoData(cd, categoryId);
AdditionalPromoListView();
db.InsertAdditionalPromoData(cd, categoryId); sp_promo.setSelection(0);
AdditionalPromoListView(); toggle_add_InStock.setChecked(true);
toggle_add_promoAnnouncer.setChecked(true);
toggle_add_runningPos.setChecked(true);
sp_promo.setSelection(0); Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show();
toggle_add_InStock.setChecked(true); //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show();
toggle_add_promoAnnouncer.setChecked(true); }
toggle_add_runningPos.setChecked(true); })
.setNegativeButton("No", new DialogInterface.OnClickListener() {
Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show(); public void onClick(DialogInterface dialog, int id) {
//Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show(); dialog.cancel();
} }
}) });
.setNegativeButton("No", new DialogInterface.OnClickListener() { AlertDialog alert = builder.create();
public void onClick(DialogInterface dialog, int id) { alert.show();
dialog.cancel(); } else {
} Snackbar.make(v, "Select the promo value", Snackbar.LENGTH_LONG).setAction("Action", null).show();
}); }
AlertDialog alert = builder.create();
alert.show();
} }
}); });
@@ -295,7 +296,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
} }
private void prepareList() { private void prepareList() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+1 -1
View File
@@ -300,7 +300,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
hashMapListHeaderData.add(headerDataList.get(i)); hashMapListHeaderData.add(headerDataList.get(i));
//Child Data //Child Data
childDataList = db.getStockAndFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id()); childDataList = db.getStockAndFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) { if (!(childDataList.size() > 0)) {
childDataList = db.getStockAndFacingSKUData(categoryId, headerDataList.get(i).getBrand_id()); childDataList = db.getStockAndFacingSKUData(categoryId, headerDataList.get(i).getBrand_id());
} }