start of iteration 2

app/views/success_criteria/_form.html.erb

@@ -4,7 +4,7 @@
   
   <div class="collapse show" id="collapseSuccessCriterion_<%= success_criterion.id %>">
     <div class="card-body">
-      <%= bootstrap_form_with(model: success_criterion) do |form| %>
+      <%= bootstrap_form_with(model: success_criterion.persisted? ? success_criterion : [:element, success_criterion]) do |form| %>
         <div class="row">
           <div class="col">
             <div class="btn-group" role="group" aria-label="Resultat">
@@ -28,11 +28,13 @@
             <%= form.select :level, SuccessCriterion.levels.keys, hide_label: true %>
           </div>
         </div>
-        <%= form.rich_text_area :comment_html %>
         <%= form.text_field :title %>
-        <%= form.rich_text_area :description_html %>
+        <%= 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-warning" %>
-        <%= link_to "Abbrechen", success_criterion, class: "btn btn-outline-secondary" %>
+        <%= link_to "Abbrechen", success_criterion.persisted? ? success_criterion : success_criterion.element, class: "btn btn-outline-secondary" %>
       <% end %>
     </div>
   </div>

app/views/success_criteria/_header.html.erb

@@ -13,7 +13,7 @@
     <span class="badge rounded-pill text-bg-secondary">
       <%= success_criterion.level %>
     </span>
-    <% if success_criterion.comment_html.present? %>
+    <% if success_criterion.test_comment.present? %>
       <i class="bi bi-chat"></i>
     <% end %>
     <% if false && action_name == "edit" %>

app/views/success_criteria/_success_criterion.html.erb

@@ -1,35 +1,39 @@
-<% expanded = false unless defined?(expanded) %>
-<div id="<%= dom_id success_criterion %>" class="card mt-3">
-  <%== render partial: "success_criteria/header", locals: {success_criterion: success_criterion } %>
-  
-  <div class="collapse<%= " show" if expanded %>" id="collapseSuccessCriterion_<%= success_criterion.id %>">
-    <div class="card-body">
-      <%= bootstrap_form_with(model: success_criterion, data: { controller: "autosubmit" }) do |form| %>
-        <div class="row mb-3">
-          <div class="col">
-            <div class="btn-group" role="group" aria-label="Resultat">
-              <%= form.radio_button_without_bootstrap :result, :passed, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_passed) %>
-              <label class="btn btn-outline-success" for="<%= dom_id(success_criterion, :result_passed) %>">
-                Bestanden
-              </label>
-              <%= form.radio_button_without_bootstrap :result, :failed, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_failed)  %>
-              <label class="btn btn-outline-danger" for="<%= dom_id(success_criterion, :result_failed) %>">
-                Durchgefallen
-              </label>
-              <%= form.radio_button_without_bootstrap :result, :not_applicable, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_not_applicable)  %>
-              <label class="btn btn-outline-secondary" for="<%= dom_id(success_criterion, :result_not_applicable) %>">
-                Nicht anwendbar
-              </label>
+<%= turbo_frame_tag(dom_id(success_criterion, :frame)) do %>
+  <% expanded = false unless defined?(expanded) %>
+  <div id="<%= dom_id success_criterion %>" class="card mt-3">
+    <%== render partial: "success_criteria/header", locals: {success_criterion: success_criterion } %>
+    
+    <div class="collapse<%= " show" if expanded %>" id="collapseSuccessCriterion_<%= success_criterion.id %>">
+      <div class="card-body">
+        <%= bootstrap_form_with(model: success_criterion, data: { controller: "autosubmit" }) do |form| %>
+          <div class="row mb-3">
+            <div class="col">
+              <div class="btn-group" role="group" aria-label="Resultat">
+                <%= form.radio_button_without_bootstrap :result, :passed, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_passed) %>
+                <label class="btn btn-outline-success" for="<%= dom_id(success_criterion, :result_passed) %>">
+                  Bestanden
+                </label>
+                <%= form.radio_button_without_bootstrap :result, :failed, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_failed)  %>
+                <label class="btn btn-outline-danger" for="<%= dom_id(success_criterion, :result_failed) %>">
+                  Durchgefallen
+                </label>
+                <%= form.radio_button_without_bootstrap :result, :not_applicable, class: "btn-check", autocomplete: "off", id: dom_id(success_criterion, :result_not_applicable)  %>
+                <label class="btn btn-outline-secondary" for="<%= dom_id(success_criterion, :result_not_applicable) %>">
+                  Nicht anwendbar
+                </label>
+              </div>
+              <%# form.collection_select :result, SuccessCriterion.results.map{ |k, v| [k, t("activerecord.attributes.success_criterion.results/#{k}")] }, :first, :second, include_blank: true, hide_label: true %>
+              <%# form.select :category, SuccessCriterion.categories.keys  %>
             </div>
-            <%# form.collection_select :result, SuccessCriterion.results.map{ |k, v| [k, t("activerecord.attributes.success_criterion.results/#{k}")] }, :first, :second, include_blank: true, hide_label: true %>
-            <%# form.select :category, SuccessCriterion.categories.keys  %>
           </div>
-        </div>
-      <% end %>
-      <%= success_criterion.description_html %>
-      <% if success_criterion.comment_html.present? %>
-        <div class="comment mt-3"><%= success_criterion.comment_html %></div>
-      <% end %>
+        <% end %>
+        <%= success_criterion.quick_criterion %>
+        <%= success_criterion.quick_fail %>
+        <%= success_criterion.quick_fix %>
+        <% if success_criterion.test_comment.present? %>
+          <div class="comment mt-3"><%= success_criterion.test_comment %></div>
+        <% end %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>

app/views/success_criteria/_success_criterion.json.jbuilder

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-json.extract! success_criterion, :id, :element_id, :title, :description_html, :level, :result, :comment_html,
+json.extract! success_criterion, :id, :element_id, :title, :description_html, :level, :result, :comment,
               :created_at, :updated_at
 json.url success_criterion_url(success_criterion, format: :json)

app/views/success_criteria/create.turbo_stream.erb

@@ -0,0 +1,2 @@
+<%= turbo_stream.update dom_id(@success_criterion.element, "new_success_criterion_frame"), partial: "elements/new_success_criterion_button", locals: { element: @success_criterion.element } %>
+<%= turbo_stream.append dom_id(@success_criterion.element, "success_criteria_list"), @success_criterion %>

app/views/success_criteria/create_from_checklist.turbo_stream.erb

@@ -0,0 +1,5 @@
+<%= turbo_stream.update dom_id(@success_criteria.first.element, "new_success_criterion_frame"), partial: "elements/new_success_criterion_button", locals: { element: @success_criteria.first.element } %>
+
+<% @success_criteria.each do |success_criterion| %>
+  <%= turbo_stream.append dom_id(success_criterion.element, "success_criteria_list"), success_criterion %>
+<% end %>

app/views/success_criteria/edit.html.erb

@@ -6,5 +6,5 @@
 
 <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)), success_criteria_path %>
+  <%= link_to t("scaffold.link_index", model: SuccessCriterion.model_name.human(count: 2)), element_success_criteria_path(@success_criterion.element) %>
 </div>

app/views/success_criteria/index.html.erb

@@ -9,13 +9,11 @@
       
         <th><%= SuccessCriterion.human_attribute_name(:title) %></th>
       
-        <th><%= SuccessCriterion.human_attribute_name(:description_html) %></th>
-      
         <th><%= SuccessCriterion.human_attribute_name(:level) %></th>
       
         <th><%= SuccessCriterion.human_attribute_name(:result) %></th>
       
-        <th><%= SuccessCriterion.human_attribute_name(:comment_html) %></th>
+        <th><%= SuccessCriterion.human_attribute_name(:test_comment) %></th>
       
   </thead>
   <tbody>
@@ -27,13 +25,11 @@
         
           <td><%= link_to(success_criterion.title, url_for(success_criterion)) %></td>
         
-          <td><%= link_to(truncate(success_criterion.description_html.to_plain_text), url_for(success_criterion)) %></td>
-        
           <td><%= link_to(success_criterion.level, url_for(success_criterion)) %></td>
         
           <td><%= link_to(success_criterion.result, url_for(success_criterion)) %></td>
         
-          <td><%= link_to(truncate(success_criterion.comment_html.to_plain_text), url_for(success_criterion)) %></td>
+          <td><%= link_to(truncate(success_criterion.test_comment.to_plain_text), url_for(success_criterion)) %></td>
         
       </tr>
     <% end %>
@@ -41,5 +37,5 @@
 </table>
 
 <div class="action-row">
-  <%= link_to t("scaffold.link_new", model: SuccessCriterion.model_name.human), new_success_criterion_path %>
+  <%= link_to t("scaffold.link_new", model: SuccessCriterion.model_name.human), new_element_success_criterion_path(@element) %>
 </div>

app/views/success_criteria/new.html.erb

@@ -1,7 +0,0 @@
-<h1><%= t("scaffold.pagetitle_new", model: SuccessCriterion.model_name.human) %></h1>
-
-<%= render "form", success_criterion: @success_criterion %>
-
-<div class="action-row">
-  <%= link_to t("scaffold.link_index", model: SuccessCriterion.model_name.human(count: 2)), success_criteria_path %>
-</div>

app/views/success_criteria/new.html.erb.old

@@ -0,0 +1,21 @@
+<h1><%= t("scaffold.pagetitle_new", model: SuccessCriterion.model_name.human) %></h1>
+
+<%= turbo_frame_tag dom_id(@success_criterion.element, "new_success_criterion_frame") do %>
+  <div id="<%= dom_id @success_criterion %>" class="card mt-3">
+    <%== render partial: "success_criteria/header", locals: { success_criterion: @success_criterion.tap { _1.title = "Neu" } } %>
+    
+    <div class="collapse show" id="collapseSuccessCriterion_<%= @success_criterion.id %>">
+      <div class="card-body">
+        <%= bootstrap_form_with(model: @success_criterion.persisted? ? @success_criterion : [:element, @success_criterion]) do |form| %>
+          <%= form.collection_select :check_id, Check.all.order(:external_number), :id, :display_label %>
+          <%= form.submit class: "btn btn-warning" %>
+          <%= link_to "Abbrechen", @success_criterion.persisted? ? @success_criterion : @success_criterion.element, class: "btn btn-outline-secondary" %>
+        <% end %>
+      </div>
+    </div>
+    <%# <%= link_to "edit", url_for([:edit, success_criterion]) %>
+  </div>
+<% end %>
+<div class="action-row">
+  <%= link_to t("scaffold.link_index", model: SuccessCriterion.model_name.human(count: 2)), element_success_criteria_path(@element) %>
+</div>

app/views/success_criteria/new.html.slim

@@ -0,0 +1,11 @@
+h1
+  = t("scaffold.pagetitle_new", model: SuccessCriterion.model_name.human)
+= turbo_frame_tag dom_id(@success_criterion.element, "new_success_criterion_frame") do
+  .border.border-info.p-3
+    = bootstrap_form_with(model: @success_criterion.persisted? ? @success_criterion : [:element, @success_criterion]) do |form|
+      = form.collection_select :check_id, Check.all.order(:external_number), :id, :display_label
+      = form.submit class: "btn btn-warning"
+      = link_to "Abbrechen", @success_criterion.persisted? ? @success_criterion : @success_criterion.element, class: "btn btn-outline-secondary"
+
+.action-row
+  = link_to t("scaffold.link_index", model: SuccessCriterion.model_name.human(count: 2)), element_success_criteria_path(@element)

app/views/success_criteria/new_from_checklist.html.slim

@@ -0,0 +1,8 @@
+
+
+= turbo_frame_tag dom_id(@success_criterion.element, :new_success_criterion_frame) do 
+  .border.border-info.p-3
+    = bootstrap_form_with(url: create_from_checklist_element_success_criteria_path(@success_criterion.element), name: :new_from_checklist) do |form| 
+      = form.collection_select :checklist_id, Checklist.all.order(:name), :id, :name 
+      = form.submit class: "btn btn-warning" 
+      = link_to "Abbrechen", @success_criterion.persisted? ? @success_criterion : @success_criterion.element, class: "btn btn-outline-secondary" 

app/views/success_criteria/show.html.erb

@@ -1,11 +1,9 @@
 <h1><%= t("scaffold.pagetitle_show", model: @success_criterion.class.model_name.human) %></h1>
 
-<%= turbo_frame_tag(dom_id(@success_criterion, :frame)) do %>
-  <% render partial: "success_criteria/success_criterion", locals: { success_criterion: @success_criterion, expanded: true } %>
-<% end %>
+<%= render partial: "success_criteria/success_criterion", locals: { success_criterion: @success_criterion, expanded: true } %>
 
 <div class="action-row">
   <%= link_to t("scaffold.link_edit", model: @success_criterion.model_name.human), edit_success_criterion_path(@success_criterion) %>
-  <%= link_to t("scaffold.link_index", model: @success_criterion.model_name.human(count: 2)), success_criteria_path %>
+  <%= link_to t("scaffold.link_index", model: @success_criterion.model_name.human(count: 2)), element_success_criteria_path(@success_criterion.element) %>
   <%= button_to t("scaffold.link_destroy", model: @success_criterion.model_name.human), @success_criterion, method: :delete, class: "btn btn-outline-danger" %>
 </div>