From faea9b0b3d933b60cbcec46f3493500d2e873911 Mon Sep 17 00:00:00 2001 From: CPM Date: Sun, 29 Nov 2020 16:24:43 +0530 Subject: [PATCH] kenya2 --- .../java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 3 ++- .../src/main/java/cpm/com/gskmtorange/LoginActivity.java | 7 ++++--- .../cpm/com/gskmtorange/dailyentry/CategoryPicture.java | 2 +- .../com/gskmtorange/dailyentry/T2PComplianceActivity.java | 6 +++++- GSKMTOrange/src/main/res/layout/t2p_item_layout.xml | 3 +-- GSKMTOrange/src/main/res/menu/activity_main_drawer.xml | 2 +- 6 files changed, 14 insertions(+), 9 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 59f17ff..7e549ed 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3986,7 +3986,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "INNER JOIN " + "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " + "ON SK.SKU_ID = A.SKU_ID " + - "WHERE CA.CATEGORY_ID = '" + category_id + "'", null); + "WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null); + // "WHERE CA.CATEGORY_ID = '" + category_id + "'", null); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index f922e9f..ef2e04e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -227,9 +227,10 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. */ //Kenya - /* museridView.setText("test.Kenya"); - mPasswordView.setText("cpm123");*/ - + // museridView.setText("test.Kenya"); + /* museridView.setText("testkenya"); + mPasswordView.setText("cpm123"); +*/ mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java index f0ea3d7..61a5d0c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java @@ -141,7 +141,7 @@ public class CategoryPicture extends AppCompatActivity { } } else { - if (country_id.equals("7")) { + if (country_id.equals("7")||country_id.equals("8")) { listdat = db.getCategoryPicturedata(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { listdat = db.getCategoryPicturedata(categoryId, key_account_id, store_type_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 532d479..db606c8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -1,5 +1,6 @@ package cpm.com.gskmtorange.dailyentry; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -204,6 +205,7 @@ public class T2PComplianceActivity extends AppCompatActivity { ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i).getKey_id()); t2PGetterSetters.get(i).setGapsChecklist(gapsList); + // t2PGetterSetters.get(i).setSkulist(skuList); t2PGetterSetters.get(i).setBrandlist(brandList); @@ -267,7 +269,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } @Override - public void onBindViewHolder(final ViewHolder holder, final int position) { + public void onBindViewHolder(final ViewHolder holder, @SuppressLint("RecyclerView") final int position) { final boolean[] userSelect = {false}; final T2PGetterSetter mItem = list.get(position); @@ -861,6 +863,7 @@ public class T2PComplianceActivity extends AppCompatActivity { final BrandMasterGetterSetter[] brand_selected = new BrandMasterGetterSetter[1]; final ArrayList brandList; + //usk just if (country_id.equals("7")) { brandList = db.getBrandT2PData(null, null, null, categoryId, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { @@ -1662,6 +1665,7 @@ public class T2PComplianceActivity extends AppCompatActivity { public void showBrandAvabilitydialog(final ArrayList brandGetdata) { final ArrayList brandList; + if (country_id.equals("7")||country_id.equals("8")) { brandList = db.getBrandAvailbilitydata(store_id, categoryId, null, null, null, CommonString.TABLE_MAPPING_STOCK_STOREWISE); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)){ diff --git a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml index e1dcd08..f9cf24c 100644 --- a/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml +++ b/GSKMTOrange/src/main/res/layout/t2p_item_layout.xml @@ -201,7 +201,7 @@