Merge pull request #5061 from dodona-edu/enhancement/right-request

app/assets/stylesheets/components/card.css.scss

@@ -156,6 +156,10 @@ a.card-title-link:hover {
   margin: 0;
   font-weight: normal;
   line-height: 1.1;
+
+  a {
+    color: var(--d-on-primary);
+  }
 }
 
 .card-title.card-subtitle {

app/controllers/rights_requests_controller.rb

@@ -30,7 +30,6 @@ def create
 
   def approve
     @rights_request.approve
-    @requests = policy_scope(RightsRequest.all)
     respond_to do |format|
       format.html { redirect_to rights_requests_path, notice: I18n.t('rights_requests.approve.approved') }
       format.js
@@ -39,7 +38,6 @@ def approve
 
   def reject
     @rights_request.reject
-    @requests = policy_scope(RightsRequest.all)
     respond_to do |format|
       format.html { redirect_to rights_requests_path, notice: I18n.t('rights_requests.reject.rejected') }
       format.js

app/views/rights_requests/approve.js.erb

@@ -1 +1 @@
-dodona.setHTMLExecuteScripts(document.querySelector("#requests-table-wrapper"), "<%= escape_javascript(render partial: 'requests_table', locals: { requests: @requests }) %>");
+document.querySelector("#request_<%= @rights_request.id %> .card-actions").innerHTML = '<button class="btn btn-filled d-btn-success" disabled><%= t("rights_requests.index.approved") %></button>'

app/views/rights_requests/index.html.erb

@@ -1,12 +1,40 @@
 <div class="row">
-  <div class="offset-md-1 col-md-10 col-12">
-    <div class="card">
-      <div class="card-title card-title-colored">
-        <h2 class="card-title-text"><%= t ".title" %></h2>
-      </div>
-      <div class="card-supporting-text" id="requests-table-wrapper">
-        <%= render partial: 'requests_table', locals: { requests: @requests } %>
+  <div class="page-subtitle justify-content-between">
+    <h3><%= @title %></h3>
+  </div>
+
+  <% @requests.each do |request| %>
+    <div class="col-lg-4 col-md-6 col-12">
+      <div class="card" id="request_<%= request.id %>">
+        <div class="card-title card-title-colored">
+          <h2 class="card-title-text">
+            <%= link_to request.user.full_name, request.user, target: "_blank", title: request.user.full_name, class: 'ellipsis-overflow' %>
+          </h2>
+          <h3 class="card-subtitle-text">
+            <%= link_to request.user.institution do %>
+              <% if request.institution_name.present? %>
+                <%= request.institution_name %>
+              <% elsif request.user.institution.generated_name %>
+                <i class="mdi mdi-alert colored-warning mdi-18"></i>
+                <%= t('.no_institution_provided') %>
+              <% else %>
+                <%= request.user.institution.name %>
+              <% end %>
+            <% end %>
+          </h3>
+        </div>
+        <div class="card-supporting-text" >
+          <%= request.context %>
+        </div>
+        <div class="card-actions card-border">
+          <%= link_to approve_rights_request_path(request), remote: true, method: :post, class: "btn btn-icon btn-icon-filled d-btn-success", title: t(".approve") do %>
+            <i class="mdi mdi-check"></i>
+          <% end %>
+          <%= link_to reject_rights_request_path(request), remote: true, method: :post, class: "btn btn-icon btn-icon-filled d-btn-danger", title: t(".reject"), data: {confirm: t("general.are_you_sure")} do %>
+              <i class="mdi mdi-close"></i>
+          <% end %>
+        </div>
       </div>
     </div>
-  </div>
+  <% end %>
 </div>

app/views/rights_requests/reject.js.erb

@@ -1 +1 @@
-dodona.setHTMLExecuteScripts(document.querySelector("#requests-table-wrapper"), "<%= escape_javascript(render partial: 'requests_table', locals: { requests: @requests }) %>");
+document.querySelector("#request_<%= @rights_request.id %> .card-actions").innerHTML = '<button class="btn btn-filled d-btn-danger" disabled><%= t("rights_requests.index.rejected") %></button>'

config/locales/views/rights_requests/en.yml

@@ -12,10 +12,11 @@ en:
       context_explanation: Some information about why you need these rights should go here...
     index:
       title: Teacher rights requests
-    requests_table:
       approve: Approve
       reject: Reject
       no_institution_provided: Not provided
+      approved: Approved
+      rejected: Rejected
     create:
       created: Request for teacher rights successfully sent.
     approve:

config/locales/views/rights_requests/nl.yml

@@ -12,10 +12,11 @@ nl:
       context_explanation: Schrijf hier wat info over waarom je deze rechten nodig hebt...
     index:
       title: Aanvragen voor lesgeversrechten
-    requests_table:
       approve: Goedkeuren
       reject: Afkeuren
       no_institution_provided: Niet opgegeven
+      approved: Goedgekeurd
+      rejected: Afgekeurd
     create:
       created: Je aanvraag voor lesgeversrechten werd successvol verzonden.
     approve: