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

Mape v mojih anketah - prenova - V DELU

Browse Source
This commit is contained in:
pero1203 2022-10-05 12:27:59 +02:00
parent b9fe773972
commit 1ddefa2499
4 changed files with 70 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
admin/survey/classes/class.SurveyListFolders.php
View File

@ -9,34 +9,13 @@ class SurveyListFolders {
private $current_folder = 0; // Trenutni odprt folder
private $folders_list = array(); // Seznam vseh folderjev uporabnika
private $pageno = 1; // Trenutna stran (paginacija)
public function __construct() {
global $admin_type, $global_user_id, $site_path;
$sql = sisplet_query("SELECT f.*, COUNT(a.ank_id) AS survey_count
FROM srv_mysurvey_folder f
LEFT JOIN srv_mysurvey_anketa a
ON f.id=a.folder
WHERE f.usr_id='".$global_user_id."'
GROUP BY 1
ORDER BY f.naslov ASC
");
if (!$sql) {
echo mysqli_error($GLOBALS['connect_db']);
}
while($row = mysqli_fetch_array($sql)){
$this->folders_list[$row['id']] = $row;
// Nastavimo, ce je to trenutno odprt folder
if($row['active'] == '1')
$this->current_folder = $row['id'];
}
}
@ -64,8 +43,9 @@ class SurveyListFolders {
// Izpisemo levo stran - seznam folderjev
private function displayLeftContent(){
global $lang;
echo '<div class="title">Vaše mape</div>';
echo '<div class="title">'.$lang['srv_mySurvey_your_folders'].'</div>';
// Izpisemo seznam folder s seznamom childov v rootu
$this->displayFolderList(0);
@ -73,18 +53,67 @@ class SurveyListFolders {
// Izpisemo seznam folderjev za posameznega parenta
private function displayFolderList($folder_id){
global $global_user_id;
$this->displayFolder();
// Izpisemo folder box
$this->displayFolder($folder_id);
echo '<ul class="folder_list">';
// Izpisemo se vse subfolderje
echo '<ul id="folder_list_'.$folder_id.'" class="folder_list">';
$sqlChildren = sisplet_query("SELECT id FROM srv_mysurvey_folder WHERE usr_id='".$global_user_id."' AND parent='".$folder_id."' ORDER BY naslov ASC");
while($rowChildren = mysqli_fetch_array($sqlChildren)){
$this->displayFolderList($rowChildren['id']);
}
echo '</ul>';
}
// Izpisemo posamezen folder
private function displayFolder(){
private function displayFolder($folder_id){
global $lang;
echo '<div class="folder_item">';
// Ce gre za root folder dobimo stevilo anket brez folderja
if($folder_id == '0'){
}
// Ce ne gre za root folder dobimo podatke o folderju
else{
// Dobimo podatke folderja
$sql = sisplet_query("SELECT f.*, COUNT(a.ank_id) AS survey_count
FROM srv_mysurvey_folder f
LEFT JOIN srv_mysurvey_anketa a
ON f.id=a.folder
WHERE id='".$folder_id."'
GROUP BY 1
");
if (!$sql)
echo mysqli_error($GLOBALS['connect_db']);
$row = mysqli_fetch_array($sql);
// Nastavimo, ce je to trenutno odprt folder
if($row['active'] == '1')
$this->current_folder = $row['id'];
}
// Izrisemo folder box
echo '<div id="folder_item_'.$folder_id.'" class="folder_item">';
echo '<span class="faicon arrow"></span>';
echo '<span class="faicon folder"></span>';
// Ce je root
if($folder_id == '0'){
echo $lang['srv_mySurvey_all_surveys'];
}
else{
echo $row['naslov'];
echo '<span class="survey_count">'.$row['survey_count'].'</span>';
}
echo '</div>';
}
@ -744,6 +773,7 @@ class SurveyListFolders {
function displayNewFolder($folder){
global $lang;
global $global_user_id;

4
lang/1.php
View File

@ -7180,6 +7180,7 @@ $lang = array (
'srv_settings_mobile_tables_hor' => "Da, s horizonalnim razpiranjem",
'srv_settings_mobile_friendly' => "Prilagojen prikaz ankete na mobilnih napravah",
'srv_settings_mobile_friendly_off' => "Prilagojen prikaz za mobilnike je izklopljen",
'srv_mySurvey_unallocated' => "Nerazporejene ankete",
'srv_mySurvey_delete_folder' => "Pobriši mapo",
'srv_mySurvey_create_folder' => "Ustvari novo mapo",
@ -7188,6 +7189,9 @@ $lang = array (
'srv_mySurvey_show_folders' => "Mape",
'srv_mySurvey_show_folders_desc' => "Pogled z mapami",
'srv_mySurvey_new_folder' => "Nova mapa",
'srv_mySurvey_all_surveys' => "Vse moje ankete",
'srv_mySurvey_your_folders' => "Vaše mape",
'srv_select-box_radio' => "Izberite s seznama",
'srv_custom-picture_radio' => "Slikovni tip",
'srv_custom-picture_radio_label' => "Vrste slikovnih tipov",

4
lang/2.php
View File

@ -7062,6 +7062,7 @@ $lang = array (
'srv_settings_mobile_tables_hor' => "Yes, with horizontal expanding",
'srv_settings_mobile_friendly' => "Optimized survey display on mobile devices",
'srv_settings_mobile_friendly_off' => "Mobile friendly survey is turned off",
'srv_mySurvey_unallocated' => "Unallocated survey",
'srv_mySurvey_delete_folder' => "Deleter folder",
'srv_mySurvey_create_folder' => "Create new folder",
@ -7070,6 +7071,9 @@ $lang = array (
'srv_mySurvey_show_folders' => "Folders",
'srv_mySurvey_show_folders_desc' => "Folders view",
'srv_mySurvey_new_folder' => "New folder",
'srv_mySurvey_all_surveys' => "All my surveys",
'srv_mySurvey_your_folders' => "Your folders",
'srv_select-box_radio' => "Select from list",
'srv_custom-picture_radio' => "Image type",
'srv_custom-picture_radio_label' => "Type of image",

4
sql/update2.sql
View File

@ -9664,3 +9664,7 @@ UPDATE misc SET value='22.08.25' WHERE what="version";
ALTER TABLE srv_mysurvey_folder ADD active enum('0','1') NOT NULL DEFAULT '0';
UPDATE misc SET value='22.10.04' WHERE what="version";
ALTER TABLE srv_mysurvey_folder ADD INDEX usr_id (usr_id);
UPDATE misc SET value='22.10.05' WHERE what="version";