From e30f6dc18918ce94c11241af9e88e68875ecd817 Mon Sep 17 00:00:00 2001
From: gagangoel290 <gagan.goel@in.cpm-int.com>
Date: Thu, 27 Apr 2017 10:57:04 +0530
Subject: [PATCH] MSL Availability Stock Facing Changes upload

---
 .idea/misc.xml                                   |  2 +-
 .../MSL_Availability_StockFacingActivity.java    | 13 ++++++++-----
 .../main/res/layout/content_promo_compliance.xml | 14 ++++++++------
 .../res/layout/item_additional_promo_list.xml    |  8 ++++++--
 .../src/main/res/layout/item_promo_sku_list.xml  | 16 +++++++++-------
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b8dc4d6..b15ecee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -41,7 +41,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
index edfe048..edd9275 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
@@ -1037,6 +1037,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                 boolean tempflag = false;
 
                 if (childData.getCompany_id().equals("1")) {
+
                     if (childData.getToggleValue().equals("0")) {
                         if (holder.stock.getText().toString().equals("")) {
                             holder.stock.setBackgroundColor(getResources().getColor(R.color.white));
@@ -1052,11 +1053,13 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                             tempflag = true;
                         }
                     } else {
-                        if (holder.facing.getText().toString().equals("")) {
-                            holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
-                            holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
-                            holder.facing.setHint(getString(R.string.empty));
-                            tempflag = true;
+                        if (childData.getMust_have().equals("1")) {
+                            if (holder.facing.getText().toString().equals("")) {
+                                holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
+                                holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
+                                holder.facing.setHint(getString(R.string.empty));
+                                tempflag = true;
+                            }
                         }
                     }
 
diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
index 076f30b..4a5ffa9 100644
--- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
@@ -13,10 +13,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/txt_promoComplianceName"
@@ -125,7 +125,7 @@
                             android:layout_marginTop="5dp"
                             android:layout_weight="1"
                             android:orientation="horizontal"
-                            android:weightSum="3">
+                            android:weightSum="2">
 
                             <LinearLayout
                                 android:layout_width="0dp"
@@ -162,7 +162,7 @@
                                         android:layout_height="wrap_content"
                                         android:background="@drawable/toggle_selector_background"
                                         android:textOff="@string/no"
-                                        android:textOn="@string/yes"/>
+                                        android:textOn="@string/yes" />
                                 </LinearLayout>
                             </LinearLayout>
 
@@ -211,6 +211,7 @@
                                 android:layout_weight="1"
                                 android:gravity="center"
                                 android:orientation="vertical"
+                                android:visibility="gone"
                                 android:weightSum="5">
 
                                 <LinearLayout
@@ -278,7 +279,8 @@
                     android:id="@+id/lin_addtional_promo"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical" />
+                    android:orientation="vertical"
+                    android:paddingBottom="10dp" />
 
             </LinearLayout>
 
diff --git a/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml b/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
index 667d1ff..b7b8698 100644
--- a/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+++ b/GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
@@ -9,6 +9,7 @@
         android:id="@+id/card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:layout_marginTop="5dp"
@@ -53,9 +54,10 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:layout_marginTop="5dp"
                 android:orientation="horizontal"
-                android:weightSum="3">
+                android:weightSum="2">
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -153,6 +155,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:orientation="vertical"
+                    android:visibility="gone"
                     android:weightSum="5">
 
                     <LinearLayout
@@ -192,9 +195,10 @@
 
                     </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
 
+            </LinearLayout>
         </LinearLayout>
+
     </android.support.v7.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
index 48ecdbd..1716914 100644
--- a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
+++ b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:orientation="horizontal"
-                android:weightSum="3">
+                android:weightSum="2">
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -88,9 +88,9 @@
                             android:id="@+id/toggle_inStock"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:background="@drawable/toggle_selector_background"
                             android:textOff="@string/no"
-                            android:textOn="@string/yes"
-                            android:background="@drawable/toggle_selector_background" />
+                            android:textOn="@string/yes" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -127,18 +127,20 @@
                             android:id="@+id/toggle_promoAnnouncer"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:background="@drawable/toggle_selector_background"
                             android:textOff="@string/no"
-                            android:textOn="@string/yes"
-                            android:background="@drawable/toggle_selector_background"/>
+                            android:textOn="@string/yes" />
                     </LinearLayout>
                 </LinearLayout>
 
+                <!--Running on Pos-->
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:orientation="vertical"
+                    android:visibility="gone"
                     android:weightSum="5">
 
                     <LinearLayout
@@ -166,9 +168,9 @@
                             android:id="@+id/toggle_runningPos"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:background="@drawable/toggle_selector_background"
                             android:textOff="@string/no"
-                            android:textOn="@string/yes"
-                            android:background="@drawable/toggle_selector_background"/>
+                            android:textOn="@string/yes" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>