From e00cb3d03f2c6abf70c25b431ca5246876d54281 Mon Sep 17 00:00:00 2001
From: CPM <upendra.kushwaha@in.cpm-int.com>
Date: Sun, 29 Nov 2020 19:06:19 +0530
Subject: [PATCH] kenya4

---
 .../cpm/com/gskmtorange/Database/GSKOrangeDB.java | 15 +++++++++++----
 .../dailyentry/CreateSelfActivity.java            |  5 +++--
 .../gsk_dailyentry/CategoryListActivity.java      |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index 7e549ed..7d0fc75 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -3980,7 +3980,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "WHERE CA.CATEGORY_ID = '" + category_id + "'", null);
             }
             else {
-                cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
+                cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND||'('||SB.SUB_CATEGORY||')' as BRAND  FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
                         "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " +
                         "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " +
                         "INNER JOIN " +
@@ -5493,15 +5493,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
     //get Sub Category Master
     public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getSubCategoryMaster(
-            String category_id) {
+            String category_id,String store_id) {
 
         ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
         Cursor dbcursor = null;
 
         try {
 
-            dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null);
-
+           // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null);
+            //kenya
+            dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " +
+                    "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " +
+                    "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID  " +
+                    "INNER JOIN " +
+                    "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " +
+                    "ON SK.SKU_ID = A.SKU_ID " +
+                    "WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null);
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
                 while (!dbcursor.isAfterLast()) {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
index 3b6e3af..a40a525 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java
@@ -104,7 +104,8 @@ public class CreateSelfActivity extends AppCompatActivity {
 
         added_sub_category_list = new ArrayList<>();
 
-        ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId);
+        //kenya use
+        ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id);
 
         for(int i=0; i<sub_category_list.size(); i++){
 
@@ -149,7 +150,7 @@ public class CreateSelfActivity extends AppCompatActivity {
 
     public void showSkuDialog() {
 
-        final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId);
+        final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(categoryId,store_id);
         MSL_AvailabilityStockFacingGetterSetter brand = new MSL_AvailabilityStockFacingGetterSetter();
         brand.setSub_category("select");
         sub_category_list.add(0, brand);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
index ec801a5..337b9d4 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
@@ -219,7 +219,7 @@ public class CategoryListActivity extends AppCompatActivity {
                        }
                        else {
 
-                           final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id);
+                           final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id);
 
                            //if Sub Group Data exists for any Sub Category of the Category
                            boolean isSubGroupDataExists = false;
@@ -624,7 +624,7 @@ public class CategoryListActivity extends AppCompatActivity {
                         }
                     }else {
 
-                        final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id);
+                        final ArrayList<MSL_AvailabilityStockFacingGetterSetter> sub_category_list = db.getSubCategoryMaster(category_id,store_id);
 
                         //if Sub Group Data exists for any Sub Category of the Category
                         boolean isSubGroupDataExists = false;