From 261aa65bd256b5bbaa7411e5329d9e7b0ea1e61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Robles?= <felix@sequentech.io>
Date: Wed, 28 Jun 2023 07:33:23 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8dynamic=20position=20of=20invalid=20vo?=
 =?UTF-8?q?te=20option=20(#336)=20(#340)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Parent Issue: https://github.com/sequentech/epi/issues/119
---
 .../review-ballot-v2-directive.html           | 20 ++++++++++++++++++-
 ...taneous-questions-v2-screen-directive.html | 20 ++++++++++++++++++-
 ...ultaneous-questions-v2-screen-directive.js |  5 +++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/avBooth/review-ballot-v2-directive/review-ballot-v2-directive.html b/avBooth/review-ballot-v2-directive/review-ballot-v2-directive.html
index 3d503ff0..8fa42842 100644
--- a/avBooth/review-ballot-v2-directive/review-ballot-v2-directive.html
+++ b/avBooth/review-ballot-v2-directive/review-ballot-v2-directive.html
@@ -41,6 +41,24 @@ <h1 aria-level="2" class="text-brand-success question-title">
     <div 
       class="question-answers text-left"
     >
+      <div 
+        class="invalid-vote-col"
+        ng-class="{'extra-invalid-vote-space': question.hasCategories}"
+        ng-if="!!markedAsInvalid(question) && 'top' === question.invalidVoteAnswer.position"
+      >
+        <div
+          avb-simultaneous-question-answer-v2
+          answer="question.invalidVoteAnswer"
+          question="question"
+          is-invalid-vote-answer="true"
+          toggle-select-item="toggleSelectItem"
+          toggle-select-item-cumulative="toggleSelectItemCumulative"
+          cumulative-checks="cumulativeChecks"
+          hide-check="true"
+          read-only="true"
+        >
+        </div>
+      </div>
       <div class="categories" ng-if="question.hasCategories">
           <div
             ng-repeat="category in question.categories"
@@ -82,7 +100,7 @@ <h1 aria-level="2" class="text-brand-success question-title">
       <div 
         class="invalid-vote-col"
         ng-class="{'extra-invalid-vote-space': question.hasCategories}"
-        ng-if="!!markedAsInvalid(question)"
+        ng-if="!!markedAsInvalid(question) && 'bottom' === question.invalidVoteAnswer.position"
       >
         <div
           avb-simultaneous-question-answer-v2
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 e0054117..5357d911 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
@@ -49,6 +49,24 @@ <h2 class="question-title" aria-level="2" ng-bind-html="question.title">
 
     <!-- QUESTION OPTIONS START -->
 
+    <div 
+      class="invalid-vote-col"
+      ng-class="{'extra-invalid-vote-space': question.hasCategories}"
+      ng-if="!!question.invalidVoteAnswer && 'top' === question.invalidVoteAnswer.position"
+    >
+      <div 
+        avb-simultaneous-question-answer-v2
+        answer="question.invalidVoteAnswer"
+        question="question"
+        is-invalid-vote-answer="true"
+        toggle-select-item="toggleSelectItem"
+        toggle-select-item-cumulative="toggleSelectItemCumulative"
+        cumulative-checks="cumulativeChecks"
+        hide-check="false"
+      >
+      </div>
+    </div>
+
     <div class="categories" ng-if="question.hasCategories">
         <div
           ng-repeat="category in question.categories"
@@ -95,7 +113,7 @@ <h2 class="question-title" aria-level="2" ng-bind-html="question.title">
     <div 
       class="invalid-vote-col"
       ng-class="{'extra-invalid-vote-space': question.hasCategories}"
-      ng-if="!!question.invalidVoteAnswer"
+      ng-if="!!question.invalidVoteAnswer && 'bottom' === question.invalidVoteAnswer.position"
     >
       <div 
         avb-simultaneous-question-answer-v2
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 612390f7..60e609cf 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
@@ -276,6 +276,11 @@ angular.module('avBooth')
                 return ErrorCheckerGeneratorService.hasUrl(answer.urls, 'invalidVoteFlag', 'true'); 
               }
             );
+
+            if (question.invalidVoteAnswer) {
+              var top = ErrorCheckerGeneratorService.hasUrl(question.invalidVoteAnswer.urls, 'positionFlag', 'top');
+              question.invalidVoteAnswer.position = top ? 'top' : 'bottom';
+            }
           }
         );