luck_remover 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b522260163d988ea9f11d4a27a1b7d8b5975f48c82d2ad7bcbbe6c2d22dc576
-  data.tar.gz: 7be40bd718c073d2f1f6a105046b76eb3a27c80d1e82a4fbbc55734306f89321
+  metadata.gz: ce01c50a6acd9c471ac05b2089f50b37cf5018b52ac8477e0d93e1cf4c55a7ca
+  data.tar.gz: b400f56a1f90c208ed3898aa3950d70e9b126e72e7469eb4d5c85bbf8bfc99bf
 SHA512:
-  metadata.gz: 9dd956f8f2a381d3be6dd34bd383fd42fba4528804eff863d443872f0573a4ce4f589108392e19dd5007f27189b3aba448cecb53de3bf811aa9d861f0fa239a0
-  data.tar.gz: b8dd19e535f7992d37db2812d851fbf160c3bb944166ba5009d9aa1b378aba9f94ab8b840994fc8bb05511d6b4a85f27d9cc39b7d60659ab20f94bc073bafc77
+  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
-      @goals = goals_in_area.order(:name)
+      @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 ])
+      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,15 +5,18 @@ 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
     enum :period, { week: "week", month: "month" }, validate: true
+    enum :status, { draft: "draft", active: "active", achieved: "achieved", abandoned: "abandoned", paused: "paused" }, validate: true
 
     validates :name, :target, presence: true
     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
@@ -43,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/models/luck_remover/reading.rb

@@ -0,0 +1,17 @@
+module LuckRemover
+  Reading = Data.define(:goal, :standing, :state) do
+    def self.of(goal, **inputs)
+      return new(goal: goal, standing: nil, state: :retired) unless LuckRemover.metrics.registered?(goal.metric_key.to_s)
+      return new(goal: goal, standing: nil, state: :untracked) unless goal.active? || goal.achieved?
+
+      new(goal: goal, standing: goal.standing(**inputs), state: :read)
+    rescue StandardError => error
+      Rails.error.report(error, context: { goal_metric: goal.metric_key })
+      new(goal: goal, standing: nil, state: :unread)
+    end
+
+    def retired? = state == :retired
+
+    def unread? = state == :unread
+  end
+end

data/app/models/luck_remover/standing.rb

@@ -9,5 +9,22 @@ module LuckRemover
 
       direction.to_s == "at_most" ? value <= target : value >= target
     end
+
+    def progress
+      return unless measured?
+      return 100 if met?
+
+      at_most? ? percentage(target, value) : percentage(value, target)
+    end
+
+    private
+
+    def at_most?
+      direction.to_s == "at_most"
+    end
+
+    def percentage(part, whole)
+      (part * 100 / whole).floor
+    end
   end
 end

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| %>
@@ -11,3 +14,4 @@
 <%= ui_form_field(attribute: "goal[target]", label: "Target", type: :number, step: "any", required: true, value: goal.target, errors: goal.errors[:target]) %>
 <%= ui_form_field(attribute: "goal[direction]", label: "Direction", type: :select, required: true, options: [["At least", "at_least"], ["At most", "at_most"]], value: goal.direction, errors: goal.errors[:direction]) %>
 <%= ui_form_field(attribute: "goal[period]", label: "Period", type: :select, required: true, options: [["Week", "week"], ["Month", "month"]], value: goal.period, errors: goal.errors[:period]) %>
+<%= ui_form_field(attribute: "goal[status]", label: "Status", type: :select, required: true, options: LuckRemover::Goal.statuses.keys.map { |status| [status.humanize, status] }, value: goal.status, errors: goal.errors[:status]) %>

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,21 +3,29 @@
 <%= 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 %>
-  <% rows = @goals.map do |goal|
+  <% rows = @readings.map do |reading|
+       goal = reading.goal
        { name: goal.name,
          edit_url: luck_remover.edit_goal_path(goal),
          person: goal.person_id ? @person_names[goal.person_id] : "Whole business",
-         metric: LuckRemover.metric(goal.metric_key).title,
+         metric: reading.retired? ? "No metric" : LuckRemover.metric(goal.metric_key).title,
          target: number_with_precision(goal.target, precision: 2, strip_insignificant_zeros: true),
          direction: goal.direction.humanize,
-         period: goal.period.humanize }
+         period: goal.period.humanize,
+         status: goal.status.humanize,
+         progress: reading.unread? ? "Could not be read" : number_to_percentage(reading.standing&.progress, precision: 0) }
      end %>
   <%= ui_data_table(
         items: rows,
-        columns: [{ name: "Name" }, { person: "Person" }, { metric: "Metric" }, { target: "Target" }, { direction: "Direction" }, { period: "Period" }],
+        columns: [{ name: "Name" }, { person: "Person" }, { metric: "Metric" }, { target: "Target" }, { direction: "Direction" }, { period: "Period" }, { status: "Status" }, { progress: "Progress" }],
         empty_message: "No goals yet."
       ) { |table| table.link(:name) { |row| row[:edit_url] } } %>
 <% end %>

data/db/migrate/20261028142026_add_status_to_luck_remover_goals.rb

@@ -0,0 +1,5 @@
+class AddStatusToLuckRemoverGoals < ActiveRecord::Migration[8.1]
+  def change
+    add_column :luck_remover_goals, :status, :string, null: false, default: "active"
+  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.7.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.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Tyler Schneider
@@ -84,6 +84,7 @@ files:
 - app/mailers/luck_remover/application_mailer.rb
 - app/models/luck_remover/application_record.rb
 - app/models/luck_remover/goal.rb
+- app/models/luck_remover/reading.rb
 - app/models/luck_remover/standing.rb
 - app/views/layouts/luck_remover/application.html.erb
 - app/views/luck_remover/goals/_form.html.erb
@@ -93,6 +94,8 @@ files:
 - config/routes.rb
 - 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