may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Podatki --> Uvozi --> Združi podatke - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-02-23 23:18:44 +01:00
parent 3b48e769d5
commit a110e352da
5 changed files with 1559 additions and 1475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
admin/survey/classes/class.SurveyAppendMerge.php
View File

@ -67,7 +67,7 @@ class SurveyAppendMerge {
echo '<input type="hidden" name="do" value="0">'; echo '<input type="hidden" name="do" value="0">';
echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">'; echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
# sporočilo za personalizirana e-vabila in respondente iz baze // Opis združevanja podatkov
echo '<p class="bottom16">'.$lang['srv_append_note'].'</p>'; echo '<p class="bottom16">'.$lang['srv_append_note'].'</p>';
// Korak 1 // Korak 1
@ -221,15 +221,19 @@ class SurveyAppendMerge {
echo '<input type="hidden" name="do" value="0">'; echo '<input type="hidden" name="do" value="0">';
echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">'; echo '<input type="hidden" name="anketa" value="'.$this->anketa.'">';
# sporočilo za personalizirana e-vabila in respondente iz baze //Opis združevanja podatkov
echo $lang['srv_merge_note']; echo '<p class="bottom16">'.$lang['srv_merge_note'].'</p>';
// Korak 1 // Korak 1
echo $lang['srv_merge_step1']; echo '<p class="bold">'.$lang['srv_merge_step1'].'</p>';
echo '<div class="append_step">'; echo '<div class="appendmerge_indent">';
echo '<ul>';
echo '<li>'.$lang['srv_merge_step1_notea'].'</li>';
echo '<li>'.$lang['srv_merge_step1_noteb'].'</li>';
echo '<li>'.$lang['srv_merge_step1_notec'].'</li>';
echo '</ul>';
echo $lang['srv_merge_step1_note'];
echo '<div id="inv_field_container">'; echo '<div id="inv_field_container">';
echo '<ul class="connectedSortable">'; echo '<ul class="connectedSortable">';
@ -256,31 +260,40 @@ class SurveyAppendMerge {
} }
} }
} }
echo '</ul><br />'; echo '</ul>';
echo '</div>';
echo '</div>'; echo '</div>';
echo '<p>'.$lang['srv_merge_step1_noted'].'</p>';
echo '</div>';
// Korak 2 // Korak 2
echo $lang['srv_merge_step2']; echo '<p class="bold">'.$lang['srv_merge_step2'].'</p>';
echo '<div class="append_step">';
echo '<div class="appendmerge_indent">';
echo '<script type="text/javascript">initAppendMergeConnectedSortable();</script>';
echo '<span><label><input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
echo ''.$lang['srv_iz_seznama'].'</label></span>';
echo '<span><label><input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
echo ''.$lang['srv_iz_excela'].'</label></span>';
echo '<br class="clr"/>';
echo '<br class="clr"/>';
echo '</div>';
echo '<script type="text/javascript">initAppendMergeConnectedSortable();</script>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_appendmerge_source'].'</span>';
echo '<div class="setting_item">';
echo '<input name="inv_import_type" id="inv_import_type0" type="radio" value="0" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m='.$_GET['m'].'\');" checked="checked">';
echo '<label for="inv_import_type0">'.$lang['srv_iz_seznama'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input name="inv_import_type" id="inv_import_type1" type="radio" value="1" onclick="append_change_import_type(\''.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=data&m=upload_xls\');">';
echo '<label for="inv_import_type1">'.$lang['srv_iz_excela'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>';
// Korak 3 // Korak 3
echo $lang['srv_merge_step3']; echo '<p class="bold">'.$lang['srv_merge_step3'].'</p>';
echo '<div class="append_step">';
echo '<div class="appendmerge_indent">';
echo '<input type="hidden" name="do_merge" value="1" id="do_merge">'; echo '<input type="hidden" name="do_merge" value="1" id="do_merge">';
echo '<p>'.$lang['srv_izberite_identifikator'].'</p>'; echo '<p>'.$lang['srv_izberite_identifikator'].'</p>';
@ -293,25 +306,35 @@ class SurveyAppendMerge {
echo '<div id="inv_import_list"'.($import_type != 1 ? '' : ' style="display:none"').'>' ; echo '<div id="inv_import_list"'.($import_type != 1 ? '' : ' style="display:none"').'>' ;
// Korak 4 // Korak 4
echo $lang['srv_merge_step4']; echo '<p class="bold">'.$lang['srv_merge_step4'].'</p>';
echo '<div class="append_step">';
echo $lang['srv_merge_step4_note'];
echo $lang['srv_inv_recipiens_sample'].'&nbsp;</span><span class="inv_sample">'; echo '<div class="appendmerge_indent">';
echo $lang['srv_inv_recipiens_sample1'];
echo '</span>'; echo '<ul>';
echo '<br class="clr" />'; echo '<li>'.$lang['srv_append_step3_note1'].'</li>';
echo '</span>'; echo '<li>'.$lang['srv_append_step3_note2'].'</li>';
echo '<br class="clr" />'.$lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">'; echo '<li>'.$lang['srv_append_step3_note3'].'</li>';
echo '</ul>';
echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note4'].'</p>';
echo '<ul>';
echo '<li>'.$lang['srv_append_step3_note5'].'</li>';
echo '<li>'.$lang['srv_append_step3_note6'].'</li>';
echo '</ul>';
echo '<p class="top16 bottom16">'.$lang['srv_append_step3_note7'].'</p>';
echo '<p>'.$lang['srv_append_step3_note8'].'</p>';
echo '<p>'.$lang['srv_append_step3_note9'].'</p>';
echo '<p class="top16">'.$lang['srv_append_step3_note10'].' <span id="inv_field_list" class="inv_type_0 bold">';
echo implode(',',$field_lang); echo implode(',',$field_lang);
echo '</span>'; echo '</span>';
echo '<br class="clr" /><textarea id="inv_recipients_list" cols="50" rows="9" name="inv_recipients_list" style="margin-bottom: 7px;">'; echo '<textarea id="inv_recipients_list" name="inv_recipients_list">';
if (is_array($recipients_list) && count($recipients_list) > 0 ) { if (is_array($recipients_list) && count($recipients_list) > 0 ) {
echo implode("\n",$recipients_list); echo implode("\n",$recipients_list);
} }
echo '</textarea>'; echo '</textarea>';
echo '<br class="clr"/>';
echo '</div>'; echo '</div>';
echo '</div>'; # id=inv_import_list echo '</div>'; # id=inv_import_list
@ -320,34 +343,27 @@ class SurveyAppendMerge {
echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' style="display:none"').'>' ; echo '<div id="inv_import_file"'.($import_type == 1 ? '' : ' style="display:none"').'>' ;
// Korak 4 // Korak 4
echo $lang['srv_merge_step4']; echo '<p class="bold">'.$lang['srv_merge_step4_xls'].'</p>';
echo '<div class="append_step">'; echo '<div class="appendmerge_indent">';
echo $lang['srv_mailing_upload_list'];
echo ' <input type="file" name="recipientsFile" id="recipientsFile" />'; echo ' <input type="file" name="recipientsFile" id="recipientsFile" />';
echo '<br class="clr" /><br />';
echo $lang['srv_excel_upload_note'];
echo '</div>'; echo '</div>';
echo '</div>'; # id=inv_import_file echo '</div>'; # id=inv_import_file
echo '<div class="button_holder bottom16">';
echo '<br class="clr" />'; echo '<button class="medium blue" onclick="append_submit(); return false;">'.$lang['srv_merge_add'].'</button>';
echo '<span id="inv_upload_recipients_nosbmt" class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" onclick="append_submit(); return false;">'.$lang['srv_inv_btn_add_recipients_add'].'</a></span>'; echo '</div>';
$d = new Dostop(); $d = new Dostop();
if ($d->checkDostopSub('edit')){ if ($d->checkDostopSub('edit')){
echo '<span style="margin: 5px 20px; line-height:24px">'; echo '<span class="red">';
printf($lang['src_coding_alert'], $this->anketa); printf($lang['src_coding_alert'], $this->anketa);
echo '</span>'; echo '</span>';
} }
echo '</form>'; echo '</form>';
echo '<br class="clr"/>';
echo '</fieldset>'; echo '</fieldset>';
} }
} }

24
lang/1.php
View File

@ -5984,14 +5984,18 @@ $lang = array (
"srv_append_xls_step2_begin" => "Številka začetne vrstice", "srv_append_xls_step2_begin" => "Številka začetne vrstice",
"srv_append_xls_step2_end" => "Številka zadnje vrstice", "srv_append_xls_step2_end" => "Številka zadnje vrstice",
"srv_merge_note" => "<p>Združevanje podatkov (join merge) ne povečuje števila zapisov (records) ampak dodaja podatke spremenljivkam</p>", "srv_merge_note" => "Združevanje podatkov omogoča dodajanje odgovorov za obstoječe respondente, ki so že v bazi podatkov vaše ankete. Dodani odgovori se shranijo v bazo podatkov skupaj z ostalimi odgovori. ",
"srv_merge_step1" => "<p><b>1. korak: Definirajte polja (spremenljivke), ki jih boste vnesli.</b></p>", "srv_merge_step1" => "1. korak: Označite spremenljivke, ki jih boste vnesli, vključno s spremenljivko, po kateri bo izvedeno združevanje (ključ):",
"srv_merge_step1_note" => "<p>S premikanjem lahko določite vrstni red.</p><p>Če v vprašalniku še nimate vprašanj, jih je potrebno predhodno vnesti.</p><p>Dodajate lahko spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori - vse trenutno obstoječe spremenljivke so spodaj tudi že prikazane.<br />Ostalih tipov zaenkrat ni mogoče vnašati. Dodatne spremenljivke lahko dodate v urejanju.</p>", "srv_merge_step1_notea" => "Spodaj so navedena imena obstoječih spremenljivk vašega vprašalnika.",
"srv_merge_step2" => "<p><b>2. korak: Izberite vir podatkov, ki jih želite vnesti:</b></p>", "srv_merge_step1_noteb" => "Dodajanje podatkov je možno le za spremenljivke tekstovnih in numeričnih tipov ter vprašanja z enim in več odgovori.",
"srv_merge_step3" => "<p><b>3. korak: Izberite polje, po katerem želite izvesti združevanje (identifikator)</b></p>", "srv_merge_step1_notec" => "Če želite dodati podatke za nove spremenljivke, jih je prvotno treba ustvariti v zavihku 'UREJANJE' - 'Vprašalnik'.",
"srv_merge_step4" => "<p><b>4. korak: Vpišite ali kopirajte podatke.</b></p>", "srv_merge_step1_noted" => "S premikanjem spremenljivk lahko spremenite vrstni red (od leve proti desni), v katerem boste vnesli podatke.",
"srv_merge_step4_note" => "<p>Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.</p>", "srv_merge_step2" => "2. korak: Izberite vir podatkov, ki jih želite vnesti:",
"srv_merge_step4_xls" => "<p><b>4. korak: Naložite podatke iz datoteke.</b></p>", "srv_merge_step3" => "3. korak: Izberite polje, po katerem želite izvesti združevanje (ključ):",
"srv_merge_step4" => "4. korak: Vpišite ali kopirajte podatke:",
"srv_merge_step4_note" => "Podatke vnesite v tekstovni obliki, vsak zapis dodajte v svojo vrstico.<br />Če dodajate več polj, jih ločite z vejico in jih dodajajte v enakem vrstnem redu, kot ste jih označili zgoraj.",
"srv_merge_step4_xls" => "4. korak: Naložite podatke iz datoteke:",
"srv_merge_add" => "Združi podatke",
"srv_append-merge_error_file" => "Napaka! Datoteka ne obstaja!", "srv_append-merge_error_file" => "Napaka! Datoteka ne obstaja!",
"srv_append-merge_added_1" => "Dodanih", "srv_append-merge_added_1" => "Dodanih",
@ -6005,7 +6009,7 @@ $lang = array (
"srv_append-merge_process_2" => "vrstic podatkov", "srv_append-merge_process_2" => "vrstic podatkov",
"srv_append-merge_process_o_1" => "V postopku bo združenih", "srv_append-merge_process_o_1" => "V postopku bo združenih",
"srv_append-merge_process_o_2" => "vrstic podatkov. Obstoječe vrednosti se bodo prepisale!", "srv_append-merge_process_o_2" => "vrstic podatkov. Obstoječe vrednosti se bodo prepisale!",
"srv_append-merge_error_value" => "Pri združevanju po identifikatorju se nobena od vrednosti ne ujema.", "srv_append-merge_error_value" => "Pri združevanju po ključu se nobena od vrednosti ne ujema.",
"srv_append-merge_fin" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran)", "srv_append-merge_fin" => "Nove vrstice se nahajajo na dnu tabele (če so podatki prikazani na večih straneh, izberite zadnjo stran)",
"srv_question_respondent_comment" => "Vaš komentar k vprašanju", "srv_question_respondent_comment" => "Vaš komentar k vprašanju",
@ -6553,7 +6557,7 @@ $lang = array (
'srv_iz_seznama' => 'Vnesel iz seznama (ločeno z vejico)', 'srv_iz_seznama' => 'Vnesel iz seznama (ločeno z vejico)',
'srv_iz_excela' => 'Uvozil iz Excelove datoteke (v formatu .xls)', 'srv_iz_excela' => 'Uvozil iz Excelove datoteke (v formatu .xls)',
'srv_iz_excela_xls_error' => 'Napačen format datoteke! Datoteka mora biti v formatu .xls.', 'srv_iz_excela_xls_error' => 'Napačen format datoteke! Datoteka mora biti v formatu .xls.',
'srv_izberite_identifikator' => 'Izberite polje po katerem želite izvesti združevanje (identifikator):', 'srv_izberite_identifikator' => 'Izberite polje, po katerem želite izvesti združevanje (ključ):',
'srv_show' => 'Prikaži', 'srv_show' => 'Prikaži',
'srv_recnum' => 'Zap. št.', 'srv_recnum' => 'Zap. št.',
'srv_recnum2' => 'Recnum', 'srv_recnum2' => 'Recnum',

24
lang/2.php
View File

@ -5857,7 +5857,7 @@ $lang = array (
"srv_coding_filter" => "Filter", "srv_coding_filter" => "Filter",
"srv_append_note" => "Adding data means adding responses for new respondents that are not yet in your survey database. The added responses are saved in the existing database.", "srv_append_note" => "Adding data means adding responses for new respondents that are not yet in your survey database. The added responses are saved in the existing database.",
"srv_append_step1" => "<Step 1: Check the variables to be entered:", "srv_append_step1" => "Step 1: Check the variables to be entered:",
"srv_append_step1_notea" => "The names of the existing variables in your questionnaire are listed below.", "srv_append_step1_notea" => "The names of the existing variables in your questionnaire are listed below.",
"srv_append_step1_noteb" => "Adding data is only possible for variables of text and numeric types and for single-choice and multiple-choice questions.", "srv_append_step1_noteb" => "Adding data is only possible for variables of text and numeric types and for single-choice and multiple-choice questions.",
"srv_append_step1_notec" => "If you do not have any questions in the questionnaire, you will need to add them first.", "srv_append_step1_notec" => "If you do not have any questions in the questionnaire, you will need to add them first.",
@ -5882,14 +5882,18 @@ $lang = array (
"srv_append_xls_step2_begin" => "Number of initial row", "srv_append_xls_step2_begin" => "Number of initial row",
"srv_append_xls_step2_end" => "Number of last row", "srv_append_xls_step2_end" => "Number of last row",
"srv_merge_note" => "<p>Merging data does not increase the number of records but adds the data to variables</p>", "srv_merge_note" => "Data merging allows you to add responses for existing respondents already in your survey database. The added responses will be stored in the database together with the other responses.",
"srv_merge_step1" => "<p><b>1. step: Define fields (variables) you would like to add.</b></p>", "srv_merge_step1" => "Step 1: Check the variables to be entered, including the variable by which the aggregation will be performed (key):",
"srv_merge_step1_note" => "<p>You can determine their order by moving them.</p><p>If there are no questions in your survey, you will need to pre-enter them.</p><p>You can add text and numeric types of variables, questions with one or more answers - all currently existing variables are also displayed below.<br />Other types of questions cannot yet be included. You can add additional variables in the editor.</p>", "srv_merge_step1_notea" => "The names of the existing variables in your questionnaire are listed below.",
"srv_merge_step2" => "<p><b>2. step: Select the data source you want to enter:</b></p>", "srv_merge_step1_noteb" => "Adding data is only possible for variables of text and numeric types and for single-choice and multiple-choice questions.",
"srv_merge_step3" => "<p><b>3. step: Select the field through which you want to perform aggregation (identifier)</b></p>", "srv_merge_step1_notec" => "If you want to add data for new variables, they must first be created in the 'EDIT' - 'Questionnaire' tab.",
"srv_merge_step4" => "<p><b>4. step: Enter or copy the data.</b></p>", "srv_merge_step1_noted" => "By moving the variables, you can change the order (from left to right) in which you enter the data.",
"srv_merge_step4_note" => "<p>Enter the data in text form; add each record in a new row.<br />If you import additional fields, separate them by a comma and add them in the same order as above.</p>", "srv_merge_step2" => "Step 2: Select the data source you want to enter:",
"srv_merge_step4_xls" => "<p><b>4. step: Load data from a file.</b></p>", "srv_merge_step3" => "Step 3: Select the field by which you want to perform aggregation (key):",
"srv_merge_step4" => "Step 4: Enter or copy the data:",
"srv_merge_step4_note" => "Enter the data in text form; add each record in a new row.<br />If you import additional fields, separate them by a comma and add them in the same order as above.",
"srv_merge_step4_xls" => "Step 4: Load data from a file:",
"srv_merge_add" => "Merge data",
"srv_append-merge_error_file" => "Error! File does not exist!", "srv_append-merge_error_file" => "Error! File does not exist!",
"srv_append-merge_added_1" => "Added", "srv_append-merge_added_1" => "Added",
@ -6440,7 +6444,7 @@ $lang = array (
'srv_iz_seznama' => 'A list (separated by a comma)', 'srv_iz_seznama' => 'A list (separated by a comma)',
'srv_iz_excela' => 'An Excel file (.xls format)', 'srv_iz_excela' => 'An Excel file (.xls format)',
'srv_iz_excela_xls_error' => 'Wrong file type! XLS file type is required.', 'srv_iz_excela_xls_error' => 'Wrong file type! XLS file type is required.',
'srv_izberite_identifikator' => 'Select identifier:', 'srv_izberite_identifikator' => 'Select the key:',
'srv_show' => 'Show', 'srv_show' => 'Show',
'srv_recnum' => 'Rec. num.', 'srv_recnum' => 'Rec. num.',
'srv_recnum2' => 'Recnum', 'srv_recnum2' => 'Recnum',

2828
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

34
resources/sass/admin_new/pages/survey_data/append_merge.scss
View File

@ -92,4 +92,38 @@ div.appendmerge_indent{
} }
} }
}
ul#merge {
display: flex !important;
flex-wrap: wrap;
margin: 0px !important;
padding: 0px !important;
clear: both;
list-style-type: none;
font-size: 11px;
border: $gray;
li {
display: flex;
align-items: center;
cursor: pointer;
height: 44px;
width: 22%;
min-width: 200px;
box-sizing: border-box;
padding: 12px 16px;
margin: 8px;
text-align: left;
vertical-align: middle;
background-color: $light-gray;
border: 1px solid $gray;
}
} }