Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[LINST] skip metadatafields for surveys #8961

Merged
merged 3 commits into from
Nov 24, 2023
Merged

[LINST] skip metadatafields for surveys #8961

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc66b9b
[LINST] skip metadatafields for surveys
ridz1208 Aug 10, 2023
fb05826
set DataEntryType before loadInstrumentFile
zaliqarosli Nov 15, 2023
4e6833a
fix test
zaliqarosli Nov 20, 2023
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
11 changes: 7 additions & 4 deletions php/libraries/NDB_BVL_Instrument.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,12 @@ abstract class NDB_BVL_Instrument extends NDB_Page
$base . "project/instruments/$instrument.meta"
);
}
// Set DataEntryType to normal or DirectEntry
if (isset($_REQUEST['key'])) {
$obj->DataEntryType = 'DirectEntry';
} else {
$obj->DataEntryType = 'normal';
}
// Adds all of the form element and form rules to the page after
// having instantiated the form above
$obj->loadInstrumentFile(
Expand Down Expand Up @@ -477,10 +483,7 @@ abstract class NDB_BVL_Instrument extends NDB_Page
{
// ALWAYS INCLUDE THESE!

if (isset($_REQUEST['key'])) {
$this->DataEntryType = 'DirectEntry';
} else {
$this->DataEntryType = 'normal';
if ($this->DataEntryType === 'normal') {
// These are required for Save Data to work properly, but not when it's
// a direct data entry page
$this->addHidden(
Expand Down
4 changes: 3 additions & 1 deletion php/libraries/NDB_BVL_Instrument_LINST.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,9 @@ class NDB_BVL_Instrument_LINST extends \NDB_BVL_Instrument
'instrument_title',
$pieces[1]
);
$this->_addMetadataFields();
if ($this->DataEntryType!=="DirectEntry") {
$this->_addMetadataFields();
}
}
break;
case 'begingroup':
Expand Down
9 changes: 5 additions & 4 deletions test/unittests/NDB_BVL_Instrument_Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,10 +1335,11 @@ function testSaveValueAndSave()
{
$this->_setUpMockDB();
$this->_setTableData();
$this->_instrument->commentID = 'commentID1';
$this->_instrument->table = 'medical_history';
$this->_instrument->testName = 'Test';
$this->_instrument->formType = "XIN";
$this->_instrument->commentID = 'commentID1';
$this->_instrument->table = 'medical_history';
$this->_instrument->testName = 'Test';
$this->_instrument->formType = "XIN";
$this->_instrument->DataEntryType = "normal";
$values = ['Date_taken' => '2005-06-06',
'arthritis_age' => 2,
'arthritis_age_status' => 'status'
Expand Down
Loading