|
|
|
@ -137,8 +137,8 @@ struct CallView: View { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func finalMessage(reSummon: Bool) -> String { |
|
|
|
func finalMessage(reSummon: Bool, forcedEmptyMessage: Bool) -> String { |
|
|
|
if simpleMode { |
|
|
|
if simpleMode || forcedEmptyMessage { |
|
|
|
let signature = dataStore.user.summonsMessageSignature ?? dataStore.user.defaultSignature() |
|
|
|
let signature = dataStore.user.summonsMessageSignature ?? dataStore.user.defaultSignature() |
|
|
|
return "\n\n\n\n" + signature |
|
|
|
return "\n\n\n\n" + signature |
|
|
|
} |
|
|
|
} |
|
|
|
@ -325,6 +325,13 @@ struct CallView: View { |
|
|
|
Button("Re-convoquer") { |
|
|
|
Button("Re-convoquer") { |
|
|
|
self._summon(byMessage: byMessage, reSummon: true) |
|
|
|
self._summon(byMessage: byMessage, reSummon: true) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if simpleMode == false { |
|
|
|
|
|
|
|
Divider() |
|
|
|
|
|
|
|
Button("Contacter") { |
|
|
|
|
|
|
|
self._summon(byMessage: byMessage, reSummon: false, forcedEmptyMessage: true) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} label: { |
|
|
|
} label: { |
|
|
|
Text(byMessage ? "sms" : "mail") |
|
|
|
Text(byMessage ? "sms" : "mail") |
|
|
|
@ -337,15 +344,15 @@ struct CallView: View { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func _summon(byMessage: Bool, reSummon: Bool) { |
|
|
|
private func _summon(byMessage: Bool, reSummon: Bool, forcedEmptyMessage: Bool = false) { |
|
|
|
self.summonParamByMessage = byMessage |
|
|
|
self.summonParamByMessage = byMessage |
|
|
|
self.summonParamReSummon = reSummon |
|
|
|
self.summonParamReSummon = reSummon |
|
|
|
self._verifyUser { |
|
|
|
self._verifyUser { |
|
|
|
self._payTournamentAndExecute { |
|
|
|
self._payTournamentAndExecute { |
|
|
|
if byMessage { |
|
|
|
if byMessage { |
|
|
|
self._contactByMessage(reSummon: reSummon) |
|
|
|
self._contactByMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
self._contactByMail(reSummon: reSummon) |
|
|
|
self._contactByMail(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -368,18 +375,18 @@ struct CallView: View { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fileprivate func _contactByMessage(reSummon: Bool) { |
|
|
|
fileprivate func _contactByMessage(reSummon: Bool, forcedEmptyMessage: Bool) { |
|
|
|
self.contactType = .message(date: callDate, |
|
|
|
self.contactType = .message(date: callDate, |
|
|
|
recipients: teams.flatMap { $0.getPhoneNumbers() }, |
|
|
|
recipients: teams.flatMap { $0.getPhoneNumbers() }, |
|
|
|
body: finalMessage(reSummon: reSummon), |
|
|
|
body: finalMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage), |
|
|
|
tournamentBuild: nil) |
|
|
|
tournamentBuild: nil) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fileprivate func _contactByMail(reSummon: Bool) { |
|
|
|
fileprivate func _contactByMail(reSummon: Bool, forcedEmptyMessage: Bool) { |
|
|
|
self.contactType = .mail(date: callDate, |
|
|
|
self.contactType = .mail(date: callDate, |
|
|
|
recipients: tournament.umpireMail(), |
|
|
|
recipients: tournament.umpireMail(), |
|
|
|
bccRecipients: teams.flatMap { $0.getMail() }, |
|
|
|
bccRecipients: teams.flatMap { $0.getMail() }, |
|
|
|
body: finalMessage(reSummon: reSummon), |
|
|
|
body: finalMessage(reSummon: reSummon, forcedEmptyMessage: forcedEmptyMessage), |
|
|
|
subject: tournament.tournamentTitle(), |
|
|
|
subject: tournament.tournamentTitle(), |
|
|
|
tournamentBuild: nil) |
|
|
|
tournamentBuild: nil) |
|
|
|
} |
|
|
|
} |
|
|
|
|