mirror of
https://github.com/rickbarrette/redmine_qbo_calendar.git
synced 2026-11-17 21:50:37 -05:00
No-new-work weeks on the calendar
A checkbox under each week number flags the week "no new work" and circles it in red. New appointments in a flagged week (or ones moved or lengthened into it) warn on the form and are stopped on save; users with "Override no-new-work weeks" can tick "Schedule anyway". Flagging needs "Flag no-new-work weeks". Call-outs aren't affected. Adds migration 005. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
cba0057c9c
commit
9a07c16731
13 files changed
+304
-5
No files matched your search
@@ -83,11 +83,14 @@ class CustomerAppointmentsController < ApplicationController
|
||||
@appointment.date = (params[:start_date].to_date + 9.hours) if params[:start_date].present?
|
||||
@appointment.customer_id = params[:customer_id] if params[:customer_id].present?
|
||||
prefill_estimate_and_vehicle
|
||||
# Warn up front when the day picked on the calendar is in a no-new-work week
|
||||
@no_work_weeks = @appointment.no_work_weeks_added
|
||||
end
|
||||
|
||||
def create
|
||||
@appointment = CustomerAppointment.new(appointment_params)
|
||||
@appointment.project = @project
|
||||
apply_no_work_week_override
|
||||
if @appointment.save
|
||||
flash[:notice] = l(:notice_successful_create)
|
||||
redirect_to customer_appointment_path( @appointment )
|
||||
@@ -101,7 +104,9 @@ class CustomerAppointmentsController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
if @appointment.update( appointment_params )
|
||||
@appointment.assign_attributes(appointment_params)
|
||||
apply_no_work_week_override
|
||||
if @appointment.save
|
||||
flash[:notice] = l(:notice_successful_update)
|
||||
redirect_to customer_appointment_path( @appointment )
|
||||
else
|
||||
@@ -117,6 +122,16 @@ class CustomerAppointmentsController < ApplicationController
|
||||
|
||||
private
|
||||
|
||||
# "Schedule anyway" on the form counts only for users with "Override no-new-work weeks"
|
||||
def apply_no_work_week_override
|
||||
@appointment.no_work_week_override = params[:override_no_work_week] == '1' && can_override_no_work_weeks?
|
||||
end
|
||||
|
||||
def can_override_no_work_weeks?
|
||||
User.current.allowed_to?(:override_no_work_weeks, nil, global: true)
|
||||
end
|
||||
helper_method :can_override_no_work_weeks?
|
||||
|
||||
# Links from an estimate (redmine_qbo) pass the estimate and vehicle; each is used only when it
|
||||
# belongs to the appointment's customer
|
||||
def prefill_estimate_and_vehicle
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# The MIT License (MIT)
|
||||
#
|
||||
# Copyright (c) 2026 rick barrette
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
# Flags and unflags a calendar week as "no new work" (the checkbox at the start of each calendar week)
|
||||
class NoWorkWeeksController < ApplicationController
|
||||
before_action :require_login
|
||||
before_action :authorize_global
|
||||
|
||||
def update
|
||||
date = Date.parse(params[:week].to_s)
|
||||
if params[:flagged] == '1'
|
||||
NoWorkWeek.flag!(date)
|
||||
else
|
||||
NoWorkWeek.unflag!(date)
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_back_or_default issues_calendar_path }
|
||||
format.json { render json: { week_start: NoWorkWeek.week_start_for(date), flagged: params[:flagged] == '1' } }
|
||||
end
|
||||
rescue Date::Error
|
||||
render_error status: 422, message: l(:error_invalid_no_work_week)
|
||||
end
|
||||
end
|
||||
@@ -34,6 +34,13 @@ class CustomerAppointment < ActiveRecord::Base
|
||||
# The hours can't be less than the attached estimate's labor hours
|
||||
validate :validate_hours_cover_estimate
|
||||
|
||||
# New work landing in a week flagged "no new work" needs an override (see #no_work_week_override)
|
||||
validate :validate_no_work_weeks
|
||||
|
||||
# Set by the controller when the user ticked "Schedule anyway" and holds the "Override no-new-work weeks"
|
||||
# permission
|
||||
attr_accessor :no_work_week_override
|
||||
|
||||
# Capitalize the first letter only; titleize mangled vehicle names and acronyms (JL -> Jl, LED -> Led)
|
||||
normalizes :subject, with: ->(subject) { subject.strip.sub(/\A[a-z]/, &:upcase) }
|
||||
|
||||
@@ -104,6 +111,24 @@ class CustomerAppointment < ActiveRecord::Base
|
||||
subject
|
||||
end
|
||||
|
||||
# The Mondays of flagged no-new-work weeks this appointment adds work to: weeks its working days fall in
|
||||
# that it didn't already cover before this change. Call-outs aren't work, so never any.
|
||||
def no_work_weeks_added
|
||||
return [] if call_out? || date.blank?
|
||||
|
||||
weeks = NoWorkWeek.flagged_week_starts(working_days)
|
||||
if persisted? && date_in_database.present? && event_type_in_database != CALL_OUT
|
||||
previous = RedmineQboCalendar::WorkingDays.dates(date_in_database.to_date, duration_in_database)
|
||||
weeks -= previous.map { |d| NoWorkWeek.week_start_for(d) }
|
||||
end
|
||||
weeks.sort
|
||||
end
|
||||
|
||||
# True after validation stopped the save over a no-new-work week, so the form can offer "Schedule anyway"
|
||||
def no_work_week_conflict?
|
||||
@no_work_week_conflict == true
|
||||
end
|
||||
|
||||
# The estimate's labor hours rounded up to whole hours (appointment hours are whole numbers): the
|
||||
# quantities of its lines with redmine_qbo's labor products/services (e.g. Labor). 0 if the
|
||||
# estimate can't be read from QuickBooks.
|
||||
@@ -148,6 +173,18 @@ class CustomerAppointment < ActiveRecord::Base
|
||||
errors.add(:base, I18n.t(:error_hours_less_than_estimate, hours: labor, estimate: estimate.doc_number))
|
||||
end
|
||||
|
||||
def validate_no_work_weeks
|
||||
@no_work_week_conflict = false
|
||||
return if no_work_week_override
|
||||
return unless new_record? || will_save_change_to_date? || will_save_change_to_duration? || will_save_change_to_event_type?
|
||||
|
||||
weeks = no_work_weeks_added
|
||||
return if weeks.empty?
|
||||
|
||||
@no_work_week_conflict = true
|
||||
errors.add(:base, I18n.t(:error_no_work_week, weeks: weeks.map { |w| I18n.l(w, format: :long) }.to_sentence))
|
||||
end
|
||||
|
||||
# Validates that the appointment date does not land on a weekend or holiday
|
||||
def validate_working_day
|
||||
return if date.blank?
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
# The MIT License (MIT)
|
||||
#
|
||||
# Copyright (c) 2026 rick barrette
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
# A week flagged "no new work" on the calendar. Weeks are keyed by their Monday, so the flag holds whatever
|
||||
# day the user's calendar starts its rows on.
|
||||
class NoWorkWeek < ApplicationRecord
|
||||
belongs_to :user, optional: true
|
||||
|
||||
validates :week_start, presence: true, uniqueness: true
|
||||
|
||||
# The Monday of the week a date is in
|
||||
def self.week_start_for(date)
|
||||
date.to_date.beginning_of_week(:monday)
|
||||
end
|
||||
|
||||
# The Mondays of the flagged weeks among the given dates' weeks, read in one query
|
||||
def self.flagged_week_starts(dates)
|
||||
starts = Array(dates).compact.map { |d| week_start_for(d) }.uniq
|
||||
return Set.new if starts.empty?
|
||||
|
||||
where(week_start: starts).pluck(:week_start).to_set
|
||||
end
|
||||
|
||||
# Whether any of the dates falls in a flagged week
|
||||
def self.flagged?(*dates)
|
||||
flagged_week_starts(dates.flatten).any?
|
||||
end
|
||||
|
||||
def self.flag!(date, user = User.current)
|
||||
find_or_create_by!(week_start: week_start_for(date)) { |w| w.user = user if user&.logged? }
|
||||
rescue ActiveRecord::RecordNotUnique
|
||||
find_by(week_start: week_start_for(date))
|
||||
end
|
||||
|
||||
def self.unflag!(date)
|
||||
where(week_start: week_start_for(date)).delete_all
|
||||
end
|
||||
end
|
||||
@@ -11,6 +11,10 @@
|
||||
|
||||
# Read once for the whole page
|
||||
non_working_days = Setting.non_working_week_days || []
|
||||
|
||||
# Weeks flagged "no new work" (keyed by their Monday): circled in red, and new appointments in them warn
|
||||
flagged_weeks = NoWorkWeek.where(week_start: (calendar.startdt - 6)..calendar.enddt).pluck(:week_start).to_set
|
||||
can_flag_weeks = User.current.allowed_to?(:manage_no_work_weeks, nil, global: true)
|
||||
all_holidays = Holiday.all.to_a
|
||||
working_days_between = lambda do |first, last|
|
||||
RedmineQboCalendar::WorkingDays.between(first, last, holidays: all_holidays, week_days: non_working_days)
|
||||
@@ -127,7 +131,8 @@
|
||||
<%= form_tag({}, data: { cm_url: issues_context_menu_path }) do %>
|
||||
<%= hidden_field_tag 'back_url', url_for(params: request.query_parameters), id: nil %>
|
||||
|
||||
<ul class="cal">
|
||||
<%# data-no-work-weeks-url: where toggleNoWorkWeek (calendar.js) saves a week's flag %>
|
||||
<ul class="cal" data-no-work-weeks-url="<%= no_work_weeks_path %>" data-no-work-week-error="<%= l(:error_no_work_week_save) %>">
|
||||
<li scope="col" title="<%= l(:label_week) %>" class="calhead week-number"></li>
|
||||
|
||||
<% 7.times do |i| %>
|
||||
@@ -175,9 +180,26 @@
|
||||
end
|
||||
%>
|
||||
|
||||
<li class="week-number">
|
||||
<%
|
||||
# Every 7-day row has exactly one Monday, whatever day the calendar starts on
|
||||
week_monday = week.find { |d| d.cwday == 1 }
|
||||
no_work_week = flagged_weeks.include?(week_monday)
|
||||
week_css = no_work_week ? ['no-work-week'] : []
|
||||
%>
|
||||
|
||||
<li class="week-number <%= week_css.join(' ') %>" data-no-work-week="<%= week_monday %>">
|
||||
<span class="label-week"><%= l(:label_week) %></span>
|
||||
<%= calendar.week_number(week.first) %>
|
||||
|
||||
<%# No-new-work flag: a checkbox for users who may set it, otherwise shown only when set %>
|
||||
<% if can_flag_weeks || no_work_week %>
|
||||
<label class="no-work-week-toggle" title="<%= l(:text_no_work_week_toggle) %>">
|
||||
<%# No name, so the issues context menu form never sends it %>
|
||||
<%= tag.input type: 'checkbox', checked: no_work_week, disabled: !can_flag_weeks,
|
||||
onchange: "toggleNoWorkWeek(this, '#{week_monday}')" %>
|
||||
<span><%= l(:label_no_work_week) %></span>
|
||||
</label>
|
||||
<% end %>
|
||||
|
||||
<%# Render the Weekly Total Hours under the Week Number %>
|
||||
<% if weekly_total_hours > 0 %>
|
||||
@@ -187,7 +209,7 @@
|
||||
<% end %>
|
||||
</li>
|
||||
|
||||
<% week.each do |day| %>
|
||||
<% week.each_with_index do |day, day_index| %>
|
||||
|
||||
<%
|
||||
is_today = (day == User.current.today)
|
||||
@@ -204,7 +226,7 @@
|
||||
%>
|
||||
|
||||
<%# Added 'week-end' class and background color styling for custom holidays to mimic weekends %>
|
||||
<li class="<%= calendar.day_css_classes(day) %> calbody <%= 'week-end' if is_custom_holiday %>" style="<%= 'background-color: #f6f6f6;' if is_custom_holiday %>"<%= ' id="today"'.html_safe if is_today %>>
|
||||
<li class="<%= calendar.day_css_classes(day) %> calbody <%= 'week-end' if is_custom_holiday %> <%= week_css.join(' ') %> <%= 'no-work-week-last' if day_index == 6 %>" data-no-work-week="<%= week_monday %>" style="<%= 'background-color: #f6f6f6;' if is_custom_holiday %>"<%= ' id="today"'.html_safe if is_today %>>
|
||||
|
||||
<p class="day-num" style="display: grid; grid-template-columns: 1fr auto 1fr; align-items: center; margin-bottom: 4px;">
|
||||
<!-- Left: Day number and abbreviated weekday -->
|
||||
|
||||
@@ -3,6 +3,27 @@
|
||||
<%= labelled_form_for @appointment do |f| %>
|
||||
<%= error_messages_for @appointment %>
|
||||
|
||||
<%# No-new-work weeks: warned before saving (the day picked on the calendar), then after a save stopped
|
||||
over one. Users with "Override no-new-work weeks" can tick "Schedule anyway". %>
|
||||
<% if @no_work_weeks.present? %>
|
||||
<div class="flash warning no-work-week-warning">
|
||||
<%= l(:warning_no_work_week, weeks: @no_work_weeks.map { |w| format_date(w) }.to_sentence) %>
|
||||
<%= l(can_override_no_work_weeks? ? :text_no_work_week_can_override : :text_no_work_week_cannot_override) %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% if @appointment.no_work_week_conflict? || @no_work_weeks.present? %>
|
||||
<% if can_override_no_work_weeks? %>
|
||||
<p class="no-work-week-override">
|
||||
<label>
|
||||
<%= check_box_tag 'override_no_work_week', '1', params[:override_no_work_week] == '1' %>
|
||||
<%= l(:label_override_no_work_week) %>
|
||||
</label>
|
||||
</p>
|
||||
<% elsif @appointment.no_work_week_conflict? %>
|
||||
<p class="no-work-week-override"><em><%= l(:text_no_work_week_cannot_override) %></em></p>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<div class="box tabular">
|
||||
<%= f.hidden_field :event_type %>
|
||||
<% if @appointment.call_out? %>
|
||||
|
||||
Reference in new issue
Block a user