cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Removed single weight match generation, fixed bracket names, reload weight matches for pool order, and auto delete errrored jobs

Browse Source
This commit is contained in:
Jacob Cody Wimer
2024-12-16 00:02:30 -05:00
parent 5f049793c8
commit a851436c0c
12 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/models/match.rb
View File

@@ -179,40 +179,34 @@ class Match < ApplicationRecord
return_string_ending = return_string_ending + "</strong>"
end
if self.w1 != nil
if self.round == 1 and (self.bracket_position == "Bracket" or self.bracket_position == "Quarter")
if self.wrestler1.original_seed
return_string = return_string + "[#{wrestler1.original_seed}] "
end
return_string = return_string + "#{w1_name} - #{wrestler1.school.name} (#{wrestler1.season_win}-#{wrestler1.season_loss})"
if self.round == 1
return_string = return_string + "#{wrestler1.long_bracket_name}"
else
return_string = return_string + "#{w1_name} (#{wrestler1.school.abbreviation})"
return_string = return_string + "#{wrestler1.short_bracket_name}"
end
else
return_string = return_string + "#{w1_name}"
return_string = return_string + "#{self.loser1_name}"
end
return return_string + return_string_ending
end
def w2_bracket_name
return_string = ""
return_string_ending = ""
if self.w2 and self.winner_id == self.w2
return_string = return_string + "<strong>"
return_string_ending = return_string_ending + "</strong>"
end
if self.w2 != nil
if self.round == 1 and (self.bracket_position == "Bracket" or self.bracket_position == "Quarter")
if self.wrestler2.original_seed
return_string = return_string + "#{wrestler2.original_seed} "
end
return_string = return_string + "#{w2_name} - #{wrestler2.school.name} (#{wrestler2.season_win}-#{wrestler2.season_loss})"
else
return_string = return_string + "#{w2_name} (#{wrestler2.school.abbreviation})"
end
else
return_string = return_string + "#{w2_name}"
end
return return_string + return_string_ending
return_string = ""
return_string_ending = ""
if self.w2 and self.winner_id == self.w2
return_string = return_string + "<strong>"
return_string_ending = return_string_ending + "</strong>"
end
if self.w2 != nil
if self.round == 1
return_string = return_string + "#{wrestler2.long_bracket_name}"
else
return_string = return_string + "#{wrestler2.short_bracket_name}"
end
else
return_string = return_string + "#{self.loser2_name}"
end
return return_string + return_string_ending
end
def winner_name

6
app/models/tournament.rb
View File

@@ -17,6 +17,12 @@ class Tournament < ApplicationRecord
Delayed::Job.where(job_owner_id: self.id)
end
def clear_errored_deferred_jobs
Delayed::Job.where(job_owner_id: self.id, last_error: ! nil).each do |job|
job.destroy
end
end
def self.search_date_name(pattern)
if pattern.blank? # blank? covers both nil and empty string
all

15
app/models/wrestler.rb
View File

@@ -280,4 +280,19 @@ class Wrestler < ApplicationRecord
end
end
def long_bracket_name
return_string = ""
if self.original_seed
return_string = return_string + "[#{self.original_seed}] "
end
return_string = return_string + "#{self.name} - #{self.school.name}"
if self.season_win && self.season_loss
return_string = return_string + " (#{self.season_win}-#{self.season_loss})"
end
return return_string
end
def short_bracket_name
return "#{self.name} (#{self.school.abbreviation})"
end
end