Merge pull request #39 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_MSL_Availability_Change

Gg stock facing msl availability change

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -920,7 +920,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
                     cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
                     cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
-                    cd.setToggleValue("0");
+                    cd.setToggleValue("1");
 
                     list.add(cd);
                     dbcursor.moveToNext();
@@ -1017,11 +1017,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 }
                 dbcursor.close();
 
-                if (list.size() > 0) {
+                return list.size() > 0;
-                    return true;
-                } else {
-                    return false;
-                }
             }
         } catch (Exception e) {
             Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1063,7 +1059,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         Cursor dbcursor = null;
 
         try {
-            dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND " +
+            dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " +
                     "from MAPPING_STOCK M " +
                     "inner join SKU_MASTER SK " +
                     "on M.SKU_ID=SK.SKU_ID " +
@@ -1074,13 +1070,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     "inner join CATEGORY_MASTER CA " +
                     "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
                     "where CA.CATEGORY_ID='" + category_id + "' " +
-                    "order by SB.SUB_CATEGORY,BR.BRAND", null);
+                    "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null);
 
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
                 while (!dbcursor.isAfterLast()) {
                     Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
 
+                    cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
                     cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
                     cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
                     cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
@@ -1158,6 +1155,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
                 values1.put("Store_Id", storeId);
                 values1.put("Category_Id", categoryId);
+                values1.put("COMPANY_ID", data1.getCompany_id());
                 values1.put("SUB_CATEGORY_ID", data1.getSub_category_id());
                 values1.put("SUB_CATEGORY", data1.getSub_category());
                 values1.put("BRAND_ID", data1.getBrand_id());
@@ -1204,6 +1202,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 while (!dbcursor.isAfterLast()) {
                     Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
 
+                    cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
                     cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
                     cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
                     cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
@@ -1312,11 +1311,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 }
                 dbcursor.close();
 
-                if (list.size() > 0) {
+                return list.size() > 0;
-                    return true;
-                } else {
-                    return false;
-                }
             }
         } catch (Exception e) {
             Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -1530,7 +1525,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
-
     public void InsertPromoSkuData(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData, String category_id) {
         ContentValues values = new ContentValues();
         try {
@@ -1577,11 +1571,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 }
                 dbcursor.close();
 
-                if (list.size() > 0) {
+                return list.size() > 0;
-                    return true;
-                } else {
-                    return false;
-                }
             }
         } catch (Exception e) {
             Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
@@ -2209,8 +2199,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
-
-
     public ArrayList<BrandMasterGetterSetter> getBrandMasterData(String store_id) {
         Cursor cursordata = null;
         ArrayList<BrandMasterGetterSetter> Data = new ArrayList<BrandMasterGetterSetter>();
@@ -2231,7 +2219,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
 
 
-
                     sb.setCOMPANY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("COMPANY_ID")));
 
                     sb.setBRAND_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_SEQUENCE")));
@@ -2252,7 +2239,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
-
     public ArrayList<SkuMasterGetterSetter> getSKUMasterData(String store_id) {
         Cursor cursordata = null;
         ArrayList<SkuMasterGetterSetter> Data = new ArrayList<SkuMasterGetterSetter>();
@@ -2273,7 +2259,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID")));
 
 
-
                     sb.setMRP(cursordata.getString(cursordata.getColumnIndexOrThrow("MRP")));
 
                     sb.setSKU_SEQUENCE(cursordata.getString(cursordata.getColumnIndexOrThrow("SKU_SEQUENCE")));
@@ -2309,8 +2294,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
             long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values);
 
-            for(int i=0;i<dialog.size();i++)
+            for (int i = 0; i < dialog.size(); i++) {
-            {
                 values1.put(CommonString.KEY_Common_ID, key_id);
                 values1.put(CommonString.KEY_STORE_ID, dialog.get(i).getStore_id());
                 values1.put(CommonString.KEY_BRAND, dialog.get(i).getBrand());
@@ -2323,16 +2307,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 db.insert(CommonString.TABLE_INSERT_STOCK_DIALOG, null, values1);
 
 
-
-
-
             }
 
 
-
-
-
-
         } catch (Exception ex) {
             Log.d("Database Exception ", ex.getMessage());
         }
@@ -2395,6 +2372,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return productData;
 
     }
+
     public void updateStoreStatus(String storeid, String visitdate,
                                   String status) {
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -265,7 +265,7 @@ public class MainActivity extends AppCompatActivity
 
         } else if (id == R.id.nav_setting) {
 
-            startActivity(new Intent(MainActivity.this, CategoryListActivity.class));
+            //startActivity(new Intent(MainActivity.this, CategoryListActivity.class));
 
         } else if (id == R.id.nav_export) {
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -235,6 +235,9 @@ public class CommonString {
             + "Category_Id"
             + " VARCHAR,"
 
+            + "COMPANY_ID"
+            + " VARCHAR,"
+
             + "SUB_CATEGORY_ID"
             + " VARCHAR,"
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java

@@ -72,7 +72,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
     boolean checkflag = true;
 
     private SharedPreferences preferences;
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -98,6 +98,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
             keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
             class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
             storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+            camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
 
             categoryName = getIntent().getStringExtra("categoryName");
             categoryId = getIntent().getStringExtra("categoryId");
@@ -315,6 +316,15 @@ public class Stock_FacingActivity extends AppCompatActivity {
             txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
             txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
 
+            if (headerTitle.getCompany_id().equals("1")) {
+                txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+            } else {
+                txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black));
+            }
+
+            //Camera allow enable
+            if (camera_allow.equalsIgnoreCase("1")) {
+
                 img_camera1.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -369,7 +379,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
                 } else {
                     img_camera2.setBackgroundResource(R.mipmap.camera_done);
                 }
-
+            } else {
+                //Camera allow disable
+                img_camera1.setBackgroundResource(R.mipmap.camera);
+                img_camera2.setBackgroundResource(R.mipmap.camera);
+            }
 
             if (!checkflag) {
                 if (checkHeaderArray.contains(groupPosition)) {
@@ -571,6 +585,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
                 String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock();
                 String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing();
 
+                //Camera allow enable
+                if (camera_allow.equalsIgnoreCase("1")) {
+
                     if (!imagePath.equals("") || !imagePath1.equals("")) {
                         if (!stock.equals("0")) {
                             if (stock.equals("") || faceup.equals("")) {
@@ -602,6 +619,32 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         Error_Message = "Please click either 1 image";
                         break;
                     }
+
+                } else {
+                    //Camera allow disable
+                    if (!stock.equals("0")) {
+                        if (stock.equals("") || faceup.equals("")) {
+                            if (!checkHeaderArray.contains(i)) {
+                                checkHeaderArray.add(i);
+                            }
+
+                            flag = false;
+                            Error_Message = "Please fill all the data";
+                            break;
+                        }
+                    } else {
+                        if (stock.equals("")) {
+                            if (!checkHeaderArray.contains(i)) {
+                                checkHeaderArray.add(i);
+                            }
+
+                            flag = false;
+                            Error_Message = "Please fill all the data";
+                            break;
+                        }
+                    }
+
+                }
             }
 
             if (flag == false) {

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

@@ -57,15 +57,15 @@
                     android:id="@+id/img_camera1"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="10dp" />
-                    android:src="@drawable/ic_menu_camera" />
+                <!--android:src="@drawable/ic_menu_camera"-->
 
                 <ImageView
                     android:id="@+id/img_camera2"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="10dp" />
-                    android:src="@drawable/ic_menu_camera" />
+                <!--android:src="@drawable/ic_menu_camera"-->
 
                 <ImageView
                     android:id="@+id/img_edit"