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

Merge pull request #2 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_PromoCompliance_Default_Toggle_False_changes

Browse Source 
//PromoCompliance Default Toggle Changes
This commit is contained in:
YadavendraSinghYaduvanshi
2017-02-02 12:42:51 +05:30
committed by GitHub
parent cbb90c982c 5fca35c584
commit c5e81a0fec
4 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+3 -3
View File
@@ -1528,9 +1528,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
cd.setIn_stock("1");
cd.setPromo_announcer("1");
cd.setRunning_pos("1");
cd.setIn_stock("0");
cd.setPromo_announcer("0");
cd.setRunning_pos("0");
list.add(cd);
dbcursor.moveToNext();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class MainActivity extends AppCompatActivity
Intent in = new Intent(getApplicationContext(), PreviousDataUploadActivity.class);
startActivity(in);
finish();
//finish();
}
});
AlertDialog alert = builder.create();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+6 -6
View File
@@ -127,9 +127,9 @@ public class PromoComplianceActivity extends AppCompatActivity {
cd.setPromo("");
cd.setSku_id("");
cd.setSku("");
cd.setIn_stock("1");
cd.setPromo_announcer("1");
cd.setRunning_pos("1");
cd.setIn_stock("0");
cd.setPromo_announcer("0");
cd.setRunning_pos("0");
cd.setSp_promo("0");
toggle_add_InStock.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -227,9 +227,9 @@ public class PromoComplianceActivity extends AppCompatActivity {
AdditionalPromoListView();
sp_promo.setSelection(0);
toggle_add_InStock.setChecked(true);
toggle_add_promoAnnouncer.setChecked(true);
toggle_add_runningPos.setChecked(true);
toggle_add_InStock.setChecked(false);
toggle_add_promoAnnouncer.setChecked(false);
toggle_add_runningPos.setChecked(false);
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();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+40
View File
@@ -945,6 +945,46 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}
}
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(), "T2PImages1");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "T2PImages1";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("T2P Images1 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(), "T2PImages2");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "T2PImages2";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("T2P Images2 Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
}