diff --git a/tools/exporters/data_dictionary_builder.php b/tools/exporters/data_dictionary_builder.php index ade314778a0..1978ea43dad 100755 --- a/tools/exporters/data_dictionary_builder.php +++ b/tools/exporters/data_dictionary_builder.php @@ -159,8 +159,10 @@ case "header": break; - - //for HTML_QuickForm versions of standard HTML Form Elements... + case "jsondata": + case "norules": + break; + //for HTML_QuickForm versions of standard HTML Form Elements... default: //continue; // jump straight to validity for debugging if (isset($bits[1]) && preg_match("/^Examiner/", $bits[1])) { @@ -338,6 +340,52 @@ "ParameterTypeCategoryID" => $catId, ] ); + + // INSTRUMENT DATA ENTRY + print "\tInserting data entry for $testname\n"; + $Name = $testname . "_Data_entry"; + if (in_array($Name, $parameterNames, true)) { + // this specific table_Data_entry combination + // was already inserted, skip. + continue; + } + + $_type_enum = "enum('Complete', 'In Progress')"; + $query_params = [ + "Name" => $Name, + "Type" => $_type_enum, + "Description" => "Data Entry for $testname", + "SourceField" => "Data_entry", + "SourceFrom" => $testname, + "Queryable" => "1", + ]; + + if (array_key_exists($Name, $parameter_types)) { + $ParameterTypeID = $parameter_types[$Name]; + $query_params["ParameterTypeID"] = $ParameterTypeID; + } else { + $ParameterTypeID = ""; + } + + $DB->insert( + "parameter_type", + $query_params + ); + + if ($ParameterTypeID === "") { + $paramId = $DB->lastInsertID; + } else { + $paramId = $ParameterTypeID; + } + + $parameterNames[$paramId] = $query_params["Name"]; + $DB->insert( + "parameter_type_category_rel", + [ + "ParameterTypeID" => $paramId, + "ParameterTypeCategoryID" => $catId, + ] + ); } //Copies the modified descriptions from the parameter_type_override to parameter_type diff --git a/tools/lorisform_parser.php b/tools/lorisform_parser.php index 32f47b71d73..8f8c28bd602 100755 --- a/tools/lorisform_parser.php +++ b/tools/lorisform_parser.php @@ -105,7 +105,7 @@ if (empty($output)) { echo "Nothing to output, 'ip_output.txt' not created\n"; } else { - $fp =fopen("ip_output.txt", "w"); + $fp =fopen(__DIR__ ."/ip_output.txt", "w"); fwrite($fp, $output); fclose($fp); }