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

Knjiznica in pobrisana vprasanja - predogled

Browse Source
This commit is contained in:
pero1203 2022-08-22 10:14:50 +02:00
parent bfde0a8d06
commit ccbef0e4b7
12 changed files with 1989 additions and 1918 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
admin/survey/SurveyAdminAjax.php
View File

@ -4325,6 +4325,74 @@ class SurveyAdminAjax {
echo '</div>';
}
elseif ($_GET['a'] == 'preview_spremenljivka_lib') {
global $site_path;
SurveyInfo :: getInstance()->SurveyInit($anketa);
$offset = 0;
$zaporedna = 0;
$count_type = SurveyInfo :: getInstance()->getSurveyCountType();
if ($count_type) {
// Preštejemo koliko vprašanj je bilo do sedaj
$sqlg = sisplet_query("SELECT vrstni_red FROM srv_grupa WHERE id = (SELECT gru_id FROM srv_spremenljivka WHERE id = '" . $_POST['spremenljivka'] . "')");
$rowg = mysqli_fetch_assoc($sqlg);
$vrstni_red = $rowg['vrstni_red'];
$sqlCountPast = sisplet_query("SELECT count(*) as cnt FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . $_POST['anketa'] . "' AND s.gru_id=g.id AND g.vrstni_red < '$vrstni_red' ORDER BY g.vrstni_red ASC, s.vrstni_red ASC");
$rowCount = mysqli_fetch_assoc($sqlCountPast);
$offset = $rowCount['cnt'];
// poiscemo vprasanja / spremenljivke
$sql = sisplet_query("SELECT id FROM srv_spremenljivka WHERE gru_id=(SELECT gru_id FROM srv_spremenljivka WHERE id = '" . $_POST['spremenljivka'] . "') AND visible='1' ORDER BY vrstni_red ASC");
while ($row = mysqli_fetch_array($sql)) {
if ($row['id'] == $_POST['spremenljivka']) {
$zaporedna++;
break;
}
}
}
echo '<h2><span class="as_link" onClick="closePreviewVprasanje();"><span class="faicon arrow_back"></span>'.$lang['srv_deleted_vprasanja_back'].'</span></h2>';
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
echo '<div id="preview_spremenljivka">';
include_once('../../main/survey/app/global_function.php');
new \App\Controllers\SurveyController(true);
if (isset($_POST['lang_id'])) {
save('lang_id', (int)$_POST['lang_id']);
}
echo ' <div id="spremenljivka_preview">';
if ( $_POST['spremenljivka'] == -1 ) {
\App\Controllers\BodyController::getInstance()->displayIntroductionContent();
}
elseif ( $_POST['spremenljivka'] == -2 ) {
\App\Controllers\BodyController::getInstance()->displayKonecContent();
}
elseif ( $_POST['spremenljivka'] == -3 ) {
\App\Controllers\StatisticController::displayStatistika();
}
else {
save('forceShowSpremenljivka', true);
save('question_preview', true);
\App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_POST['spremenljivka'], $offset, $zaporedna);
}
echo ' </div>';
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="medium blue" onClick="closePreviewVprasanje(); return false;">'.$lang['srv_deleted_vprasanja_back'].'</button>';
echo '</div>';
}
else if ($_GET['a'] == 'preview_page') {
echo '<div id="preview_page">';
echo ' <div id="page_preview">';
@ -4337,22 +4405,6 @@ class SurveyAdminAjax {
echo ' </div>';
echo '</div>';
}
/*else if ($_GET['a'] == 'rename_variable') {
if ($_POST['show'] == 'true') {
echo '<input type="text" name="variable" id="variable_' . $spremenljivka . '" value="' . $_POST['value'] . '" class="variableinput variableinput_noborder" onkeyup="edit_spremenljivka_variable(\'' . $spremenljivka . '\');" ' . ' />';
echo '<script type="text/javascript">';
echo '$(document).ready(function() {';
echo ' $("#variable_' . $spremenljivka . '").keypress(function(e){if(e.which==13) rename_variable(\'' . $spremenljivka . '\', $(this).val()' . ', \'' . $_POST['variable_custom'] . '\', \'false\'); });';
echo '});';
echo '</script>';
} else {
echo $_POST['value'];
echo '<a href="#" onclick="rename_variable(\'' . $spremenljivka . '\', \'' . $_POST['value'] . '\', \'' . $_POST['variable_custom'] . '\', \'true\'); return false;" title="' . $lang['edit3'] . '"><img id="edit_variable_' . $spremenljivka . '" src="img_' . $this->skin . '/pencil.png" /></a>';
}
}*/
else if ($_GET['a'] == 'form_settings') {
Common::updateEditStamp();

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

@ -478,6 +478,9 @@ class LibraryBranching {
// Urejanje Vprasanja
if($this->tab == '0' && ($spremenljivka['folder_uid'] == $global_user_id || $admin_type == 0)){
// Preview
echo ' <span class="faicon monitor" onClick="previewVprasanje(\''.$spremenljivka['id'].'\');"></span>';
// Tri pikice za prikaz urejanja vprasanja
echo ' <span class="faicon dots_ver dots_ver_item" onClick="showLibraryItemEdit(this);"></span>';
@ -842,6 +845,9 @@ class LibraryBranching {
// Odpremo popup s knjiznico
if ($_GET['a'] == 'displayLibraryPopup') {
$this->displayLibrary();
// Div za dodaten popup za preview
echo '<div id="vprasanje_preview" class="displayNone"></div>';
}
// Preklopimo tab v kniznici

4
admin/survey/classes/class.VprasanjeDeleted.php
View File

@ -62,7 +62,7 @@ class VprasanjeDeleted {
echo ' <span class="date">('.date("G:i d.m.Y", strtotime($row['delete_time'])).')</span>';
echo ' </div>';
echo ' <span class="faicon monitor" title="'.$lang['srv_predogled_spremenljivka'].'" onClick="previewVprasanjeDeleted(\''.$row['spr_id'].'\');"></span>';
echo ' <span class="faicon monitor" title="'.$lang['srv_predogled_spremenljivka'].'" onClick="previewVprasanje(\''.$row['spr_id'].'\');"></span>';
echo ' </div>';
@ -144,7 +144,7 @@ class VprasanjeDeleted {
$this->displayDeletedVprasanja();
// Div za dodaten popup za preview
echo '<div id="vprasanje_deleted_preview" class="displayNone"></div>';
echo '<div id="vprasanje_preview" class="displayNone"></div>';
}
// Dodajanje pobrisanega vprasanja nazaj v vprasalnik

13
admin/survey/script/vprasanjeDeleted.js
View File

@ -72,18 +72,15 @@ function insertVprasanjeDeletedItemsIntoSurvey(){
}
// Predogled pobrisanega vprasanja
function previewVprasanjeDeleted(spr_id){
// Predogled pobrisanega vprasanjaoz. vprasanja iz knjiznice
function previewVprasanje(spr_id){
$('#vprasanje_deleted_preview').load('ajax.php?a=preview_spremenljivka', {anketa: srv_meta_anketa_id, spremenljivka: spr_id, podstran: srv_meta_podstran}).removeClass('displayNone');
//preview_spremenljivka(spr_id);
$('#vprasanje_preview').load('ajax.php?a=preview_spremenljivka_lib', {anketa: srv_meta_anketa_id, spremenljivka: spr_id, podstran: srv_meta_podstran}).removeClass('displayNone');
event.stopPropagation();
}
// Predogled pobrisanega vprasanja
function closePreviewVprasanjeDeleted(){
$('#vprasanje_deleted_preview').html().addClass('displayNone');
function closePreviewVprasanje(){
$('#vprasanje_preview').addClass('displayNone').empty();
}

1
lang/1.php
View File

@ -2431,6 +2431,7 @@ $lang = array (
"srv_library_add_to_lib_success_err" => "Prišlo je do napake pri dodajanju v knjižnico!",
"srv_deleted_vprasanja" => "Pobrisana vprašanja",
"srv_deleted_vprasanja_back" => "Nazaj na vsa vprašanja",
"srv_nadzor" => "Nadzor",
"srv_knjiznica_add" => "&#268;e &#382;elite dodati spremenljivko v knji&#382;nico, jo povlecite v to polje",

1
lang/2.php
View File

@ -2413,6 +2413,7 @@ $lang = array (
"srv_library_add_to_lib" => "Add to library",
"srv_deleted_vprasanja" => "Deleted questions",
"srv_deleted_vprasanja_back" => "Back to all questions",
"srv_nadzor" => "Supervise",
"srv_knjiznica_add" => "To add a question to a library, drag it to this field",

3716
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -298,7 +298,8 @@
&:hover{
background-color: $light-gray;
.dots_ver{
.dots_ver,
.monitor{
display: block;
}
}
@ -337,6 +338,15 @@
}
}
.monitor{
display: none;
position: absolute;
right: 22px;
padding: 7px 8px;
margin-right: 0;
}
.folder_empty:before{
color: $dark-gray2;
}

1
resources/sass/admin_new/pages/survey_edit/popups/popups.scss
View File

@ -2,6 +2,7 @@
@import "survey_edit";
@import "title_edit";
@import "preview_question";
@import "vprasanje_deleted";
@import "import_from_text";
@import "archive";

3
resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
View File

@ -28,8 +28,7 @@ $progress_bar_background: black;
//Preview spremenljivka
#fullscreen,
#vprasanje_deleted_preview,
#library_preview{
#vprasanje_preview{
#preview_spremenljivka {
@include popup_general();

41
resources/sass/admin_new/pages/survey_edit/vprasanje_deleted.scss → resources/sass/admin_new/pages/survey_edit/popups/vprasanje_deleted.scss
View File

@ -79,7 +79,8 @@
&:hover{
background-color: $light-gray;
.dots_ver{
.dots_ver,
.monitor{
display: block;
}
}
@ -124,6 +125,7 @@
}
.monitor{
display: none;
margin-right: 0;
}
}
@ -141,12 +143,13 @@
margin: 0 16px 16px 0;
}
}
}
/* Dodaten popup za preview */
#vprasanje_deleted_preview{
#vprasanje_preview{
position: absolute;
z-index: 9999;
top: 0;
left: 0;
@ -155,9 +158,39 @@
background-color: $white;
h2 .as_link{
text-decoration: none;
text-transform: none;
}
#preview_spremenljivka{
box-sizing: border-box;
width: 100%;
height: calc(100% - 140px);
max-height: none;
box-sizing: border-box;
padding-top: 0;
#spremenljivka_preview .spremenljivka{
padding: 0;
.naslov{
padding: 0;
font-weight: 600;
font-size: 20px;
p{
font-weight: 600;
}
}
}
}
.button_holder{
padding: 16px;
margin: 0;
border-top: 1px $gray solid;
}
}

1
resources/sass/admin_new/pages/survey_edit/survey_edit.scss
View File

@ -12,7 +12,6 @@
@import "library";
@import "jquery";
@import "top_center_settings";
@import "vprasanje_deleted";
// Urejanje -> Nastavitve