diff --git a/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.html b/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.html index ddf23f77..6deae60e 100644 --- a/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.html +++ b/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.html @@ -17,7 +17,7 @@

-
+
diff --git a/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.less b/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.less index a7a9c713..f63d7b65 100644 --- a/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.less +++ b/avBooth/simultaneous-questions-category-v2-directive/simultaneous-questions-category-v2-directive.less @@ -21,7 +21,18 @@ box-shadow: none; } } +[avb-simultaneous-questions-category-v2].empty-category { + background-color: unset; + box-shadow: unset; + .category-heading-container { + display: none; + } + + .category-body .questions-answers { + gap: unset; + } +} [avb-simultaneous-questions-category-v2] { background-color: @av-primary; padding: 0 14px 20px 16px; diff --git a/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html b/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html index 0b2057f2..52b5d470 100644 --- a/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html +++ b/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.html @@ -82,7 +82,8 @@

'flex-col-12': (question.extra_options.answer_group_columns_size === 12), 'flex-col-6': (question.extra_options.answer_group_columns_size === 6), 'flex-col-4': (question.extra_options.answer_group_columns_size === 4), - 'flex-col-3': (question.extra_options.answer_group_columns_size === 3) + 'flex-col-3': (question.extra_options.answer_group_columns_size === 3), + 'empty-category': !category.title }" >

diff --git a/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.js b/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.js index 18dad8a6..904b9102 100644 --- a/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.js +++ b/avBooth/simultaneous-questions-v2-screen-directive/simultaneous-questions-v2-screen-directive.js @@ -186,7 +186,6 @@ angular.module('avBooth') return ( !ErrorCheckerGeneratorService.hasUrl(answer.urls, 'invalidVoteFlag', 'true') && !ErrorCheckerGeneratorService.hasUrl(answer.urls, 'isCategoryList', 'true') && - !!answer.category && ( !ErrorCheckerGeneratorService.hasUrl(answer.urls, 'isWriteIn', 'true') || (question.extra_options && question.extra_options.allow_writeins) @@ -194,6 +193,12 @@ angular.module('avBooth') ); } ); + + var hasNonEmptyCategory = _.pluck(filteredAnswers, "category").some( + function (category) { + return !!category; + } + ); var categories = _.groupBy(filteredAnswers, "category"); categories = _.map( _.pairs(categories), @@ -220,8 +225,9 @@ angular.module('avBooth') }; } ); + question.categories = categories; - question.hasCategories = (categories.length >= 1); + question.hasCategories = hasNonEmptyCategory; // filter write-ins question.writeIns = _.filter(