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 f6e0362..0b6a11d 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 @@ -119,11 +119,34 @@ public class CategoryListActivity extends AppCompatActivity { //holder.categoryIcon.setImageResource(R.drawable.category); if (categoryData.getCategory().equalsIgnoreCase("Oral Health")) { - holder.categoryIcon.setImageResource(R.drawable.ohc); + if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) + && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) + && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { + + holder.categoryIcon.setImageResource(R.drawable.ohc_done); + } else { + holder.categoryIcon.setImageResource(R.drawable.ohc); + } } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { - holder.categoryIcon.setImageResource(R.drawable.pdr); + if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) + && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) + && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { + + holder.categoryIcon.setImageResource(R.drawable.pdr_done); + } else { + + holder.categoryIcon.setImageResource(R.drawable.pdr); + } } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { - holder.categoryIcon.setImageResource(R.drawable.hfd); + + if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) + && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) + && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { + + holder.categoryIcon.setImageResource(R.drawable.hfd_done); + } else { + holder.categoryIcon.setImageResource(R.drawable.hfd); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index ec5b0d0..3d28cac 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -321,7 +321,7 @@ public class Stock_FacingActivity extends AppCompatActivity { //String date = new Date().toLocaleString().toString(); //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam1_" + store_id + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; @@ -349,7 +349,7 @@ public class Stock_FacingActivity extends AppCompatActivity { //String date = new Date().toLocaleString().toString(); //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - _pathforcheck = "Stock_Cam2_" + store_id + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; child_position = groupPosition; path = str + _pathforcheck; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 6c789a6..8030b22 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -628,7 +628,7 @@ public class UploadActivity extends AppCompatActivity { return CommonString.KEY_FAILURE; } } else { - //new File(Path + path).delete(); + new File(Path + path).delete(); } return result.toString(); diff --git a/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml new file mode 100644 index 0000000..3044f98 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/toggle_selector_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml index 2e7dcf1..f6d49c0 100644 --- a/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml +++ b/GSKMTOrange/src/main/res/layout/content_promo_compliance.xml @@ -158,7 +158,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background"/> @@ -196,7 +197,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background" /> @@ -234,7 +236,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background" /> diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 3970b89..9979c83 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -23,7 +23,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="5dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:weightSum="5"> + android:layout_gravity="center" + android:background="@drawable/toggle_selector_background" /> 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 0c4046f..48ecdbd 100644 --- a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml +++ b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml @@ -89,7 +89,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes" /> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background" /> @@ -127,7 +128,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes"/> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background"/> @@ -165,7 +167,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOff="@string/no" - android:textOn="@string/yes"/> + android:textOn="@string/yes" + android:background="@drawable/toggle_selector_background"/> diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml index 7e9286c..b728bd5 100644 --- a/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml @@ -23,7 +23,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="5dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:weightSum="5"> #FFFFFF #000000 #EEEEEE - + #FF27A404 #2196F3 #FFE0B2