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

//New Change

Browse Source
This commit is contained in:
Gagan Goel
2017-01-07 10:07:39 +05:30
parent 1260f47b0d
commit 9e285c92a4
2 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+8 -10
View File
@@ -7,9 +7,9 @@ import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Window;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -25,9 +25,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -534,15 +532,15 @@ public class DownloadActivity extends AppCompatActivity {
xpp.next();
eventType = xpp.getEventType();
mappingPromotionGetterSetter = XMLHandlers.mappingPromotionXMLHandler(xpp, eventType);
if (mappingPromotionGetterSetter.getSTORE_ID().size() > 0) {
//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 {
/*} else {
//return "MAPPING_PROMOTION";
}
}*/
data.value = 100;
data.name = "MAPPING_PROMOTION Data Download";
}
@@ -572,15 +570,15 @@ public class DownloadActivity extends AppCompatActivity {
eventType = xpp.getEventType();
mapping_additional_promotion_masterGetterSetter = XMLHandlers.mappingAdditionalPromotionXMLHandler(xpp, eventType);
if (mapping_additional_promotion_masterGetterSetter.getSTORE_ID().size() > 0) {
//if (mapping_additional_promotion_masterGetterSetter.getSTORE_ID().size() > 0) {
String mapping_additional_promotion_table = mapping_additional_promotion_masterGetterSetter.getTable_MAPPING_ADDITIONAL_PROMOTION();
if (mapping_additional_promotion_table != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingAdditionalPromotion(mapping_additional_promotion_table);
}
} else {
/*} else {
//return "MAPPING_ADDITIONAL_PROMOTION";
}
}*/
data.value = 100;
data.name = "MAPPING_ADDITIONAL_PROMOTION Data Download";
}
@@ -600,8 +598,8 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertMappingStock(mappingStockGetterSetter);
db.InsertDisplayChecklistMaster(checklistMasterGetterSetter);
db.InsertMappingDisplayChecklist(mappingChecklistGetterSetter);
db.InsertMAPPING_ADDITIONAL_PROMOTION(mapping_additional_promotion_masterGetterSetter);
db.InsertMAPPING_PROMOTION(mappingPromotionGetterSetter);
db.InsertMAPPING_ADDITIONAL_PROMOTION(mapping_additional_promotion_masterGetterSetter);
db.insertNonWorkingData(nonWorkingReasonGetterSetter);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+44 -21
View File
@@ -1,44 +1,31 @@
package cpm.com.gskmtorange.gsk_dailyentry;
import android.content.Context;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.view.ScrollingView;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.ToggleButton;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import static android.R.attr.data;
import static cpm.com.gskmtorange.R.id.toggle_inStock;
public class PromoComplianceActivity extends AppCompatActivity {
LinearLayout lin_promo_sku, lin_addtional_promo;
View view_promo_sku, view_additional_promo;
@@ -191,20 +178,55 @@ public class PromoComplianceActivity extends AppCompatActivity {
btn_add.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
public void onClick(final View v) {
AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this);
builder.setMessage("Are you sure you want to add")
.setCancelable(false)
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
db.InsertAdditionalPromoData(cd);
AdditionalPromoListView();
Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show();
//Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show();
}
})
.setNegativeButton("No", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
alert.show();
}
});
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
/*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();*/
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) {
db.InsertPromoSkuData(promoSkuListData);
Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
//Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).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();
}
});
@@ -307,6 +329,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
private void AdditionalPromoListView() {
additionalPromoListData.clear();
lin_addtional_promo.removeAllViews();
//Additional Promo List
additionalPromoListData = db.getAdditionalPromoData();
@@ -318,12 +341,12 @@ public class PromoComplianceActivity extends AppCompatActivity {
final Promo_Compliance_DataGetterSetter data = additionalPromoListData.get(i);
TextView txt_promoSkuName = (TextView) view.findViewById(R.id.txt_promoSkuName);
TextView txt_promoName = (TextView) view.findViewById(R.id.txt_promoName);
TextView txt_inStock = (TextView) view.findViewById(R.id.txt_inStock);
TextView txt_promoAnnouncer = (TextView) view.findViewById(R.id.txt_promoAnnouncer);
TextView txt_runningPos = (TextView) view.findViewById(R.id.txt_runningPos);
txt_promoSkuName.setText(data.getPromo());
txt_promoName.setText(data.getPromo());
//In Stock
if (data.getIn_stock().equals("1")) {