From 341fe12479b14a2321321f86c19fc19f6043ca94 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:28:43 +0530 Subject: [PATCH 1/8] Update CategoryWisePerformanceActivity.java --- .../gsk_dailyentry/CategoryWisePerformanceActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index c92ae49..a70b34d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -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); From af08ab63ff63f156af129b97ce6634637a60e0f6 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:29:24 +0530 Subject: [PATCH 2/8] Update MSL_AvailabilityActivity.java --- .../gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 6a1f03b..dc5c0b5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -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); From 17974ee5400ad423a263a12c70cdab0e1ad708bf Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:30:01 +0530 Subject: [PATCH 3/8] Update PromoComplianceActivity.java --- .../gskmtorange/gsk_dailyentry/PromoComplianceActivity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 0e0ae6b..9bc7dd1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -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); From e79a09506d098fcd4a05ff6f827e9de4c4220616 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:30:48 +0530 Subject: [PATCH 4/8] Update Stock_FacingActivity.java --- .../com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 0421cc9..bb1e86a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -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); From d8db348cdf68ff70c332fa419902d639a43b311b Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:31:21 +0530 Subject: [PATCH 5/8] Update StoreWisePerformanceActivity.java --- .../gsk_dailyentry/StoreWisePerformanceActivity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index 956ad29..893a3ea 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -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); From 7ccc3139517bb7366ca0db9d83235be494bf722f Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:33:47 +0530 Subject: [PATCH 6/8] Update strings.xml --- GSKMTOrange/src/main/res/values/strings.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index ea1ec39..efb2dfc 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -114,9 +114,6 @@ Enter the values - Yes - No - Upload Data No Data For Upload First checkout of store From 28e9219de56692a7cb6c6bbde7050fec22308fd9 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:34:46 +0530 Subject: [PATCH 7/8] Update strings.xml --- GSKMTOrange/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index efb2dfc..5635797 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -164,7 +164,7 @@ Please enter Quantity Do you want to save the data - OK + Please click the image GPS IS DISABLED... Click ok to enable GPS. From 8135f2452293895ee992cad422abd120dfd16131 Mon Sep 17 00:00:00 2001 From: gagangoel290 Date: Fri, 13 Jan 2017 18:50:31 +0530 Subject: [PATCH 8/8] Update CommonString.java --- .../java/cpm/com/gskmtorange/constant/CommonString.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index ce9a089..71f2a7f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -359,11 +359,14 @@ public class CommonString { + "STORE_ID" + " INTEGER," - /*+ "SKU_ID" + + "CATEGORY_ID" + + " VARCHAR," + + + "SKU_ID" + " INTEGER," + "SKU" - + " VARCHAR,"*/ + + " VARCHAR," + "PROMO_ID" + " INTEGER,"