| Typ | +Art | +Zielstunden | +
|---|---|---|
| <%= typ.capitalize %> | +<%= art %> | ++ <%= number_field_tag( + "user[required_hours_matrix][#{typ}][#{art}]", + current_user.required_hours_matrix.dig(typ, art), + class: "form-control", min: 0 + ) %> + | +
<%= notice %>
+<% end %> + +Gesamtzeit: <%= @total_minutes / 60 %> h <%= @total_minutes % 60 %> min
-Fehlend: <%= @remaining_minutes / 60 %> h <%= @remaining_minutes % 60 %> min
-Geplante Stunden/Woche: <%= current_user.weekly_target_hours %> h
- <% if @estimated_end_date.present? %> -Voraussichtliches Ende: <%= @estimated_end_date.strftime("%d.%m.%Y") %>
- <% end %> - <%= link_to '➕ Neuer Eintrag', new_entry_path, class: 'btn btn-primary' %> +Fahrtkosten gesamt: + <%= number_to_currency(@total_kilometer_pauschale, unit: "€", separator: ",", delimiter: ".") %> +
+ +| Typ | +Art | +Verbleibend | +Soll (h) | +Wöchentlich | +Vorauss. Ende | +
|---|---|---|---|---|---|
| <%= typ.capitalize %> | +<%= art %> | +<%= remaining ? "#{remaining / 60} h #{remaining % 60} min" : "—" %> | +<%= soll || "—" %> h | +<%= weekly || "—" %> h/Woche | +<%= ende.present? ? ende.strftime("%d.%m.%Y") : "—" %> | +
| Datum | -Stunden | -Minuten | +Zeit | +Typ | +Art | +Kilometer | +Pauschale | Aktionen | |
|---|---|---|---|---|---|---|---|---|---|
| <%= entry.date %> | -<%= entry.hours %> | -<%= entry.minutes %> | +<%= entry.date.strftime('%d.%m.%Y') %> | +<%= entry.hours.to_i %>h <%= entry.minutes.to_i %>min | +<%= entry.praktikums_typ %> | +<%= entry.entry_art %> | +<%= entry.distance_km.to_f %> km | +<%= number_to_currency(entry.kilometer_pauschale, unit: "€", separator: ",", delimiter: ".") %> | <%= link_to '✏️ Bearbeiten', edit_entry_path(entry), class: 'btn btn-sm btn-primary' %> - <%= link_to '🗑️ Löschen', entry, method: :delete, data: { confirm: 'Sicher?' }, class: 'btn btn-sm btn-danger' %> + <%= link_to '🗑️ Löschen', entry_path(entry), class: 'btn btn-sm btn-danger open-delete-modal' %> |
<%= notice %>
-<%= render @entry %> +<% if @entry.present? %> + <%= render @entry %> +<% else %> +⚠️ Kein Eintrag gefunden.
+<% end %>Eingeloggt als <%= current_user.email %> | <%= link_to "Profil", edit_user_registration_path %> | - <%= link_to "Logout", destroy_user_session_path, method: :delete %> + <%= link_to "Logout", destroy_user_session_path, method: :delete, data: { turbo: false } %>
<% end %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 2eeef96..26649d2 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -2,7 +2,7 @@ # Version of your assets, change this if you want to expire all your assets. Rails.application.config.assets.version = "1.0" - +Rails.application.config.assets.precompile += %w( application.js ) # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index b5b172b..7ede34c 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -266,7 +266,7 @@ Devise.setup do |config| # config.navigational_formats = ['*/*', :html, :turbo_stream] # The default HTTP method used to sign out a resource. Default is :delete. - config.sign_out_via = :delete + config.sign_out_via = :get # ==> OmniAuth # Add a new OmniAuth provider. Check the wiki for more information on setting diff --git a/db/migrate/20251107034228_add_fields_to_entries.rb b/db/migrate/20251107034228_add_fields_to_entries.rb new file mode 100644 index 0000000..7bb853f --- /dev/null +++ b/db/migrate/20251107034228_add_fields_to_entries.rb @@ -0,0 +1,7 @@ +class AddFieldsToEntries < ActiveRecord::Migration[7.1] + def change + add_column :entries, :praktikums_typ, :string, null: false, default: "propädeutikum" + add_column :entries, :entry_art, :string, null: false, default: "Praktikum" + add_column :entries, :distance_km, :integer, null: false, default: 0 + end +end diff --git a/db/migrate/20251107034403_add_required_hours_matrix_to_users.rb b/db/migrate/20251107034403_add_required_hours_matrix_to_users.rb new file mode 100644 index 0000000..0b8674f --- /dev/null +++ b/db/migrate/20251107034403_add_required_hours_matrix_to_users.rb @@ -0,0 +1,5 @@ +class AddRequiredHoursMatrixToUsers < ActiveRecord::Migration[7.1] + def change + add_column :users, :required_hours_matrix, :jsonb, default: {}, null: false + end +end diff --git a/db/migrate/20251107054255_add_weekly_target_matrix_to_users.rb b/db/migrate/20251107054255_add_weekly_target_matrix_to_users.rb new file mode 100644 index 0000000..8adc4ea --- /dev/null +++ b/db/migrate/20251107054255_add_weekly_target_matrix_to_users.rb @@ -0,0 +1,5 @@ +class AddWeeklyTargetMatrixToUsers < ActiveRecord::Migration[7.1] + def change + add_column :users, :weekly_target_matrix, :jsonb, default: {}, null: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 1c43b69..16d6e49 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2025_11_06_161110) do +ActiveRecord::Schema[7.1].define(version: 2025_11_07_054255) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,9 @@ ActiveRecord::Schema[7.1].define(version: 2025_11_06_161110) do t.bigint "user_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "praktikums_typ", default: "propädeutikum", null: false + t.string "entry_art", default: "Praktikum", null: false + t.integer "distance_km", default: 0, null: false t.index ["user_id"], name: "index_entries_on_user_id" end @@ -34,6 +37,8 @@ ActiveRecord::Schema[7.1].define(version: 2025_11_06_161110) do t.datetime "updated_at", null: false t.integer "total_required_hours", default: 480, null: false t.integer "weekly_target_hours", default: 12, null: false + t.jsonb "required_hours_matrix", default: {}, null: false + t.jsonb "weekly_target_matrix", default: {}, null: false t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end