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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2022-02-25 12:01:01 +01:00
commit 57cd23c133
7 changed files with 1673 additions and 1434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ class LibraryBranching {
$this->folder_id = $rowFolders['id'];
}
$this->displayFolderItem($rowFolders['id'], $rowFolders['naslov'], $child_count='11');
$this->displayFolderItem($rowFolders['id'], $rowFolders['naslov'], $uid);
echo '<ul id="folder_list_'.$rowFolders['id'].'" class="folder_list" style="display:none;">';
@ -182,8 +182,9 @@ class LibraryBranching {
}
// Levi item - folder
private function displayFolderItem($id, $title, $child_count) {
private function displayFolderItem($id, $title, $uid) {
global $lang;
global $admin_type;
echo '<li id="folder_item_'.$id.'" class="folder_item '.($this->folder_id == $id ? 'active' : '').'" onClick="openLibraryFolder(\''.$id.'\');">';
@ -199,13 +200,18 @@ class LibraryBranching {
//echo ' <span class="folder_item_child_count">'.$child_count.'</span>';
// Tri pikice za prikaz urejanja folderja
echo ' <span class="faicon dots_ver displayNone"></span>';
// Urejanje folderja
if($uid != 0 || $admin_type == 0){
// Tri pikice za prikaz urejanja folderja
echo ' <span class="faicon dots_ver" onClick="showLibraryFolderEdit(this);"></span>';
// Skrit div za urejanje folderja
echo ' <div class="folder_item_settings displayNone">';
echo ' ';
echo ' </div>';
// Skrit div za urejanje folderja
echo ' <div class="folder_item_settings displayNone">';
echo ' <span onClick="addLibraryFolder(\''.$id.'\');">'.$lang['srv_library_folder_add'].'</span>';
echo ' <span onClick="deleteLibraryFolder(\''.$id.'\');">'.$lang['srv_library_folder_delete'].'</span>';
echo ' <span onClick="renameLibraryFolder(\''.$id.'\');">'.$lang['srv_library_folder_rename'].'</span>';
echo ' </div>';
}
echo '</li>';
@ -225,15 +231,6 @@ class LibraryBranching {
echo ' <span class="folder_item_title">'.$title.'</span>';
// Tri pikice za prikaz urejanja folderja
echo ' <span class="faicon dots_ver displayNone"></span>';
// Skrit div za urejanje folderja
echo ' <div class="folder_item_settings displayNone">';
echo ' ';
echo ' </div>';
echo '</li>';
}
@ -250,13 +247,26 @@ class LibraryBranching {
// Seznam vprasanj iz anket v knjiznici
if($this->tab == 1){
$sqlFolderSurveys = sisplet_query("SELECT a.id FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='".$this->folder_id."' ORDER BY naslov ASC");
// Najprej zlistamo vse child folderje
$sqlFolders = sisplet_query("SELECT id, naslov FROM srv_library_folder WHERE parent='".$this->folder_id."' AND tip='".$this->tab."' ORDER BY naslov");
if (mysqli_num_rows($sqlFolders) > 0){
// Loop po vseh mapah znotraj parenta
while ($rowFolders = mysqli_fetch_array($sqlFolders)) {
$this->displayRightFolderItem($rowFolders['id'], $rowFolders['naslov']);
}
}
$sqlFolderSurveys = sisplet_query("SELECT a.id, a.naslov FROM srv_anketa a, srv_library_anketa l WHERE a.id=l.ank_id AND l.folder='".$this->folder_id."' ORDER BY naslov ASC");
while ($rowFolderSurveys = mysqli_fetch_array($sqlFolderSurveys)) {
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$rowFolderSurveys['id']."' ORDER BY s.naslov ASC");
// Naslov ankete
echo '<div class="survey_title">'.$rowFolderSurveys['naslov'].'</div>';
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$rowFolderSurveys['id']."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {
$this->displayQuestionItem($rowQuestions);
$this->displayRightQuestionItem($rowQuestions);
}
}
}
@ -265,7 +275,7 @@ class LibraryBranching {
$sqlFolderQuestions = sisplet_query("SELECT * FROM srv_spremenljivka WHERE folder='".$this->folder_id."' AND gru_id='-1' ORDER BY naslov ASC");
while ($rowFolderQuestions = mysqli_fetch_array($sqlFolderQuestions)) {
$this->displayQuestionItem($rowFolderQuestions);
$this->displayRightQuestionItem($rowFolderQuestions);
}
}
@ -280,16 +290,34 @@ class LibraryBranching {
if($this->folder_id == 0)
return;
// Naslov ankete
SurveyInfo :: getInstance()->SurveyInit($this->folder_id);
echo '<div class="survey_title">'.SurveyInfo::getSurveyTitle().'</div>';
$sqlQuestions = sisplet_query("SELECT s.id, s.naslov, s.tip FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$this->folder_id."' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
while ($rowQuestions = mysqli_fetch_array($sqlQuestions)) {
$this->displayQuestionItem($rowQuestions);
$this->displayRightQuestionItem($rowQuestions);
}
}
// Prikazemo vrstico (item, folder) na desni
private function displayRightFolderItem($folder_id, $folder_title){
global $lang;
echo '<div id="folder_item_holder_'.$folder_id.'" class="folder_item_holder" onClick="openLibraryFolder(\''.$folder_id.'\');">';
echo ' <div class="folder_item_info">';
echo ' <span class="faicon folder_empty"></span>';
echo ' <span class="title">'.$folder_title.'</span>';
echo ' </div>';
echo '</div>';
}
// Prikazemo 1 vrstico (item, vprasanje) na desni
private function displayQuestionItem($spremenljivka){
private function displayRightQuestionItem($spremenljivka){
global $lang;
echo '<div id="question_item_holder_'.$spremenljivka['id'].'" class="question_item_holder" onClick="selectLibraryItem(\''.$spremenljivka['id'].'\');">';

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

@ -328,6 +328,21 @@ function expandLibraryFolder(folder_id){
event.stopPropagation();
}
// Prikazemo opcije za urejanje folderja
function showLibraryFolderEdit(element){
if($(element).parent().find('.folder_item_settings').hasClass('displayNone')){
$('.folder_item_settings').addClass('displayNone');
$(element).parent().find('.folder_item_settings').removeClass('displayNone');
}
else{
$('.folder_item_settings').addClass('displayNone');
$(element).parent().find('.folder_item_settings').addClass('displayNone');
}
event.stopPropagation();
}
// Dodamo nov folder
function addLibraryFolder(parent_folder_id, uid){
@ -344,6 +359,14 @@ function deleteLibraryFolder(folder_id){
$("#lib_folder_list").load('ajax.php?t=libraryBranching&a=deleteFolder', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
}
// Pobrisemo obstojeci folder
function renameLibraryFolder(folder_id){
var tab = $('#active_tab').val();
//$("#lib_folder_list").load('ajax.php?t=libraryBranching&a=deleteFolder', {anketa: srv_meta_anketa_id, tab: tab, folder_id: folder_id});
}
// Klik na posamezen item na desni
function selectLibraryItem(item_id){

3
lang/1.php
View File

@ -2369,6 +2369,9 @@ $lang = array (
"srv_library_survey_title" => "Knjižnica vprašanj",
"srv_library_survey_add" => "Dodaj v anketo",
"srv_library_item_counter" => "Št. izbranih vprašanj",
"srv_library_folder_add" => "Dodaj direktorij",
"srv_library_folder_delete" => "Odstrani direktorij",
"srv_library_folder_rename" => "Preimenuj direktorij",
"srv_nadzor" => "Nadzor",
"srv_knjiznica_add" => "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",
"srv_knjiznica_copy" => "&#268;e &#382;elite kopirati vpra&#154;anje, ga ozna&#269;ite z ikono COPY",

3
lang/2.php
View File

@ -2354,6 +2354,9 @@ $lang = array (
"srv_library_survey_title" => "Questions library",
"srv_library_survey_add" => "Add to survey",
"srv_library_item_counter" => "No. of selected questions",
"srv_library_folder_add" => "Add direktorij",
"srv_library_folder_delete" => "Remove direktorij",
"srv_library_folder_rename" => "Rename direktorij",
"srv_nadzor" => "Supervise",
"srv_knjiznica_add" => "To add a question to a library, drag it to this field",
"srv_knjiznica_copy" => "To copy a question, click on COPY icon",

2958
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

6
resources/sass/admin_new/components/popup/basic.scss
View File

@ -104,6 +104,12 @@
span.faicon {
margin-right: 6px;
color: $blue;
&:before{
font-size: 14px;
}
}
}

40
resources/sass/admin_new/pages/survey_edit/library.scss
View File

@ -48,6 +48,7 @@
li.folder_item{
cursor: pointer;
position: relative;
display: flex;
align-items: center;
@ -71,6 +72,10 @@
&:hover{
background-color: $light-gray;
.dots_ver{
display: block;
}
}
span{
@ -90,6 +95,24 @@
font-size: 12px;
color: $very-dark-gray;
}
.dots_ver{
display: none;
position: absolute;
right: 0;
}
.folder_item_settings{
@include hover_basic();
position: absolute;
z-index: 9999;
right: 0;
top: 38px;
border-radius: 2px;
}
}
}
@ -113,7 +136,19 @@
border-bottom: 1px $gray solid;
.question_item_holder{
.survey_title{
margin: 16px 0 8px 0;
font-weight: 600;
text-transform: uppercase;
&:first-child{
margin-top: 0;
}
}
.question_item_holder,
.folder_item_holder{
cursor: pointer;
display: flex;
align-items: center;
@ -134,7 +169,8 @@
}
}
.question_item_info{
.question_item_info,
.folder_item_info{
display: flex;
align-items: center;