From c56eb9ecd1d536a741e3fbdd597f0ea8c2df1c4a Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Mon, 15 Sep 2025 10:29:43 -0500 Subject: [PATCH] Cards in On Deck adopt some entropy behavior as ones in Doing --- app/helpers/entropy_helper.rb | 2 +- app/models/card/entropic.rb | 4 ++-- app/models/card/entropy.rb | 2 +- app/views/entropy/_auto_close.html.erb | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/helpers/entropy_helper.rb b/app/helpers/entropy_helper.rb index c9cb66699..10eb76daf 100644 --- a/app/helpers/entropy_helper.rb +++ b/app/helpers/entropy_helper.rb @@ -22,7 +22,7 @@ module EntropyHelper end def card_entropy_action(card) - if card.doing? + if card.doing? || card.on_deck? "Falls Back" elsif card.considering? "Closes" diff --git a/app/models/card/entropic.rb b/app/models/card/entropic.rb index cd65b34cc..6fa5cad26 100644 --- a/app/models/card/entropic.rb +++ b/app/models/card/entropic.rb @@ -8,7 +8,7 @@ module Card::Entropic Entropy::Configuration.default.public_send(period_name)) end - scope :stagnated, -> { doing.entropic_by(:auto_reconsider_period) } + scope :stagnated, -> { doing.or(on_deck).entropic_by(:auto_reconsider_period) } scope :due_to_be_closed, -> { considering.entropic_by(:auto_close_period) } @@ -20,7 +20,7 @@ module Card::Entropic end scope :falling_back_soon, -> do - doing + doing.or(on_deck) .left_outer_joins(collection: :entropy_configuration) .where("last_active_at > DATETIME('now', '-' || COALESCE(entropy_configurations.auto_reconsider_period, ?) || ' seconds')", Entropy::Configuration.default.auto_reconsider_period) .where("last_active_at <= DATETIME('now', '-' || CAST(COALESCE(entropy_configurations.auto_reconsider_period, ?) * 0.75 AS INTEGER) || ' seconds')", Entropy::Configuration.default.auto_reconsider_period) diff --git a/app/models/card/entropy.rb b/app/models/card/entropy.rb index 51b1e54a4..e23b31572 100644 --- a/app/models/card/entropy.rb +++ b/app/models/card/entropy.rb @@ -7,7 +7,7 @@ class Card::Entropy if card.considering? new(card, card.auto_close_period) - elsif card.doing? + elsif card.doing? || card.on_deck? new(card, card.auto_reconsider_period) end end diff --git a/app/views/entropy/_auto_close.html.erb b/app/views/entropy/_auto_close.html.erb index c0fb2a6e4..e5183e9a7 100644 --- a/app/views/entropy/_auto_close.html.erb +++ b/app/views/entropy/_auto_close.html.erb @@ -2,8 +2,8 @@
- Cards in The Stream -

Auto-close after…

+ The Stream +

Cards auto-close after…

<%= form_with model: model, url: url, data: { controller: "form" } do |form| %> <%= render "entropy/knob", form: form, @@ -16,8 +16,8 @@
- Cards in On Deck/Working On -

Back to The Stream after…

+ On Deck/Working On +

Cards return to The Stream after…

<%= form_with model: model, url: url, data: { controller: "form" } do |form| %> <%= render "entropy/knob", form: form,