-
-
Source
-
Cadence
-
Retention
-
Enabled
-
- <% sources.each do |row| %>
- <% source = row.source %>
-
-
<%= source.key %><%= source.label %>
-
- <%= render "val", source: source.key, name: Engine::Setting::CADENCE,
- may_tune: may_tune, show_was: true %>
-
-
- <%= render "val", source: source.key, name: Engine::Setting::RETENTION,
- may_tune: may_tune, show_was: true %>
-
-
- <%= render "val", source: source.key, name: Engine::Setting::ENABLED,
- may_tune: may_tune, show_was: true %>
-
+
+
+
+
+
Source
+
Cadence
+
Retention
+
Enabled
- <% end %>
+ <% sources.each do |row| %>
+ <% source = row.source %>
+
+
<%= source.key %><%= source.label %>
+
+ <%= render "val", source: source.key, name: Engine::Setting::CADENCE,
+ may_tune: may_tune, show_was: true %>
+
+
+ <%= render "val", source: source.key, name: Engine::Setting::RETENTION,
+ may_tune: may_tune, show_was: true %>
+
+
+ <%= render "val", source: source.key, name: Engine::Setting::ENABLED,
+ may_tune: may_tune, show_was: true %>
+
+
+ <% end %>
+
diff --git a/web/app/views/engine/index.html.erb b/web/app/views/engine/index.html.erb
index 2e414e63..cd0dc183 100644
--- a/web/app/views/engine/index.html.erb
+++ b/web/app/views/engine/index.html.erb
@@ -4,8 +4,19 @@
<% content_for :page_title, EngineController::TABS.fetch(@tab) %>
+
<% content_for :head_actions do %>
<% if @active_request %>
+ <%= button_to(@orphaned ? "Release" : "Cancel", engine_cancel_path,
+ class: "btn", form: { class: "contents" }) %>
+ <% else %>
+ <%= button_to "Run the nightly now", engine_sync_path,
+ class: "btn btn-primary", form: { class: "contents" } %>
+ <% end %>
+<% end %>
+
+<% if @active_request %>
+ <% content_for :page_controls do %>
<% if @orphaned %>
worker down
<% else %>
@@ -14,63 +25,88 @@
<%= step_progress(@progress) || @active_request.status %>
<% end %>
- <%= button_to(@orphaned ? "Release" : "Cancel", engine_cancel_path,
- class: "btn", form: { class: "contents" }) %>
- <% else %>
- <%= button_to "Run the nightly now", engine_sync_path,
- class: "btn btn-primary", form: { class: "contents" } %>
<% end %>
<% end %>
<% if @tab == "runs" %>
-
-
-
-
Tonight
-
- <% if @run %>
- <%= @run.started_at.strftime("%-d %b, %H:%M") %>
- · <%= run_duration(@run) %><%= " so far" if @run.running? %>
- <% if (progress = step_progress(@progress)) %>
- · <%= progress %>
- <% end %>
- <% else %>
- nothing recorded yet
- <% end %>
-
-
+ <% missed_nights = @nightly.count { |cell| cell == "none" } %>
+
+
+ Tonight
+ <%= @run.nil? ? "no run" : (@orphaned ? "stuck" : @run.status) %>
+
+ <% if @run.nil? %>
+ nothing recorded yet
+ <% elsif @orphaned %>
+ <%= worker_chip(@worker) %>
+ <% else %>
+ <%= @run.started_at.strftime("%-d %b, %H:%M") %>
+ <%= run_age(@run) if run_stale?(@run) %>
+ <% end %>
+
+
+
+
+ How far
+
+ <% if @progress %>
+ <%= @progress.step_index %><% if @progress.step_total %>of <%= @progress.step_total %><% end %>
+ <% else %>
+ <%= @run ? "done" : "n/a" %>
+ <% end %>
+
+
+ <%= @run&.running? ? "running now" : (@run ? "finished" : "waiting on the first run") %>
+
+
+
+
+ Running
+
+ <%= @run ? run_duration(@run) : "n/a" %><% if @run&.running? %>so far<% end %>
+
+
+ <%= @run ? "started #{@run.started_at.strftime("%-d %b, %H:%M")}" : "no run yet" %>
+
+
+
+
+ Missed, last <%= EngineController::NIGHTS %>
+ <%= missed_nights %>
+
+ <%= missed_nights.zero? ? "the nightly ran every night" : "#{"night".pluralize(missed_nights)} it never ran" %>
+
+
+
+
+
+
+
Tonight
<% if @run %>
-
- <% if @steps.any? %>
- <%= render "ladder", steps: @steps %>
- <% else %>
-
n/a
- <% end %>
+
+ <% if @steps.any? %>
+ <%= render "ladder", steps: @steps %>
+ <% else %>
+
n/a
+ <% end %>
+
-
-
-
-
The last <%= EngineController::NIGHTS %> nights
-
one square a night, worst run of that night wins the colour
-
+
+
+
The last <%= EngineController::NIGHTS %> nights
+
+
+ <%= render "matrix", matrix: @matrix, nights: @nights, nightly: @nightly %>
- <%= render "matrix", matrix: @matrix, nights: @nights, nightly: @nightly %>
<% elsif @tab == "sources" %>
diff --git a/web/app/views/fd/_modal.html.erb b/web/app/views/fd/_modal.html.erb
index 39495786..f5812a6f 100644
--- a/web/app/views/fd/_modal.html.erb
+++ b/web/app/views/fd/_modal.html.erb
@@ -4,13 +4,21 @@
<%= "checked" if local_assigns[:open] %>>
-
"
+ role="dialog" aria-modal="true" tabindex="-1"
aria-label="<%= local_assigns[:label] || title %>" data-modal-target="box">
<%= title %>
<% if local_assigns[:sub].present? %>
<%= sub %>
<% end %>
+
<%= yield %>
diff --git a/web/app/views/fd/audits/show.html.erb b/web/app/views/fd/audits/show.html.erb
index 707f3fe0..4b4af078 100644
--- a/web/app/views/fd/audits/show.html.erb
+++ b/web/app/views/fd/audits/show.html.erb
@@ -1,66 +1,19 @@
<% content_for :page_title, "Audit log" %>
-
-
- Everything firefighters did
-
-
- last 30 days · <%= pluralize(@total, "entry") %>
- · page <%= @page %> of <%= @pages %>
-
-
-
+
<% if @rows.any? %>
-
diff --git a/web/app/views/fd/cases/_actions.html.erb b/web/app/views/fd/cases/_actions.html.erb
index f4ffbe2e..10500578 100644
--- a/web/app/views/fd/cases/_actions.html.erb
+++ b/web/app/views/fd/cases/_actions.html.erb
@@ -1,8 +1,3 @@
-
- <%= actions_head_line(actions) %>
- <%= opens_modal "case.act", "Log an action", opens: "log-action", on: kase %>
-
-
<% actions.each do |action| %>
">
@@ -10,7 +5,10 @@
<%= case_action_button("gauge", nil) %>
- <%= action_label(action.type_key) %>
+
+ <%= action_label(action.type_key) %>
+ <%= action_state_chip(action) %>
+
<%= action_reason(action) %>
<%= action_sentence(action) %>
@@ -32,10 +30,9 @@
<% end %>
- <%= action_state_chip(action) %>
<% unless action.reversed? %>
<%= opens_modal "case.reverse", "Reverse it", opens: "reverse-#{action.id}",
- on: kase, css: "btn btn-danger" %>
+ on: kase, css: "btn btn-sm btn-danger" %>
<% end %>
diff --git a/web/app/views/fd/cases/_board.html.erb b/web/app/views/fd/cases/_board.html.erb
index e82bace1..45f1947a 100644
--- a/web/app/views/fd/cases/_board.html.erb
+++ b/web/app/views/fd/cases/_board.html.erb
@@ -1,4 +1,4 @@
-
+
<% cases.each do |kase| %>
<%= render "report_card", kase: kase, priors_by_user: priors_by_user,
action_counts: action_counts, violations: violations %>
diff --git a/web/app/views/fd/cases/_highlights.html.erb b/web/app/views/fd/cases/_highlights.html.erb
deleted file mode 100644
index 06d24d65..00000000
--- a/web/app/views/fd/cases/_highlights.html.erb
+++ /dev/null
@@ -1,52 +0,0 @@
-<% first = reports.min_by(&:received_at) %>
-<% on = threads.find(&:is_primary) || threads.first %>
-
-
-
- About
- - ">
- <% if kase.subject_user_ids.any? %>
- <%= subject_faces(kase) %>
- <% else %>
- nobody named yet
- <% end %>
-
-
-
-
- Violation
- - ">
- <%= violations_label(kase.violations, short: true) || "not set" %>
-
-
-
-
- Where
- - ">
- <% if on && channels.named?(on.channel_id) %>
- <%= channel_link(on.channel_id) %>
- <% else %>
- n/a
- <% end %>
-
-
-
-
- Opened
- - <%= on_day(kase.opened_at) %>
-
-
-
- Reported by
- - ">
- <% if first.nil? %>
- nobody
- <% elsif first.anonymous? %>
- Anonymous
- <% else %>
- <%= slack_face(first.reporter_user_id) %><%= member_link(first.reporter_user_id) %>
- <% end %>
-
-
-
-
- Actions
- - ">
- <%= actions.any? ? pluralize(actions.size, "action") : "none logged" %>
-
-
-
diff --git a/web/app/views/fd/cases/_open_case_modal.html.erb b/web/app/views/fd/cases/_open_case_modal.html.erb
index 105bc24b..8aab03a2 100644
--- a/web/app/views/fd/cases/_open_case_modal.html.erb
+++ b/web/app/views/fd/cases/_open_case_modal.html.erb
@@ -23,28 +23,14 @@
Category
-
-
- <%=
- params[:category_key].present? ? category_label(params[:category_key]) : "Not sure yet"
- %>
-
-
-
-
+ <%= render "shared/choice", name: :category_key, blank: "Not sure yet",
+ chosen: (params[:category_key].present? ?
+ category_label(params[:category_key]) : "Not sure yet"),
+ options: [{ value: "", label: "Not sure yet",
+ current: params[:category_key].blank? }] +
+ Fd::Case::CATEGORIES.map { |key| {
+ value: key, label: category_label(key),
+ current: params[:category_key] == key } } %>