Skip to content

feat: Add phonetic name support for racers in registration and editing #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Japenner wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: Add phonetic name support for racers in registration and editing #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions website/ajax/action.racer.add.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ if (have_permission(REGISTER_NEW_RACER_PERMISSION)) {
'note_from' => $_POST['note_from'],
'partitionid' => $partitionid,
'exclude' => @$_POST['exclude'] ? true : false);

if (isset($_POST['phonetic_firstname'])) {
$options['phonetic_firstname'] = $_POST['phonetic_firstname'];
}
if (isset($_POST['phonetic_lastname'])) {
$options['phonetic_lastname'] = $_POST['phonetic_lastname'];
}

if (isset($_POST['partitionid']) && $_POST['partitionid'] > 0) {
$options['partitionid'] = $_POST['partitionid'];
}
Expand Down
8 changes: 8 additions & 0 deletions website/ajax/action.racer.edit.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ if (have_permission(EDIT_RACER_PERMISSION)) {
$assignments .= ', lastname = :lastname';
$values[':lastname'] = trim($_POST['lastname']);
}
if (isset($_POST['phonetic_firstname'])) {
$assignments .= ', phonetic_firstname = :phonetic_firstname';
$values[':phonetic_firstname'] = trim($_POST['phonetic_firstname']);
}
if (isset($_POST['phonetic_lastname'])) {
$assignments .= ', phonetic_lastname = :phonetic_lastname';
$values[':phonetic_lastname'] = trim($_POST['phonetic_lastname']);
}
if ($ok && isset($_POST['carno'])) {
$assignments .= ', carnumber = :carnumber';
$values[':carnumber'] = trim($_POST['carno']);
Expand Down
6 changes: 6 additions & 0 deletions website/ajax/action.racer.import.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ if ($ok) {
if (isset($_POST['partition'])) {
$options['partition'] = trim(@$_POST['partition']);
}
if (isset($_POST['phonetic_firstname'])) {
$options['phonetic_firstname'] = trim($_POST['phonetic_firstname']);
}
if (isset($_POST['phonetic_lastname'])) {
$options['phonetic_lastname'] = trim($_POST['phonetic_lastname']);
}
$racerid = insert_new_racer($options);
json_out('racerid', $racerid);

Expand Down
34 changes: 34 additions & 0 deletions website/ajax/query.poll.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,40 @@ function json_common_1($key, &$now_running) {
json_current_racers($now_running, read_name_style(), $render, $render2));
}
break;
case 'racers-phonetic': // Same as 'racers' but forces phonetic name style
require_once('inc/name-mangler.inc');
require_once('inc/json-current-racers.inc');
if ($now_running['roundid'] == TIMER_TEST_ROUNDID) {
$racers = array();
$nlanes = get_lane_count();
for ($lane = 1; $lane <= $nlanes; ++$lane) {
if (($tt['mask'] & (1 << ($lane - 1))) == 0) {
$racers[] = array('lane' => $lane);
}
}
json_out('racers', $racers);
} else {
require_once('inc/photos-on-now-racing.inc');
$render = false;
$render2 = false;
if (isset($_GET['head-size'])) {
$render = photo_repository('head')->lookup_or_any($_GET['head-size']);
if (isset($_GET['car-size'])) {
$render2 = photo_repository('car')->lookup_or_any($_GET['car-size']);
}
} else if (isset($_GET['row-height']) && $_GET['row-height'] > 0) {
if (isset($_GET['repo'])) {
$photos = $_GET['repo'];
if (!photo_repository($photos)) { $photos = 0; }
} else {
$photos = read_photos_on_now_racing();
} if ($photos) {
$render_name = (2 * $_GET['row-height']).'x'.$_GET['row-height'];
$render = photo_repository($photos)->lookup_or_any($render_name);
}
}
json_out('racers', json_current_racers($now_running, PHONETIC_NAME, $render, $render2));
}
case 'replay-state':
require_once('inc/json-replay.inc');
json_out('replay-state', json_replay());
Expand Down
7 changes: 6 additions & 1 deletion website/checkin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@ function addrow0(racer) {
<label for="edit_lastname">Last name:</label>
<input id="edit_lastname" type="text" name="edit_lastname" value=""/>

<label for="edit_phonetic_firstname">Phonetic first name:</label>
<input id="edit_phonetic_firstname" type="text" name="edit_phonetic_firstname" value=""/>
<label for="edit_phonetic_lastname">Phonetic last name:</label>
<input id="edit_phonetic_lastname" type="text" name="edit_phonetic_lastname" value=""/>

<label for="edit_carno">Car number:</label>
<input id="edit_carno" type="text" name="edit_carno" value=""/>

Expand Down Expand Up @@ -390,7 +395,7 @@ class="delete_button"
data-off-text="Excluded"
data-on-text="Eligible"/>
</div>

<input type="submit"/>
<input type="button" value="Cancel"
onclick='pop_modal("#bulk_details_modal");'/>
Expand Down
2 changes: 2 additions & 0 deletions website/inc/checkin-table.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ function checkin_table_SELECT_FROM_sql() {
$schema_version = schema_version();
return
'SELECT racerid, carnumber, lastname, firstname, carname, imagefile,'
.($schema_version < PHONETIC_NAMES_SCHEMA ? " '' AS phonetic_lastname, '' AS phonetic_firstname,"
: " phonetic_lastname, phonetic_firstname,")
.($schema_version < 2 ? " '' AS carphoto," : " carphoto,")
.($schema_version < PARTITION_SCHEMA
? " 1 AS partitionid, 1 AS partition_sortorder, '".DEFAULT_PARTITION_NAME."' AS partition_name,"
Expand Down
61 changes: 20 additions & 41 deletions website/inc/json-current-racers.inc
View file
Open in desktop
Copy link
Author

@Japenner Japenner Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My editor inadvertently blew away formatting here, will fix in a soon to be pushed commit.

Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,26 @@ require_once('inc/schema_version.inc');
// $photo_render if a PhotoRender or false
function json_current_racers(&$now_running, $name_style, $photo_render, $photo_render2 = false) {
global $db;

$use_subgroups = use_subgroups();
$time_format = get_finishtime_formatting_string();

$stmt = $db->prepare('SELECT lane, RegistrationInfo.racerid,'
.' carnumber, lastname, firstname, carname, rank,'
.' finishtime, finishplace, imagefile, '
.(schema_version() >= 2 ? 'carphoto' : "'' AS carphoto").', '
.(schema_version() >= PARTITION_SCHEMA ? ' note' : "'' AS note")
.' FROM '
.inner_join('RaceChart', 'RegistrationInfo',
'RaceChart.racerid = RegistrationInfo.racerid',
'Ranks',
'RegistrationInfo.rankid = Ranks.rankid')
.' WHERE roundid = :roundid'
.' AND heat = :heat'
.' ORDER BY lane');
$stmt->execute(array(':roundid' => $now_running['roundid'],
':heat' => $now_running['heat']));
$racers = array();

foreach ($stmt as $row) {
$racer = array(
'lane' => $row['lane'],
'racerid' => $row['racerid'],
'name' => mangled_name($row, $name_style),
'carname' => $row['carname'],
'carnumber' => $row['carnumber'],
'note' => $row['note'],
'photo' => $photo_render ? $photo_render->url_for_row($row) : '',
'finishtime' => $row['finishtime'] ? sprintf($time_format, $row['finishtime']) : '',
'finishplace' => $row['finishplace'] ? $row['finishplace'] : '');
if ($photo_render2) {
$racer['photo2'] = $photo_render2->url_for_row($row);
}
if ($use_subgroups) {
$racer['subgroup'] = $row['rank'];
}
$racers[] = $racer;
}

return $racers;
}
?>
$stmt = $db->prepare('SELECT lane, RegistrationInfo.racerid,' .' carnumber,
lastname, firstname,' .(schema_version() >= PHONETIC_NAMES_SCHEMA ? '
phonetic_lastname, phonetic_firstname,' : ' \'\' AS phonetic_lastname, \'\' AS
phonetic_firstname,') .' carname, rank,' .' finishtime, finishplace, imagefile,
' .(schema_version() >= 2 ? 'carphoto' : "'' AS carphoto").', '
.(schema_version() >= PARTITION_SCHEMA ? ' note' : "'' AS note") .' FROM '
.inner_join('RaceChart', 'RegistrationInfo', 'RaceChart.racerid =
RegistrationInfo.racerid', 'Ranks', 'RegistrationInfo.rankid = Ranks.rankid') .'
WHERE roundid = :roundid' .' AND heat = :heat' .' ORDER BY lane');
$stmt->execute(array(':roundid' => $now_running['roundid'], ':heat' =>
$now_running['heat'])); $racers = array(); foreach ($stmt as $row) { $racer =
array( 'lane' => $row['lane'], 'racerid' => $row['racerid'], 'name' =>
mangled_name($row, $name_style), 'carname' => $row['carname'], 'carnumber' =>
$row['carnumber'], 'note' => $row['note'], 'photo' => $photo_render ?
$photo_render->url_for_row($row) : '', 'finishtime' => $row['finishtime'] ?
sprintf($time_format, $row['finishtime']) : '', 'finishplace' =>
$row['finishplace'] ? $row['finishplace'] : ''); if ($photo_render2) {
$racer['photo2'] = $photo_render2->url_for_row($row); } if ($use_subgroups) {
$racer['subgroup'] = $row['rank']; } $racers[] = $racer; } return $racers; } ?>
8 changes: 7 additions & 1 deletion website/inc/name-mangler.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

define('FULL_NAME', 0);
define('FIRST_NAME_LAST_INITIAL', 1);
define('PHONETIC_NAME', 2);

function read_name_style() {
return read_raceinfo('name-style', FULL_NAME);
Expand All @@ -10,8 +11,13 @@ function read_name_style() {
function mangled_name(&$racer, $style) {
if ($style == FIRST_NAME_LAST_INITIAL) {
return $racer['firstname'].' '.substr($racer['lastname'], 0, 1).'.';
} else if ($style == PHONETIC_NAME) {
// Use phonetic names if available, fall back to regular names
$firstname = !empty($racer['phonetic_firstname']) ? $racer['phonetic_firstname'] : $racer['firstname'];
$lastname = !empty($racer['phonetic_lastname']) ? $racer['phonetic_lastname'] : $racer['lastname'];
return $firstname.' '.$lastname;
} else {
return $racer['firstname'].' '.$racer['lastname'];
}
}
?>
?>
Loading