luck_remover 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 859d5f62571ed162fc9e8bc7753e3c436c25778e8d6258a0f08b46f1b11444c0
-  data.tar.gz: a760259b16892d3dd39561638d578ceeb55d649590a15d6161e7475687812a53
+  metadata.gz: ce01c50a6acd9c471ac05b2089f50b37cf5018b52ac8477e0d93e1cf4c55a7ca
+  data.tar.gz: b400f56a1f90c208ed3898aa3950d70e9b126e72e7469eb4d5c85bbf8bfc99bf
 SHA512:
-  metadata.gz: 1fad684b0accd4aebaab5c6ad5125797095594be8d117071e7f9bc139ecacdd7a9230e90c6b5fbc3cd91b8ca815c4cf4bbb2aa5b7a384da6ad18a63ae8450614
-  data.tar.gz: 22152fcc7bbb80f81f6582d366e9263a98eea550d3deed9fe744f938a49e23bbdf272ad8b62a30852addae64e010d0acb567216458937bf65b04a14f976c80f1
+  metadata.gz: 538b819d7c67047da6bd1982ff9c289c292e767f4c9c7f589574f55c304b74ae44bb89cd06e4e31ab12b5be6fed6f9028a67c3ac45983ae62ff36a440fce1f89
+  data.tar.gz: ab3b709e3421ad8c96694a08e00b33467ec72ea987258cae4cd19ae0fb2c4881d5df6660289b733382b3b30e3f8c92642667adffd36f4401efe69b499241623a

data/app/controllers/luck_remover/goals_controller.rb

@@ -1,9 +1,9 @@
 module LuckRemover
   class GoalsController < LuckRemover.parent_controller.constantize
-    helper_method :page_query
+    helper_method :page_query, :archived_list?
 
     def index
-      @readings = goals_in_area.order(:name).map { |goal| Reading.of(goal) }
+      @readings = goals_in_area.where(archived: archived_list?).order(:name).map { |goal| Reading.of(goal) }
       @person_names = LuckRemover.people(current_goal_owner).to_h { |label, id| [ id, label ] }
     end
 
@@ -50,7 +50,7 @@ module LuckRemover
     end
 
     def goal_params
-      params.expect(goal: [ :name, :metric_key, :person_id, :target, :direction, :period, :status ])
+      params.expect(goal: [ :name, :metric_key, :person_id, :target, :direction, :period, :status, :archived ])
     end
 
     def goal_scope
@@ -69,6 +69,10 @@ module LuckRemover
       url_from(params[:return_to]) || goals_path
     end
 
+    def archived_list?
+      params[:archived] == "true"
+    end
+
     def area
       params[:area].presence
     end

data/app/models/luck_remover/goal.rb

@@ -5,6 +5,7 @@ module LuckRemover
     belongs_to :owner, polymorphic: true
 
     scope :for_owner, ->(owner) { where(owner: owner) }
+    scope :unarchived, -> { where(archived: false) }
     scope :in_area, ->(area) { where(metric_key: LuckRemover.metrics.in_area(area).map { |stat| stat.key.to_s }) }
 
     enum :direction, { at_least: "at_least", at_most: "at_most" }, validate: true
@@ -15,6 +16,7 @@ module LuckRemover
     validate :metric_is_registered
     validate :person_is_one_the_host_gives, if: :person_id
     validate :metric_is_readable_for_one_person, if: :person_id
+    validate :only_finished_goals_are_archived, if: :archived
 
     def standing(now: Time.current, **inputs)
       value = LuckRemover.metric(metric_key).read(range: current_period(now), **for_person, **inputs).value
@@ -44,6 +46,12 @@ module LuckRemover
       errors.add(:metric_key, "#{metric_key} cannot be read for one person")
     end
 
+    def only_finished_goals_are_archived
+      return if achieved? || abandoned?
+
+      errors.add(:base, "Only achieved or abandoned goals can be archived")
+    end
+
     def metric_is_registered
       return if LuckRemover.metrics.registered?(metric_key.to_s)
 

data/app/views/luck_remover/goals/_form.html.erb

@@ -1,3 +1,6 @@
+<% goal.errors[:base].each do |message| %>
+  <%= ui_alert(message: message, type: :error) %>
+<% end %>
 <%= ui_form_field(attribute: "goal[name]", label: "Name", required: true, value: goal.name, errors: goal.errors[:name]) %>
 
 <% goal.errors[:metric_key].each do |message| %>

data/app/views/luck_remover/goals/edit.html.erb

@@ -5,6 +5,11 @@
     <%= ui_button(label: "Save") %>
   <% end %>
   <%= ui_action_menu do %>
+    <% if @goal.archived %>
+      <%= ui_action_menu_item(label: "Unarchive", href: luck_remover.goal_path(@goal, **page_query, goal: { archived: false }), method: :patch) %>
+    <% else %>
+      <%= ui_action_menu_item(label: "Archive", href: luck_remover.goal_path(@goal, **page_query, goal: { archived: true }), method: :patch) %>
+    <% end %>
     <%= ui_action_menu_item(label: "Delete", href: luck_remover.goal_path(@goal, **page_query), method: :delete) %>
   <% end %>
 <% end %>

data/app/views/luck_remover/goals/index.html.erb

@@ -3,6 +3,11 @@
 <%= ui_page(max_width: :xl) do %>
   <%= ui_page_header(title: "Goals", action_url: new_goal_path, action_label: "Add") do |header| %>
     <% header.action do %>
+      <% if archived_list? %>
+        <%= ui_button(label: "Show current", href: luck_remover.goals_path(**page_query), variant: :secondary) %>
+      <% else %>
+        <%= ui_button(label: "Show archived", href: luck_remover.goals_path(**page_query, archived: true), variant: :secondary) %>
+      <% end %>
       <%= ui_button(label: "Add", href: new_goal_path) %>
     <% end %>
   <% end %>

data/db/migrate/20261028152059_add_archived_to_luck_remover_goals.rb

@@ -0,0 +1,5 @@
+class AddArchivedToLuckRemoverGoals < ActiveRecord::Migration[8.1]
+  def change
+    add_column :luck_remover_goals, :archived, :boolean, null: false, default: false
+  end
+end

data/lib/luck_remover/version.rb

@@ -1,3 +1,3 @@
 module LuckRemover
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luck_remover
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Tyler Schneider
@@ -95,6 +95,7 @@ files:
 - db/migrate/20261022212722_create_luck_remover_goals.rb
 - db/migrate/20261023134729_add_person_id_to_luck_remover_goals.rb
 - db/migrate/20261028142026_add_status_to_luck_remover_goals.rb
+- db/migrate/20261028152059_add_archived_to_luck_remover_goals.rb
 - lib/luck_remover.rb
 - lib/luck_remover/engine.rb
 - lib/luck_remover/metric_registry.rb