kenya2

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);
             }
 
 

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");
+      //  museridView.setText("test.Kenya");
-        mPasswordView.setText("cpm123");*/
+      /*  museridView.setText("testkenya");
-
+        mPasswordView.setText("cpm123");
+*/
         mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {

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);

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<BrandAvabilityGetterSetter> 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<BrandMasterGetterSetter> 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<BrandAvabilityGetterSetter> brandGetdata) {
 
         final ArrayList<BrandAvabilityGetterSetter> 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)){

GSKMTOrange/src/main/res/layout/t2p_item_layout.xml

@@ -201,7 +201,7 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="264dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
                     android:orientation="horizontal"
@@ -217,7 +217,6 @@
                             android:id="@+id/img_cam"
                             android:layout_width="50dp"
                             android:layout_height="50dp"
-                            android:layout_alignParentTop="true"
                             android:layout_centerHorizontal="true"
                             android:layout_weight="1"
                             android:background="@mipmap/camera_orange"

GSKMTOrange/src/main/res/menu/activity_main_drawer.xml

@@ -66,7 +66,7 @@
             android:id="@+id/nav_additional_adhoc_stores"
             android:icon="@mipmap/baseline_playlist_add_black_48"
             android:title="@string/additional_adhoc_stores"
-
+            android:visible="false"
             />
 
         <item