Merge pull request #4 from akpaevj/feature-add-date-and-badge

date and project badge are added in the issue card

Author: akpaevj

app/controllers/dashboard_controller.rb

@@ -30,6 +30,7 @@ def getProjects(selected_project_id = -1)
     projects.push({
       "id" => project.id,
       "name" => project.name,
+      "color" => Setting.plugin_dashboard["project_color_" + project.id.to_s],
       "selected" => selected
     })
   end
@@ -52,6 +53,9 @@ def getData(project_id = -1)
       "id" => issue.id,
       "subject" => issue.subject,
       "status_id" => issue.status.id,
+      "project" => issue.project.name,
+      "project_id" => issue.project.id,
+      "created_at" => issue.start_date,
       "author" => issue.author.name(User::USER_FORMATS[:firstname_lastname]),
       "executor" => executor
     })

app/views/dashboard/index.html.erb

@@ -21,6 +21,10 @@
 			<div class="status_column_issues">
 				<% status["issues"].each do |issue| %>
 					<div draggable="true" class="issue_card" data-status="<%= status['id'] %>" data-id="<%= issue['id'] %>" onclick="goToIssue(<%= issue['id'] %>)">
+						<div class="issue_card_header">
+							<span class="issue_card_header_date"><%= issue["created_at"] %></span>
+							<div class="issue_card_header_project" style="background-color: <%= @projects[issue['project_id']]['color'] %>"><%= issue["project"] %></div>
+						</div>
 						<span class="issue_card_title"> <%= issue["subject"] %> </span>
 						<span class="issue_card_author"><i class="bi bi-person"></i> <%= issue["author"] %> </span>
 						<% if issue["executor"] == '' || issue["executor"].nil? %>

app/views/settings/_dashboard_settings.erb

@@ -1,10 +1,8 @@
 <table>
-  <thead>
-    <tr>
-      <th colspan="2"> <%=l :settings_header %> </td>
-    </tr>
-  </thead>
   <tbody>
+  <tr>
+    <th colspan="2"> <%=l :settings_header_statuses %> </td>
+  </tr>
   <% IssueStatus.sorted().each do |status| %>
     <% if !status.is_closed %>
       <% property_name = "status_color_" + status.id.to_s %>
@@ -15,6 +13,18 @@
         </td>
       </tr>
     <% end %>
+  <% end %>
+  <tr>
+    <th colspan="2"> <%=l :settings_header_projects %> </td>
+  </tr>
+  <% Project.all.each do |project| %>
+    <% property_name = "project_color_" + project.id.to_s %>
+    <tr>
+      <td> <%= project.name %> </th>
+      <td>
+        <input type="color" id="settings_<%= property_name %>" value="<%= settings[property_name] %>" name="settings[<%= property_name %>]">
+      </td>
+    </tr>
   <% end %>  
   </tbody>
 </table>

assets/stylesheets/style.css

@@ -97,4 +97,22 @@
 
 .select_project {
     margin-left: 10px;
+}
+
+.issue_card_header {
+    display: flex;
+    padding-top: 5px;
+    align-items: center;
+    width: 100%;
+}
+
+.issue_card_header_project {
+    margin-left: auto;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 8px;
+    padding-right: 8px;
+    margin-right: 10px;
+    border-radius: 15px;
+    color: white;
 }

config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   top_menu_item_title: "Dashboard"
-  settings_header: "Colors of the status column header"
+  settings_header_statuses: "Colors of the status column header"
+  settings_header_projects: "Project colors"
   executor_not_set: "Not set"
   label_all: "All"

config/locales/ru.yml

@@ -1,5 +1,6 @@
 ru:
   top_menu_item_title: "Панель задач"
-  settings_header: "Цвета заголовков колонок статусов"
+  settings_header_statuses: "Цвета заголовков колонок статусов"
+  settings_header_projects: "Цвета проектов"
   executor_not_set: "Не установлен"
   label_all: "Все"

init.rb

@@ -2,7 +2,7 @@
   name 'Dashboard'
   author "Akpaev E.A."
   description "Plugin adds an issues dashboard to the application"
-  version '1.0.3'
+  version '1.0.4'
   url 'https://github.com/akpaevj/Dashboard'
   author_url 'https://github.com/akpaevj'
   menu :top_menu, :dashboard, { controller: 'dashboard', action: 'index' }, caption: :top_menu_item_title, first: true