Skip to content

[modules | candidate_parameters] Fix DoB page loading for EDC-only participants #10688

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

Open
priyavrat7 wants to merge 3 commits into
base: 29.0-release
Choose a base branch
from
+30 −5
Open

[modules | candidate_parameters] Fix DoB page loading for EDC-only participants #10688

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ffa69
Fix DoB page loading for EDC-only participants
priyavrat7 Jun 23, 2026
f9c0970
Fixed checkstatic error
priyavrat7 Jun 23, 2026
50a9b33
Fix DoD page as well now to load for EDC-only participants
priyavrat7 Jun 23, 2026
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
35 changes: 30 additions & 5 deletions modules/candidate_parameters/ajax/getData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,7 @@ function getDOBFields(): array
$dobFormat = $config->getSetting('dobFormat');

$dobProcessedFormat = implode("-", str_split($dobFormat, 1));
$dobDate = DateTime::createFromFormat('Y-m-d', $dob);
$formattedDate = $dobDate ? $dobDate->format($dobProcessedFormat) : null;
$formattedDate = formatCandidateDate($dob, $dobProcessedFormat);

$result = [
'pscid' => $pscid,
Expand Down Expand Up @@ -610,9 +609,10 @@ function getDODFields(): array
$dobFormat = $config->getSetting('dobFormat');

$dobProcessedFormat = implode("-", str_split($dobFormat, 1));
$dobDate = DateTime::createFromFormat('Y-m-d', $candidateData['DoB']);
$dob = $dobDate ? $dobDate->format($dobProcessedFormat) : null;

$dob = formatCandidateDate(
$candidateData['DoB'] ?? null,
$dobProcessedFormat
);
$result = [
'pscid' => $candidateData['PSCID'],
'candID' => $candID->__toString(),
Expand Down Expand Up @@ -704,3 +704,28 @@ function getDiagnosisEvolutionFields(): array
return $result;
}

/**
* Format a candidate date for display.
*
* Returns null when the date is null or invalid.
*
* @param string|null $date Database date in Y-m-d format
* @param string $format Display format
*
* @return string|null
*/
function formatCandidateDate(?string $date, string $format): ?string
{
if (empty($date)) {
return null;
}

$dateTime = DateTime::createFromFormat('Y-m-d', $date);

if ($dateTime === false) {
return null;
}

return $dateTime->format($format);
}

Loading