From ace8cdceb7437afc3e4a2ebf86a84940c13afae9 Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Tue, 16 Apr 2024 11:32:45 -0400
Subject: [PATCH 1/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 37 +++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index f2e6267f0..395b3f81a 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -50,12 +50,9 @@
                 </span>
               </template>
               <b-dropdown-item
-                variant="success"
-                @click="
-                  handleDropdownSelection('requests_dropdown', 'In Progress')
-                "
+                @click="handleDropdownSelection('requests_dropdown', 'all')"
               >
-                <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
+                {{ $t("View All") }}
               </b-dropdown-item>
               <b-dropdown-item
                 variant="primary"
@@ -66,9 +63,12 @@
                 <i class="fas fa-circle mr-2" />{{ $t("Completed") }}
               </b-dropdown-item>
               <b-dropdown-item
-                @click="handleDropdownSelection('requests_dropdown', 'all')"
+                variant="success"
+                @click="
+                  handleDropdownSelection('requests_dropdown', 'In Progress')
+                "
               >
-                {{ $t("View All") }}
+                <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
               </b-dropdown-item>
             </b-dropdown>
           </div>
@@ -86,11 +86,8 @@
                   {{ $t(titleDropdown) }}
                 </span>
               </template>
-              <b-dropdown-item
-                variant="warning"
-                @click="handleDropdownSelection('tasks', 'In Progress')"
-              >
-                <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
+              <b-dropdown-item @click="handleDropdownSelection('tasks', 'all')">
+                {{ $t("View All") }}
               </b-dropdown-item>
               <b-dropdown-item
                 variant="danger"
@@ -98,8 +95,11 @@
               >
                 <i class="fas fa-circle mr-2" />{{ $t("Overdue") }}
               </b-dropdown-item>
-              <b-dropdown-item @click="handleDropdownSelection('tasks', 'all')">
-                {{ $t("View All") }}
+              <b-dropdown-item
+                variant="warning"
+                @click="handleDropdownSelection('tasks', 'In Progress')"
+              >
+                <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
               </b-dropdown-item>
             </b-dropdown>
           </div>
@@ -327,4 +327,13 @@ export default {
 .btn-outline-secondary {
   border: none;
 }
+
+.dropdown-menu.show {
+  padding: 10px;
+  width: 211px;
+}
+
+.dropdown-item {
+  padding: 12px 8px;
+}
 </style>

From 585360779221ff3ff5b5fa24eafb7a0c03c8f91b Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Tue, 16 Apr 2024 15:53:17 -0400
Subject: [PATCH 2/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index 395b3f81a..79e2808b9 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -64,9 +64,7 @@
               </b-dropdown-item>
               <b-dropdown-item
                 variant="success"
-                @click="
-                  handleDropdownSelection('requests_dropdown', 'In Progress')
-                "
+                @click="handleDropdownSelection('requests_dropdown', 'In Progress')"
               >
                 <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
               </b-dropdown-item>

From 9031f4965f79c5b59643d7e23b558d98670cd81e Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Wed, 17 Apr 2024 09:23:20 -0400
Subject: [PATCH 3/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 76 ++++++++++++++++-----
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index 79e2808b9..2845d8de8 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -38,7 +38,11 @@
       <div class="ml-auto d-flex align-items-center">
         <template v-if="dataControl.dropdownShow === 'requests'">
           <div class="mr-4">
-            <b-dropdown variant="outline-secondary" size="sm">
+            <b-dropdown
+              id="resquestDropdown"
+              variant="outline-secondary"
+              size="sm"
+            >
               <template #button-content>
                 <span>
                   <b-icon
@@ -52,28 +56,40 @@
               <b-dropdown-item
                 @click="handleDropdownSelection('requests_dropdown', 'all')"
               >
-                {{ $t("View All") }}
+                <span class="item-text">
+                  {{ $t("View All") }}
+                </span>
               </b-dropdown-item>
               <b-dropdown-item
-                variant="primary"
-                @click="
-                  handleDropdownSelection('requests_dropdown', 'Completed')
-                "
+                @click="handleDropdownSelection('requests_dropdown', 'Completed')"
               >
-                <i class="fas fa-circle mr-2" />{{ $t("Completed") }}
+                <span class="item-text">
+                  <i
+                    class="fas fa-circle mr-2 text-primary" 
+                  />
+                  {{ $t("Completed") }}
+                </span>
               </b-dropdown-item>
               <b-dropdown-item
-                variant="success"
                 @click="handleDropdownSelection('requests_dropdown', 'In Progress')"
               >
-                <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
+                <span class="item-text">
+                  <i
+                    class="fas fa-circle mr-2 text-success"
+                  />
+                  {{ $t("In Progress") }}
+                </span>
               </b-dropdown-item>
             </b-dropdown>
           </div>
         </template>
         <template v-if="dataControl.dropdownShow === 'tasks'">
           <div class="mr-4">
-            <b-dropdown variant="outline-secondary" size="sm">
+            <b-dropdown
+              id="tasksDropdown"
+              variant="outline-secondary"
+              size="sm"
+            >
               <template #button-content>
                 <span>
                   <b-icon
@@ -85,19 +101,29 @@
                 </span>
               </template>
               <b-dropdown-item @click="handleDropdownSelection('tasks', 'all')">
-                {{ $t("View All") }}
+                <span class="item-text">
+                  {{ $t("View All") }}
+                </span>
               </b-dropdown-item>
               <b-dropdown-item
-                variant="danger"
                 @click="handleDropdownSelection('tasks', 'Overdue')"
               >
-                <i class="fas fa-circle mr-2" />{{ $t("Overdue") }}
+                <span class="item-text">
+                <i
+                  class="fas fa-circle mr-2 text-danger"
+                />
+                {{ $t("Overdue") }}
+                </span>
               </b-dropdown-item>
               <b-dropdown-item
-                variant="warning"
                 @click="handleDropdownSelection('tasks', 'In Progress')"
               >
-                <i class="fas fa-circle mr-2" />{{ $t("In Progress") }}
+                <span class="item-text">
+                  <i
+                    class="fas fa-circle mr-2 text-warning"
+                  />
+                  {{ $t("In Progress") }}
+                </span>
               </b-dropdown-item>
             </b-dropdown>
           </div>
@@ -326,12 +352,26 @@ export default {
   border: none;
 }
 
-.dropdown-menu.show {
+.item-text {
+  color: #42526E;
+  font-family: 'Open Sans', sans-serif;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 21px;
+  letter-spacing: -0.02em;
+  text-align: left;
+}
+</style>
+
+<style lang="scss">
+#resquestDropdown .dropdown-menu,
+#tasksDropdown .dropdown-menu {
   padding: 10px;
   width: 211px;
 }
 
-.dropdown-item {
-  padding: 12px 8px;
+#resquestDropdown .dropdown-item,
+#tasksDropdown .dropdown-item {
+  padding: 10px 8px;
 }
 </style>

From d31fe8b39ae6ae43306c1dbcff10114a4480eade Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Wed, 17 Apr 2024 09:29:10 -0400
Subject: [PATCH 4/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index 36d7a6ebd..1790f3fc2 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -48,6 +48,7 @@
                   <b-icon
                     v-if="showBadge"
                     icon="circle-fill"
+                    class="mr-2"
                     :variant="badgeVariant"
                   />
                   {{ $t(titleDropdown) }}
@@ -95,6 +96,7 @@
                   <b-icon
                     v-if="showBadge"
                     icon="circle-fill"
+                    class="mr-2"
                     :variant="badgeVariant"
                   />
                   {{ $t(titleDropdown) }}

From f7785f509635f37cbb968b11364a385856389503 Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Wed, 17 Apr 2024 09:44:10 -0400
Subject: [PATCH 5/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index 1790f3fc2..ce2d08a4f 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -14,19 +14,28 @@
             {{ $t(title) }}
           </p>
           <template v-if="dataControl.dropdownShow === 'requests'">
-            <b-dropdown variant="outline-secondary" no-caret>
+            <b-dropdown
+              id="typeRequestDropdown"
+              variant="outline-secondary"
+              right
+              no-caret
+            >
               <template #button-content>
                 <i class="fas fa-caret-down" />
               </template>
               <b-dropdown-item
                 @click="handleDropdownSelection('requests_filter', 'by_me')"
               >
-                {{ $t("As Requester") }}
+                <span class="item-text">
+                  {{ $t("As Requester") }}
+                </span>
               </b-dropdown-item>
               <b-dropdown-item
                 @click="handleDropdownSelection('requests_filter', 'as_participant')"
               >
-                {{ $t("As Participant") }}
+                <span class="item-text">
+                  {{ $t("As Participant") }}
+                </span>
               </b-dropdown-item>
             </b-dropdown>
           </template>
@@ -366,12 +375,15 @@ export default {
 </style>
 
 <style lang="scss">
+#typeRequestDropdown .dropdown-menu,
 #resquestDropdown .dropdown-menu,
 #tasksDropdown .dropdown-menu {
   padding: 10px;
   width: 211px;
+  box-shadow: 0px 10px 20px 4px #00000021;
 }
 
+#typeRequestDropdown .dropdown-item,
 #resquestDropdown .dropdown-item,
 #tasksDropdown .dropdown-item {
   padding: 10px 8px;

From a62b1ce75f1716de62366ce93547f5d0af22441f Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Wed, 17 Apr 2024 10:05:39 -0400
Subject: [PATCH 6/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index ce2d08a4f..5f30fc915 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -15,7 +15,7 @@
           </p>
           <template v-if="dataControl.dropdownShow === 'requests'">
             <b-dropdown
-              id="typeRequestDropdown"
+              class="type-request-dropdown"
               variant="outline-secondary"
               right
               no-caret
@@ -48,7 +48,7 @@
         <template v-if="dataControl.dropdownShow === 'requests'">
           <div class="mr-4">
             <b-dropdown
-              id="resquestDropdown"
+              class="resquest-dropdown"
               variant="outline-secondary"
               size="sm"
             >
@@ -96,7 +96,7 @@
         <template v-if="dataControl.dropdownShow === 'tasks'">
           <div class="mr-4">
             <b-dropdown
-              id="tasksDropdown"
+              class="tasks-dropdown"
               variant="outline-secondary"
               size="sm"
             >
@@ -375,17 +375,17 @@ export default {
 </style>
 
 <style lang="scss">
-#typeRequestDropdown .dropdown-menu,
-#resquestDropdown .dropdown-menu,
-#tasksDropdown .dropdown-menu {
+.type-request-dropdown .dropdown-menu,
+.resquest-dropdown .dropdown-menu,
+.tasks-dropdown .dropdown-menu {
   padding: 10px;
   width: 211px;
   box-shadow: 0px 10px 20px 4px #00000021;
 }
 
-#typeRequestDropdown .dropdown-item,
-#resquestDropdown .dropdown-item,
-#tasksDropdown .dropdown-item {
+.type-request-dropdown .dropdown-item,
+.resquest-dropdown .dropdown-item,
+.tasks-dropdown .dropdown-item {
   padding: 10px 8px;
 }
 </style>

From 0bd3ce5862a7852c2103e4f261b5c5e44c81d026 Mon Sep 17 00:00:00 2001
From: luNunezProcessmaker <luciana.nunez@processmaker.com>
Date: Wed, 17 Apr 2024 11:05:24 -0400
Subject: [PATCH 7/7] feature/FOUR-15039

---
 src/components/renderer/form-list-table.vue | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/renderer/form-list-table.vue b/src/components/renderer/form-list-table.vue
index 5f30fc915..624ad185f 100755
--- a/src/components/renderer/form-list-table.vue
+++ b/src/components/renderer/form-list-table.vue
@@ -15,7 +15,6 @@
           </p>
           <template v-if="dataControl.dropdownShow === 'requests'">
             <b-dropdown
-              class="type-request-dropdown"
               variant="outline-secondary"
               right
               no-caret
@@ -48,7 +47,6 @@
         <template v-if="dataControl.dropdownShow === 'requests'">
           <div class="mr-4">
             <b-dropdown
-              class="resquest-dropdown"
               variant="outline-secondary"
               size="sm"
             >
@@ -96,7 +94,6 @@
         <template v-if="dataControl.dropdownShow === 'tasks'">
           <div class="mr-4">
             <b-dropdown
-              class="tasks-dropdown"
               variant="outline-secondary"
               size="sm"
             >
@@ -372,20 +369,14 @@ export default {
   letter-spacing: -0.02em;
   text-align: left;
 }
-</style>
 
-<style lang="scss">
-.type-request-dropdown .dropdown-menu,
-.resquest-dropdown .dropdown-menu,
-.tasks-dropdown .dropdown-menu {
+.dropdown-menu {
   padding: 10px;
   width: 211px;
   box-shadow: 0px 10px 20px 4px #00000021;
 }
 
-.type-request-dropdown .dropdown-item,
-.resquest-dropdown .dropdown-item,
-.tasks-dropdown .dropdown-item {
+.dropdown-item {
   padding: 10px 8px;
 }
 </style>