luck_remover 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f765a3caec1653e4d4c5e907ef9b86bdc8fd17c546cbdde0db9f0ba3ebad04
-  data.tar.gz: 1ea36de465eebbdc7e6c4de32d8a3c9d43a3f0960d7dff5b091e0753b4ac0b29
+  metadata.gz: 859d5f62571ed162fc9e8bc7753e3c436c25778e8d6258a0f08b46f1b11444c0
+  data.tar.gz: a760259b16892d3dd39561638d578ceeb55d649590a15d6161e7475687812a53
 SHA512:
-  metadata.gz: d0b239758493cb01bcabe00d209123f4d68e916e6e9fa60e1401b9ee2dd201d0060ff6c34b06a382cdec3905efd8ae88c0bfa85e48f5d557ed14ec20a8d3b552
-  data.tar.gz: f4800a8600a16fa644199da842cc8a6a8ee313d3ffd5271bdf6aaa5370e3148597c625586f77dd3b67a9f11fee59fc92f721c217cb8b08ab5b427a0dd1976166
+  metadata.gz: 1fad684b0accd4aebaab5c6ad5125797095594be8d117071e7f9bc139ecacdd7a9230e90c6b5fbc3cd91b8ca815c4cf4bbb2aa5b7a384da6ad18a63ae8450614
+  data.tar.gz: 22152fcc7bbb80f81f6582d366e9263a98eea550d3deed9fe744f938a49e23bbdf272ad8b62a30852addae64e010d0acb567216458937bf65b04a14f976c80f1

data/app/controllers/luck_remover/goals_controller.rb

@@ -3,7 +3,7 @@ module LuckRemover
     helper_method :page_query
 
     def index
-      @goals = goals_in_area.order(:name)
+      @readings = goals_in_area.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 ])
     end
 
     def goal_scope
@@ -62,7 +62,7 @@ module LuckRemover
     end
 
     def page_query
-      params.permit(:area, :return_to).to_h.compact_blank.symbolize_keys
+      params.permit(:area, :return_to, *LuckRemover.carried_params).to_h.compact_blank.symbolize_keys
     end
 
     def after_change_path

data/app/models/luck_remover/goal.rb

@@ -9,6 +9,7 @@ module LuckRemover
 
     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

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

@@ -11,3 +11,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/index.html.erb

@@ -6,18 +6,21 @@
       <%= 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/lib/luck_remover/version.rb

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

data/lib/luck_remover.rb

@@ -7,6 +7,7 @@ require "luck_remover/metric_registry"
 module LuckRemover
   mattr_accessor :parent_controller, default: "LuckRemover::ApplicationController"
   mattr_accessor :current_owner_method, default: nil
+  mattr_accessor :carried_params, default: []
 
   NO_PEOPLE = ->(_owner) { [] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luck_remover
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.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,7 @@ 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
 - lib/luck_remover.rb
 - lib/luck_remover/engine.rb
 - lib/luck_remover/metric_registry.rb