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

Knjiznica - popravki obvestil, ikon

Browse Source
This commit is contained in:
pero1203 2022-03-25 11:32:29 +01:00
parent a933734e43
commit 63ad58c80a
7 changed files with 1557 additions and 1467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/Branching.php
View File

@ -7512,7 +7512,7 @@ class Branching {
echo '<div class="condition_setting_holder">'; echo '<div class="condition_setting_holder">';
echo ' <div class="condition_setting_line">'; echo ' <div class="condition_setting_line">';
echo ' <button class="blue small" onClick="displayAddIntoLibraryPopup(\''.$if.'\', \'2\');">'.$lang['srv_library_add_to_lib'].'</button>'; echo ' <button class="blue small" onClick="displayAddIntoLibraryPopup(\''.$if.'\', \'2_'.$row['tip'].'\');">'.$lang['srv_library_add_to_lib'].'</button>';
echo ' </div>'; echo ' </div>';
echo '</div>'; echo '</div>';

90
admin/survey/classes/class.LibraryBranching.php
View File

@ -277,11 +277,11 @@ class LibraryBranching {
private function displayFolderItemSurvey($id, $title) { private function displayFolderItemSurvey($id, $title) {
global $lang; global $lang;
echo '<li id="folder_item_'.$id.'" class="folder_item survey_item '.($this->folder_id == $id ? 'active' : '').'" onClick="openLibrarySurvey(\''.$id.'\');">'; echo '<li id="survey_item_'.$id.'" class="folder_item survey_item '.($this->folder_id == $id ? 'active' : '').'" onClick="openLibrarySurvey(\''.$id.'\');">';
// Ikoni puscice in mape // Ikoni puscice in mape
echo ' <span class="faicon list"></span>'; echo ' <span class="faicon clipboard"></span>';
// Naslov folderja - ankete // Naslov folderja - ankete
echo ' <span class="folder_item_title">'.$title.'</span>'; echo ' <span class="folder_item_title">'.$title.'</span>';
@ -464,9 +464,9 @@ class LibraryBranching {
echo '<div id="question_item_holder_'.$spremenljivka['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');">'; echo '<div id="question_item_holder_'.$spremenljivka['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');">';
echo ' <input type="checkbox" id="question_item_check_'.$spremenljivka['id'].'" item-type="1" class="question_item_check" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');"><label for="question_item_check_'.$spremenljivka['id'].'"></label>'; echo ' <input type="checkbox" id="question_item_check_'.$spremenljivka['id'].'" item-type="1" item-subtype="1" class="question_item_check" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');"><label for="question_item_check_'.$spremenljivka['id'].'"></label>';
echo ' <div id="question_item_info_'.$spremenljivka['id'].'" item-type="1" item-id="'.$spremenljivka['id'].'" class="question_item_info">'; echo ' <div id="question_item_info_'.$spremenljivka['id'].'" item-type="1" item-subtype="1" item-id="'.$spremenljivka['id'].'" class="question_item_info">';
echo ' <span class="faicon list"></span>'; echo ' <span class="faicon list"></span>';
echo ' <span class="title">'.substr(strip_tags($spremenljivka['naslov']), 0, 40).'</span>'; echo ' <span class="title">'.substr(strip_tags($spremenljivka['naslov']), 0, 40).'</span>';
@ -499,25 +499,28 @@ class LibraryBranching {
$type_string = '<span class="item_type">[LOOP]</span>'; $type_string = '<span class="item_type">[LOOP]</span>';
$icon = 'loop_32'; $icon = 'loop_32';
$type = 'loop'; $type = 'loop';
$subtype = '2_2';
} }
elseif($if['tip'] == 1){ elseif($if['tip'] == 1){
$type_string = '<span class="item_type">[BLOCK]</span>'; $type_string = '<span class="item_type">[BLOCK]</span>';
$icon = 'block_32'; $icon = 'block_32';
$type = 'block'; $type = 'block';
$subtype = '2_1';
} }
else{ else{
$type_string = '<span class="item_type">[IF]</span>'; $type_string = '<span class="item_type">[IF]</span>';
$icon = 'if_32'; $icon = 'if_32';
$type = 'if'; $type = 'if';
$subtype = '2_0';
} }
$type_string = ''; $type_string = '';
echo '<div id="question_item_holder_'.$if['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$if['id'].'\');">'; echo '<div id="question_item_holder_'.$if['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$if['id'].'\');">';
echo ' <input type="checkbox" id="question_item_check_'.$if['id'].'" item-type="2" class="question_item_check" onClick="selectLibraryItem(\''.$if['id'].'\');"><label for="question_item_check_'.$spremenljivka['id'].'"></label>'; echo ' <input type="checkbox" id="question_item_check_'.$if['id'].'" item-type="2" item-subtype="'.$subtype.'" class="question_item_check" onClick="selectLibraryItem(\''.$if['id'].'\');"><label for="question_item_check_'.$spremenljivka['id'].'"></label>';
echo ' <div id="question_item_info_'.$if['id'].'" item-type="2" item-id="'.$if['id'].'" class="question_item_info">'; echo ' <div id="question_item_info_'.$if['id'].'" item-type="2" item-subtype="'.$subtype.'" item-id="'.$if['id'].'" class="question_item_info">';
echo ' <span class="faicon '.$icon.'"></span>'; echo ' <span class="faicon '.$icon.'"></span>';
echo ' <span class="title">'.$type_string.substr(strip_tags($if['label']), 0, 40).'</span>'; echo ' <span class="title">'.$type_string.substr(strip_tags($if['label']), 0, 40).'</span>';
@ -547,7 +550,7 @@ class LibraryBranching {
global $lang; global $lang;
echo '<button class="medium white-blue" onClick="popupClose();">'.$lang['edit1338'].'</button>'; echo '<button class="medium white-blue" onClick="popupClose();">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onClick="insertLibraryItemsIntoSurvey();">'.$lang['srv_library_survey_add'].'</button>'; echo '<button id="insert_library_button" class="medium blue" disabled="disabled" onClick="insertLibraryItemsIntoSurvey();">'.$lang['srv_library_survey_add'].'</button>';
} }
@ -565,22 +568,7 @@ class LibraryBranching {
global $global_user_id; global $global_user_id;
// Podtip elementa (vprasanje, blok, if...) // Podtip elementa (vprasanje, blok, if...)
if($type == '2'){ if($type == '1'){
// Dobimo tip (if ali blok) in naslov
$sql = sisplet_query("SELECT tip, label FROM srv_if WHERE id='".$item_id."'");
$row = mysqli_fetch_array($sql);
$tip = $row['tip'];
$naslov = $row['label'];
if($tip == '2')
$subtype = 'loop';
elseif($tip == '1')
$subtype = 'block';
else
$subtype = 'if';
}
else{
// Dobimo naslov // Dobimo naslov
$sql = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id='".$item_id."'"); $sql = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id='".$item_id."'");
@ -589,6 +577,21 @@ class LibraryBranching {
$subtype = 'q'; $subtype = 'q';
} }
else{
// Dobimo naslov
$sql = sisplet_query("SELECT label FROM srv_if WHERE id='".$item_id."'");
$row = mysqli_fetch_array($sql);
$naslov = $row['label'];
if($type == '2_2')
$subtype = 'loop';
elseif($type == '2_1')
$subtype = 'block';
else
$subtype = 'if';
}
// Naslov okna glede na tip elementa (vprasanje, blok, if...) // Naslov okna glede na tip elementa (vprasanje, blok, if...)
@ -636,22 +639,7 @@ class LibraryBranching {
global $lang; global $lang;
// Podtip elementa (vprasanje, blok, if...) // Podtip elementa (vprasanje, blok, if...)
if($type == '2'){ if($type == '1'){
// Dobimo tip (if ali blok) in naslov
$sql = sisplet_query("SELECT tip, label FROM srv_if WHERE id='".$item_id."'");
$row = mysqli_fetch_array($sql);
$tip = $row['tip'];
$naslov = $row['label'];
if($tip == '2')
$subtype = 'loop';
elseif($tip == '1')
$subtype = 'block';
else
$subtype = 'if';
}
else{
// Dobimo naslov // Dobimo naslov
$sql = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id='".$item_id."'"); $sql = sisplet_query("SELECT naslov FROM srv_spremenljivka WHERE id='".$item_id."'");
@ -660,6 +648,21 @@ class LibraryBranching {
$subtype = 'q'; $subtype = 'q';
} }
else{
// Dobimo tip (if ali blok) in naslov
$sql = sisplet_query("SELECT label FROM srv_if WHERE id='".$item_id."'");
$row = mysqli_fetch_array($sql);
$naslov = $row['label'];
if($tip == '2_2')
$subtype = 'loop';
elseif($tip == '2_1')
$subtype = 'block';
else
$subtype = 'if';
}
// Naslov okna glede na tip elementa (vprasanje, blok, if...) // Naslov okna glede na tip elementa (vprasanje, blok, if...)
@ -1036,21 +1039,16 @@ class LibraryBranching {
$b = new Branching($this->ank_id); $b = new Branching($this->ank_id);
// v knjiznico dodamo spremenljivko // v knjiznico dodamo spremenljivko
if($type == 1) { if($type == '1') {
$id = $b->nova_spremenljivka(-1, 0, 0, $item_id); $id = $b->nova_spremenljivka(-1, 0, 0, $item_id);
sisplet_query("UPDATE srv_spremenljivka SET folder='".$folder_id."', naslov='".$title."' WHERE id='".$id."'"); sisplet_query("UPDATE srv_spremenljivka SET folder='".$folder_id."', naslov='".$title."' WHERE id='".$id."'");
} }
// v knjiznico dodamo if/blok // v knjiznico dodamo if/blok
elseif($type == 2) { elseif($type == '2_0' || $type == '2_1' || $type == '2_2') {
$id = $b->if_copy(0, $item_id, true); $id = $b->if_copy(0, $item_id, true);
sisplet_query("UPDATE srv_if SET folder='".$folder_id."', label='".$title."' WHERE id='".$id."'"); sisplet_query("UPDATE srv_if SET folder='".$folder_id."', label='".$title."' WHERE id='".$id."'");
} }
//$this->displayAddIntoLibrarySuccess($item_id, $type, $success=true);
}
else{
//$this->displayAddIntoLibrarySuccess($item_id, $type, $success=false);
} }
} }
} }

43
admin/survey/script/library.js
View File

@ -302,7 +302,7 @@ function openLibraryFolder(folder_id){
function openLibrarySurvey(folder_id){ function openLibrarySurvey(folder_id){
$('.folder_item').removeClass('active'); $('.folder_item').removeClass('active');
$('#folder_item_'+folder_id).addClass('active'); $('#survey_item_'+folder_id).addClass('active');
var tab = $('#active_tab').val(); var tab = $('#active_tab').val();
@ -423,6 +423,14 @@ function selectLibraryItem(item_id){
// Prestejemo oznacene iteme // Prestejemo oznacene iteme
var count = $('.question_item_check:checkbox:checked').length; var count = $('.question_item_check:checkbox:checked').length;
$('#selected_item_counter').html(count); $('#selected_item_counter').html(count);
// Nastavimo gumb dodaj kot disabled glede na to ce imamo elemente ali ne
if(count > 0){
$("#insert_library_button").prop('disabled', false);
}
else{
$("#insert_library_button").prop('disabled', true);
}
} }
// Prikaz urejanja posameznega itema na desni // Prikaz urejanja posameznega itema na desni
@ -502,19 +510,49 @@ function insertLibraryItemsIntoSurvey(){
var items = []; var items = [];
var multiple = false;
var different = false;
var prev = '';
var subtype = '';
$('.question_item_check:checkbox:checked').each(function(){ $('.question_item_check:checkbox:checked').each(function(){
var id_string = $(this).attr("id"); var id_string = $(this).attr("id");
var id = id_string.substring(20); var id = id_string.substring(20);
var type = $(this).attr("item-type"); var type = $(this).attr("item-type");
subtype = $(this).attr("item-subtype");
items.push(id + '_' + type); items.push(id + '_' + type);
// Preverimo za obvestilo, ce dodajamo vec elementov in ce so razlicni
if(prev != ''){
multiple = true;
if(prev != subtype){
different = true;
}
}
prev = subtype;
}); });
// Pohendlamo obvestilo, ce dodajamo vec elementov in ce so razlicni
var note = subtype;
if(different){
note = 'm';
}
else if(multiple){
note = subtype + 'm';
}
else{
note = subtype;
}
console.log(note)
$("#branching").load('ajax.php?t=libraryBranching&a=addIntoSurvey', {anketa: srv_meta_anketa_id, items: items}, function(){ $("#branching").load('ajax.php?t=libraryBranching&a=addIntoSurvey', {anketa: srv_meta_anketa_id, items: items}, function(){
popupClose(); popupClose();
actionNotePopup('lib_add_to_survey', 'success'); actionNotePopup('lib_add_to_survey_'+note, 'success');
}); });
} }
@ -534,7 +572,6 @@ function addIntoLibrary(item_id, type){
var title = $('#lib_item_title').val(); var title = $('#lib_item_title').val();
var folder_id = $('#lib_item_folder').val(); var folder_id = $('#lib_item_folder').val();
//$("#general_popup").load('ajax.php?t=libraryBranching&a=addIntoLibrary', {anketa: srv_meta_anketa_id, item_id:item_id, type:type, title:title, folder_id:folder_id});
$.post('ajax.php?t=libraryBranching&a=addIntoLibrary', {anketa: srv_meta_anketa_id, item_id:item_id, type:type, title:title, folder_id:folder_id}, function(){ $.post('ajax.php?t=libraryBranching&a=addIntoLibrary', {anketa: srv_meta_anketa_id, item_id:item_id, type:type, title:title, folder_id:folder_id}, function(){
popupClose(); popupClose();

16
lang/1.php
View File

@ -8488,8 +8488,20 @@ $lang = array (
// Besedila popupa levo spodaj (obvestilo o akciji) // Besedila popupa levo spodaj (obvestilo o akciji)
"action_note_lib_add_to_lib_type1" => "Vprašanje je bilo dodano v knjižnico", "action_note_lib_add_to_lib_type1" => "Vprašanje je bilo dodano v knjižnico",
"action_note_lib_add_to_lib_type2" => "Blok je bil dodan v knjižnico", "action_note_lib_add_to_lib_type2_0" => "Pogoj je bil dodan v knjižnico",
"action_note_lib_add_to_survey" => "Elementi so bili dodani v anketo", "action_note_lib_add_to_lib_type2_1" => "Blok je bil dodan v knjižnico",
"action_note_lib_add_to_lib_type2_2" => "Zanka je bila dodana v knjižnico",
"action_note_lib_add_to_survey_m" => "Elementi so bili dodani na konec ankete",
"action_note_lib_add_to_survey_1" => "Vprašanje je bilo dodano na konec ankete",
"action_note_lib_add_to_survey_1m" => "Vprašanja so bila dodana na konec ankete",
"action_note_lib_add_to_survey_2_0" => "Pogoj je bil dodan na konec ankete",
"action_note_lib_add_to_survey_2_0m" => "Pogoji so bili dodani na konec ankete",
"action_note_lib_add_to_survey_2_1" => "Blok je bil dodan na konec ankete",
"action_note_lib_add_to_survey_2_1m" => "Bloki so bili dodani na konec ankete",
"action_note_lib_add_to_survey_2_2" => "Zanka je bil dodana na konec ankete",
"action_note_lib_add_to_survey_2_2m" => "Zanke so bile dodane na konec ankete",
"action_note_link_copied" => 'Povezava je bila kopirana', "action_note_link_copied" => 'Povezava je bila kopirana',
"action_note_success_save" => "Nastavitve so bile shranjene", "action_note_success_save" => "Nastavitve so bile shranjene",

12
lang/2.php
View File

@ -8383,7 +8383,17 @@ GDPR introduction preview",
// Besedila popupa levo spodaj (obvestilo o akciji) // Besedila popupa levo spodaj (obvestilo o akciji)
"action_note_lib_add_to_lib_type1" => "Question added to library", "action_note_lib_add_to_lib_type1" => "Question added to library",
"action_note_lib_add_to_lib_type2" => "Block added to library", "action_note_lib_add_to_lib_type2" => "Block added to library",
"action_note_lib_add_to_survey" => "Question added to survey",
"action_note_lib_add_to_survey_m" => "Elements were added to survey",
"action_note_lib_add_to_survey_1" => "Question was added to survey",
"action_note_lib_add_to_survey_1m" => "Questions were added to survey",
"action_note_lib_add_to_survey_2_0" => "Condition was added to survey",
"action_note_lib_add_to_survey_2_0m" => "Conditions were added to survey",
"action_note_lib_add_to_survey_2_1" => "Block was added to survey",
"action_note_lib_add_to_survey_2_1m" => "Blocks were added to survey",
"action_note_lib_add_to_survey_2_2" => "Loop was added to survey",
"action_note_lib_add_to_survey_2_2m" => "Loops were added to survey",
"action_note_link_copied" => 'The link has been copied', "action_note_link_copied" => 'The link has been copied',
"action_note_success_save" => "The settings have been saved", "action_note_success_save" => "The settings have been saved",

2840
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

11
resources/sass/admin_new/components/form/button.scss
View File

@ -99,6 +99,17 @@ submit{
&:hover { &:hover {
background-color: darken($blue, 3%); background-color: darken($blue, 3%);
} }
&:disabled{
color: $very-dark-gray2;
background-color: $gray;
border: 1px $gray solid;
&:hover {
background-color: $gray;
}
}
} }
&.white-blue{ &.white-blue{
color: $blue; color: $blue;