mirror of
https://github.com/rickbarrette/redmine_qbo_calendar.git
synced 2026-11-17 21:50:37 -05:00
Appointment statuses in the plugin settings; call-outs as their own entry
Statuses (name, colour, counts toward hours, order) are set up on the plugin's settings page instead of being hard-coded. Appointments keep a fixed key, so renaming is safe; removing a status in use asks which status to move its appointments to (done on save by a SettingsController hook). Colours come from the settings everywhere statuses show, which also fixes Cancelled never being coloured (cancelled/canceled mismatch). Call-outs (an employee off work) are their own kind of entry (event_type 'call_out') with an employee, date, days and notes, added from a button on each calendar day. They sit at the top of the day in red stripes and never count toward hours. Migration 004 converts Call_Out appointments. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
f2a16b1821
commit
31356ac3fb
23 files changed
+536
-252
No files matched your search
@@ -22,7 +22,11 @@
|
||||
end
|
||||
%>
|
||||
|
||||
<%= tag.div class: ['appointment-block', 'tooltip', appointment.status.to_s.parameterize] do %>
|
||||
<%
|
||||
status = appointment.status_record
|
||||
css = ['appointment-block', 'tooltip', (appointment.call_out? ? 'call-out' : status.key.parameterize), ('no-hours' if status && !status.counts_hours?)]
|
||||
%>
|
||||
<%= tag.div class: css.compact, style: status&.style do %>
|
||||
|
||||
<div class="appointment-bar"></div>
|
||||
|
||||
@@ -51,9 +55,14 @@
|
||||
<span class="appointment-days">(Day <%= day_number %> of <%= duration %>)</span>
|
||||
<% end %>
|
||||
|
||||
<span class="appointment-hours">
|
||||
<%= number_with_precision(appointment.estimated_hours.to_f, precision: 1) %>h
|
||||
</span>
|
||||
<%# Call-outs don't use hours %>
|
||||
<% if appointment.call_out? %>
|
||||
<span class="appointment-call-out-label" title="<%= l(:label_call_out) %>"><i class="fa-solid fa-user-slash"></i></span>
|
||||
<% else %>
|
||||
<span class="appointment-hours">
|
||||
<%= number_with_precision(appointment.estimated_hours.to_f, precision: 1) %>h
|
||||
</span>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<%# Row 3: Details %>
|
||||
|
||||
@@ -4,6 +4,21 @@
|
||||
<%= error_messages_for @appointment %>
|
||||
|
||||
<div class="box tabular">
|
||||
<%= f.hidden_field :event_type %>
|
||||
<% if @appointment.call_out? %>
|
||||
<%# An employee off work: no customer, vehicle, estimate, hours or status %>
|
||||
<p>
|
||||
<label for="customer_appointment_user_id"><%= l(:label_employee) %> <span class="required">*</span></label>
|
||||
<%= f.collection_select :user_id, User.active.sorted, :id, :name, { include_blank: true }, { label: false } %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<%= f.text_field :subject, style: "width: 95%;", placeholder: l(:text_call_out_subject_placeholder) %>
|
||||
</p>
|
||||
|
||||
<p><%= f.datetime_local_field :date %></p>
|
||||
<p><%= f.number_field :duration, step: 1, size: 6, label: :label_duration %></p>
|
||||
<% else %>
|
||||
<p><%= f.text_field :subject, required: true, style: "width: 95%;" %></p>
|
||||
|
||||
<p>
|
||||
@@ -33,7 +48,11 @@
|
||||
<p><%= f.number_field :estimated_hours, step: 1, size: 6 %></p>
|
||||
<p><%= f.number_field :duration, step: 1, size: 6, label: :label_duration %></p>
|
||||
|
||||
<p><%= f.select :status, CustomerAppointment::STATUSES, label: :field_status %></p>
|
||||
<%# The statuses set up in the plugin settings, plus a removed one this appointment still has %>
|
||||
<% status_options = CustomerAppointment.status_options %>
|
||||
<% status_options += [[@appointment.status_record.name, @appointment.status]] if @appointment.status.present? && !@appointment.status_record.known? %>
|
||||
<p><%= f.select :status, status_options, label: :field_status %></p>
|
||||
<% end %>
|
||||
|
||||
<p>
|
||||
<%= f.text_area :description,
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
<td>
|
||||
|
||||
<%= appointment.status %>
|
||||
<%= appointment_status_badge(appointment) %>
|
||||
|
||||
</td>
|
||||
|
||||
|
||||
@@ -19,11 +19,7 @@
|
||||
<td><%= link_to appointment.user unless appointment.user.nil? %></td>
|
||||
<td><%= format_date(appointment.date) %></td>
|
||||
<td>
|
||||
<% if appointment.status.present? %>
|
||||
<span class="status-badge status-<%= appointment.status.to_s.parameterize %>">
|
||||
<%= appointment.status.to_s.humanize %>
|
||||
</span>
|
||||
<% end %>
|
||||
<%= appointment_status_badge(appointment) %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
</h3>
|
||||
|
||||
<p class="subtitle">
|
||||
<strong><%= appointment.status.to_s.humanize %></strong>
|
||||
<strong><%= appointment.call_out? ? l(:label_call_out) : appointment.status_record.name %></strong>
|
||||
</p>
|
||||
|
||||
<table class="attributes">
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
<% if appointment.user %>
|
||||
<tr>
|
||||
<th><%= l(:label_technician) %></th>
|
||||
<th><%= l(appointment.call_out? ? :label_employee : :label_technician) %></th>
|
||||
<td>
|
||||
<%= avatar(appointment.user, size: 16) %>
|
||||
<%= link_to appointment.user %>
|
||||
@@ -74,10 +74,12 @@
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<% unless appointment.call_out? %>
|
||||
<tr>
|
||||
<th><%= l(:label_estimated_hours) %></th>
|
||||
<td><%= number_with_precision(appointment.estimated_hours, precision: 1) %> hrs</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<tr>
|
||||
<th><%= l(:label_duration) %></th>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<h2><%=l(:label_edit_appointment)%></h2>
|
||||
<h2><%= l(@appointment.call_out? ? :label_edit_call_out : :label_edit_appointment) %></h2>
|
||||
|
||||
<%= render "form" %>
|
||||
<%= render "form" %>
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
<label for="status"><%= l(:field_status) %></label>
|
||||
<%= select_tag :status,
|
||||
options_for_select(CustomerAppointment::STATUSES.map { |s| [s.humanize, s] }, @status),
|
||||
options_for_select(CustomerAppointment.status_options + [[l(:label_call_out_plural), CustomerAppointment::CALL_OUT]], @status),
|
||||
include_blank: l(:label_all_statuses) %>
|
||||
|
||||
<label for="from"><%= l(:label_date_from) %></label>
|
||||
@@ -80,11 +80,7 @@
|
||||
<td><%= link_to_user(appointment.user) if appointment.user %></td>
|
||||
<td><%= appointment.duration %> <%= l(:label_days) %></td>
|
||||
<td>
|
||||
<% if appointment.status.present? %>
|
||||
<span class="status-badge status-<%= appointment.status.to_s.parameterize %>">
|
||||
<%= appointment.status.to_s.humanize %>
|
||||
</span>
|
||||
<% end %>
|
||||
<%= appointment_status_badge(appointment) %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<h2><%=l(:label_new_appointment)%></h2>
|
||||
<h2><%= l(@appointment.call_out? ? :label_new_call_out : :label_new_appointment) %></h2>
|
||||
|
||||
<%= render "form" %>
|
||||
<%= render "form" %>
|
||||
@@ -8,7 +8,7 @@
|
||||
<i class="fa-solid fa-clock-rotate-left"></i> <%= l(:label_appointment_history) %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if User.current.allowed_to?(:add_customer_appointments, nil, global: true) %>
|
||||
<% if !@appointment.call_out? && User.current.allowed_to?(:add_customer_appointments, nil, global: true) %>
|
||||
<%= link_to new_issue_path(issue: { customer_id: @appointment.customer_id, vehicle_id: @appointment.vehicle_id, estimate_id: @appointment.estimate_id }), target: :_blank do %>
|
||||
<i class="fa-solid fa-plus"></i> <%= l(:label_new_issue) %>
|
||||
<% end %>
|
||||
@@ -53,19 +53,15 @@
|
||||
</span>
|
||||
</h2>
|
||||
|
||||
<% if User.current.allowed_to?(:edit_customer_appointments, nil, global: true) %>
|
||||
<%# Quick Status Action Buttons %>
|
||||
<%
|
||||
statuses = CustomerAppointment::STATUSES
|
||||
current_status = @appointment.status.to_s.parameterize.underscore
|
||||
%>
|
||||
<%# Quick status buttons; call-outs have no status %>
|
||||
<% if !@appointment.call_out? && User.current.allowed_to?(:edit_customer_appointments, nil, global: true) %>
|
||||
<div class="appointment-quick-actions">
|
||||
<span class="quick-action-label"><%= l(:label_change_status, default: 'Change Status:') %></span>
|
||||
<% statuses.reject { |s| s == current_status }.each do |status_key| %>
|
||||
<%= link_to status_key.humanize,
|
||||
customer_appointment_path(@appointment, customer_appointment: { status: status_key }),
|
||||
<% CustomerAppointment.statuses.reject { |s| s.key == @appointment.status_record.key }.each do |status| %>
|
||||
<%= link_to status.name,
|
||||
customer_appointment_path(@appointment, customer_appointment: { status: status.key }),
|
||||
method: :patch,
|
||||
class: "quick-status-btn status-#{status_key.parameterize}" %>
|
||||
class: 'quick-status-btn', style: status.style %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
@@ -74,6 +70,13 @@
|
||||
<div class="attributes">
|
||||
<div class="splitcontent">
|
||||
<div class="splitcontentleft">
|
||||
<% if @appointment.call_out? %>
|
||||
<%# A call-out is about the employee who's off, not a customer %>
|
||||
<div class="attribute">
|
||||
<div class="label"><%= l(:label_employee) %>:</div>
|
||||
<div class="value"><%= link_to_user(@appointment.user) %></div>
|
||||
</div>
|
||||
<% else %>
|
||||
<div class="attribute">
|
||||
<div class="label"><%= l(:label_customer, default: 'Customer') %>:</div>
|
||||
<div class="value"><%= link_to_if @appointment.customer, @appointment.customer&.name, @appointment.customer %></div>
|
||||
@@ -92,15 +95,14 @@
|
||||
<div class="value"><%= link_to @appointment.estimate, @appointment.estimate, target: "_blank" %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="splitcontentright">
|
||||
<div class="attribute">
|
||||
<div class="label"><%= l(:field_status) %>:</div>
|
||||
<div class="value">
|
||||
<span class="status-badge status-<%= @appointment.status.to_s.parameterize %>">
|
||||
<%= @appointment.status.to_s.humanize %>
|
||||
</span>
|
||||
<%= appointment_status_badge(@appointment) %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="attribute">
|
||||
@@ -109,18 +111,22 @@
|
||||
<%= @appointment.date ? @appointment.date.strftime('%I:%M %p') : '-' %>
|
||||
</div>
|
||||
</div>
|
||||
<% unless @appointment.call_out? %>
|
||||
<div class="attribute">
|
||||
<div class="label"><%= l(:field_user) %>:</div>
|
||||
<div class="value"><%= link_to_user(@appointment.user) %></div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="attribute">
|
||||
<div class="label"><%= l(:label_duration, default: 'Duration') %>:</div>
|
||||
<div class="value"><%= @appointment.duration %> <%= l(:label_days) %></div>
|
||||
</div>
|
||||
<% unless @appointment.call_out? %>
|
||||
<div class="attribute">
|
||||
<div class="label"><%= l(:field_estimated_hours) %>:</div>
|
||||
<div class="value"><%= @appointment.estimated_hours %> <%= l(:label_hours) %></div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user