jwa11y/a11yist
2
1
Fork 0
Code Issues 15 Pull requests Projects 1 Releases Packages 1 Wiki Activity Actions

Improve exports and GUI
Some checks failed
/ Run tests (push) Successful in 1m47s
Details
/ Run system tests (push) Has been cancelled
Details
/ Build, push and deploy image (push) Has been cancelled
Details

Browse source
This commit is contained in:
david 2024-11-17 13:44:51 +01:00
parent 0a48759576
commit fa1d5b8bce
13 changed files with 195 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/application.bootstrap.scss
View file

@ -163,3 +163,4 @@ trix-toolbar .trix-dialog--link {
} */
@import "./layout";
@import "./dropdown";

67
app/assets/stylesheets/dropdown.scss Normal file
View file

@ -0,0 +1,67 @@
.details-dropdown {
display: inline-block;
position: relative;
}
/* Hide The disclosure widget: */
.details-dropdown summary {
list-style: none;
cursor: pointer;
}
.details-dropdown[open] summary {
list-style: none;
cursor: pointer;
i {
color: var(--bs-body-color)
}
/* border-left: solid 1px $secondary; */
/* border-top: solid 1px $secondary; */
/* border-right: solid 1px $secondary; */
}
.details-dropdown[open] {
background-color: $secondary;
}
/* Detache details content */
.details-dropdown .details-dropdown-content {
border: solid 1px $secondary;
position: absolute;
min-inline-size: max-content;
z-index: 2000;
/* In case the details-dropdown should open to the left: */
right: 0;
}
/* Closing the details-dropdown on clicking anywhere else */
.details-dropdown[open] summary::before {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
content: "";
cursor: default;
}
/* Visual styles for your details-dropdown: */
.details-dropdown .details-dropdown-trigger {
/* your look and feel here */
}
.details-dropdown .details-dropdown-content {
/* your look and feel here */
}
form.no-padding {
button {
padding: 0;
}
}
li.list-group-item-danger:hover {
button {
color: var(--bs-body-color) ;
}
}

26
app/assets/stylesheets/layout.scss
View file

@ -91,7 +91,9 @@ $tertiary-dark-active-open: $gray-600;
.page_nav nav ul {
padding-left: 0;
list-style-type: none;
line-height: 2rem;
li {
margin-bottom: 0.5rem;
}
a {
color: var(--bs-text);
@ -223,7 +225,14 @@ details.tree[open]>summary::before {
padding-bottom: 0;
}
details.success_criterion:last-child {
border-bottom: solid 1px $tertiary;
}
details.success_criterion {
border: solid 1px $tertiary;
border-bottom: solid 0px $tertiary;
summary:hover {
background-color: $tertiary-hover;
@ -255,24 +264,31 @@ details.success_criterion {
details.success_criterion[open] {
border: solid 1px $tertiary;
summary {
>summary {
background-color: $tertiary;
}
summary:hover {
>summary:hover {
background-color: $tertiary-active-hover;
}
}
@include color-mode(dark) {
details.success_criterion {
border: solid 1px $tertiary-dark;
border-bottom: solid 0px $tertiary-dark;
}
details.success_criterion:last-child {
border-bottom: solid 1px $tertiary-dark;
}
details.success_criterion[open] {
border: solid 1px $tertiary-dark;
summary {
>summary {
background-color: $tertiary-dark;
}
summary:hover {
>summary:hover {
background-color: $tertiary-dark-active-open;
}
}

31
app/helpers/application_helper.rb
View file

@ -32,4 +32,35 @@ module ApplicationHelper
def turbo_stream_toast(content, alert)
turbo_stream.append("toasts", partial: "layouts/toast", locals: { content:, alert: })
end
def dropdown_menu(items, klass: "")
tag.details(class: "details-dropdown #{klass}") do
tag.summary do
tag.div(class: "details-dropdown-trigger") do
tag.div(tag.i(class: "bi bi-three-dots-vertical"), class: "btn btn-outline-secondary")
end
end +
tag.div(class: "details-dropdown-content bg-secondary") do
tag.ul(class: "list-group") do
safe_join(items.map do |item|
tag.li(class: "list-group-item list-group-item-action#{ item[:color] ? " list-group-item-#{item[:color]}" : ""}") do
text = item[:icon] ? tag.i(class: "bi bi-#{item[:icon]} me-2") + " #{item[:text]}".html_safe : item[:text]
case item[:method]
when nil, :get
link_to(text, item[:href], class: "text-decoration-none text-body")
else
button_to(text,
item[:href],
method: item[:method],
form_class: "no-padding",
class: "btn btn-link text-decoration-none text-#{item[:color] ? "#{item[:color]}-emphasis" : "body"}",
data: { turbo_confirm: item[:confirm] })
end
end
end)
end
end
end
end
end

18
app/helpers/success_criteria_helper.rb
View file

@ -25,6 +25,20 @@ module SuccessCriteriaHelper
end
end
def success_criterion_menu(success_criterion, show_mode = true)
dropdown_menu([
{ text: show_mode ? "Bearbeiten" : "Bearbeiten abbrechen",
icon: "pencil",
href: show_mode ? edit_success_criterion_path(success_criterion) : success_criterion_path(success_criterion)},
{ text: "Löschen",
icon: "trash",
href: success_criterion_path(success_criterion),
color: :danger,
method: :delete,
confirm: "Bist du sicher?"}],
klass: "mt-3 ms-auto")
end
def success_criterion_edit_button(success_criterion, edit_mode)
path = if success_criterion.persisted?
@ -37,9 +51,9 @@ module SuccessCriteriaHelper
else
success_criterion.element
end
link_to tag.i(class: "bi bi-pencil"),
link_to tag.i(class: "bi bi-pencil") + " Bearbeiten".html_safe,
path,
class: "btn btn-#{edit_mode ? 'link text-warning' : 'link text-body'}"
class: "text-decoration-none xbtn xbtn-#{edit_mode ? 'link text-warning' : 'link text-body'}"
end
def success_criterion_badge(content, extra_classes: "")

13
app/views/exports/show.html.slim
View file

@ -37,19 +37,26 @@ p Woher kommt dieser Text?
h2 2 Protokoll
- current_page_pos = 0
- current_abs_element_pos = 0
- @report.pages.select { |p| p.elements.any? { |e| e.success_criteria.any? { _1.failed? } } }.each do |page|
- current_page_pos += 1
- current_element_pos = 0
h3 = "2.#{current_page_pos} #{page.path}"
- current_abs_element_pos = 0
/h3 = "2.#{current_page_pos} #{page.path}"
- page.elements { |e| e.success_criteria.any? { _1.failed? } }.each do |element|
- current_element_pos += 1
- current_abs_element_pos += 1
- current_sc_pos = 0
h4 = "2.#{current_page_pos}.#{current_element_pos} #{element.title}"
/h4 = "2.#{current_page_pos}.#{current_element_pos} #{element.title}"
h3 = "2.#{current_abs_element_pos} #{element.title}"
p
strong Pfad:
span =< page.path
= safe_display(element.screenshot) { image_tag(_1.representation(resize_to_fit: [250, 250]))}
= element.description
- element.success_criteria.select{ _1.failed? }.each do |sc|
- current_sc_pos += 1
h5 = "2.#{current_page_pos}.#{current_element_pos}.#{current_sc_pos} #{sc.title}"
h4 = "2.#{current_abs_element_pos}.#{current_sc_pos} #{sc.title}"
- if sc.test_comment?
p = sc.test_comment
- safe_display(sc.quick_criterion) do

7
app/views/success_criteria/_body.html.slim
View file

@ -1,7 +1,6 @@
.content id="#{dom_id(success_criterion, :body)}"
= turbo_frame_tag(dom_id(success_criterion, :frame)) do
.row
.col
.d-flex
.my-3.btn-group[role="group" aria-label="Resultat"]
= bootstrap_form_with(model: success_criterion, data: { controller: "autosubmit" }) do |form|
= form.radio_button_without_bootstrap :result, :passed, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_passed)
@ -12,8 +11,8 @@
label.btn.btn-outline-secondary for=dom_id(success_criterion, :result_not_applicable) Nicht anwendbar
/= form.radio_button_without_bootstrap :result, nil, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_not_applicable)
/label.btn.btn-outline-secondary for=dom_id(success_criterion, :nil) Reset
= button_to(tag.i(class: "bi bi-trash"), success_criterion, method: :delete, class: "btn btn-link text-danger", data: { turbo_confirm: "Bist du sicher?"})
= success_criterion_edit_button(success_criterion, false)
/ = dropdown_menu([{ text: "Bearbeiten", icon: "pencil", href: edit_success_criterion_path(success_criterion) }, { text: "Löschen", icon: "trash", href: success_criterion, color: :danger, method: :delete, confirm: "Bist du sicher?"}], klass: "mt-3 ms-auto")
= success_criterion_menu(success_criterion)
.row
.col
- if success_criterion.test_comment?

11
app/views/success_criteria/_form.html.erb
View file

@ -1,11 +0,0 @@
<%= bootstrap_form_with(model: success_criterion.persisted? ? success_criterion : [:element, success_criterion], data: { controller: "unsaved-changes" }) do |form| %>
<%= form.text_field :title %>
<%= form.collection_select :result, SuccessCriterion.results.keys.map { [_1, t("activerecord.attributes.success_criterion.results/#{_1}")] }, :first, :second, include_blank: success_criterion.result ? "(Resultat zurücksetzen)" : "(unbeantwortet)" %>
<%= form.rich_text_area :quick_criterion %>
<%= form.rich_text_area :quick_fail %>
<%= form.rich_text_area :quick_fix %>
<%= form.rich_text_area :test_comment %>
<%= form.submit class: "btn btn-primary" %>
<%= link_to "Abbrechen", success_criterion.persisted? ? success_criterion : success_criterion.element, class: "btn btn-outline-secondary" %>
<% end %>

9
app/views/success_criteria/_form.html.slim Normal file
View file

@ -0,0 +1,9 @@
= bootstrap_form_with(model: success_criterion.persisted? ? success_criterion : [:element, success_criterion], data: { controller: "unsaved-changes" }) do |form|
= form.text_field :title
= form.collection_select :result, SuccessCriterion.results.keys.map { [_1, t("activerecord.attributes.success_criterion.results/#{_1}")] }, :first, :second, include_blank: success_criterion.result ? "(Resultat zurücksetzen)" : "(unbeantwortet)"
= form.rich_text_area :quick_criterion
= form.rich_text_area :quick_fail
= form.rich_text_area :quick_fix
= form.rich_text_area :test_comment
= form.submit class: "btn btn-primary"
= link_to "Abbrechen", success_criterion.persisted? ? success_criterion : success_criterion.element, class: "btn btn-outline-secondary"

2
app/views/success_criteria/_header.html.slim
View file

@ -3,7 +3,7 @@ summary.d-flex.align-items-start id=dom_id(success_criterion, :header)
.content.d-flex.align-items-center.w-100
.result-icon.flex-shrink-0 class=[success_criterion_result_color_classes(success_criterion)]
span.h1.bi class=[success_criterion_result_icon_classes(success_criterion)]
.flex-fill
.flex-fill.py-1
span id=dom_id(success_criterion, :position)
= success_criterion.page.position
| .

3
app/views/success_criteria/_record_menu.html.slim Normal file
View file

@ -0,0 +1,3 @@
= dropdown_menu(klass: "mt-3 ms-auto b-0") do
= success_criterion_edit_button(@success_criterion, true)
= button_to(tag.i(class: "bi bi-trash") + " Löschen".html_safe, @success_criterion, method: :delete, class: "text-danger", data: { turbo_confirm: "Bist du sicher?"})

10
app/views/success_criteria/edit.html.erb
View file

@ -1,10 +0,0 @@
<h1><%= t("scaffold.pagetitle_edit", model: SuccessCriterion.model_name.human) %></h1>
<%= turbo_frame_tag(dom_id(@success_criterion, :frame)) do %>
<%= render "form", success_criterion: @success_criterion %>
<% end %>
<div class="action-row">
<%= link_to t("scaffold.link_show", model: SuccessCriterion.model_name.human), @success_criterion %>
<%= link_to t("scaffold.link_index", model: SuccessCriterion.model_name.human(count: 2)), element_success_criteria_path(@success_criterion.element) %>
</div>

19
app/views/success_criteria/edit.html.slim Normal file
View file

@ -0,0 +1,19 @@
h1
= t("scaffold.pagetitle_edit", model: SuccessCriterion.model_name.human)
= turbo_frame_tag(dom_id(@success_criterion, :frame)) do
.d-flex
h2.my-2 Bearbeiten
.ms-auto
= success_criterion_menu(@success_criterion, false)
/= dropdown_menu(klass: "mt-3 b-0") do
ul.list-group
li.list-group-item
= success_criterion_edit_button(@success_criterion, true)
li.list-group-item
= button_to(tag.i(class: "bi bi-trash") + " Löschen".html_safe, @success_criterion, method: :delete, class: "btn text-danger", data: { turbo_confirm: "Bist du sicher?"})
.mb-3
= render "form", success_criterion: @success_criterion
.action-row
= link_to t("scaffold.link_show", model: SuccessCriterion.model_name.human), @success_criterion
= link_to t("scaffold.link_index", model: SuccessCriterion.model_name.human(count: 2)), element_success_criteria_path(@success_criterion.element)