1618: add group by priority to dashboard/home

Leantime · Jun 6, 2024 · 35b64b6 · 35b64b6
1 parent 8e64c9e
commit 35b64b6
Show file tree

Hide file tree

Showing 42 changed files with 101 additions and 0 deletions.
diff --git a/app/Domain/Tickets/Services/Tickets.php b/app/Domain/Tickets/Services/Tickets.php
@@ -780,6 +780,48 @@ public function getOpenUserTicketsByProject($userId, $projectId): array
             return $tickets;
         }
 
+        /**
+         * @param $userId
+         * @param $projectId
+         * @return array
+         */
+        public function getOpenUserTicketsByPriority($userId, $projectId): array
+        {
+
+            $searchCriteria = $this->prepareTicketSearchArray(array("users" => $userId, "status" => "", "sprint" => ""));
+            $allTickets = $this->ticketRepository->getAllBySearchCriteria($searchCriteria, "priority");
+
+            $statusLabels = $this->getAllStatusLabelsByUserId($userId);
+
+            $tickets = array();
+
+            foreach ($allTickets as $row) {
+                //Only include todos that are not done
+                if (
+                    isset($statusLabels[$row['projectId']]) &&
+                    isset($statusLabels[$row['projectId']][$row['status']]) &&
+                    $statusLabels[$row['projectId']][$row['status']]['statusType'] != "DONE"
+                ) {
+                    $label = $this->ticketRepository->priority[$row['priority']];
+                    if (isset($tickets[$row['priority']])) {
+                        $tickets[$row['priority']]['tickets'][] = $row;
+                    } else {
+                        // If the priority is not set, the label for priority not defined is used.
+                        if (empty($this->ticketRepository->priority[$row['priority']])) {
+                            $label =$this->language->__("label.priority_not_defined");
+                        }
+                        $tickets[$row['priority']] = array(
+                            "labelName" =>$label,
+                            "tickets" => array($row),
+                            "groupValue" => $row['time'],
+                        );
+                    }
+                }
+            }
+
+            return $tickets;
+        }
+
 
         /**
          * @param $userId
@@ -1941,6 +1983,8 @@ public function getToDoWidgetAssignments($params)
                 $tickets = $this->getOpenUserTicketsThisWeekAndLater($_SESSION["userdata"]["id"], $projectFilter);
             } elseif ($groupBy == "project") {
                 $tickets = $this->getOpenUserTicketsByProject($_SESSION["userdata"]["id"], $projectFilter);
+            } elseif ($groupBy == "priority") {
+                $tickets = $this->getOpenUserTicketsByPriority($_SESSION["userdata"]["id"], $projectFilter);
             } elseif ($groupBy == "sprint") {
                 $tickets = $this->getOpenUserTicketsBySprint($_SESSION["userdata"]["id"], $projectFilter);
             }

diff --git a/app/Domain/Widgets/Templates/partials/myToDos.blade.php b/app/Domain/Widgets/Templates/partials/myToDos.blade.php
@@ -54,6 +54,22 @@ class="btn btn-primary"
                                     <label for="groupByProject">{!! __("label.project") !!}</label>
                                 </span>
                             </li>
+                            <li>
+                                <span class="radio">
+                                    <input type="radio"
+                                           name="groupBy"
+                                           @if($groupBy == "priority") checked='checked' @endif
+                                           value="priority" id="groupByPriority"
+                                           hx-get="{{BASE_URL}}/widgets/myToDos/get"
+                                           hx-trigger="click"
+                                           hx-target="#yourToDoContainer"
+                                           hx-swap="outerHTML"
+                                           hx-indicator="#todos .htmx-indicator"
+                                           hx-vals='{"projectFilter": {{ $projectFilter }}, "groupBy": "priority" }'
+                                    />
+                                    <label for="groupByPriority">{!! __("label.priority") !!}</label>
+                                </span>
+                            </li>
 
                         </ul>
                     </div>

diff --git a/app/Language/ar-SA.ini b/app/Language/ar-SA.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/cs-CZ.ini b/app/Language/cs-CZ.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/da-DK.ini b/app/Language/da-DK.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Prioritet"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/de-DE-inf.ini b/app/Language/de-DE-inf.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="Liste"
 groupByLabel.sprint="Liste"
 groupByLabel.project="Projekt"
 groupByLabel.time="Fälligkeitsdatum"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Daten"
 

diff --git a/app/Language/de-DE.ini b/app/Language/de-DE.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="Liste"
 groupByLabel.sprint="Liste"
 groupByLabel.project="Projekt"
 groupByLabel.time="Fälligkeitsdatum"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Daten"
 

diff --git a/app/Language/el-GR.ini b/app/Language/el-GR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/en-GB.ini b/app/Language/en-GB.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/en-PT.ini b/app/Language/en-PT.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/en-UD.ini b/app/Language/en-UD.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/es-419.ini b/app/Language/es-419.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/es-ES.ini b/app/Language/es-ES.ini
@@ -2393,6 +2393,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/es-MX.ini b/app/Language/es-MX.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/et-EE.ini b/app/Language/et-EE.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/fa-IR.ini b/app/Language/fa-IR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/fr-FR.ini b/app/Language/fr-FR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/he-IL.ini b/app/Language/he-IL.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/hr-HR.ini b/app/Language/hr-HR.ini
@@ -2391,6 +2391,8 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/is-IS.ini b/app/Language/is-IS.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/it-IT.ini b/app/Language/it-IT.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/ja-JP.ini b/app/Language/ja-JP.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/kaa.ini b/app/Language/kaa.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/km-KH.ini b/app/Language/km-KH.ini
@@ -2393,6 +2393,7 @@ dropdown.choose_list="បញ្ជី"
 groupByLabel.sprint="បញ្ជី"
 groupByLabel.project="គម្រោង"
 groupByLabel.time="កាលបរិច្ឆេទកំណត់"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/ko-KR.ini b/app/Language/ko-KR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/ks-IN.ini b/app/Language/ks-IN.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/lv-LV.ini b/app/Language/lv-LV.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/nl-NL.ini b/app/Language/nl-NL.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/no-NO.ini b/app/Language/no-NO.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/pl-PL.ini b/app/Language/pl-PL.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/pt-BR.ini b/app/Language/pt-BR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/pt-PT.ini b/app/Language/pt-PT.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/ro-RO.ini b/app/Language/ro-RO.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/ru-RU.ini b/app/Language/ru-RU.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/sk-SK.ini b/app/Language/sk-SK.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/sl-SI.ini b/app/Language/sl-SI.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/sr-SP.ini b/app/Language/sr-SP.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/sv-SE.ini b/app/Language/sv-SE.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/tr-TR.ini b/app/Language/tr-TR.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/vi-VN.ini b/app/Language/vi-VN.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="List"
 groupByLabel.sprint="List"
 groupByLabel.project="Project"
 groupByLabel.time="Due Date"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="Sprint Dates"
 

diff --git a/app/Language/zh-CN.ini b/app/Language/zh-CN.ini
@@ -2391,6 +2391,7 @@ dropdown.choose_list="选择列表"
 groupByLabel.sprint="列表"
 groupByLabel.project="项目"
 groupByLabel.time="截止日期"
+groupByLabel.priority="Priority"
 
 label.sprint_dates="冲刺日期"