Added projects

app/controllers/application_controller.rb

@@ -22,9 +22,13 @@ class ApplicationController < ActionController::Base
           path: :root
         },
         {
-          label: Report.model_name.human(count: 2),
+          label: Project.model_name.human(count: 2),
-          icon: :'journal-text',
+          icon: :'folder',
-          path: :reports },
+          path: :projects },
+        # {
+        #   label: Report.model_name.human(count: 2),
+        #   icon: :'journal-text',
+        #   path: :reports },
         {
           label: I18n.t("backoffice"),
           icon: :gear,

app/controllers/home_controller.rb

@@ -20,11 +20,6 @@ class HomeController < ApplicationController
         path: profile_path,
         active: action_name == "profile"
       },
-      # {
-      #   label: "Passwort ändern",
-      #   path: new_password_path,
-      #   icon: :lock
-      # },
       {
         label: "Logout",
         icon: :"box-arrow-right",

app/controllers/projects_controller.rb

@@ -0,0 +1,62 @@
+class ProjectsController < ApplicationController
+  before_action :set_project, only: %i[ show edit update destroy ]
+
+  # GET /projects
+  def index
+    @projects = Project.all
+  end
+
+  # GET /projects/1
+  def show
+  end
+
+  # GET /projects/new
+  def new
+    @project = Project.new
+  end
+
+  # GET /projects/1/edit
+  def edit
+  end
+
+  # POST /projects
+  def create
+    @project = if params[:copy_from_id]
+      Project.find(params[:copy_from_id]).dup
+    else
+      Project.new(project_params)
+    end
+
+    if @project.save
+      redirect_to @project, notice: "Project was successfully created."
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /projects/1
+  def update
+    if @project.update(project_params)
+      redirect_to @project, notice: "Project was successfully updated.", status: :see_other
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /projects/1
+  def destroy
+    @project.destroy!
+    redirect_to projects_url, notice: "Project was successfully destroyed.", status: :see_other
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_project
+      @project = Project.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def project_params
+      params.require(:project).permit(:name, :details)
+    end
+end

app/controllers/reports_controller.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 class ReportsController < ApplicationController
+  before_action :set_project, only: %i[index new create]
   before_action :set_report, only: %i[show edit update destroy work]
 
   # GET /reports
   def index
-    @reports = Report.all
+    @reports = @project.reports
   end
 
   # GET /reports/1
@@ -85,7 +86,7 @@ class ReportsController < ApplicationController
 
   # GET /reports/new
   def new
-    @report = Report.new
+    @report = Report.new(project_id: @project.id)
   end
 
   # GET /reports/1/edit
@@ -93,10 +94,45 @@ class ReportsController < ApplicationController
 
   # POST /reports
   def create
-    @report = Report.new(report_params)
+    success = if params[:copy_from_id]
+      original = Report.find(params[:copy_from_id])
+      @report = original.dup
+      @report.pages = original.pages.map do |page|
+        page.dup.tap do |p|
+          p.elements = page.elements.map do |element|
+            element.dup.tap do |e|
+              e.success_criteria = element.success_criteria.map do |sc|
+                csc = sc.dup
+                SuccessCriterion.rich_text_association_names
+                                .map { _1.to_s.sub(/^rich_text_/, "") }
+                                .each do |a|
+                  csc.send("#{a}=", sc.send(a).dup)
+                end
+                csc
+              end
+              e.screenshot = element.screenshot&.dup
+              Element.rich_text_association_names
+                              .map { _1.to_s.sub(/^rich_text_/, "") }
+                              .each do |a|
+                e.send("#{a}=", element.send(a).dup)
+              end
+            end
+          end
+          Page.rich_text_association_names
+                          .map { _1.to_s.sub(/^rich_text_/, "") }
+                          .each do |a|
+            p.send("#{a}=", page.send(a).dup)
+          end
+        end
+      end
+      @report.save
+    else
+      @report = Report.new(report_params.merge(project_id: @project.id))
+      @report.save
+    end
 
-    if @report.save
+    if success
-      redirect_to @report, notice: "Report was successfully created."
+      redirect_to @report.reload, notice: "Report was successfully created."
     else
       render :new, status: :unprocessable_entity
     end
@@ -114,7 +150,7 @@ class ReportsController < ApplicationController
   # DELETE /reports/1
   def destroy
     @report.destroy!
-    redirect_to reports_url, notice: "Report was successfully destroyed.", status: :see_other
+    redirect_to project_url(@report.project), notice: "Report was successfully destroyed.", status: :see_other
   end
 
   def work
@@ -130,7 +166,7 @@ class ReportsController < ApplicationController
 
   # Only allow a list of trusted parameters through.
   def report_params
-    params.require(:report).permit(:name, :comment, :url)
+    params.require(:report).permit(:name, :comment, :url, :project_id)
   end
 
   def filename(report, extension: "html")
@@ -140,4 +176,8 @@ class ReportsController < ApplicationController
   def page_param
     params[:page_id]
   end
+
+  def set_project
+    @project = Project.find(params[:project_id])
+  end
 end

app/helpers/projects_helper.rb

@@ -0,0 +1,2 @@
+module ProjectsHelper
+end

app/javascript/application.js

@@ -1,7 +1,6 @@
 // Entry point for the build script in your package.json
 import "@hotwired/turbo-rails"
 import "./controllers"
-import * as bootstrap from "bootstrap"
 
 import "trix"
 import "@rails/actiontext"

app/models/project.rb

@@ -0,0 +1,7 @@
+class Project < ApplicationRecord
+  has_many :reports, dependent: :restrict_with_error
+
+  has_rich_text :details
+
+  scope :current, -> { where("updated_at > ?", 1.month.ago) }
+end

app/models/report.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Report < ApplicationRecord
+  belongs_to :project, touch: true
+
   has_many :pages, -> { order(:position) }, dependent: :destroy
   has_many :elements, through: :pages, dependent: :destroy
   has_many :success_criteria, through: :elements, dependent: :destroy

app/views/home/show.html.slim

@@ -1,18 +1,25 @@
-h1 a11ydive
+h1 Dashboard
-h2 Dashboard
+
+.row
+  .col-md-6
+    - if Project.current.any?
+      h2 
+        i.bi.bi-folder>
+        'Aktuelle Projekte
+      ul
+        - Project.current.order(updated_at: :desc).each do |p|
+          li = link_to(p.name, p)
 
     - if Report.any?
-  h3 Zuletzt bearbeitete Prüfberichte
+      h2 
+        i.bi.bi-journal-text>
+        'Zuletzt bearbeitete Prüfberichte
       ul 
         - Report.all.order(updated_at: :desc).limit(3).each do |r|
           li = link_to(r.name, r)
 
-p
+  .col-md-6
-  i.bi.bi-journal-text
+    h2 Hotkeys
-  =< Report.count
-  =< link_to Report.model_name.human(count: Report.count), :reports
-
-h3 Hotkeys
     p Auf der Bericht-Ausfüllen Seite können folgende Shortcuts verwendet werden: 
     dl
       dt t

app/views/projects/_form.html.erb

@@ -0,0 +1,5 @@
+<%= bootstrap_form_with(model: project) do |form| %>
+        <%= form.text_field :name %>
+        <%= form.rich_text_area :details %>
+        <%= form.submit %>
+<% end %>

app/views/projects/_project.html.slim

@@ -0,0 +1,20 @@
+.project id=dom_id(project)
+  p
+    strong Name:
+    = project.name
+  p
+    strong Details:
+    = project.details
+  p
+    strong Berichte:
+    ul.ps-0
+      - project.reports.each do 
+        li.d-flex.ps-0
+          =< "ID #{_1.id}: #{l(_1.created_at,format: :short)} #{_1.name}"          
+          = link_to(_1, class: "btn btn-sm btn-link-secondary") do
+            i.bi.bi-folder-symlink
+          = button_to(project_reports_path(project), class: "btn btn-sm btn-link-secondary", params: { copy_from_id: _1.id }) do
+            i.bi.bi-copy
+  p
+    = link_to(new_project_report_path(project), class: "btn btn-secondary") do
+      i.bi.bi-plus-lg

app/views/projects/_project.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! project, :id, :name, :created_at, :updated_at
+json.url project_url(project, format: :json)

app/views/projects/edit.html.erb

@@ -0,0 +1,8 @@
+<h1><%= t("scaffold.pagetitle_edit", model: Project.model_name.human) %></h1>
+
+<%= render "form", project: @project %>
+
+<div class="action-row">
+  <%= link_to t("scaffold.link_show", model: Project.model_name.human), @project %>
+  <%= link_to t("scaffold.link_index", model: Project.model_name.human(count: 2)), projects_path %>
+</div>

app/views/projects/index.html.erb

@@ -0,0 +1,25 @@
+<h1><%= t("scaffold.pagetitle_index", model: Project.model_name.human(count: 2)) %></h1>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th><%= Project.human_attribute_name(:id) %></th>
+      
+        <th><%= Project.human_attribute_name(:name) %></th>
+      
+  </thead>
+  <tbody>
+    <% @projects.each do |project| %>
+      <tr>
+        <td><%= link_to(project.id, url_for(project)) %></td>
+        
+          <td><%= link_to(project.name, url_for(project)) %></td>
+        
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<div class="action-row">
+  <%= link_to t("scaffold.link_new", model: Project.model_name.human), new_project_path %>
+</div>

app/views/projects/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @projects, partial: "projects/project", as: :project

app/views/projects/new.html.erb

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

app/views/projects/show.html.erb

@@ -0,0 +1,9 @@
+<h1><%= t("scaffold.pagetitle_show", model: @project.class.model_name.human) %></h1>
+
+<%= render @project %>
+
+<div class="action-row">
+  <%= link_to t("scaffold.link_edit", model: @project.model_name.human), edit_project_path(@project) %>
+  <%= link_to t("scaffold.link_index", model: @project.model_name.human(count: 2)), projects_path %>
+  <%= button_to t("scaffold.link_destroy", model: @project.model_name.human), @project, method: :delete, class: "btn btn-outline-danger" if @project.reports.none? %>
+</div>

app/views/projects/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "projects/project", project: @project

app/views/reports/_form.html.erb

@@ -1,4 +1,5 @@
-<%= bootstrap_form_with(model: report) do |form| %>
+<%= bootstrap_form_with(model: report.persisted? ? report : [@project, report]) do |form| %>
+  <%= form.collection_select :project_id, Project.all, :id, :name, include_blank: true %>
   <%= form.text_field :name %>
   <%= form.text_field :url %>
   <%= form.rich_text_area :comment %>

app/views/reports/edit.html.erb

@@ -4,5 +4,5 @@
 
 <div class="action-row">
   <%= link_to t("scaffold.link_show", model: Report.model_name.human), @report %>
-  <%= link_to t("scaffold.link_index", model: Report.model_name.human(count: 2)), reports_path %>
+  <%= link_to t("scaffold.link_index", model: Report.model_name.human(count: 2)), project_reports_path(@report.project) %>
 </div>

app/views/reports/index.html.erb

@@ -27,5 +27,5 @@
 </table>
 
 <div class="action-row">
-  <%= link_to t("scaffold.link_new", model: Report.model_name.human), new_report_path %>
+  <%= link_to t("scaffold.link_new", model: Report.model_name.human), new_project_report_path(@project) %>
 </div>

app/views/reports/new.html.erb

@@ -3,5 +3,5 @@
 <%= render "form", report: @report %>
 
 <div class="action-row">
-  <%= link_to t("scaffold.link_index", model: Report.model_name.human(count: 2)), reports_path %>
+  <%= link_to t("scaffold.link_index", model: Report.model_name.human(count: 2)), project_reports_path(@project) %>
 </div>

app/views/reports/show.html.slim

@@ -3,11 +3,12 @@
     i.bi.bi-journal-text.me-2
     = @report.name
 div
-  small
+  small = "Erstellt am #{l(@report.created_at, format: :short)}, zuletzt bearbeitet am #{l(@report.updated_at, format: :short)}"
-    'Erstellt am 
+
-    = l(@report.created_at, format: :short)
+p
-    ', zuletzt bearbeitet am 
+  i.bi.bi-folder
-    = l(@report.updated_at, format: :short)
+  strong< = link_to(@report.project.name, @report.project)
+
 .smb-4.lead.mb-5
   = @report.comment || tag.i("leer")
 - if @current_page
@@ -26,7 +27,6 @@ div
         .btn-group.me-3.visually-hidden
           = link_to("Alle zu [s]", "#", data: { action: "click->details-list#closeAll", controller: :hotkey, hotkey: "s" }, class: "btn btn-outline-secondary")
           = link_to("Alle auf [a]", "#", data: { action: "click->details-list#openAll", controller: :hotkey, hotkey: "a" }, class: "btn btn-outline-secondary")
-        /= button_to(tag.i(class: "bi bi-trash"), page_path(@current_page), method: :delete, class: "btn btn-outline-danger", form: {data: { turbo_confirm: "Bist du sicher?" }})
 .row
   .col-lg-3.col-md-4.col-sm-12
     .page_nav.sticky-top
@@ -63,5 +63,5 @@ div
     |  ODT 
 .action-row
   = link_to t("scaffold.link_edit", model: @report.model_name.human), edit_report_path(@report)
-  = link_to t("scaffold.link_index", model: @report.model_name.human(count: 2)), reports_path
+  = link_to t("scaffold.link_index", model: @report.model_name.human(count: 2)), project_reports_path(@report.project)
   = button_to t("scaffold.link_destroy", model: @report.model_name.human), @report, method: :delete, class: "btn btn-outline-danger", data: { turbo_confirm: "Bist du sicher?"}

db/migrate/20241124183246_create_projects.rb

@@ -0,0 +1,9 @@
+class CreateProjects < ActiveRecord::Migration[8.0]
+  def change
+    create_table :projects do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20241124183406_add_project_to_reports.rb

@@ -0,0 +1,5 @@
+class AddProjectToReports < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :reports, :project, null: true, foreign_key: true
+  end
+end

db/queue_schema.rb

@@ -1,4 +1,16 @@
-ActiveRecord::Schema[7.1].define(version: 1) do
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema[8.0].define(version: 1) do
   create_table "solid_queue_blocked_executions", force: :cascade do |t|
     t.bigint "job_id", null: false
     t.string "queue_name", null: false

db/schema.rb

@@ -10,7 +10,19 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
+ActiveRecord::Schema[8.0].define(version: 2024_11_24_183406) do
+  create_table "account_remember_keys", force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "deadline", null: false
+  end
+
+  create_table "accounts", force: :cascade do |t|
+    t.integer "status", default: 1, null: false
+    t.string "email", null: false
+    t.string "password_hash"
+    t.index ["email"], name: "index_accounts_on_email", unique: true, where: "status IN (1, 2)"
+  end
+
   create_table "action_text_rich_texts", force: :cascade do |t|
     t.string "name", null: false
     t.text "body"
@@ -115,6 +127,7 @@ ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
     t.datetime "updated_at", null: false
     t.integer "page_id", null: false
     t.integer "position", null: false
+    t.index ["page_id", "position"], name: "index_elements_on_page_id_and_position", unique: true
     t.index ["page_id"], name: "index_elements_on_page_id"
   end
 
@@ -144,6 +157,7 @@ ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "notes"
+    t.index ["report_id", "position"], name: "index_pages_on_report_id_and_position", unique: true
     t.index ["report_id"], name: "index_pages_on_report_id"
   end
 
@@ -154,11 +168,19 @@ ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "projects", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "reports", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "url"
+    t.integer "project_id"
+    t.index ["project_id"], name: "index_reports_on_project_id"
   end
 
   create_table "sessions", force: :cascade do |t|
@@ -191,6 +213,7 @@ ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
     t.integer "priority"
     t.integer "position", null: false
     t.index ["check_id"], name: "index_success_criteria_on_check_id"
+    t.index ["element_id", "position"], name: "index_success_criteria_on_element_id_and_position", unique: true
     t.index ["element_id"], name: "index_success_criteria_on_element_id"
   end
 
@@ -202,6 +225,7 @@ ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
     t.index ["email_address"], name: "index_users_on_email_address", unique: true
   end
 
+  add_foreign_key "account_remember_keys", "accounts", column: "id"
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "checklist_entries", "checklists"
@@ -210,6 +234,7 @@ ActiveRecord::Schema[8.0].define(version: 2024_11_11_034826) do
   add_foreign_key "elements", "pages"
   add_foreign_key "links", "link_categories"
   add_foreign_key "pages", "reports"
+  add_foreign_key "reports", "projects"
   add_foreign_key "sessions", "users"
   add_foreign_key "success_criteria", "checks"
   add_foreign_key "success_criteria", "elements"

test/controllers/projects_controller_test.rb

@@ -0,0 +1,55 @@
+require "test_helper"
+
+class ProjectsControllerTest < ::ControllerTest
+  teardown do
+    logout
+  end
+
+  setup do
+    @project = projects(:one)
+    User.create!(email_address: "test@example.com", password: "password")
+    login("test@example.com", "password")
+  end
+
+  test "should get index" do
+    get projects_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_project_url
+    assert_response :success
+  end
+
+  test "should create project" do
+    assert_difference("Project.count") do
+      post projects_url, params: { project: { name: @project.name } }
+    end
+
+    assert_redirected_to project_url(Project.last)
+  end
+
+  test "should show project" do
+    get project_url(@project)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_project_url(@project)
+    assert_response :success
+  end
+
+  test "should update project" do
+    patch project_url(@project), params: { project: { name: @project.name } }
+    assert_redirected_to project_url(@project)
+  end
+
+  test "should destroy project" do
+    p = Project.create!(name: "empty")
+    assert_difference("Project.count", -1) do
+      delete project_url(p)
+    end
+
+    assert_redirected_to projects_url
+  end
+end

test/controllers/reports_controller_test.rb

@@ -14,18 +14,18 @@ class ReportsControllerTest < ::ControllerTest
   end
 
   test "should get index" do
-    get reports_url
+    get project_reports_url(@report.project)
     assert_response :success
   end
 
   test "should get new" do
-    get new_report_url
+    get new_project_report_url(@report.project)
     assert_response :success
   end
 
   test "should create report" do
     assert_difference("Report.count") do
-      post reports_url, params: { report: { comment: @report.comment, name: @report.name } }
+      post project_reports_url(@report.project), params: { report: { comment: @report.comment, name: @report.name } }
     end
 
     assert_redirected_to report_url(Report.last)
@@ -51,6 +51,6 @@ class ReportsControllerTest < ::ControllerTest
       delete report_url(@report)
     end
 
-    assert_redirected_to reports_url
+    assert_redirected_to project_url(@report.project)
   end
 end

test/fixtures/projects.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString

test/fixtures/reports.yml

@@ -2,6 +2,8 @@
 
 one:
   name: MyString
+  project: one
 
 two:
   name: MyString
+  project: one

test/models/project_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+class ProjectTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/system/projects_test.rb

@@ -0,0 +1,47 @@
+require "application_system_test_case"
+
+class ProjectsTest < ApplicationSystemTestCase
+  setup do
+    @project = projects(:one)
+    login_test
+  end
+
+  teardown do
+    logout
+  end
+
+  test "visiting the index" do
+    visit projects_url
+    assert_selector "h1", text: "Projekte"
+  end
+
+  test "should create project" do
+    visit projects_url
+    click_on "Projekt hinzufügen"
+
+    fill_in "Name", with: @project.name
+    click_on "Projekt erstellen"
+
+    assert_text "Project was successfully created"
+    click_on "Projekte Liste"
+  end
+
+  test "should update Project" do
+    visit project_url(@project)
+    click_on "Projekt bearbeiten", match: :first
+
+    fill_in "Name", with: @project.name
+    click_on "Projekt aktualisieren"
+
+    assert_text "Project was successfully updated"
+    click_on "Projekte Liste"
+  end
+
+  test "should destroy Project" do
+    empty = Project.create!(name: "empty")
+    visit project_url(empty)
+    click_on "Projekt löschen", match: :first
+
+    assert_text "Project was successfully destroyed"
+  end
+end

test/system/reports_test.rb

@@ -13,12 +13,12 @@ class ReportsTest < ApplicationSystemTestCase
   end
 
   test "visiting the index" do
-    visit reports_url
+    visit project_reports_url(@report.project)
     assert_selector "h1", text: "Prüfberichte"
   end
 
   test "should create report" do
-    visit reports_url
+    visit project_reports_url(@report.project)
     click_on "Prüfbericht hinzufügen"
 
     fill_in_rich_text_area "Projektbeschreibung", with: @report.comment