From b298b58967d1f9335152ab5b4e348cdcc4b5d04e Mon Sep 17 00:00:00 2001 From: Bart Mesuere Date: Sun, 22 Oct 2023 13:34:41 +0200 Subject: [PATCH] refactor table to card view --- .../stylesheets/components/card.css.scss | 4 ++ app/controllers/rights_requests_controller.rb | 2 - .../rights_requests/_requests_table.html.erb | 40 ----------------- app/views/rights_requests/approve.js.erb | 2 +- app/views/rights_requests/index.html.erb | 44 +++++++++++++++---- app/views/rights_requests/reject.js.erb | 2 +- config/locales/views/rights_requests/en.yml | 3 +- config/locales/views/rights_requests/nl.yml | 3 +- 8 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 app/views/rights_requests/_requests_table.html.erb diff --git a/app/assets/stylesheets/components/card.css.scss b/app/assets/stylesheets/components/card.css.scss index e147e9c543..4da0dcef0c 100644 --- a/app/assets/stylesheets/components/card.css.scss +++ b/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 { diff --git a/app/controllers/rights_requests_controller.rb b/app/controllers/rights_requests_controller.rb index 2b0fcf8c16..49e1b31a2f 100644 --- a/app/controllers/rights_requests_controller.rb +++ b/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 diff --git a/app/views/rights_requests/_requests_table.html.erb b/app/views/rights_requests/_requests_table.html.erb deleted file mode 100644 index d187f67461..0000000000 --- a/app/views/rights_requests/_requests_table.html.erb +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - <% requests.each do |request| %> - - - - - - - <% end %> - -
<%= RightsRequest.human_attribute_name("user") %><%= RightsRequest.human_attribute_name("context") %><%= RightsRequest.human_attribute_name("institution_name") %>
- <%= link_to request.user.full_name, request.user, target: "_blank", title: request.user.full_name, class: 'ellipsis-overflow' %> - <%= request.context %> - <%= link_to request.user.institution do %> - <% if request.institution_name.present? %> - <%= request.institution_name %> - <% elsif request.user.institution.generated_name %> - - <%= t('.no_institution_provided') %> - <% else %> - <%= request.user.institution.name %> - <% end %> - <% end %> - - <%= 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 %> - - <% 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") do %> - - <% end %> -
diff --git a/app/views/rights_requests/approve.js.erb b/app/views/rights_requests/approve.js.erb index ae432c51a0..c30d7e9487 100644 --- a/app/views/rights_requests/approve.js.erb +++ b/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 = '' diff --git a/app/views/rights_requests/index.html.erb b/app/views/rights_requests/index.html.erb index bd651e0661..26e1fff98d 100644 --- a/app/views/rights_requests/index.html.erb +++ b/app/views/rights_requests/index.html.erb @@ -1,12 +1,40 @@
-
-
-
-

<%= t ".title" %>

-
-
- <%= render partial: 'requests_table', locals: { requests: @requests } %> +
+

<%= @title %>

+
+ + <% @requests.each do |request| %> +
+
+
+

+ <%= link_to request.user.full_name, request.user, target: "_blank", title: request.user.full_name, class: 'ellipsis-overflow' %> +

+

+ <%= link_to request.user.institution do %> + <% if request.institution_name.present? %> + <%= request.institution_name %> + <% elsif request.user.institution.generated_name %> + + <%= t('.no_institution_provided') %> + <% else %> + <%= request.user.institution.name %> + <% end %> + <% end %> +

+
+
+ <%= request.context %> +
+
+ <%= 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 %> + + <% 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 %> + + <% end %> +
-
+ <% end %>
diff --git a/app/views/rights_requests/reject.js.erb b/app/views/rights_requests/reject.js.erb index ae432c51a0..178a775ed8 100644 --- a/app/views/rights_requests/reject.js.erb +++ b/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 = '' diff --git a/config/locales/views/rights_requests/en.yml b/config/locales/views/rights_requests/en.yml index 2b7bc03cbb..57dd0b5b0c 100644 --- a/config/locales/views/rights_requests/en.yml +++ b/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: diff --git a/config/locales/views/rights_requests/nl.yml b/config/locales/views/rights_requests/nl.yml index b41d67fbf4..5fb16fcadb 100644 --- a/config/locales/views/rights_requests/nl.yml +++ b/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: