Skip to content

Commit

Permalink
[media] Use study's start/end date as min/max values for Date of Admi…
Browse files Browse the repository at this point in the history
…nistration field (#5248)

When uploading a form to media module, you cannot currently enter a date greater than 2017-12-31. The date of administration field is currently hard-coded to have a minYear of '2000' and a maxYear of '2017'.

Min and max year are now determined by the study's start and end year (taken from configuration).
  • Loading branch information
jesscall authored and driusan committed Oct 2, 2019
1 parent 718524f commit 20ae3f6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 7 additions & 2 deletions modules/media/ajax/FileUpload.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,9 @@ function viewData()
function getUploadFields()
{

$db = \NDB_Factory::singleton()->database();
$user = \User::singleton();
$db = \NDB_Factory::singleton()->database();
$user = \User::singleton();
$config = \NDB_Config::singleton();

// Select only candidates that have had visit at user's sites
$qparam = array();
Expand All @@ -231,6 +232,8 @@ function getUploadFields()
$visitList = Utility::getVisitList();
$siteList = Utility::getSiteList(false);
$languageList = Utility::getLanguageList();
$startYear = $config->getSetting('startYear');
$endYear = $config->getSetting('endYear');

// Build array of session data to be used in upload media dropdowns
$sessionData = array();
Expand Down Expand Up @@ -328,6 +331,8 @@ function getUploadFields()
'mediaFiles' => array_values(getFilesList()),
'sessionData' => $sessionData,
'language' => $languageList,
'startYear' => $startYear,
'endYear' => $endYear,
];

return $result;
Expand Down
4 changes: 2 additions & 2 deletions modules/media/jsx/uploadForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ class MediaUploadForm extends Component {
<DateElement
name='dateTaken'
label='Date of Administration'
minYear='2000'
maxYear='2017'
minYear={this.state.Data.startYear}
maxYear={this.state.Data.endYear}
onUserInput={this.setFormData}
ref='dateTaken'
value={this.state.formData.dateTaken}
Expand Down

0 comments on commit 20ae3f6

Please sign in to comment.