Add last_representative_date column, invoice event dropdown use current year helper

Author: DaAwesomeP

app/models/event.rb

@@ -21,7 +21,7 @@ class Event < ActiveRecord::Base
   attr_accessor :org_type, :org_new, :created_email
 
   before_validation :prune_attachments, :prune_roles
-  before_save :handle_organization, :ensure_tic, :sort_roles, :synchronize_representative_date
+  before_save :handle_organization, :ensure_tic, :sort_roles, :synchronize_representative_dates
   after_initialize :default_values
   after_save :set_eventdate_delta_flags, :set_created_email
 
@@ -71,7 +71,7 @@ class Event < ActiveRecord::Base
   # validate :eventdate_valid?
   validate :textable_social_valid?
 
-  scope :current_year, -> { where("representative_date >= ?", Account.magic_date) }
+  scope :current_year, -> { where("representative_date >= ? or last_representative_date > ?", Account.magic_date, Account.magic_date) }
 
   ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql, :deltas])  # associated via eventdate
 
@@ -117,8 +117,9 @@ def tic_and_stic_only
     event_roles.where(role: [EventRole::Role_sTiC, EventRole::Role_TiC]).where.not(member: nil).all.map(&:member)
   end
 
-  def synchronize_representative_date
+  def synchronize_representative_dates
     self.representative_date = self.eventdates[0].startdate
+    self.last_representative_date = eventdates.last.enddate
   end
 
   def has_run_position?(member)
@@ -157,7 +158,7 @@ def current_year?
     # a part of both years (i.e. Precollege). Otherwise Tracker does not allow
     # certain functions (like invoicing) for the now previous year's event. So,
     # we considered an event by start and end.
-    (representative_date >= Account.magic_date) or (self.eventdates.last.enddate > Account.magic_date)
+    (representative_date >= Account.magic_date) or (self.last_representative_date > Account.magic_date)
   end
 
   private

app/models/eventdate.rb

@@ -16,7 +16,7 @@ class Eventdate < ApplicationRecord
   validate :dates, :validate_call, :validate_strike
 
   before_validation :prune_roles
-  after_save :synchronize_representative_date
+  after_save :synchronize_representative_dates
 
   Event_Span_Days       = 2;
   Event_Span_Seconds    = Event_Span_Days * 24 * 60 * 60;
@@ -110,8 +110,8 @@ def total_gross
     timecard_entries.map(&:gross_amount).reduce(0.0, &:+)
   end
 
-  def synchronize_representative_date
-    self.event.synchronize_representative_date
+  def synchronize_representative_dates
+    self.event.synchronize_representative_dates
   end
 
   def full_roles

app/views/invoices/_form.html.erb

@@ -18,7 +18,7 @@
 
   <tr>
     <td class="subheading"><%= f.label :event_id, "Event" %>:</td>
-    <% if not f.object.event.nil? and f.object.event.representative_date < Account.magic_date %>
+    <% if not f.object.event.nil? and not f.object.event.current_year? %>
       <td><%= f.object.event.title %></td>
     <% else %>
       <td><%= f.select :event_id, options_from_collection_for_select(Event.current_year.order("title ASC"), "id", "title", f.object.event_id) %></td>

db/migrate/20230801015855_add_last_representative_date_to_events.rb

@@ -0,0 +1,13 @@
+class AddLastRepresentativeDateToEvents < ActiveRecord::Migration[6.1]
+  def up
+    add_column :events, :last_representative_date, :datetime
+    add_index :events, :last_representative_date
+    Event.all.each do |event|
+      event.save
+    end
+  end
+  def down
+    remove_index :events, name: "index_events_on_last_representative_date"
+    remove_column :events, :last_representative_date
+  end
+end