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

Merge branch 'master' into ACVisibilityDone

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 19:13:10 +05:30
committed by GitHub
parent eb891ffc70 8135f24522
commit c66f0649f3
7 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+5 -2
View File
@@ -359,11 +359,14 @@ public class CommonString {
+ "STORE_ID"
+ " INTEGER,"
/*+ "SKU_ID"
+ "CATEGORY_ID"
+ " VARCHAR,"
+ "SKU_ID"
+ " INTEGER,"
+ "SKU"
+ " VARCHAR,"*/
+ " VARCHAR,"
+ "PROMO_ID"
+ " INTEGER,"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+2 -2
View File
@@ -51,13 +51,13 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
toolbar = (Toolbar) findViewById(R.id.toolbar);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
db = new GSKOrangeDB(this);
db.open();
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+2 -2
View File
@@ -72,11 +72,11 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
db = new GSKOrangeDB(this);
db.open();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+2 -3
View File
@@ -99,12 +99,11 @@ public class PromoComplianceActivity extends AppCompatActivity {
btn_add = (Button) findViewById(R.id.btn_add);
db = new GSKOrangeDB(this);
db.open();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
db.open();
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+2 -2
View File
@@ -127,11 +127,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
//txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
+2 -3
View File
@@ -78,12 +78,11 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
db = new GSKOrangeDB(this);
db.open();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
db.open();
//preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
GSKMTOrange/src/main/res/values/strings.xml
-3
View File
@@ -114,8 +114,6 @@
<string name="enter_the_values">Enter the values</string>
<string name="title_activity_upload">Upload Data</string>
<string name="no_data_for_upload">No Data For Upload</string>
<string name="first_checkout_store">First checkout of store</string>
@@ -166,7 +164,6 @@
<string name="title_activity_enter_quantity">Please enter Quantity</string>
<string name="title_activity_save_data">Do you want to save the data</string>
<string name="clickimage">Please click the image</string>
<string name="gps">GPS IS DISABLED...</string>
<string name="gpsebale">Click ok to enable GPS.</string>