Skip to content

proposed fix for #12 #13

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

proposed fix for #12 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f02335
ignore .idea folder
gadeynebram Sep 13, 2018
35b7978
proposed fix for smartinkc/Multilingual#12
gadeynebram Sep 13, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.idea/
3 changes: 2 additions & 1 deletion Multilingual.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,15 @@ public function getTranslations($data, $projectSettings){
$data['project_id'] = mysqli_real_escape_string($conn, $data['project_id']);
$data['page'] = mysqli_real_escape_string($conn, $data['page']);

$query = "SELECT field_name, element_type, misc, grid_name, element_validation_type, element_validation_min, element_validation_max, element_label FROM redcap_metadata
$query = "SELECT field_name, element_type, misc, grid_name, element_validation_type, element_validation_min, element_validation_max, element_label, field_req FROM redcap_metadata
WHERE project_id = " . $data['project_id'] . "
AND (form_name LIKE '" . $data['page'] . "' OR field_name LIKE 'survey_text_" . $data['page'] . "')";
$result = mysqli_query($conn, $query);

while($row = mysqli_fetch_array($result)){
//default questions
$response['defaults'][$row['field_name']] = strip_tags($row['element_label']. '<br>');
$response['questions'][$row['field_name']]['req'] = $row['field_req'] == "1";

//$misc = explode("@", $row['misc']);
$misc = str_getcsv($row['misc'], '@');
Expand Down
2 changes: 2 additions & 0 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

$data = @$_POST['data'];

/* @var $module Multilingual*/

if(isset($data) && $data != ''){
$data = json_decode($data, true);

Expand Down
85 changes: 68 additions & 17 deletions js/multilingual_survey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
var project_id = getVariable('pid');
//var languages = {1: 'en', 2: 'es', 3: 'fr'};
var languages = {1: 'en', 2: 'es'};
var requiredFieldTranslations = {1:'Required *',2:'Required *'};
var totalLanguages = 2;
var settings = {};
settings['empty'] = true;
getSettings();
getLanguages();
getRequiredFieldTranslations();
var lang = 'en';
var langReady = 0;
var interval = null;
Expand Down Expand Up @@ -307,28 +308,57 @@
$('#changeLang').css('color', (settings['font-color'] && settings['font-color']['value'] ? settings['font-color']['value'] : ''));
$('#changeLang').css('opacity','1');

//remove required english label
$('.requiredlabel').remove();
var mergedRequiredFieldTranslations = {};
var requiredLabelText = "";

//handle required english label
if(requiredFieldTranslations[""]==""){
// no field was set
// remove required english label
$('.requiredlabel').remove();
}else{
// replace required field label (if language is found)
var langKeys = Object.keys(requiredFieldTranslations);

//match language ids with defined required field labels
for(i=0; i<langKeys.length;i++){
mergedRequiredFieldTranslations[languages[langKeys[i]]]=requiredFieldTranslations[langKeys[i]];
}

if(lang in mergedRequiredFieldTranslations){
requiredLabelText = mergedRequiredFieldTranslations[lang];
}
//replace requiredlabel text for untranslated questions.
$('.requiredlabel').html(requiredLabelText);

}
$('.multilingual').remove();

//questions
var id;
for(id in translations['questions']){
if(translations['questions'][id]['matrix'] != null){
//$('#' + id + '-tr').children('td').eq(1).children('table').children().children().children('td:first').html(translations['questions'][id]['text']);
$('#label-' + id).html(translations['questions'][id]['text']);
}
else if(translations['questions'][id]['type'] == 'descriptive'){
var tmp = $('#' + id + '-tr').children('td').eq(1).html();
if(tmp != undefined){
$('#' + id + '-tr').children('td').eq(1).html(translations['questions'][id]['text']);
//tmp = tmp.split(/<(.+)/);
//$('#' + id + '-tr').children('td').eq(1).html(translations['questions'][id]['text'] + ' <' + tmp[1]);
if('text' in translations['questions'][id]){
var requiredLabelDiv = "";
if(translations['questions'][id]['req']){
requiredLabelDiv = '<div class="requiredlabel">'+requiredLabelText+'</div>';
}
}
else{
$('#label-' + id).html(translations['questions'][id]['text']);
}

if(translations['questions'][id]['matrix'] != null){
//$('#' + id + '-tr').children('td').eq(1).children('table').children().children().children('td:first').html(translations['questions'][id]['text']);
$('#label-' + id).html(translations['questions'][id]['text']+requiredLabelDiv);
}
else if(translations['questions'][id]['type'] == 'descriptive'){
var tmp = $('#' + id + '-tr').children('td').eq(1).html();
if(tmp != undefined){
$('#' + id + '-tr').children('td').eq(1).html(translations['questions'][id]['text']+requiredLabelDiv);
//tmp = tmp.split(/<(.+)/);
//$('#' + id + '-tr').children('td').eq(1).html(translations['questions'][id]['text'] + ' <' + tmp[1]);
}
}
else{
$('#label-' + id).html(translations['questions'][id]['text']+requiredLabelDiv);
}
}
}

//answers
Expand Down Expand Up @@ -581,6 +611,27 @@
});
}

function getRequiredFieldTranslations(){
var data = {};
data['todo'] = 2;
data['project_id'] = pid;
data['field_name'] = 'requiredFieldTranslations';
var json = encodeURIComponent(JSON.stringify(data));

$.ajax({
url: ajax_url,
type: 'POST',
data: 'data=' + json,
success: function (r) {
requiredFieldTranslations = r;
getLanguages();
},
error: function(jqXHR, textStatus, errorThrown) {
console.log(textStatus, errorThrown);
}
});
}

//generic functions
function getVariable(variable){
var query = window.location.search.substring(1);
Expand Down