Merge branch 'master' into release/produkcija
This commit is contained in:
pero1203
commit
0e45b81e78
2
.gitignore
vendored
2
.gitignore
vendored
@ -50,3 +50,5 @@ docker
|
||||
/composer.lock
|
||||
/.favorites.json
|
||||
main/survey/skins/1045_test.css
|
||||
|
||||
/d
|
||||
@ -2,6 +2,9 @@ RewriteEngine On
|
||||
|
||||
|
||||
################ FRONTEND DRUPAL konfiguracija ################
|
||||
## Drupal API call
|
||||
#RewriteRule ^api/drupal/(.*) frontend/drupal.php?action=$1
|
||||
|
||||
## root domain
|
||||
# RewriteCond %{REQUEST_URI} ^(/)?$
|
||||
# RewriteRule ^(.*)$ /frontend/drupal/$1 [L]
|
||||
@ -45,6 +48,7 @@ RewriteRule ^koda/(.*) main/survey/sa_koda.php?%{QUERY_STRING}
|
||||
RewriteRule ^a/(.*) main/survey/index.php?anketa=$1&%{QUERY_STRING}
|
||||
RewriteRule ^podatki/(.*?[^/])/(.*[^/])? admin/survey/public.php?anketa=$1&urlhash=$2&%{QUERY_STRING}
|
||||
RewriteRule ^admin/survey/minify/([a-z]=.*) admin/survey/minify/index.php?$1 [L,NE]
|
||||
RewriteRule ^api/drupal/(.*) frontend/drupal.php?action=?$1
|
||||
|
||||
## Google OAuth2 prijava
|
||||
RewriteRule ^google-prijava\b(.*) frontend/api/google-oauth2.php$1
|
||||
|
||||
@ -329,7 +329,7 @@ class Branching {
|
||||
}
|
||||
|
||||
// Knjiznica
|
||||
echo '<div class="toolbox_item open_lib" onClick="displayLibraryPopup();"><span class="item_icon faicon library"></span><span class="item_text">'.$lang['srv_library'].'</span></div>';
|
||||
echo '<div class="toolbox_item open_lib"><span class="item_icon faicon library"></span><span class="item_text">'.$lang['srv_library'].'</span></div>';
|
||||
echo '<div class="toolbox_border open_lib"></div>';
|
||||
|
||||
// normalna anketa
|
||||
@ -342,8 +342,13 @@ class Branching {
|
||||
echo '<div class="toolbox_border new_if"></div>';
|
||||
|
||||
echo '<div class="toolbox_item new_block '.(!$userAccess->checkUserAccess($what='block') ? 'user_access_locked' : '').'" tip="9998"><span class="item_icon faicon icon-white block_32"></span> <span class="item_text">'.$lang['srv_block_random_blocks'].'</span></div>';
|
||||
//echo '<div class="toolbox_border new_block"></div>';
|
||||
}
|
||||
}
|
||||
|
||||
// Pobrisana vprasanja
|
||||
$vd = new VprasanjeDeleted($this->anketa);
|
||||
$deleted_vrasanja_count = $vd->countDeletedVprasanja();
|
||||
echo '<div id="vprasanje_deleted_border" class="toolbox_border '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'"></div>';
|
||||
echo '<div id="vprasanje_deleted_toolbox" class="toolbox_item open_deleted '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' (<span id="vprasanje_deleted_count">'.$deleted_vrasanja_count.'</span>)</span></div>';
|
||||
}
|
||||
else {
|
||||
|
||||
@ -391,8 +396,13 @@ class Branching {
|
||||
echo '<div class="toolbox_border new_if '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'"></div>';
|
||||
|
||||
echo '<div class="toolbox_item new_block '.(!$userAccess->checkUserAccess($what='block') ? 'user_access_locked' : '').'" tip="9998"><span class="item_icon faicon icon-white block_32"></span> <span class="item_text">'.$lang['srv_block_random_blocks'].'</span></div>';
|
||||
//echo '<div class="toolbox_border new_block"></div>';
|
||||
}
|
||||
|
||||
// Pobrisana vprasanja
|
||||
$vd = new VprasanjeDeleted($this->anketa);
|
||||
$deleted_vrasanja_count = $vd->countDeletedVprasanja();
|
||||
echo '<div id="vprasanje_deleted_border" class="toolbox_border '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'"></div>';
|
||||
echo '<div id="vprasanje_deleted_toolbox" class="toolbox_item open_deleted '.($deleted_vrasanja_count == 0 ? 'displayNone' : '').'" onClick="displayVprasanjeDeletedPopup();"><span class="item_icon faicon delete"></span><span class="item_text">'.$lang['srv_deleted_vprasanja'].' (<span id="vprasanje_deleted_count">'.$deleted_vrasanja_count.'</span>)</span></div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
@ -425,9 +435,11 @@ class Branching {
|
||||
// Vsebina okna
|
||||
echo '<div class="toolbox_expand_segments_holder">';
|
||||
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
|
||||
// Segment kategorije
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_sklop_osnovna2'].'</p>';
|
||||
|
||||
echo '<p class="new_spr adv segment_option" tip="1">'.$lang['srv_vprasanje_tip_1'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="3">'.$lang['srv_vprasanje_tip_1'].' - '.$lang['srv_dropdown'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="2">'.$lang['srv_vprasanje_tip_2'].'</p>';
|
||||
@ -435,6 +447,18 @@ class Branching {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Segment vnos
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_sklop_osnovna_vnos2'].'</p>';
|
||||
|
||||
echo '<p class="new_spr adv segment_option" tip="7">'.$lang['srv_vprasanje_tip_7'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="21">'.$lang['srv_vprasanje_tip_21'].'</p>';
|
||||
echo '<p class="new_spr podtip adv segment_option" tip="7" podtip="2">'.$lang['srv_number_insert_1'].'</p>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Segment tabele
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_vprasanje_tables'].'</p>';
|
||||
|
||||
@ -446,6 +470,19 @@ class Branching {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Segment ostale tabele
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_sklop_tabele_ostale'].'</p>';
|
||||
|
||||
echo '<p class="new_spr adv segment_option" tip="16">'.$lang['srv_vprasanje_tip_16'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="20">'.$lang['srv_vprasanje_tip_20'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="19">'.$lang['srv_vprasanje_tip_19'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option '.(!$userAccess->checkUserAccess($what='question_type_multitable') ? 'user_access_locked' : '').'" tip="24">'.$lang['srv_survey_table_multiple'].'</p>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Segment posebna vprasanja
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_sklop_posebna'].'</p>';
|
||||
|
||||
@ -459,27 +496,6 @@ class Branching {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_sklop_osnovna_vnos2'].'</p>';
|
||||
|
||||
echo '<p class="new_spr adv segment_option" tip="7">'.$lang['srv_vprasanje_tip_7'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="21">'.$lang['srv_vprasanje_tip_21'].'</p>';
|
||||
echo '<p class="new_spr podtip adv segment_option" tip="7" podtip="2">'.$lang['srv_number_insert_1'].'</p>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_sklop_tabele_ostale'].'</p>';
|
||||
|
||||
echo '<p class="new_spr adv segment_option" tip="16">'.$lang['srv_vprasanje_tip_16'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="20">'.$lang['srv_vprasanje_tip_20'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option" tip="19">'.$lang['srv_vprasanje_tip_19'].'</p>';
|
||||
echo '<p class="new_spr adv segment_option '.(!$userAccess->checkUserAccess($what='question_type_multitable') ? 'user_access_locked' : '').'" tip="24">'.$lang['srv_survey_table_multiple'].'</p>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="toolbox_expand_segment">';
|
||||
echo '<p class="segment_title">'.$lang['srv_standardni_vnosi'].'</p>';
|
||||
|
||||
@ -2570,6 +2586,8 @@ class Branching {
|
||||
$num = mysqli_num_rows($sql1);
|
||||
$size = $num * 50;
|
||||
|
||||
echo '<div class="ranking_holder">';
|
||||
|
||||
//zaslon razdelimo na dva dela - izris leve strani
|
||||
echo '<div id="half" class="dropzone '.($this->lang_id==null?'allow_new':'').'" style="width: 50%; min-height:' . $size . 'px; float: left; border-right: 1px solid black;">';
|
||||
|
||||
@ -2674,8 +2692,7 @@ class Branching {
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="clr"></div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
//Image hot spot @ radio ********************************************************************************************************
|
||||
@ -5780,7 +5797,7 @@ class Branching {
|
||||
// Add variable - hover
|
||||
if ( in_array($row['tip'], array(1,2,6,16,19,20)) ) {
|
||||
if ($row['enota'] != 10 && $row['orientation'] != 10){
|
||||
echo '<div class="add-variable tip_'.$row['tip'].'"><a href="#" class="noline" onclick="vprasanje_fullscreen(\''.$spremenljivka.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add"></span>'.$lang['srv_novavrednost'].'</a></div>';
|
||||
echo '<div class="add-variable tip_'.$row['tip'].'"><a href="#" class="noline" onclick="add_question_category(\''.$spremenljivka.'\'); return false;" title="'.$lang['srv_novavrednost'].'"><span class="faicon add"></span>'.$lang['srv_novavrednost'].'</a></div>';
|
||||
|
||||
MobileSurveyAdmin::displayAddQuestionCategory($this->anketa, $spremenljivka, $row['tip']);
|
||||
}
|
||||
@ -6097,14 +6114,47 @@ class Branching {
|
||||
if ($admin_type <= $question_comment && $question_comment != '') {
|
||||
|
||||
// Dodaj komentar
|
||||
echo '<a href="#" id="surveycomment_'.$spremenljivka.'_0" class="surveycomment noline" type="1" subtype="q_admin_add" spremenljivka="'.$spremenljivka.'" view="0" onclick="return false;" title="'.$lang['srv_question_comment'].'">';
|
||||
echo '<div onClick="toggleCommentPopupInline(1); return false;" id="surveycomment_'.$spremenljivka.'_0" class="surveycomment noline" type="1" subtype="q_admin_add" spremenljivka="'.$spremenljivka.'" view="0" title="'.$lang['srv_question_comment'].'">';
|
||||
echo ' <button class="small-rounded white-gray">';
|
||||
echo ' <span class="faicon inline_comment"></span> ';
|
||||
echo $lang['srv_add_comment'];
|
||||
echo ' </button>';
|
||||
echo '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<script> $(function() { load_comment(\'#surveycomment_'.$spremenljivka.'_0\'); }); </script>';
|
||||
echo '<div class="comment_inline_popup displayNone" id="comment_inline_add">';
|
||||
|
||||
echo '<div class="comment_inline_top">';
|
||||
echo '<div class="title">';
|
||||
echo '<span class="faicon fa-comment"></span>';
|
||||
echo $lang['srv_add_comment'];
|
||||
echo '</div>';
|
||||
echo '<span class="gray" onClick="toggleCommentPopupInline(1); return false;">✕</span>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="first_holder_div" id="survey_comment_'.$spremenljivka.'_0">';
|
||||
$ba = new BranchingAjax($this->anketa);
|
||||
$ba->add_comment_field($spremenljivka, '1', '0', false, false);
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="small white-blue" onclick="toggleCommentPopupInline(1); return false;">'.$lang['edit1338'].'</button>';
|
||||
echo '<button class="small blue" onclick="add_comment(\''.$spremenljivka.'\', \'1\', \'0\', $(\'#vsebina_'.$spremenljivka.'_0\').val()); actionNotePopup(\'comment_added\', \'success\'); return false;">'.$lang['srv_comments_new'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; //comment_inline_popup
|
||||
|
||||
// Klik izven - zapremo popup
|
||||
echo '<script>
|
||||
$(document).mouseup(function(e){
|
||||
var container = $("#comment_inline_add");
|
||||
|
||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||
$("#comment_inline_add").addClass("displayNone");
|
||||
}
|
||||
});
|
||||
</script>';
|
||||
|
||||
//echo '<script> $(function() { load_comment(\'#surveycomment_'.$spremenljivka.'_0\'); }); </script>';
|
||||
|
||||
$row = Cache::srv_spremenljivka($spremenljivka);
|
||||
if ($row['thread'] == 0) {
|
||||
@ -6123,14 +6173,43 @@ class Branching {
|
||||
|
||||
// Poglej komentarje
|
||||
if ($admin_type <= $question_comment_viewadminonly || $question_comment_viewauthor==1) {
|
||||
echo '<a href="#" id="surveycomment_'.$spremenljivka.'_1" class="surveycomment noline" type="1" subtype="q_admin_all" spremenljivka="'.$spremenljivka.'" view="1" onclick="return false;" title="'.$lang['srv_question_comments'].'">';
|
||||
echo '<div onClick="toggleCommentPopupInline(2); return false;" id="surveycomment_'.$spremenljivka.'_1" class="surveycomment noline" type="1" subtype="q_admin_all" spremenljivka="'.$spremenljivka.'" view="1" title="'.$lang['srv_question_comments'].'">';
|
||||
echo ' <button class="small-rounded white-gray" id="comment_add_'.$spremenljivka.'"'.($row['count']== 0 ? ' style="display:none;"' : '').'>';
|
||||
echo ' <span class="faicon inline_double_comment"></span> ';
|
||||
echo $lang['srv_view_comment'].($row['count'] > 0 ? ' ('.$row['count'].')':'');
|
||||
echo $lang['srv_admin_comment'].($row['count'] > 0 ? ' ('.$row['count'].')':'');
|
||||
echo ' </button>';
|
||||
echo '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<script> $(function() { load_comment(\'#surveycomment_'.$spremenljivka.'_1\'); }); </script>';
|
||||
echo '<div class="comment_inline_popup displayNone" id="comment_inline_editor">';
|
||||
|
||||
echo '<div class="comment_inline_top">';
|
||||
echo '<div class="title">';
|
||||
echo '<span class="faicon fa-comment"></span>';
|
||||
echo $lang['srv_admin_comment'];
|
||||
echo '</div>';
|
||||
echo '<span class="gray" onClick="toggleCommentPopupInline(2); return false;">✕</span>';
|
||||
echo '</div>';
|
||||
|
||||
echo 'TODO: load editor commments';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="small blue" onclick="toggleCommentPopupInline(2); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; //comment_inline_popup
|
||||
|
||||
// Klik izven - zapremo popup
|
||||
echo '<script>
|
||||
$(document).mouseup(function(e){
|
||||
var container = $("#comment_inline_editor");
|
||||
|
||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||
$("#comment_inline_editor").addClass("displayNone");
|
||||
}
|
||||
});
|
||||
</script>';
|
||||
|
||||
//echo '<script> $(function() { load_comment(\'#surveycomment_'.$spremenljivka.'_1\'); }); </script>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -6141,14 +6220,44 @@ class Branching {
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
if ($row['count'] > 0) {
|
||||
echo '<a href="#" id="surveycomment_'.$spremenljivka.'_2" class="surveycomment noline" type="2" subtype="q_resp_all" spremenljivka="'.$spremenljivka.'" onclick="return false;">';
|
||||
echo '<div onClick="toggleCommentPopupInline(3); return false;" id="surveycomment_'.$spremenljivka.'_2" class="surveycomment noline" type="2" subtype="q_resp_all" spremenljivka="'.$spremenljivka.'">';
|
||||
echo ' <button class="small-rounded white-gray">';
|
||||
echo ' <span class="faicon inline_comment icon-orange"></span> ';
|
||||
echo $lang['srv_repondent_comment'].' ('.$row['count'].')';
|
||||
echo ' </button>';
|
||||
echo '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="comment_inline_popup displayNone" id="comment_inline_respondent">';
|
||||
|
||||
echo '<div class="comment_inline_top">';
|
||||
echo '<div class="title">';
|
||||
echo '<span class="faicon fa-comment"></span>';
|
||||
echo $lang['srv_repondent_comment'];
|
||||
echo '</div>';
|
||||
echo '<span class="gray" onClick="toggleCommentPopupInline(3); return false;">✕</span>';
|
||||
echo '</div>';
|
||||
|
||||
echo 'TODO: load respondent commments';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="small blue" onclick="toggleCommentPopupInline(3); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; //comment_inline_popup
|
||||
|
||||
// Klik izven - zapremo popup
|
||||
echo '<script>
|
||||
$(document).mouseup(function(e){
|
||||
var container = $("#comment_inline_respondent");
|
||||
|
||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||
$("#comment_inline_respondent").addClass("displayNone");
|
||||
}
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
echo '<script> $(function() { load_comment(\'#surveycomment_'.$spremenljivka.'_2\'); }); </script>';
|
||||
//echo '<script> $(function() { load_comment(\'#surveycomment_'.$spremenljivka.'_2\'); }); </script>';
|
||||
}
|
||||
echo '</span>';
|
||||
}
|
||||
|
||||
@ -694,11 +694,12 @@ class BranchingAjax {
|
||||
echo '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
|
||||
|
||||
echo '<p>'.$lang['if_delete_data'].'</p>';
|
||||
echo '<p>'.$lang['srv_brisiifconfirm_all'].'</p><br />';
|
||||
echo '<p class="top16">'.$lang['srv_brisiifconfirm_all'].'</p>';
|
||||
|
||||
echo '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;"><span>'.$lang['srv_if_rem_all'].'</span></a></span>';
|
||||
echo '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
|
||||
//echo '<p><a href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;">'.$lang['srv_if_rem_all'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
|
||||
echo ' <button class="medium blue" onclick="if_remove(\''.$if.'\', \'1\'); return false;">'.$lang['srv_if_rem_all'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
return;
|
||||
}
|
||||
@ -1929,89 +1930,22 @@ class BranchingAjax {
|
||||
$sql = sisplet_query("SELECT * FROM post WHERE 1=0");
|
||||
}
|
||||
|
||||
if (mysqli_num_rows($sql) > 0) {
|
||||
if ($view == 1) {
|
||||
//echo '<b><a href="'.$site_url.'index.php?fl=4&fid='.$row['forum'].'&tid='.$tid.'&sortpostorder='.$sortpostorder.'" target="_blank">'.$lang['srv_forum_go'].'</a></b>';
|
||||
$rows = mysqli_num_rows($sql);
|
||||
if ($rows > 0) echo '<img src="'.$site_url.'/admin/survey/img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
|
||||
echo '<br /><br />';
|
||||
} elseif ($view == 3) {
|
||||
echo '<div style="width:45%; float:left">';
|
||||
echo '<h3 class="red"><b>'.$lang['comments'].'</b>';
|
||||
$rows = mysqli_num_rows($sql);
|
||||
if ($rows > 0) echo '<img src="img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
|
||||
echo '</h3>';
|
||||
}
|
||||
}
|
||||
|
||||
// textarea za oddat komentar - zgoraj
|
||||
/*/ textarea za oddat komentar - zgoraj
|
||||
if ($addfieldposition == 1) {
|
||||
$this->add_comment_field($spremenljivka, $type, $view);
|
||||
echo '<br /><br />';
|
||||
}
|
||||
}*/
|
||||
|
||||
if (mysqli_num_rows($sql) > 0) {
|
||||
|
||||
$i = 0;
|
||||
$rows = mysqli_num_rows($sql);
|
||||
while ($row = mysqli_fetch_array($sql)) {
|
||||
|
||||
// Prikazemo zgodovino glede na nastavitev
|
||||
if($comment_history == '2' || (($comment_history == '0' || $comment_history == '') && $row['uid'] == $global_user_id)){
|
||||
if ($row['ocena'] == 0) echo '<span style="color:black">';
|
||||
elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
|
||||
elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
|
||||
elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
|
||||
else echo '<span>';
|
||||
|
||||
echo '<b>'.$f->user($row['uid']).'</b> ('.$f->datetime1($row['time']).'):';
|
||||
|
||||
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
|
||||
|
||||
echo '<div style="float:right">';
|
||||
|
||||
if ($commentmarks == 1) {
|
||||
echo ' <select name="ocena" onchange="$.post(siteurl+\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowi['id'].'\'}, function () { add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', \'\' ); });">
|
||||
<option value="0"'.($row['ocena']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
|
||||
<option value="1"'.($row['ocena']==1?' selected':'').'>'.$lang['srv_todo'].'</option>
|
||||
<option value="2"'.($row['ocena']==2?' selected':'').'>'.$lang['srv_done'].'</option>
|
||||
<option value="3"'.($row['ocena']==3?' selected':'').'>'.$lang['srv_not_relevant'].'</option>
|
||||
</select>';
|
||||
} else {
|
||||
echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" style="margin-right:3px;" onchange="$.post(siteurl+\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowi['id'].'\'}, function () { add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', \'\' ); });" value="2" '.($row['ocena'] >= 2?' checked':'').' /><label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>';
|
||||
}
|
||||
//echo ' <br /><a href="javascript:comment_on_comment(\''.$rowt['id'].'\');">'.$lang['srv_comment_comment'].'</a>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '<br/>'.$row['vsebina'].'<hr>';
|
||||
|
||||
echo '</span>';
|
||||
}
|
||||
|
||||
//}
|
||||
$i++;
|
||||
|
||||
// Nastavimo oglede foruma in teme
|
||||
if ($global_user_id > 0) {
|
||||
$sqla2 = sisplet_query("SELECT time FROM views WHERE pid='" .$row['id'] ."' AND uid='$global_user_id'");
|
||||
if (mysqli_num_rows($sqla2) > 0) {
|
||||
$sqla3 = sisplet_query("UPDATE views SET time=NOW() WHERE pid='" .$row['id'] ."' AND uid='$global_user_id'");
|
||||
} else {
|
||||
$sqla3 = sisplet_query("INSERT INTO views (pid, uid, time) VALUES ('" .$row['id'] ."', '$global_user_id', NOW())");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// textarea za oddat komentar - spodaj
|
||||
if ($addfieldposition == 0 || $addfieldposition == '') {
|
||||
echo '<br />';
|
||||
$this->add_comment_field($spremenljivka, $type, $view);
|
||||
echo '<div id="survey_comment_0_1">';
|
||||
$this->add_comment_field($spremenljivka, $type, $view, true, false);
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
} else {
|
||||
$this->add_comment_field($spremenljivka, $type, $view);
|
||||
//$this->add_comment_field($spremenljivka, $type, $view);
|
||||
}
|
||||
|
||||
if ($_REQUEST['refresh'] != '1' || $view==3)
|
||||
@ -2317,7 +2251,7 @@ class BranchingAjax {
|
||||
}
|
||||
}
|
||||
|
||||
function add_comment_field ($spremenljivka, $type, $view, $form=true) {
|
||||
function add_comment_field ($spremenljivka, $type, $view, $form=true, $buttons=true) {
|
||||
global $admin_type;
|
||||
global $global_user_id;
|
||||
global $lang;
|
||||
@ -2325,29 +2259,28 @@ class BranchingAjax {
|
||||
|
||||
$rowanketa = SurveyInfo::getInstance()->getSurveyRow();
|
||||
|
||||
echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
|
||||
|
||||
$tip_lang = '';
|
||||
if ($type == 1 && $view == 4) //splošen komentar na strani testiranje
|
||||
$tip_lang = 'S';
|
||||
if ($type == 0 && $view == 1) //splošen komentar v dropdownu
|
||||
$tip_lang = 'S';
|
||||
if ($spremenljivka != 0) //komentar na vprašanja
|
||||
$tip_lang = 'Q';
|
||||
|
||||
echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'.$tip_lang.''].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
|
||||
|
||||
echo '<div class="button_holder bottom0">';
|
||||
if ($buttons) {
|
||||
echo '<div class="button_holder bottom0">';
|
||||
|
||||
if($_GET['a'] == 'comment_manage')
|
||||
echo ' <button class="medium white-blue" onClick="closeCommentQtip(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
|
||||
else
|
||||
echo ' <button class="medium white-blue" onClick="toggleAddComment(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
|
||||
if($_GET['a'] == 'comment_manage')
|
||||
echo ' <button class="medium white-blue" onClick="closeCommentQtip(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
|
||||
else
|
||||
echo ' <button class="medium white-blue" onClick="toggleAddComment(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
|
||||
|
||||
echo ' <button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) {
|
||||
echo '<div class="comment_bottom">';
|
||||
|
||||
// Link na pregled splosnih komentarjev
|
||||
echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=komentarji_anketa" class="noline">'.$lang['srv_comment_overview'].'</a>';
|
||||
|
||||
// Link na nastavitve komentarjev
|
||||
echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$this->anketa.'&a=urejanje" class="noline">'.$lang['settings'].'</a>';
|
||||
|
||||
echo ' <button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -332,13 +332,13 @@ class SurveyAdmin
|
||||
echo '<div id="anketa">';
|
||||
|
||||
// breadcrumbs
|
||||
echo '<div class="breadcrumbs displayNone">'; //Začasno skriti breadcrumbs, dokler se ne uredi css @TGx
|
||||
echo '<div class="breadcrumbs">';
|
||||
|
||||
if ((isset($_GET['a']) && $this->first_action == 'NAVI_STATUS')? $breadcrumbs_a = '_' . $_GET['a'] : $breadcrumbs_a = '');
|
||||
if ((isset($_GET['m']) && $this->first_action == 'NAVI_ANALYSIS' && $_GET['m'] == 'charts')? $breadcrumbs_m = '_' . $_GET['m'] : $breadcrumbs_m = '');
|
||||
|
||||
echo $lang['navigation_'.$this->first_action] . ' > ' . $lang['navigation_'.$this->second_action.$breadcrumbs_a.$breadcrumbs_m];
|
||||
if (isset($this->third_action)) {
|
||||
if (isset($this->third_action) && $this->third_action != '') {
|
||||
echo ' > '.$lang['navigation_'.$this->third_action];
|
||||
}
|
||||
//echo '<br>'.$this->first_action .' > '.$this->second_action. ' > '.$this->third_action;
|
||||
@ -747,17 +747,17 @@ class SurveyAdmin
|
||||
global $site_url;
|
||||
|
||||
// Logo glede na jezik in namestitev
|
||||
if(isLastnaInstalacija() || isVirtual())
|
||||
$logo_class = ' class="namestitev"';
|
||||
elseif($lang['id'] != "1")
|
||||
$logo_class = ' class="english"';
|
||||
else
|
||||
$logo_class = '';
|
||||
$logo_class = '';
|
||||
|
||||
if(isLastnaInstalacija() || isVirtual() || isAAI())
|
||||
$logo_class = 'namestitev';
|
||||
|
||||
if($lang['id'] != "1")
|
||||
$logo_class .= ' english';
|
||||
|
||||
$url = ($site_url == "https://www.1ka.si/" && $lang['id'] != "1") ? "https://www.1ka.si/d/en/" : $site_url;
|
||||
|
||||
echo '<div id="logo_holder" '.$logo_class.'>';
|
||||
echo '<div id="logo_holder" class="'.$logo_class.'">';
|
||||
echo ' <a href="'.$url.'" title="'.$lang['srv_1cs'].'"></a>';
|
||||
echo '</div>';
|
||||
}
|
||||
@ -1396,20 +1396,89 @@ class SurveyAdmin
|
||||
) {
|
||||
echo '<li>';
|
||||
echo '<div id="quick_comments_link" class="newCss">';
|
||||
|
||||
$comment_count = $sas->testiranje_komentarji_count();
|
||||
$nereseno = ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']) + $comment_count['question']['unresolved'];
|
||||
|
||||
if($userAccess->checkUserAccess('komentarji')){
|
||||
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
|
||||
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
|
||||
else
|
||||
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
|
||||
if ($nereseno > 0) {
|
||||
|
||||
if ($nereseno > 99)
|
||||
$nereseno = '99+';
|
||||
|
||||
echo '<div class="fa-stack has_comment"><span class="faicon comments" id="nereseno" onclick="toggleCommentDropdown(); return false;">';
|
||||
echo '<span class="comment_number">'.$nereseno.'</span>';
|
||||
|
||||
}
|
||||
else {
|
||||
echo '<div class="fa-stack" ><span class="faicon comments" id="vkljuceno" onclick="toggleCommentDropdown(); return false;">';
|
||||
}
|
||||
}
|
||||
else{
|
||||
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
|
||||
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
|
||||
if ($nereseno > 0)
|
||||
echo '<div class="fa-stack"><span class="faicon comments icon-orange fa-stack-1x user_access_locked">';
|
||||
else
|
||||
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
|
||||
echo '<div class="fa-stack"><span class="faicon comments user_access_locked">';
|
||||
}
|
||||
|
||||
echo '</span></div>'; //zaključi ikono
|
||||
|
||||
//dropdown na klik ikone
|
||||
echo '<div id="comment_dropdown" class="displayNone">';
|
||||
|
||||
echo '<div class="comment_dropdown_top">';
|
||||
|
||||
echo '<div class="title">';
|
||||
echo '<span class="faicon comment_dropdown"></span>';
|
||||
echo $lang['comments'];
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="settings">';
|
||||
echo '<span class="faicon wheel_32"></span>';
|
||||
echo '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
$comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;';
|
||||
echo '<div class="links" onclick="'.$comment_link.'">';
|
||||
echo $lang['srv_testiranje_komentarji_anketa_overview'];
|
||||
echo ' (<span class="red">' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //nerešeni
|
||||
echo '</span>/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']) . ')'; //vsi
|
||||
echo '<span class="faicon fa-angle-right"></span>';
|
||||
echo '</div>';
|
||||
|
||||
$comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;';
|
||||
echo '<div class="links" onclick="'.$comment_link.'">';
|
||||
echo $lang['srv_testiranje_komentarji_overview'];
|
||||
echo ' (<span class="red">' . $comment_count['question']['unresolved'];
|
||||
echo '</span>/' . $comment_count['question']['all'] . ')';
|
||||
echo '<span class="faicon fa-angle-right"></span>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="first_holder_div" id="survey_comment_0_1">';
|
||||
$ba = new BranchingAjax($this->anketa);
|
||||
$ba->add_comment_field(0, '0', '1', false, false);
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="small white-blue" onclick="toggleCommentDropdown(); return false;">'.$lang['edit1338'].'</button>';
|
||||
echo '<button class="small blue" onclick="add_comment(\'0\', \'0\', \'1\', $(\'#vsebina_0_1\').val()); actionNotePopup(\'comment_added\', \'success\');return false;">'.$lang['srv_comments_new'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; //comment_dropdown
|
||||
|
||||
// Klik izven - zapremo dropdown
|
||||
echo '<script>
|
||||
$(document).mouseup(function(e){
|
||||
var container = $("#comment_dropdown");
|
||||
|
||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||
$("#comment_dropdown").addClass("displayNone");
|
||||
}
|
||||
});
|
||||
</script>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</li>';
|
||||
}
|
||||
@ -1420,24 +1489,27 @@ class SurveyAdmin
|
||||
|
||||
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
|
||||
|
||||
if($userAccess->checkUserAccess('komentarji'))
|
||||
echo '<a href="' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_preview_comments'] . '">';
|
||||
else
|
||||
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
|
||||
|
||||
echo '</span></div></a>';
|
||||
if($userAccess->checkUserAccess('komentarji')) {
|
||||
$comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on\'; return false;';
|
||||
echo '<div class="fa-stack inactive_comments" onclick="'.$comment_link.'"><span class="faicon comments" title="' . $lang['srv_preview_comments'] . '">';
|
||||
}
|
||||
else {
|
||||
$comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=urejanje\'; return false;';
|
||||
echo '<div class="fa-stack" onclick="'.$comment_link.'"><span class="faicon comments user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
|
||||
}
|
||||
echo '</span></div>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</li>';
|
||||
}
|
||||
|
||||
if (($admin_type <= $survey_comment && $survey_comment != '') || $sas->testiranje_komentarji_komentarji_na_anketo(false) > 0) {
|
||||
/*if (($admin_type <= $survey_comment && $survey_comment != '') || $sas->testiranje_komentarji_komentarji_na_anketo(false) > 0) {
|
||||
echo '<li>';
|
||||
echo '<div id="quick_comments_link" class="newCss">';
|
||||
$this->survey_icon_add_comment();
|
||||
echo '</div>';
|
||||
echo '</li>';
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
echo '</ol>';
|
||||
@ -1972,9 +2044,6 @@ class SurveyAdmin
|
||||
elseif($_GET['a'] == 'nonresponse_graph'){
|
||||
$podstran = 'para_analysis_graph';
|
||||
}
|
||||
elseif($_GET['a'] == 'status_advanced'){
|
||||
$podstran = 'status_advanced';
|
||||
}
|
||||
|
||||
// Izrisemo ustrezen meni, ce je prisoten
|
||||
if($podstran != ''){
|
||||
@ -2094,9 +2163,9 @@ class SurveyAdmin
|
||||
|
||||
// Imamo levi meni
|
||||
if($this->layout_menu == 'menu_left'){
|
||||
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
// Prikazemo meni na levi po potrebi glede na podstran
|
||||
echo '<div class="layout_left_item">';
|
||||
echo '<div class="layout_left_item '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').'">';
|
||||
$this->displayLeftMenu();
|
||||
echo '</div>';
|
||||
|
||||
@ -2210,8 +2279,8 @@ class SurveyAdmin
|
||||
|
||||
// Prikazemo levi meni po potrebi
|
||||
private function displayLeftMenu(){
|
||||
global $lang;
|
||||
|
||||
global $lang, $global_user_id;
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
$hierarhija_type = (!empty($_SESSION['hierarhija'][$this->anketa]['type']) ? $_SESSION['hierarhija'][$this->anketa]['type'] : null);
|
||||
|
||||
// Levi meni v nastavitvah ankete
|
||||
@ -2226,6 +2295,7 @@ class SurveyAdmin
|
||||
|| $_GET['a'] == 'forma'
|
||||
|| $_GET['a'] == 'metadata'
|
||||
|| $_GET['a'] == 'mobile_settings'
|
||||
|| $_GET['a'] == 'table_settings'
|
||||
|| $_GET['a'] == A_PRIKAZ
|
||||
|| $_GET['a'] == A_MISSING
|
||||
|| $_GET['a'] == A_SKUPINE
|
||||
@ -2308,8 +2378,7 @@ class SurveyAdmin
|
||||
// Arhiv levi meni
|
||||
elseif(in_array($_GET['a'], ['arhivi', 'tracking', 'tracking-hierarhija']) || in_array($_GET['m'], ['anal_arch', 'view_archive'])){
|
||||
|
||||
echo '<span class="menu_left-title">'.$lang['srv_arhivi'].'</span>';
|
||||
|
||||
echo '<span class="menu_left-title title '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').'">'.$lang['srv_arhivi'].'</span>';
|
||||
|
||||
echo '<div id="globalSetingsLinks" class="globalSetingsLinks archive">';
|
||||
$SSH = new SurveyStaticHtml($this->anketa);
|
||||
@ -2554,6 +2623,7 @@ class SurveyAdmin
|
||||
|| $_GET['a'] == 'forma'
|
||||
|| $_GET['a'] == 'metadata'
|
||||
|| $_GET['a'] == 'mobile_settings'
|
||||
|| $_GET['a'] == 'table_settings'
|
||||
|| $_GET['a'] == A_PRIKAZ
|
||||
|| $_GET['a'] == A_EXPORTSETTINGS
|
||||
|| $_GET['a'] == A_GDPR
|
||||
@ -2634,10 +2704,12 @@ class SurveyAdmin
|
||||
private function displayAnketaTabTestiranje(){
|
||||
if ($_GET['a'] == 'komentarji') {
|
||||
$sas = new SurveyAdminSettings();
|
||||
$sas->menu_komentarji();
|
||||
$sas->testiranje_komentarji();
|
||||
}
|
||||
elseif ($_GET['a'] == 'komentarji_anketa') {
|
||||
$sas = new SurveyAdminSettings();
|
||||
$sas->menu_komentarji();
|
||||
$sas->testiranje_komentarji_anketa();
|
||||
}
|
||||
elseif (trim($_GET['m']) == '' || $_GET['m'] == 'diagnostika') {
|
||||
@ -2920,22 +2992,18 @@ class SurveyAdmin
|
||||
|
||||
if ($_GET['m'] == 'data') {
|
||||
$sas->arhivi_data();
|
||||
|
||||
}
|
||||
else if ($_GET['m'] == 'testdata') {
|
||||
$sas->arhivi_testdata();
|
||||
|
||||
}
|
||||
else if ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') {
|
||||
$sas->arhivi_survey();
|
||||
|
||||
}
|
||||
else if ($_GET['a'] == 'tracking') {
|
||||
if($_GET['d'] == 'download')
|
||||
return TrackingClass::init()->filter([20,21,22])->csvExport();
|
||||
|
||||
TrackingClass::init()->filter([20,21,22])->trackingDisplay();
|
||||
|
||||
}
|
||||
else if ($_GET['a'] == 'tracking-hierarhija') {
|
||||
if($_GET['m'] == 'udelezenci') {
|
||||
@ -3123,10 +3191,15 @@ class SurveyAdmin
|
||||
echo '<li ' . ($get == A_SETTINGS || $get == A_OSNOVNI_PODATKI ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_OSNOVNI_PODATKI . '" title="' . $lang['srv_osnovniPodatki2'] . '">' . $lang['srv_osnovniPodatki2'] . '</a></li> ';
|
||||
|
||||
# prikaz pri mobilnikih
|
||||
echo '<li ' . ($get == A_MOBILESETTINGS ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_MOBILESETTINGS . '" title="' . $lang['srv_mobile_settings'] . '">' . $lang['srv_mobile_settings'] . '</a></li> ';
|
||||
# prikaz pri mobilnikih - tega zaenkrat nimamo vec, mogoce s bo v prihodnosti se rabilo za kaksne dodatne nastavitve. zaenkrat so tabele v locenem razdelku, slike pa itak vedno prikazujemo
|
||||
/*echo '<li ' . ($get == A_MOBILESETTINGS ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_MOBILESETTINGS . '" title="' . $lang['srv_mobile_settings'] . '">' . $lang['srv_mobile_settings'] . '</a></li> ';*/
|
||||
|
||||
# prikaz tabel
|
||||
echo '<li ' . ($get == A_TABLESETTINGS ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_TABLESETTINGS . '" title="' . $lang['srv_table_settings'] . '">' . $lang['srv_table_settings'] . '</a></li> ';
|
||||
|
||||
|
||||
# prevajanje - jezik (standardne besede)
|
||||
echo '<li ' . ($get == A_JEZIK ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_JEZIK . '" title="' . $lang['srv_standardne_besede'] . '">' . $lang['srv_standardne_besede'] . '</a></li> ';
|
||||
@ -3222,7 +3295,7 @@ class SurveyAdmin
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_TEMA . '" title="' . $lang['srv_themes'] . '">' . $lang['srv_themes'] . '</a></li> ';
|
||||
|
||||
# jezik
|
||||
echo '<li ' . ($get == A_PREVAJANJE ? 'class="active"' : '') . '>';
|
||||
echo '<li id="jezik" ' . ($get == A_PREVAJANJE ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_PREVAJANJE . '" title="' . $lang['lang'] . '">' . $lang['lang'] . '</a></li> ';
|
||||
|
||||
# arhivi
|
||||
@ -3460,8 +3533,11 @@ class SurveyAdmin
|
||||
private function displaySeznamAnket(){
|
||||
global $lang, $site_url, $global_user_id, $admin_type, $site_domain;
|
||||
|
||||
|
||||
# naložimo razred z seznamom anket
|
||||
$SL = new SurveyList();
|
||||
$SL = ($has_folders = SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
|
||||
$SLCount = $SL->countSurveys();
|
||||
$SLCountPhone = $SL->countPhoneSurveys();
|
||||
|
||||
@ -3546,6 +3622,9 @@ class SurveyAdmin
|
||||
elseif($_GET['m'] == 'all'){
|
||||
$sas->allUsersList();
|
||||
}
|
||||
elseif($_GET['m'] == 'add'){
|
||||
$sas->dodeljeniUporabniki();
|
||||
}
|
||||
else {
|
||||
$sas->assignedUsersList();
|
||||
}
|
||||
@ -3629,6 +3708,10 @@ class SurveyAdmin
|
||||
$sas = new SurveyAdminSettings();
|
||||
$sas->globalUserMyProfile();
|
||||
}
|
||||
if ($_GET['m'] == 'global_user_ChangeArchive') {
|
||||
$sas = new SurveyAdminSettings();
|
||||
$sas->globalUserChangeArchive();
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
@ -4118,86 +4201,280 @@ class SurveyAdmin
|
||||
$lan_ppt = ' title="' . $lang['PPT_Izpis'] . '"';
|
||||
|
||||
if ($_GET['m'] == M_ANALYSIS_DESCRIPTOR) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_ANALYSIS . '\',\'' . M_ANALYSIS_DESCRIPTOR . '\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span>' . $lang['srv_export_hover_public'] . '</a>';
|
||||
echo '<a href="#" onclick="doArchiveAnaliza();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Opisne statistike\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_xls&anketa=' . $this->anketa) . '" target="_blank"' . $lan_xls . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_FREQUENCY) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_ANALYSIS . '\',\'' . M_ANALYSIS_FREQUENCY . '\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span>' . $lang['srv_export_hover_public'] . '</a>';
|
||||
echo '<a href="#" onclick="doArchiveAnaliza();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Frekvence\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_xls&anketa=' . $this->anketa) . '" target="_blank"' . $lan_xls . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_SUMMARY) {
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_ANALYSIS . '\',\'' . M_ANALYSIS_SUMMARY . '\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span>' . $lang['srv_export_hover_public'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_ANALYSIS . '\',\'' . M_ANALYSIS_SUMMARY . '\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span><div class="hover_export_text">' . $lang['srv_export_hover_public'] . '</div></a>';
|
||||
echo '<a href="#" onclick="doArchiveAnaliza();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_xls&anketa=' . $this->anketa) . '" target="_blank"' . $lan_xls . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_CROSSTAB) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="doArchiveCrosstab();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveCrosstabBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Crosstab\'); return false;"' . $lan_print . ' class="srv_ico hidden"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" id="crosstabDoPdf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_crosstabs') ? 'user_access_locked' : '').' hidden" user-access="analysis_crosstabs"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="#" id="crosstabDoRtf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_crosstabs') ? 'user_access_locked' : '').' hidden" user-access="analysis_crosstabs"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="#" id="crosstabDoXls" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_crosstabs') ? 'user_access_locked' : '').' hidden" user-access="analysis_crosstabs"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_MULTICROSSTABS) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'MultiCrosstab\'); return false;"' . $lan_print . ' class="srv_ico hidden"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" id="multicrosstabDoPdf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_multicrosstabs') ? 'user_access_locked' : '').' hidden" user-access="analysis_multicrosstabs"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="#" id="multicrosstabDoRtf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_multicrosstabs') ? 'user_access_locked' : '').' hidden" user-access="analysis_multicrosstabs"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="#" id="multicrosstabDoXls" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_multicrosstabs') ? 'user_access_locked' : '').' hidden" user-access="analysis_multicrosstabs"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_CHARTS) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_ANALYSIS . '\',\'' . M_ANALYSIS_CHARTS . '\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span>' . $lang['srv_export_hover_public'] . '</a>';
|
||||
echo '<a href="#" onclick="doArchiveChart();" title="' . $lang['srv_analiza_arhiviraj_ttl'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveChartBeforeEmail();" title="' . $lang['srv_analiza_arhiviraj_email_ttl'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Grafi\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_ppt&anketa=' . $this->anketa) . '" target="_blank"' . $lan_ppt . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon ppt black"></span></span>' . $lang['srv_export_hover_ppt'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_MEANS) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="doArchiveMeans();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveMeansBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Means\'); return false;"' . $lan_print . ' class="srv_ico hidden"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" id="meansDoPdf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_means') ? 'user_access_locked' : '').' hidden" user-access="analysis_means"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="#" id="meansDoRtf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_means') ? 'user_access_locked' : '').' hidden" user-access="analysis_means"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="#" id="meansDoXls" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_means') ? 'user_access_locked' : '').' hidden" user-access="analysis_means"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_TTEST) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="doArchiveTTest();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveTTestBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'TTest\'); return false;"' . $lan_print . ' class="srv_ico hidden"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" id="ttestDoPdf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_ttest') ? 'user_access_locked' : '').' hidden" user-access="analysis_ttest"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="#" id="ttestDoRtf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_ttest') ? 'user_access_locked' : '').' hidden" user-access="analysis_ttest"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="#" id="ttestDoXls" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_ttest') ? 'user_access_locked' : '').' hidden" user-access="analysis_ttest"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_BREAK) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="doArchiveBreak();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveBreakBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'Break\'); return false;"' . $lan_print . ' class="srv_ico hidden"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" id="breakDoPdf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_break') ? 'user_access_locked' : '').' hidden" user-access="analysis_break"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="#" id="breakDoRtf" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_break') ? 'user_access_locked' : '').' hidden" user-access="analysis_break"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
echo '<a href="#" id="breakDoXls" target="_blank" class="srv_ico '.(!$userAccess->checkUserAccess('analysis_break') ? 'user_access_locked' : '').' hidden" user-access="analysis_break"><span class="hover_export_icon"><span class="faicon xls black very_large"></span></span>' . $lang['srv_export_hover_xls'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['m'] == M_ANALYSIS_CREPORT) {
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_ANALYSIS . '\',\'' . M_ANALYSIS_CREPORT . '\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span>' . $lang['srv_export_hover_public'] . '</a>';
|
||||
echo '<a href="#" onclick="doArchiveCReport();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
|
||||
echo '<a href="#" onclick="createArchiveCReportBeforeEmail();"' . $lan_archive_send . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv_mail black very_large"></span></span>' . $lang['srv_export_hover_archive_mail'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle_no_lock">';
|
||||
}
|
||||
echo '<a href="#" onClick="printAnaliza(\'CReport\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=creport_pdf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=creport_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
else if ($_GET['a'] == A_COLLECT_DATA) {
|
||||
echo '<a href="#" onclick="showSurveyUrlLinks(\'' . A_COLLECT_DATA . '\',\'\');" class="srv_ico '.(!$userAccess->checkUserAccess('public_link') ? 'user_access_locked' : '').'" user-access="public_link" title="' . $lang['srv_export_hover_public2'] . '"><span class="hover_export_icon"><span class="faicon data_link very_large"></span></span>' . $lang['srv_export_hover_public'] . '</a>';
|
||||
@ -4238,6 +4515,11 @@ class SurveyAdmin
|
||||
else {
|
||||
if ($this->first_action == NAVI_UREJANJE || $_GET['a'] == '' || $_GET['a'] == 'reporti') {
|
||||
if ($_GET['a'] == '' || $_GET['a'] == 'branching') {
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '<div id="hover_export_rectangle">';
|
||||
}
|
||||
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_pdf&anketa=' . $this->anketa . '&type=1') . '" target="_blank" title="' . $lang['PDF_Izpis'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('export') ? 'user_access_locked' : '').'"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
|
||||
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_rtf&anketa=' . $this->anketa . '&type=1') . '" target="_blank" title="' . $lang['RTF_Izpis'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('export') ? 'user_access_locked' : '').'"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
|
||||
|
||||
@ -4249,6 +4531,10 @@ class SurveyAdmin
|
||||
if ($row['multilang'] == 1 && $full_view) {
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" title="' . $lang['srv_prevajanje'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('export') ? 'user_access_locked' : '').'"><span class="hover_export_icon"><span class="sprites book"></span></span></a>';
|
||||
}
|
||||
|
||||
if($userAccess->checkUserAccess('export') == ''){
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
if ($_GET['a'] == 'reporti') {
|
||||
@ -4334,7 +4620,7 @@ class SurveyAdmin
|
||||
if($userAccess->checkUserAccess('komentarji')){
|
||||
echo '<a href="#" onclick="return false;" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
|
||||
|
||||
echo '<div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
|
||||
//echo '<div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
|
||||
|
||||
// ali prikazemo okno odprto - je dodan tak admin komentar
|
||||
$sqlf1 = sisplet_query("SELECT id FROM post p WHERE p.tid='$row[thread]' AND p.ocena='5'");
|
||||
@ -4830,6 +5116,10 @@ class SurveyAdmin
|
||||
|
||||
$rowg = Cache::srv_spremenljivka($spremenljivka);
|
||||
|
||||
// Preden vprasanje zbrisemo po novem ustvarimo kopijo vprasanja med zbrisanimi (knjiznica zbrisanih vprasanj)
|
||||
$vd = new VprasanjeDeleted($this->anketa);
|
||||
$vd->createDeletedVprasanje($spremenljivka);
|
||||
|
||||
// pri brisanju multiple grid vprasanja, moramo pobrisate tudi vse child spremenljivke (ker kljuci niso nastavljeni)
|
||||
if ($rowg['tip'] == 24) {
|
||||
$sqld = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka'");
|
||||
|
||||
@ -933,6 +933,10 @@ class SurveyAdminAjax {
|
||||
if (isset($_POST['mobile_tables'])) {
|
||||
SurveySetting::getInstance()->setSurveyMiscSetting('mobile_tables', $_POST['mobile_tables']);
|
||||
}
|
||||
|
||||
if (isset($_POST['pc_tables'])) {
|
||||
SurveySetting::getInstance()->setSurveyMiscSetting('pc_tables', $_POST['pc_tables']);
|
||||
}
|
||||
|
||||
if (isset($_POST['export_font_size'])) {
|
||||
SurveySetting::getInstance()->setSurveyMiscSetting('export_font_size', $_POST['export_font_size']);
|
||||
@ -4083,13 +4087,17 @@ class SurveyAdminAjax {
|
||||
// shranimo nastavitve
|
||||
UserSetting::getInstance()->saveUserSetting();
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL->getSurveys();
|
||||
}
|
||||
elseif ($_GET['a'] == 'surveyListFilter') {
|
||||
// setiramo nastavitve v UserSetting
|
||||
$SL = new SurveyList();
|
||||
$SL -> setFilter();
|
||||
|
||||
// setiramo nastavitve v UserSetting
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL->setFilter();
|
||||
|
||||
$SL->getSurveys();
|
||||
}
|
||||
elseif ($_GET['a'] == 'default_surveyListSettings') {
|
||||
@ -4116,8 +4124,10 @@ class SurveyAdminAjax {
|
||||
if ($_POST['sortby'] != "" )
|
||||
UserSetting::getInstance()->setUserSetting('survey_list_order_by', $_POST['sortby']. ",".$_POST['sorttype']);
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL->saveCssSettings($_POST['data']);
|
||||
|
||||
$SL->getSurveys();
|
||||
}
|
||||
elseif ($_GET['a'] == 'surveyList_goTo') {
|
||||
@ -4126,7 +4136,7 @@ class SurveyAdminAjax {
|
||||
UserSetting::getInstance()->setUserSetting('survey_list_order_by', $_POST['sortby']. ",".$_POST['sorttype']);
|
||||
UserSetting::getInstance()->saveUserSetting();
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
$SL->getSurveys();
|
||||
|
||||
}
|
||||
@ -4137,37 +4147,37 @@ class SurveyAdminAjax {
|
||||
UserSetting::getInstance()->setUserSetting('survey_list_folders', $val);
|
||||
UserSetting::getInstance()->saveUserSetting();
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
$SL->getSurveys();
|
||||
|
||||
}
|
||||
elseif ($_GET['a'] == 'surveyList_user') {
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL -> setUserId();
|
||||
$SL->getSurveys();
|
||||
|
||||
}
|
||||
elseif ($_GET['a'] == 'surveyList_language') {
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL -> setUserLanguage();
|
||||
$SL->getSurveys();
|
||||
|
||||
}
|
||||
elseif ($_GET['a'] == 'surveyList_gdpr') {
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL -> setUserGDPR();
|
||||
$SL->getSurveys();
|
||||
|
||||
}
|
||||
elseif ($_GET['a'] == 'surveyList_library') {
|
||||
|
||||
$SL = new SurveyList();
|
||||
$SL = (SurveyList::hasFolders()) ? new SurveyListFolders() : new SurveyList();
|
||||
|
||||
$SL -> setUserLibrary();
|
||||
$SL->getSurveys();
|
||||
|
||||
}
|
||||
elseif ($_GET['a'] == 'survey_chaneg_type') {
|
||||
global $site_url;
|
||||
@ -4325,6 +4335,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">';
|
||||
@ -4336,23 +4414,7 @@ class SurveyAdminAjax {
|
||||
echo ' <div class="clr"></div>';
|
||||
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();
|
||||
|
||||
@ -4704,13 +4766,18 @@ class SurveyAdminAjax {
|
||||
sisplet_query("UPDATE srv_user SET deleted = '1', time_edit = NOW() WHERE id = '$usr_id'");
|
||||
sisplet_query('COMMIT');
|
||||
|
||||
// Pobrišemo vse datoteke
|
||||
$SDF = SurveyDataFile::get_instance();
|
||||
$SDF->init($this->anketa);
|
||||
$SDF->clearFiles();
|
||||
|
||||
echo '0';
|
||||
}
|
||||
else {
|
||||
echo 'Error: Invalid user ID!';
|
||||
}
|
||||
|
||||
} elseif ($_GET['a'] == 'dataDeleteMultipleRow') { // V DELU...
|
||||
} elseif ($_GET['a'] == 'dataDeleteMultipleRow') {
|
||||
|
||||
// ulovimo json objekt z userji za brisanje
|
||||
if ( is_array($_POST['users']) && count($_POST['users']) > 0 ) {
|
||||
@ -4723,6 +4790,11 @@ class SurveyAdminAjax {
|
||||
|
||||
sisplet_query("UPDATE srv_user SET deleted = '1', time_edit = NOW() WHERE id IN (".$users.")");
|
||||
sisplet_query('COMMIT');
|
||||
|
||||
// Pobrišemo vse datoteke
|
||||
$SDF = SurveyDataFile::get_instance();
|
||||
$SDF->init($this->anketa);
|
||||
$SDF->clearFiles();
|
||||
}
|
||||
|
||||
} elseif ($_GET['a'] == 'dataCopyRow') {
|
||||
@ -4856,10 +4928,39 @@ class SurveyAdminAjax {
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$f = new Forum();
|
||||
$vsebina = $row['vsebina'].'<blockquote style="margin-left:20px"><b>'.$f->user($global_user_id).'</b> ('.$f->datetime1(date('Y-m-d h:i:s')).'):<br />'.$vsebina.'</blockquote>';
|
||||
$vsebina = $row['vsebina'].'<blockquote><span class="semi-bold">'.$f->user($global_user_id).'</span> <span class="gray">('.$f->datetime1(date('Y-m-d h:i:s')).')</span><div class="answer">'.$vsebina.'</div></blockquote>';
|
||||
|
||||
sisplet_query("UPDATE post SET vsebina='$vsebina' WHERE id='$id'");
|
||||
|
||||
} elseif ($_GET['a'] == 'comment_delete') {
|
||||
$id = $_POST['id'];
|
||||
|
||||
if (isset($_POST['id']) && $_POST['id'] != "" && $_POST['id'] > 0) {
|
||||
$id = $_POST['id'];
|
||||
$sql = sisplet_query("DELETE FROM post WHERE id='$id'");
|
||||
}
|
||||
} elseif ($_GET['a'] == 'respondent_comment_delete') {
|
||||
$id = $_POST['id'];
|
||||
|
||||
if (isset($_POST['id']) && $_POST['id'] != "" && $_POST['id'] > 0) {
|
||||
$id = $_POST['id'];
|
||||
$sql = sisplet_query("DELETE FROM srv_data_text_active WHERE id='$id'");
|
||||
}
|
||||
} elseif ($_GET['a'] == 'survey_respondent_comment_delete') {
|
||||
$id = $_POST['id'];
|
||||
|
||||
if (isset($_POST['id']) && $_POST['id'] != "" && $_POST['id'] > 0) {
|
||||
$id = $_POST['id'];
|
||||
$sql = sisplet_query("DELETE FROM srv_comment_resp WHERE id='$id'");
|
||||
}
|
||||
} elseif ($_GET['a'] == 'survey_comment_delete') {
|
||||
$id = $_POST['id'];
|
||||
|
||||
if (isset($_POST['id']) && $_POST['id'] != "" && $_POST['id'] > 0) {
|
||||
$id = $_POST['id'];
|
||||
$sql = sisplet_query("DELETE FROM post WHERE id='$id'");
|
||||
}
|
||||
|
||||
} elseif ($_GET['a'] == 'archivePopup') {
|
||||
echo '<div class="survey_archive_popup">';
|
||||
$sas = new SurveyAdminSettings();
|
||||
@ -7265,6 +7366,33 @@ class SurveyAdminAjax {
|
||||
echo '<button class="medium blue" onclick="create_archive_survey(\'' . $this->anketa .'\'); return false;">'.$lang['srv_backup_button'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
private function ajax_show_gdpr_messeage(){
|
||||
global $lang;
|
||||
|
||||
$id_sporocila = $_POST['id_sporocila'];
|
||||
|
||||
$sql = sisplet_query("SELECT text FROM srv_gdpr_requests WHERE id = '".$id_sporocila."'");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
echo '<h2><span class="faicon envelope"></span>'.$lang['srv_gdpr_requests_text'].'</h2>';
|
||||
|
||||
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';
|
||||
|
||||
|
||||
echo '<div class="popup_content">';
|
||||
echo '<p class="bottom16"> '.$row['text'].'</p>';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo '<button class="medium blue" onClick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
File diff suppressed because it is too large
Load Diff
@ -95,6 +95,12 @@ elseif ($_GET['t'] == 'vprasanjeinline') {
|
||||
$v = new VprasanjeInline();
|
||||
$v->ajax();
|
||||
}
|
||||
elseif ($_GET['t'] == 'vprasanjeDeleted') {
|
||||
$tracking_status = 0;
|
||||
|
||||
$vd = new VprasanjeDeleted($anketa);
|
||||
$vd->ajax();
|
||||
}
|
||||
elseif ($_GET['t'] == 'prevajanje') {
|
||||
$tracking_status = 0;
|
||||
|
||||
@ -502,6 +508,10 @@ elseif ($_GET['t'] == 'surveyList') {
|
||||
$SL = new SurveyList();
|
||||
$SL->Ajax();
|
||||
}
|
||||
elseif ($_GET['t'] == 'surveyListFolders') {
|
||||
$SL = new SurveyListFolders();
|
||||
$SL->ajax();
|
||||
}
|
||||
elseif ($_GET['t'] == 'library') {
|
||||
$l = new Library();
|
||||
$l->ajax();
|
||||
@ -665,6 +675,13 @@ elseif ($_GET['t'] == 'evoliTM') {
|
||||
$evoliTM = new SurveyTeamMeter($anketa);
|
||||
$evoliTM->ajax();
|
||||
}
|
||||
elseif ($_GET['t'] == 'kolektor') {
|
||||
$tracking_status = -1;
|
||||
|
||||
// Modul za kolektor
|
||||
$kolektor = new Kolektor();
|
||||
$kolektor->ajax();
|
||||
}
|
||||
/**************** UNKNOWN, NAPREDNI MODULI - END ****************/
|
||||
|
||||
|
||||
|
||||
@ -8,26 +8,30 @@
|
||||
|
||||
// Nastavimo url api-ja
|
||||
//$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
|
||||
//$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
|
||||
|
||||
// Nastavimo identifier in key userja
|
||||
$identifier = 'a1c3b90fdae3c45d';
|
||||
$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';
|
||||
/*$identifier = 'a1c3b90fdae3c45d';
|
||||
$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';*/
|
||||
|
||||
$api_url = 'http://localhost/admin/survey/api/api.php';
|
||||
$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
|
||||
$identifier = '3ccc9cbc90493d09';
|
||||
$private_key = 'b8dbeceed3d0d7f80ca5d82ba352d9696c1804ff9b9d45272b8e99ea0a4987d6';
|
||||
|
||||
/*$api_url = 'http://localhost/admin/survey/api/api.php';
|
||||
$identifier = '0d712128f7fe5707';
|
||||
$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';
|
||||
$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';*/
|
||||
|
||||
|
||||
// Nastavimo parametre
|
||||
//$ank_id = '8086';
|
||||
$ank_id = '384751';
|
||||
//$action = 'getSurveyQuestions';
|
||||
$action = 'createSurvey';
|
||||
//$action = 'createSurvey';
|
||||
$action = 'getSurveyResponseData';
|
||||
|
||||
|
||||
// Izvedemo klic (GET ali POST)
|
||||
//$result = executeGET();
|
||||
$result = executePOST();
|
||||
//$result = executePOST();
|
||||
|
||||
|
||||
|
||||
@ -55,6 +59,7 @@ function executeGET(){
|
||||
// GET params
|
||||
$params = 'action='.$action; // Funkcija, ki jo želimo izvesti
|
||||
$params .= '&ank_id='.$ank_id; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
|
||||
$params .= '&usr_id=50666962'; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
|
||||
|
||||
// Pripravimo podatke za hashiranje
|
||||
$request_method = 'GET';
|
||||
|
||||
@ -2199,9 +2199,9 @@ class Common {
|
||||
|
||||
// Logo
|
||||
if($lang['id'] == '1')
|
||||
$signature .= '<img src="https://www.1ka.si/public/img/logo/1ka_slo.png" width=90 style="width:90px; height:auto; border:0;" />';
|
||||
$signature .= '<img src="https://www.1ka.si/public/img/logo/1ka_logo_slo.svg" width=90 style="width:90px; height:auto; border:0;" />';
|
||||
else
|
||||
$signature .= '<img src="https://www.1ka.si/public/img/logo/1ka_eng.png" width=90 style="width:90px; height:auto; border:0;" />';
|
||||
$signature .= '<img src="https://www.1ka.si/public/img/logo/1ka_logo_eng.svg" width=90 style="width:90px; height:auto; border:0;" />';
|
||||
|
||||
$signature .= '<br/>-------------------------------------------------------------------<br/>';
|
||||
|
||||
|
||||
@ -1201,8 +1201,9 @@ class Dostop {
|
||||
" WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
|
||||
|
||||
// Filtri, ki jih datatables pošilja in po katerih filtriramo
|
||||
if($_POST['order'][0]['column'] < 12) {
|
||||
if($_POST['order'][0]['column'] < 13) {
|
||||
$orderPolje = [
|
||||
"u.name",
|
||||
"u.name ".$_POST['order'][0]['dir'].", u.surname",
|
||||
"u.email",
|
||||
"u.type",
|
||||
@ -1328,8 +1329,9 @@ class Dostop {
|
||||
|
||||
|
||||
// Filtri, ki jih datatables pošilja in po katerih filtriramo
|
||||
if($_POST['order'][0]['column'] < 10) {
|
||||
if($_POST['order'][0]['column'] < 11) {
|
||||
$orderPolje = [
|
||||
"u.name",
|
||||
"u.name ".$_POST['order'][0]['dir'].", u.surname",
|
||||
"u.email",
|
||||
"u.type",
|
||||
|
||||
@ -55,44 +55,87 @@ class GDPR{
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
$survey_list = array();
|
||||
$survey_list = $this->getUserSurveys();
|
||||
|
||||
// Dobimo seznam vseh anket in stevilke
|
||||
list($survey_list, $survey_count) = $this->getUserSurveys();
|
||||
|
||||
|
||||
echo '<fieldset>';
|
||||
echo '<legend>'.$lang['srv_anketalist'].'</legend>';
|
||||
// 3 boxi na vrhu za filtriranje tabele (gdpr ankete, ne-gdpr ankete, potencialno gdpr ankete)
|
||||
echo '<div class="gdpr-box-container">';
|
||||
|
||||
// Box 1 - gdpr ankete
|
||||
echo ' <div class= "num_box num_box1 checked" id="num_box1" onclick="gdpr_ankete()">';
|
||||
|
||||
echo ' <div id="box_flex" class="box_flex">';
|
||||
echo ' <input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="gdpr_ankete()">';
|
||||
echo ' <div class="naslov_gdpr">'.$lang['srv_gdpr_survey_list_gdpr_surveys'].'</div>';
|
||||
echo ' </div>';
|
||||
|
||||
|
||||
echo ' <div class="box_text">';
|
||||
echo ' <p id="p_num_of_surveys1"> <span class="num_of_surveys" id="num_of_surveys1"> '.$survey_count['gdpr'].' </span> '.$lang['srv_gdpr_survey_list_gdpr_surveys_note'].'</p>';
|
||||
echo ' </div>';
|
||||
echo ' </div>';
|
||||
|
||||
// Box 2 - gdpr ankete
|
||||
echo ' <div class= "num_box num_box2 checked" id="num_box2" onclick="potenc_gdpr_ankete()">';
|
||||
|
||||
echo ' <div id="box_flex" class="box_flex potenc_gdpr">';
|
||||
echo ' <input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="potenc_gdpr_ankete()">';
|
||||
echo ' <div class="naslov_gdpr">'.$lang['srv_gdpr_survey_list_potenc_gdpr_surveys'].'</div>';
|
||||
echo ' </div>';
|
||||
|
||||
echo ' <div class="box_text">';
|
||||
echo ' <p id="p_num_of_surveys2"> <span class="num_of_surveys" id="num_of_surveys2"> '.$survey_count['potential_gdpr'].' </span> '.$lang['srv_gdpr_survey_list_potenc_gdpr_surveys_note'].'</p>';
|
||||
echo ' </div>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
// Box 3 - gdpr ankete
|
||||
echo ' <div class= "num_box num_box3 checked" id="num_box3" onclick="ne_gdpr_ankete()">';
|
||||
|
||||
echo ' <div id="box_flex" class="box_flex no_gdpr">';
|
||||
echo ' <input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="ne_gdpr_ankete()" >';
|
||||
echo ' <div class="naslov_gdpr">'.$lang['srv_gdpr_survey_list_no_gdpr_surveys'].'</div>';
|
||||
echo ' </div>';
|
||||
|
||||
echo ' <div class="box_text">';
|
||||
echo ' <p id="p_num_of_surveys3"> <span class="num_of_surveys" id="num_of_surveys3"> '.$survey_count['no_gdpr'].' </span> '.$lang['srv_gdpr_survey_list_no_gdpr_surveys_note'].'</p>';
|
||||
echo ' </div>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Text med nastavitvami in tabelo
|
||||
echo '<p class="bottom16">'.$lang['srv_gdpr_survey_list_text'].'</p>';
|
||||
|
||||
echo $lang['srv_gdpr_survey_list_text2'].'<ul style="margin-top:2px;">';
|
||||
echo ' <li>'.$lang['srv_gdpr_survey_list_li_1'].'</li>';
|
||||
echo ' <li>'.$lang['srv_gdpr_survey_list_li_2'].'</li>';
|
||||
echo ' <li>'.$lang['srv_gdpr_survey_list_li_3'].'</li>';
|
||||
echo ' <li>'.$lang['srv_gdpr_survey_list_li_4'].'</li>';
|
||||
echo '</ul>';
|
||||
|
||||
echo '<p class="top16 bottom16">'.$lang['srv_gdpr_survey_list_text3'].'</p>';
|
||||
|
||||
|
||||
// Tabela anket
|
||||
echo '<table class="gdpr_surveys">';
|
||||
|
||||
echo '<tr>';
|
||||
echo '<th class="center">GDPR</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_survey_list_survey'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_survey_list_activity'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_survey_list_pot_gdpr'].'</th>';
|
||||
echo '</tr>';
|
||||
// Naslovna vrstica
|
||||
echo ' <tr>';
|
||||
echo ' <th class="center">GDPR</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_survey_list_survey'].'</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_survey_list_activity'].'</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_survey_list_pot_gdpr'].'</th>';
|
||||
echo ' </tr>';
|
||||
|
||||
foreach($survey_list as $anketa){
|
||||
|
||||
// Nastavimo barvo vrstice
|
||||
if($anketa['gdpr'] == 1)
|
||||
$color = ' class="green_row"';
|
||||
$color = 'green_row';
|
||||
elseif($anketa['potential_gdpr'] == 1)
|
||||
$color = ' class="red_row"';
|
||||
$color = 'red_row';
|
||||
else
|
||||
$color = '';
|
||||
$color = 'grey_row';
|
||||
|
||||
echo '<tr '.$color.'>';
|
||||
echo '<tr class="'.$color.'">';
|
||||
|
||||
if($anketa['active']==1)
|
||||
$anketa_active = $lang['yes'];
|
||||
@ -104,20 +147,15 @@ class GDPR{
|
||||
else
|
||||
$anketa_potential_gdpr = $lang['no'];
|
||||
|
||||
|
||||
echo '<td class="center"><input type="checkbox" id="gdpr_'.$anketa['id'].'" value="1" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdpr_'.$anketa['id'].'"></label></td>';
|
||||
echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
|
||||
echo '<td>'.$anketa_active.'</td>';
|
||||
echo '<td>'.$anketa_potential_gdpr.'</td>';
|
||||
|
||||
echo ' <td class="center"><input type="checkbox" id="gdpr_'.$anketa['id'].'" value="1" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdpr_'.$anketa['id'].'"></label></td>';
|
||||
echo ' <td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
|
||||
echo ' <td>'.$anketa_active.'</td>';
|
||||
echo ' <td>'.$anketa_potential_gdpr.'</td>';
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
echo '</table>';
|
||||
|
||||
echo '</fieldset>';
|
||||
|
||||
}
|
||||
|
||||
// Prikazemo vsebino zavihka gdpr - nastavitve uporabnika
|
||||
@ -339,15 +377,15 @@ class GDPR{
|
||||
echo '<div class="gdpr_authority_info_data">';
|
||||
|
||||
if($authority['name'] != '')
|
||||
echo '<span class="bold">'.$authority['name'].'</span><br />';
|
||||
echo '<span class="authority_name">'.$authority['name'].'</span><br />';
|
||||
if($authority['title'] != '')
|
||||
echo '<span>'.$authority['title'].'</span><br />';
|
||||
if($authority['email'] != '')
|
||||
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_email'].': '.$authority['email'].'</span><br />';
|
||||
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_email'].': <div class="bold" > '.$authority['email'].'</div></span>';
|
||||
if($authority['phone'] != '')
|
||||
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_phone'].': '.$authority['phone'].'</span><br />';
|
||||
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_phone'].': <div class="bold" > '.$authority['phone'].'</div></span>';
|
||||
if($authority['fax'] != '')
|
||||
echo '<span class="spaceLeft">Fax: '.$authority['fax'].'</span><br />';
|
||||
echo '<span class="spaceLeft">Fax: <div class="bold" > '.$authority['fax'].'</div></span><br />';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
@ -359,8 +397,6 @@ class GDPR{
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
echo '<fieldset>';
|
||||
echo '<legend>'.$lang['srv_gdpr_requests_list'].'</legend>';
|
||||
|
||||
echo '<p class="bottom16">'.$lang['srv_gdpr_requests_desc'].'</p>';
|
||||
|
||||
@ -372,103 +408,112 @@ class GDPR{
|
||||
$request_list_done = array();
|
||||
$request_list_done = $this->getUserRequests($ank_id=0, $status=1);
|
||||
|
||||
|
||||
// Nimamo zahtevkov
|
||||
if(count($request_list) == 0 &&count($request_list_done) == 0){
|
||||
echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_none'].'</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// Tabela neizvrsenih zahtevkov
|
||||
if(count($request_list) > 0){
|
||||
|
||||
echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</p>';
|
||||
echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</div>';
|
||||
|
||||
echo '<div class="table-horizontal-scroll-wrapper-outer" id="gdrp_requests_unresolved">';
|
||||
echo '<div class="table-horizontal-scroll-wrapper-inner">';
|
||||
|
||||
echo '<table class="gdpr_surveys requests">';
|
||||
|
||||
echo '<tr>';
|
||||
echo '<th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_text'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
|
||||
echo '<th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_requests_survey'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_requests_email'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_type'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_date_sent'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
|
||||
echo '</tr>';
|
||||
|
||||
foreach($request_list as $request_id => $request){
|
||||
|
||||
echo '<tr '.($request['status'] == 0 ? ' class="red_row"' : '').'>';
|
||||
echo '<tr>';
|
||||
|
||||
// Checkbox ce je zahteva opravljena
|
||||
echo '<td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'>';
|
||||
echo '<label class="empty" for="gdrp_request_'.$request_id.'"></label></td>';
|
||||
echo '<td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
|
||||
echo ' <td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'>';
|
||||
echo ' <label class="empty" for="gdrp_request_'.$request_id.'"></label>';
|
||||
echo ' </td>';
|
||||
|
||||
echo ' <td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
|
||||
|
||||
echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>';
|
||||
echo '<td>'.$request['email'].'</td>';
|
||||
echo ' <td class="center"><span class="faicon envelope" onclick="show_gdpr_messeage('.$request_id.')"></span></td>';
|
||||
|
||||
echo ' <td>'.$request['email'].'</td>';
|
||||
|
||||
echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
|
||||
echo ' <td class="center">';
|
||||
echo ' <div class="request_type type'.$request['type'].'">'.$lang['srv_gdpr_requests_type_'.$request['type']].'</div>';
|
||||
echo ' </td>';
|
||||
|
||||
echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
|
||||
echo ' <td class="center">'.date('j.n.Y', strtotime($request['datum'])).'</td>';
|
||||
|
||||
// Komentar avtorja
|
||||
echo '<td class="center"><textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
|
||||
|
||||
echo ' <td class="center">';
|
||||
echo ' <textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea>';
|
||||
echo ' </td>';
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
echo '</table>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
else{
|
||||
if(count($request_list_done) == 0)
|
||||
echo '<p class="bold">'.$lang['srv_gdpr_requests_none'].'</p>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Tabela opravljenih zahtevkov
|
||||
if(count($request_list_done) > 0){
|
||||
|
||||
echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</p>';
|
||||
|
||||
echo '<div class="table-horizontal-scroll-wrapper1">';
|
||||
echo '<div class="table-horizontal-scroll-wrapper2">';
|
||||
echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</div>';
|
||||
|
||||
echo '<div class="table-horizontal-scroll-wrapper-outer">';
|
||||
echo '<div class="table-horizontal-scroll-wrapper-inner">';
|
||||
echo '<table class="gdpr_surveys requests">';
|
||||
|
||||
echo '<tr>';
|
||||
echo '<th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_text'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
|
||||
echo '<th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_requests_survey'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
|
||||
echo ' <th>'.$lang['srv_gdpr_requests_email'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_type'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_date_sent'].'</th>';
|
||||
echo ' <th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
|
||||
echo '</tr>';
|
||||
|
||||
foreach($request_list_done as $request_id => $request){
|
||||
|
||||
echo '<tr '.($request['status'] == 0 ? ' class="red_row"' : '').'>';
|
||||
echo '<tr>';
|
||||
|
||||
// Checkbox ce je zahteva opravljena
|
||||
echo '<td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdrp_request_'.$request_id.'"></label></td>';
|
||||
echo '<td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
|
||||
echo ' <td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdrp_request_'.$request_id.'"></label></td>';
|
||||
echo ' <td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
|
||||
|
||||
echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>';
|
||||
echo '<td>'.$request['email'].'</td>';
|
||||
echo ' <td class="center"><span class="faicon envelope" onclick="show_gdpr_messeage('.$request_id.')"></span></td>';
|
||||
|
||||
echo ' <td>'.$request['email'].'</td>';
|
||||
|
||||
echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
|
||||
|
||||
echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
|
||||
echo ' <td class="center">';
|
||||
echo ' <div class="request_type type'.$request['type'].'">'.$lang['srv_gdpr_requests_type_'.$request['type']].'</div>';
|
||||
echo ' </td>';
|
||||
|
||||
echo ' <td class="center">'.date('j.n.Y', strtotime($request['datum'])).'</td>';
|
||||
|
||||
// Komentar avtorja
|
||||
echo '<td class="center"><textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
|
||||
|
||||
|
||||
echo ' <td class="center">';
|
||||
echo ' <textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea>';
|
||||
echo ' </td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
echo '</table>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
@ -1362,12 +1407,24 @@ class GDPR{
|
||||
$temp_naslov = array();
|
||||
$temp_active = array();
|
||||
|
||||
$count_gdpr = 0;
|
||||
$count_potential_gdpr = 0;
|
||||
$count_no_gdpr = 0;
|
||||
|
||||
$key = 0;
|
||||
foreach($surveys as $anketa){
|
||||
|
||||
$potential_gdpr = $this->potentialGDPRSurvey($anketa['id']);
|
||||
$gdpr = $this->isGDPRSurvey($anketa['id']);
|
||||
|
||||
// Prestejemo ankete v posamezni skupini
|
||||
if($gdpr == '1')
|
||||
$count_gdpr++;
|
||||
elseif($potential_gdpr == '1')
|
||||
$count_potential_gdpr++;
|
||||
else
|
||||
$count_no_gdpr++;
|
||||
|
||||
$temp_gdpr[$key] = $gdpr;
|
||||
$temp_gdpr_p[$key] = $potential_gdpr;
|
||||
$temp_naslov[$key] = $anketa['naslov'];
|
||||
@ -1386,7 +1443,13 @@ class GDPR{
|
||||
|
||||
array_multisort($temp_gdpr, SORT_DESC, $temp_gdpr_p, SORT_DESC, $temp_active, SORT_DESC, $temp_naslov, SORT_DESC, $survey_list);
|
||||
|
||||
return $survey_list;
|
||||
$survey_count = array(
|
||||
'gdpr' => $count_gdpr,
|
||||
'potential_gdpr' => $count_potential_gdpr,
|
||||
'no_gdpr' => $count_no_gdpr
|
||||
);
|
||||
|
||||
return array($survey_list, $survey_count);
|
||||
}
|
||||
|
||||
// Pridobimo vse zahteve za izbris za userja (za vse ankete ali samo za doloceno anketo)
|
||||
@ -1750,10 +1813,10 @@ class GDPR{
|
||||
else
|
||||
$note = $request_data['gdpr-note'];
|
||||
|
||||
|
||||
|
||||
// Ce imamo vse potrebne podatke posredujemo zahtevo
|
||||
if(empty($errors)){
|
||||
|
||||
|
||||
// Zabelezimo zahtevo v bazo
|
||||
$sql = sisplet_query("INSERT INTO srv_gdpr_requests
|
||||
(usr_id, ank_id, email, url, datum, text, type)
|
||||
@ -1826,7 +1889,7 @@ class GDPR{
|
||||
$resultX = $MA->sendMail($content, $subject);
|
||||
}
|
||||
catch (Exception $e){
|
||||
}
|
||||
}
|
||||
|
||||
// Vrnemo vse ok
|
||||
if($jezik == '2'){
|
||||
@ -1864,42 +1927,57 @@ class GDPR{
|
||||
|
||||
// Pridobimo id ankete iz url-ja
|
||||
if($arr[1] == 'a'){
|
||||
$data['ank_id'] = $arr[2];
|
||||
$data['hash'] = $arr[2];
|
||||
|
||||
// Dobimo id ankete iz hasha
|
||||
$sql = sisplet_query("SELECT a.id AS ank_id, a.naslov, u.id AS usr_id, u.lang, u.email
|
||||
FROM srv_anketa a, users u
|
||||
WHERE a.hash='".$data['hash']."' AND u.id=a.insert_uid
|
||||
");
|
||||
|
||||
// Anekta ne obstaja - nepravilen url
|
||||
if(mysqli_num_rows($sql) == 0)
|
||||
return false;
|
||||
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$data['url'] = $site_url.'a/'.$data['hash'];
|
||||
|
||||
$data['ank_id'] = $row['ank_id'];
|
||||
$data['title'] = $row['naslov'];
|
||||
$data['usr_id'] = $row['usr_id'];
|
||||
$data['usr_lang'] = $row['lang'];
|
||||
$data['author_email'] = $row['email'];
|
||||
}
|
||||
else{
|
||||
// Preverimo ce imamo mogoce lep url
|
||||
$nice_url = $arr[1];
|
||||
|
||||
$sqlN = sisplet_query("SELECT ank_id, link FROM srv_nice_links WHERE link='".$nice_url."'");
|
||||
if(mysqli_num_rows($sqlN) > 0){
|
||||
$rowN = mysqli_fetch_array($sqlN);
|
||||
$data['ank_id'] = $rowN['ank_id'];
|
||||
}
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
// Nastavimo url ankete
|
||||
$data['url'] = $site_url.'a/'.$data['ank_id'];
|
||||
|
||||
// Pridobimo avtorja in naslov ankete
|
||||
$sql = sisplet_query("SELECT a.naslov, u.id, u.lang, u.email
|
||||
FROM srv_anketa a, users u
|
||||
WHERE a.hash='".$data['ank_id']."' AND u.id=a.insert_uid");
|
||||
if(mysqli_num_rows($sql) == 1){
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$data['title'] = $row['naslov'];
|
||||
$data['usr_id'] = $row['id'];
|
||||
$sql = sisplet_query("SELECT a.id AS ank_id, a.hash, a.naslov, u.id AS usr_id, u.lang, u.email
|
||||
FROM srv_anketa a, srv_nice_links nl, users u
|
||||
WHERE nl.link='".$nice_url."' AND nl.ank_id=a.id AND u.id=a.insert_uid
|
||||
");
|
||||
|
||||
// Anekta ne obstaja - nepravilen url
|
||||
if(mysqli_num_rows($sql) == 0)
|
||||
return false;
|
||||
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$data['url'] = $site_url.'/'.$nice_url;
|
||||
|
||||
$data['ank_id'] = $row['ank_id'];
|
||||
$data['hash'] = $row['hash'];
|
||||
$data['title'] = $row['naslov'];
|
||||
$data['usr_id'] = $row['usr_id'];
|
||||
$data['usr_lang'] = $row['lang'];
|
||||
$data['author_email'] = $row['email'];
|
||||
}
|
||||
else
|
||||
return false;
|
||||
}
|
||||
else
|
||||
return false;
|
||||
|
||||
|
||||
if(isset($data['ank_id']) && isset($data['usr_id']) && isset($data['title']) && isset($data['url']) && isset($data['author_email']))
|
||||
return $data;
|
||||
else
|
||||
|
||||
@ -475,12 +475,18 @@ class LibraryBranching {
|
||||
echo ' <span class="faicon list"></span>';
|
||||
echo ' <span class="title">'.substr(strip_tags($spremenljivka['naslov']), 0, 40).'</span>';
|
||||
|
||||
|
||||
echo '<div class="right_icons">';
|
||||
|
||||
// Preview
|
||||
echo ' <span class="faicon monitor" onClick="previewVprasanje(\''.$spremenljivka['id'].'\');"></span>';
|
||||
|
||||
// Urejanje Vprasanja
|
||||
if($this->tab == '0' && ($spremenljivka['folder_uid'] == $global_user_id || $admin_type == 0)){
|
||||
if($this->tab == '0' && ($spremenljivka['folder_uid'] == $global_user_id || $admin_type == 0)){
|
||||
|
||||
// Tri pikice za prikaz urejanja vprasanja
|
||||
echo ' <span class="faicon dots_ver dots_ver_item" onClick="showLibraryItemEdit(this);"></span>';
|
||||
|
||||
|
||||
// Skrit div za urejanje vprasanja
|
||||
echo ' <div class="item_settings displayNone">';
|
||||
echo ' <ul>';
|
||||
@ -490,6 +496,9 @@ class LibraryBranching {
|
||||
echo ' </div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
@ -531,6 +540,9 @@ class LibraryBranching {
|
||||
echo ' <span class="faicon '.$icon.'"></span>';
|
||||
echo ' <span class="title">'.$type_string.substr(strip_tags($if['label']), 0, 40).'</span>';
|
||||
|
||||
|
||||
echo '<div class="right_icons">';
|
||||
|
||||
// Urejanje Vprasanja
|
||||
if($this->tab == '0' && ($if['folder_uid'] == $global_user_id || $admin_type == 0)){
|
||||
|
||||
@ -546,6 +558,9 @@ class LibraryBranching {
|
||||
echo ' </div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
@ -842,6 +857,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
|
||||
|
||||
@ -1923,7 +1923,7 @@ class SurveyCustomReport {
|
||||
// div za brisanje
|
||||
echo '<div id="deleteCReportProfile">';
|
||||
|
||||
echo '<p>'.$lang['srv_custom_report_delete_confirm'].':<span id="deleteCReportProfileName" class="semi-bold"></span>?</p>';
|
||||
echo '<p>'.$lang['srv_custom_report_delete_confirm'].': <span id="deleteCReportProfileName" class="semi-bold"></span>?</p>';
|
||||
echo '<input id="deleteCReportProfileId" type="hidden" value="' . $this->creportProfile . '" />'."\n";
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
@ -2032,7 +2032,7 @@ class SurveyCustomReport {
|
||||
echo '</script>';
|
||||
echo '</head>';
|
||||
|
||||
echo '<body style="margin:5px; padding:5px;" >';
|
||||
echo '<body class="public_link creport" style="margin:5px; padding:5px;" >';
|
||||
|
||||
$what = 'creport_title_profile_'.$this->creportProfile;
|
||||
$sql = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$anketa' AND uid='$this->creportAuthor' AND what='$what'");
|
||||
|
||||
@ -176,13 +176,9 @@ class SurveyDiagnostics
|
||||
echo ' <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
//Nastavitve testnega vnosa - popup
|
||||
echo '<p class="top16"><a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'">'.$lang['srv_uredniske_nastavitve'].'</a></p>';
|
||||
//Nastavitve testnega vnosa - popup
|
||||
echo '<p class="top16"><a href="' .$site_url . '/admin/survey/index.php?anketa=' . $this->sid . '&a=urejanje" title="' . $lang['srv_uredniske_nastavitve'] . '">'. $lang['srv_uredniske_nastavitve'] .'</a></p>';
|
||||
|
||||
if ( isset($_GET['popup']) && $_GET['popup'] == 'open' ) {
|
||||
?><script> $(function() { $('#popup-open').click(); }); </script><?php
|
||||
}
|
||||
|
||||
// DIAGNOSTIKA
|
||||
|
||||
# predviden čas ankete
|
||||
|
||||
@ -21,55 +21,55 @@ if(session_id() == '') {session_start();}
|
||||
|
||||
class SurveyList {
|
||||
|
||||
private $surveys_ids = array(); # array z id-ji anket
|
||||
private $settingsArray = array(); # array z nastavitvami
|
||||
protected $surveys_ids = array(); # array z id-ji anket
|
||||
protected $settingsArray = array(); # array z nastavitvami
|
||||
|
||||
private $parentFolder; # osnovni direktorij
|
||||
private $currentFolder; # trenutni direktorij
|
||||
private $folders = array(); # array z direktoriji
|
||||
protected $parentFolder; # osnovni direktorij
|
||||
protected $currentFolder; # trenutni direktorij
|
||||
protected $folders = array(); # array z direktoriji
|
||||
|
||||
private $user_id = null; # ali filtriramo po userju
|
||||
private $g_uid = null; # globalna nastavitev user_id
|
||||
private $g_adminType = null; # globalna nastavitev adminType
|
||||
protected $user_id = null; # ali filtriramo po userju
|
||||
protected $g_uid = null; # globalna nastavitev user_id
|
||||
protected $g_adminType = null; # globalna nastavitev adminType
|
||||
|
||||
|
||||
private $onlyPhone = false; # Ali prikazujemo samo telefonske ankete
|
||||
protected $onlyPhone = false; # Ali prikazujemo samo telefonske ankete
|
||||
|
||||
private $lang_id = 0; # nastavitev languageType
|
||||
protected $lang_id = 0; # nastavitev languageType
|
||||
|
||||
private $gdpr = 0; # nastavitev gdpr filter za ankete
|
||||
protected $gdpr = 0; # nastavitev gdpr filter za ankete
|
||||
|
||||
private $dostopCondition = null; # shranimo omejitve dostopa (glede na tip uporabnika in uporabniški uid)
|
||||
private $folderCondition = null; # shranimo omejevanja folderjev
|
||||
protected $dostopCondition = null; # shranimo omejitve dostopa (glede na tip uporabnika in uporabniški uid)
|
||||
protected $folderCondition = null; # shranimo omejevanja folderjev
|
||||
|
||||
private $libraryCondition = null; # shranimo novo omejevanje folderjev (moja knjiznica)
|
||||
private $currentLibrary; # trenutni direktorij moje knjiznice
|
||||
protected $libraryCondition = null; # shranimo novo omejevanje folderjev (moja knjiznica)
|
||||
protected $currentLibrary; # trenutni direktorij moje knjiznice
|
||||
|
||||
private $filter = null; # filter za ime ankete
|
||||
protected $filter = null; # filter za ime ankete
|
||||
|
||||
private $show_folders = 0; # ali prikazujemo mape ali ne (default zaenkrat da)
|
||||
protected $show_folders = 0; # ali prikazujemo mape ali ne (default zaenkrat da)
|
||||
|
||||
|
||||
private $isSearch = 0; # ali izvajamo search po anektah
|
||||
private $searchString = ''; # geslo po katerem iscemo po anketah
|
||||
private $searchStringProcessed = array(); # geslo po katerem iscemo po anketah, obdelano (skrajsano da isce tudi po drugih sklanjatvah)
|
||||
private $searchSettings = array(); # nastavitve searcha
|
||||
protected $isSearch = 0; # ali izvajamo search po anektah
|
||||
protected $searchString = ''; # geslo po katerem iscemo po anketah
|
||||
protected $searchStringProcessed = array(); # geslo po katerem iscemo po anketah, obdelano (skrajsano da isce tudi po drugih sklanjatvah)
|
||||
protected $searchSettings = array(); # nastavitve searcha
|
||||
|
||||
|
||||
# privzete nastavitve
|
||||
private $pageno = 1; # na kateri strani navigacije smo
|
||||
private $max_pages = 1; # koliko strani imamo
|
||||
private $sortby = SRV_LIST_ORDER_BY; # id polja po katerem sortiramo
|
||||
private $sorttype = SRV_LIST_ORDER_TYPE; # tip sortiranja 1= deac, 0 = asc
|
||||
private $rec_per_page = SRV_LIST_REC_PER_PAGE; # število zapisov na stran
|
||||
private $orderByText = false; # ali sortiramo po tekstovnem polju (takrat uporabimo upper)
|
||||
protected $pageno = 1; # na kateri strani navigacije smo
|
||||
protected $max_pages = 1; # koliko strani imamo
|
||||
protected $sortby = SRV_LIST_ORDER_BY; # id polja po katerem sortiramo
|
||||
protected $sorttype = SRV_LIST_ORDER_TYPE; # tip sortiranja 1= deac, 0 = asc
|
||||
protected $rec_per_page = SRV_LIST_REC_PER_PAGE; # število zapisov na stran
|
||||
protected $orderByText = false; # ali sortiramo po tekstovnem polju (takrat uporabimo upper)
|
||||
|
||||
# privzete možnosti
|
||||
private $sort_types_options = array(1=>'DESC',2=>'ASC'); # možni načini sortiranja
|
||||
private $appropriateStatus = '5,6'; # statusi ki veljajo kot ustrezni
|
||||
protected $sort_types_options = array(1=>'DESC',2=>'ASC'); # možni načini sortiranja
|
||||
protected $appropriateStatus = '5,6'; # statusi ki veljajo kot ustrezni
|
||||
|
||||
# možni načini sortiranja
|
||||
private $order_by_options = array(
|
||||
protected $order_by_options = array(
|
||||
1=>'naslov',
|
||||
2=>'active',
|
||||
3=>'lib_glb',
|
||||
@ -95,7 +95,7 @@ class SurveyList {
|
||||
);
|
||||
|
||||
# polja za prikaz
|
||||
private $dataFields = array(
|
||||
protected $dataFields = array(
|
||||
1=>array('id'=>1,'visible'=>1,'order_by'=>'naslov','header_field'=>'sl_naslov','alsoResize'=>'.sl_naslov','minWidth'=>100,'data_field'=>'naslov','data_type'=>'naslov', 'data_css'=>'sl_naslov_padding', 'order_text'=>true),
|
||||
2=>array('id'=>2,'visible'=>1,'order_by'=>'active','header_field'=>'sl_active','lang_label'=>'sl_active_1','alsoResize'=>'.sl_active','minWidth'=>20,'maxWidth'=>30,'data_field'=>'active','data_type'=>'active','data_css'=>'anl_ac'),
|
||||
3=>array('id'=>3,'visible'=>0,'order_by'=>'lib_glb','header_field'=>'sl_lib_glb','lang_label'=>'sl_lib_glb_1','alsoResize'=>'.sl_lib_glb','minWidth'=>20,'maxWidth'=>30,'data_field'=>'lib_glb','data_type'=>'lib_glb','data_css'=>'anl_ac'),
|
||||
@ -228,6 +228,27 @@ class SurveyList {
|
||||
}
|
||||
|
||||
|
||||
// Vrnemo, ce imamo vklopljene folderje ali ne
|
||||
public static function hasFolders(){
|
||||
global $global_user_id;
|
||||
|
||||
$show_folders = 0;
|
||||
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
$detect = New Mobile_Detect();
|
||||
|
||||
if($userAccess->checkUserAccess('my_survey_folders') && !$detect->isMobile() && !$detect->isTablet()){
|
||||
UserSetting::getInstance()->Init($global_user_id);
|
||||
$show_folders = UserSetting::getInstance()->getUserSetting('survey_list_folders');
|
||||
}
|
||||
|
||||
if($show_folders == '1')
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @desc prikaze zgornjo navigacijo
|
||||
*/
|
||||
@ -247,11 +268,17 @@ class SurveyList {
|
||||
if ($admin_type == 0) {
|
||||
echo '<ul class="secondNavigation">';
|
||||
|
||||
#zavihek osnovni pregled uporabnikov
|
||||
#zavihek moji uporabniki
|
||||
echo '<li class="'.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'">';
|
||||
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
|
||||
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
|
||||
echo $lang['n_users_list'].'</a>';
|
||||
echo '</li>';
|
||||
|
||||
#zavihek dodajanje uporabnikov
|
||||
echo '<li class="'.($_GET['m'] == 'add' ? 'active' : '').'">';
|
||||
echo '<a href="index.php?a=diagnostics&t=uporabniki&m=add" title="'.$lang['n_users_list_add'].'">';
|
||||
echo $lang['n_users_list_add'].'</a>';
|
||||
echo '</li>';
|
||||
|
||||
#zavihek seznam vseh uporabnikov
|
||||
echo '<li class="'.($_GET['m'] == 'all' ? 'active' : '').'">';
|
||||
@ -291,9 +318,9 @@ class SurveyList {
|
||||
|
||||
echo '<ul class="secondNavigation">';
|
||||
|
||||
#zavihek osnovni pregled uporabnikov
|
||||
#zavihek moji uporabniki
|
||||
echo '<li class="active">';
|
||||
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
|
||||
echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
|
||||
echo $lang['n_users_list'].'</a>';
|
||||
echo '</li>';
|
||||
|
||||
@ -416,8 +443,23 @@ class SurveyList {
|
||||
echo '<a href="index.php?a=nastavitve&m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
|
||||
echo $lang['edit_data'] . '</a>';
|
||||
echo '</li>';
|
||||
|
||||
|
||||
echo '</ul>';
|
||||
|
||||
echo '<div class="separator"></div>';
|
||||
|
||||
// Arhiv sprememb
|
||||
echo '<ul class="secondNavigationArchive">';
|
||||
|
||||
echo '<li class="'.($tab == 'global_user_ChangeArchive' ? ' active' : '').'">';
|
||||
echo '<a href="index.php?a=nastavitve&m=global_user_ChangeArchive" title="' . $lang['srv_survey_archives_tracking_archive'] . '">';
|
||||
echo $lang['srv_survey_archives_tracking_archive'] . '</a>';
|
||||
echo '</li>';
|
||||
|
||||
echo '</ul>';
|
||||
|
||||
|
||||
|
||||
}
|
||||
#podnavigacija za obvestila
|
||||
if(($_GET['a']=='obvestila')) {
|
||||
@ -858,7 +900,7 @@ class SurveyList {
|
||||
global $global_user_id;
|
||||
global $lang;
|
||||
|
||||
|
||||
|
||||
// Gumba za ustvarjanje ankete - nekatere niso prikazane pri searchu
|
||||
if($this->isSearch != 1){
|
||||
|
||||
@ -1465,10 +1507,10 @@ class SurveyList {
|
||||
}
|
||||
|
||||
// Prikazemo gumb za sortiranje seznama anket
|
||||
private function displaySortButton(){
|
||||
protected function displaySortButton(){
|
||||
global $lang, $site_url;
|
||||
|
||||
echo $lang['orderby'];
|
||||
echo '<span class="faicon sort"></span>';
|
||||
|
||||
echo '<div id="sortSettings">';
|
||||
|
||||
@ -1498,12 +1540,12 @@ class SurveyList {
|
||||
}
|
||||
|
||||
// Prikazemo gumb za filtriranje seznama anket
|
||||
private function displayFilterButton(){
|
||||
protected function displayFilterButton(){
|
||||
global $lang, $site_url, $admin_languages;
|
||||
|
||||
echo '<div id="filterButton" '.(($this->user_id || $this->lang_id != 0 || $this->gdpr != 0) ? 'class="active"' : '').'>';
|
||||
|
||||
echo $lang['srv_analiza_filter'];
|
||||
echo '<span class="faicon filter"></span>';
|
||||
|
||||
echo '<div id="filterSettings">';
|
||||
echo '<ul>';
|
||||
@ -1552,8 +1594,8 @@ class SurveyList {
|
||||
}
|
||||
|
||||
// Prikazemo preklop med navadnim pogledom in pogledom s folderji
|
||||
private function displayFolderSwitch(){
|
||||
global $lang, $global_user_id;
|
||||
protected function displayFolderSwitch(){
|
||||
global $lang, $global_user_id, $site_url;
|
||||
|
||||
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
@ -1562,6 +1604,7 @@ class SurveyList {
|
||||
if(!$userAccess->checkUserAccess('my_survey_folders')){
|
||||
echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" class="user_access_locked" onClick="popupUserAccess(\'my_survey_folders\');">';
|
||||
echo $lang['srv_mySurvey_show_folders'];
|
||||
echo ' <div class="switch_folders off"></div>';
|
||||
echo '</div>';
|
||||
}
|
||||
else{
|
||||
@ -1587,7 +1630,7 @@ class SurveyList {
|
||||
}
|
||||
|
||||
// Prikazemo nastavitve za napredno iskanje ce iscemo po anketah
|
||||
private function displaySearchSettings(){
|
||||
protected function displaySearchSettings(){
|
||||
global $lang;
|
||||
global $site_url;
|
||||
|
||||
@ -1716,7 +1759,8 @@ class SurveyList {
|
||||
echo '<input id="searchMySurvey" type="text" value="" placeholder="'.$lang['s_search_mySurvey'].'" name="search" />';
|
||||
|
||||
echo ' <button class="medium white-black" onclick="$(\'#1kasmysurvey\').submit(); return false;">';
|
||||
echo $lang['s_search2'];
|
||||
//echo $lang['s_search2'];
|
||||
echo ' <span class="faicon search"></span>';
|
||||
echo ' </button>';
|
||||
|
||||
echo '</form>';
|
||||
@ -2051,7 +2095,7 @@ class SurveyList {
|
||||
return $result;
|
||||
}
|
||||
|
||||
private function createOrderUrlNew($id=null, $txt) {
|
||||
protected function createOrderUrlNew($id=null, $txt) {
|
||||
global $site_url;
|
||||
|
||||
if (!isset($id) || $id == null || $id == "") {
|
||||
@ -2084,7 +2128,7 @@ class SurveyList {
|
||||
$result = '<strong><a href="'.$site_url.'admin/survey/index.php?anketa='.$id.'&a='.A_REDIRECTLINK.'" title="'.$text.'">'.$text.'</a></strong>';
|
||||
} elseif ($type == 'active') {
|
||||
$result = '<a href="/" onclick="anketa_active(\''.$id.'\',\''.(int)$text.'\',\'true\'); return false;">' .
|
||||
'<span class="faicon '.((int)$text==1?'star_on':'star_off').'" alt="'.(int)$text.'" title="'.((int)$text==1?$lang['srv_anketa_active']:$lang['srv_anketa_noactive']).'"></span>'.
|
||||
'<span class="faicon '.((int)$text==1?'star_on':'star_off').'" alt="'.(int)$text.'" title="'.((int)$text==1?$lang['srv_anketa_active']:$lang['srv_anketa_noactive']).'"> </span>'.
|
||||
'</a>';
|
||||
} elseif ($type == 'delete') {
|
||||
if ((int)$options['anketa_canEdit'] > 0) {
|
||||
@ -2400,7 +2444,7 @@ class SurveyList {
|
||||
}
|
||||
|
||||
/** vrne sql string za omejevanje dostopa uporabniku */
|
||||
function getLanguageLimit() {
|
||||
protected function getLanguageLimit() {
|
||||
global $global_admin_type;
|
||||
|
||||
if ((int)$this->lang_id > 0) {
|
||||
@ -2409,7 +2453,7 @@ class SurveyList {
|
||||
}
|
||||
|
||||
/** vrne sql string za omejevanje dostopa uporabniku */
|
||||
function getDostopAnketa() {
|
||||
protected function getDostopAnketa() {
|
||||
global $global_admin_type;
|
||||
global $global_user_id;
|
||||
|
||||
@ -2462,7 +2506,7 @@ class SurveyList {
|
||||
}
|
||||
|
||||
/** vrne order string za SQL s katerim sortiramo */
|
||||
private function getOrderString() {
|
||||
protected function getOrderString() {
|
||||
|
||||
if (!isset($this->sortby) || (int)$this->sortby == 0) {
|
||||
$this->sortby = SRV_LIST_ORDER_BY;
|
||||
@ -2495,13 +2539,13 @@ class SurveyList {
|
||||
}
|
||||
|
||||
/** vrne Limit string za SQL s katerim prika?emo posamezno stran */
|
||||
private function getLimitString() {
|
||||
protected function getLimitString() {
|
||||
$result = " LIMIT " . ($this->pageno * $this->rec_per_page - $this->rec_per_page) . ", " . $this->rec_per_page;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// vrne sql string za search po anketah glede na nastavitve searcha
|
||||
private function getSearchString(){
|
||||
protected function getSearchString(){
|
||||
|
||||
$search_text = mysqli_real_escape_string($GLOBALS['connect_db'], $this->searchString);
|
||||
$search_text = stripslashes(stripslashes($search_text));
|
||||
@ -2600,7 +2644,7 @@ class SurveyList {
|
||||
}
|
||||
|
||||
// Dobimo vse parametri searcha
|
||||
private function getSearchParams(){
|
||||
protected function getSearchParams(){
|
||||
global $site_url;
|
||||
|
||||
$params = '';
|
||||
|
||||
1183
admin/survey/classes/class.SurveyListFolders.php
Normal file
1183
admin/survey/classes/class.SurveyListFolders.php
Normal file
File diff suppressed because it is too large
Load Diff
@ -76,45 +76,50 @@ class SurveySkupine {
|
||||
}
|
||||
else{
|
||||
echo '<div class="setting_holder">';
|
||||
echo '<label for="skupina">'.$lang['group_name'].':</label>';
|
||||
echo '<div class="button_holder inline">';
|
||||
echo '<input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
|
||||
echo '<button class="medium blue" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
echo ' <label for="skupina">'.$lang['group_name'].':</label>';
|
||||
echo ' <div class="button_holder inline">';
|
||||
echo ' <input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
|
||||
echo ' <button class="medium blue" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// izpis skupin za anketo
|
||||
$vrednosti = $this->getVrednosti($spr_id);
|
||||
echo '<table id="groups_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
|
||||
|
||||
// izpis skupin za anketo
|
||||
$vrednosti = $this->getVrednosti($spr_id);
|
||||
echo '<table id="groups_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
|
||||
|
||||
echo '<tr>';
|
||||
echo '<th></th>';
|
||||
echo '<th>'.$lang['group_name'].'</th>';
|
||||
echo '<th>'.$lang['group_URL'].'</th>';
|
||||
echo '</tr>';
|
||||
echo '<tr>';
|
||||
echo '<th></th>';
|
||||
echo '<th>'.$lang['group_name'].'</th>';
|
||||
echo '<th>'.$lang['group_URL'].'</th>';
|
||||
echo '<th>'.$lang['group_answer_count'].'</th>';
|
||||
echo '</tr>';
|
||||
|
||||
if($spr_id != 0){
|
||||
foreach($vrednosti as $vrednost){
|
||||
|
||||
echo '<tr>';
|
||||
echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span></a></td>';
|
||||
echo '<td>'.$vrednost['naslov'].'</td>';
|
||||
// Dobimo stevilo odgovorov za skupino
|
||||
$count_answers = $this->countSkupinaAnswers($vrednost['id']);
|
||||
|
||||
$link = $vrednost['url'];
|
||||
if(isset($vrednost['nice_url']))
|
||||
$link = $vrednost['nice_url'];
|
||||
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
|
||||
|
||||
echo '</tr>';
|
||||
echo '<tr>';
|
||||
|
||||
echo ' <td><a><span class="faicon trash empty" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span></a></td>';
|
||||
echo ' <td>'.$vrednost['naslov'].'</td>';
|
||||
|
||||
$link = (isset($vrednost['nice_url'])) ? $vrednost['nice_url'] : $vrednost['url'];
|
||||
|
||||
echo ' <td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
|
||||
echo ' <td class="right">'.$count_answers.'</td>';
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
}
|
||||
echo '</table>';
|
||||
echo '</table>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '</fieldset>';
|
||||
}
|
||||
|
||||
@ -176,6 +181,23 @@ class SurveySkupine {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Prestejemo stevilo odgovorov za doloceno skupino
|
||||
private function countSkupinaAnswers($vre_id){
|
||||
|
||||
$answer_count = 0;
|
||||
|
||||
$sql = sisplet_query("SELECT count(u.id) AS answer_count
|
||||
FROM srv_user u, srv_data_vrednost_active v
|
||||
WHERE v.vre_id='".$vre_id."' AND u.id=v.usr_id
|
||||
");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$answer_count = $row['answer_count'];
|
||||
|
||||
return $answer_count;
|
||||
|
||||
}
|
||||
|
||||
// Vrnemo url za doloceno skupino
|
||||
function getUrl($spr_id, $vre_id){
|
||||
global $global_user_id;
|
||||
@ -327,6 +349,7 @@ class SurveySkupine {
|
||||
echo '<td>'.stripslashes($naslov_vrednost).'</td>';
|
||||
$link = $this->getUrl($spr_id, $vre_id);
|
||||
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
|
||||
echo '<td class="right">0</td>';
|
||||
}
|
||||
|
||||
//Gesla
|
||||
|
||||
@ -107,6 +107,8 @@ class SurveyStaticHtml
|
||||
public function displayArchiveNavigation()
|
||||
{
|
||||
global $lang, $admin_type, $global_user_id;
|
||||
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
|
||||
$d = new Dostop();
|
||||
|
||||
@ -114,7 +116,7 @@ class SurveyStaticHtml
|
||||
$this->survey_type = $sa->getSurvey_type($this->sid);
|
||||
|
||||
echo '<div id="globalSetingsLinks" class="archive">';
|
||||
echo '<ul class="menu_left-list">';
|
||||
echo '<ul class="menu_left-list locked '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').' ">';
|
||||
|
||||
# arhivi vprasalnika
|
||||
if ($d->checkDostopSub('edit')) {
|
||||
@ -155,7 +157,7 @@ class SurveyStaticHtml
|
||||
|
||||
# uvoz/izvoz ankete ali ankete s podatki
|
||||
if ($d->checkDostopSub('edit')) {
|
||||
echo '<ul class="menu_left-list">';
|
||||
echo '<ul class="menu_left-list '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').'">';
|
||||
echo '<span class="menu_left-title">'.$lang['srv_survey_archives_other'].'</span>';
|
||||
echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking active"' : ' class="navi_tracking"') . $_js_links[1] . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives'] . '"><span>' . $lang['srv_survey_archives'] . '</span></a>';
|
||||
@ -288,13 +290,18 @@ class SurveyStaticHtml
|
||||
if( in_array($data_file_status, array(FILE_STATUS_SRV_DELETED, FILE_STATUS_NO_DATA))
|
||||
&& in_array($podstran, array(
|
||||
'status', 'para_analysis_graph', 'para_graph', 'usable_resp', 'status_advanced',
|
||||
'data', 'quick_edit', 'variables', 'export',
|
||||
'data', 'quick_edit', 'variables', 'export',
|
||||
'sumarnik', 'descriptor', 'frequency', 'crosstabs', 'ttest', 'means', 'break', 'multicrosstabs', 'charts', 'analysis_links'
|
||||
)) ){
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
//V komentarjih ni tega menija
|
||||
if($podstran == "komentarji" || $podstran == "komentarji_anketa") {
|
||||
return;
|
||||
}
|
||||
|
||||
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
|
||||
@ -374,57 +381,6 @@ class SurveyStaticHtml
|
||||
|
||||
echo '<span class="active"><a href="index.php?anketa=' . $this->sid . '&a=' . A_TESTIRANJE . '&m=' . M_TESTIRANJE_CAS . '" title="' . $lang['srv_testiranje_cas'] . '">'.$lang['srv_testiranje_cas'].'</a></span>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
$borderLeft = ' class="borderLeft"';
|
||||
}
|
||||
// Link nazaj na komentarje
|
||||
elseif ($podstran == 'komentarji' || $podstran == 'komentarji_anketa') {
|
||||
|
||||
// Prestejemo komentarje (nereseni/vsi)
|
||||
$sas = new SurveyAdminSettings();
|
||||
$comment_count = $sas->testiranje_komentarji_count();
|
||||
|
||||
echo '<div id="additional_navigation">';
|
||||
|
||||
// Komentarji na vprasanja
|
||||
echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
|
||||
|
||||
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
|
||||
echo $lang['srv_testiranje_komentarji_anketa_title'];
|
||||
echo '</a>';
|
||||
|
||||
echo '<span class="bold">(';
|
||||
if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
|
||||
echo '<span class="orange">';
|
||||
echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
|
||||
if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
|
||||
echo '</span>';
|
||||
echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']);
|
||||
echo ')</span>';
|
||||
|
||||
echo '</span>';
|
||||
|
||||
|
||||
// Komentarji na anketo
|
||||
echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
|
||||
|
||||
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
|
||||
echo $lang['srv_testiranje_komentarji_title'];
|
||||
echo '</a>';
|
||||
|
||||
echo '<span class="bold">(';
|
||||
if ($comment_count['question']['unresolved'] > 0)
|
||||
echo '<span class="orange">';
|
||||
echo $comment_count['question']['unresolved'];
|
||||
if ($comment_count['question']['unresolved'] > 0)
|
||||
echo '</span>';
|
||||
echo '/' . $comment_count['question']['all'];
|
||||
echo ')</span>';
|
||||
|
||||
echo '</span>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
|
||||
$borderLeft = ' class="borderLeft"';
|
||||
@ -550,11 +506,19 @@ class SurveyStaticHtml
|
||||
echo '</select>';
|
||||
echo '</div>';
|
||||
|
||||
// Nastavitve za filtre (po spr, zoom, statusi...)
|
||||
echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
|
||||
echo '<span id="filters_span2" class="faicon wheel_32"></span>';
|
||||
$this->displayAnalizaRightOptions2($podstran);
|
||||
echo '</div>';
|
||||
// Nastavitve pri grafih
|
||||
if(in_array($podstran, array('charts'))){
|
||||
echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
|
||||
echo '<span id="filters_span2" class="faicon wheel_32"></span>';
|
||||
$this->displayAnalizaRightOptions2($podstran);
|
||||
echo '</div>';
|
||||
}
|
||||
// Nastavitve pri analizah - brez popupa - samo klik na zobnik
|
||||
else{
|
||||
echo '<div title="' . $lang['settings'] . '" id="analiza_right_options2" class="spaceRight spaceLeft">';
|
||||
echo ' <span id="filters_span2" class="faicon wheel_32" onClick="dataSettingProfileAction(\'showProfiles\');"></span>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
elseif ($podstran == 'data' || $podstran == 'export') {
|
||||
// Ikona za ponovno generiranje datoteke
|
||||
@ -569,24 +533,6 @@ class SurveyStaticHtml
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
// Link na nastavitve komentarjev
|
||||
elseif ($podstran == 'komentarji' || $podstran == 'komentarji_anketa') {
|
||||
|
||||
$d = new Dostop();
|
||||
|
||||
# nastavitve komentarjev
|
||||
if ($d->checkDostopSub('edit')) {
|
||||
echo '<div id="analiza_right_options_holder" class="right_options_holder">';
|
||||
|
||||
echo '<div title="' . $lang['settings'] . '" id="analiza_right_options">';
|
||||
echo '<a href="index.php?anketa=' . $this->sid . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
|
||||
echo '<span class="faicon wheel_32"></span>';
|
||||
echo '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
@ -807,7 +807,7 @@ class SurveyStatistic {
|
||||
echo '<div class="dashboard_boxes">';
|
||||
|
||||
// nimamo še vnosov
|
||||
if ($allUserCount == 0 || $paradata_date == 1) {
|
||||
if ($allUserCount == 0 || ($paradata_date == 1 && !SurveyInfo::getInstance()->checkSurveyModule('voting'))){
|
||||
|
||||
echo '<div class="dashboard_box" name="div_statistic_info" id="div_statistic_info">';
|
||||
$this->DisplayInfoView();
|
||||
|
||||
@ -161,7 +161,7 @@ class SurveyTheme {
|
||||
break;
|
||||
case 'checboxThemeSave':
|
||||
$this->ajaxSaveChecboxTheme($_POST['anketa'],$_POST['checkbox']);
|
||||
breake;
|
||||
break;
|
||||
|
||||
default:
|
||||
print_r("<pre>");
|
||||
@ -179,6 +179,7 @@ class SurveyTheme {
|
||||
$groupId = 0;
|
||||
|
||||
echo '<div class="themes-content">';
|
||||
|
||||
|
||||
echo '<div id="div_theme_groups">';
|
||||
$this->displayGroupSelector($groupId);
|
||||
@ -369,19 +370,29 @@ class SurveyTheme {
|
||||
}
|
||||
|
||||
//Gumbi
|
||||
echo '<div class="options">';
|
||||
echo '<div class="options option1" >';
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
echo '<span class="faicon dots" onclick="teme_options()" > </span>';
|
||||
|
||||
// echo '<img src="\public\img\icons\dots.svg">';
|
||||
echo '<i class="fa-solid fa-ellipsis"></i>';
|
||||
echo ' </button>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
echo '<div class= "buttons-window displayNone buttons-window1" id="buttons-window1">';
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button palette" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -417,17 +428,24 @@ class SurveyTheme {
|
||||
//Gumbi
|
||||
echo '<div class="options">';
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$preview_link_mobile.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
// echo '<button id="btn-2" onclick="teme_options2()"> <i class="fa-solid fa-ellipsis"></i> </button>';
|
||||
echo '<span class="faicon dots" onclick="teme_options2()" > </span>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button" onclick="window.location.href='.$modify_link_mobile.'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
echo '<div class= "buttons-window displayNone " id="buttons-window2">';
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button palette" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -570,42 +588,50 @@ class SurveyTheme {
|
||||
$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'';
|
||||
$is_current_skin = ($rowa['skin_profile'] == $row['id']) ? true : false;
|
||||
|
||||
echo '<div class="theme_list">';
|
||||
echo '<div class="theme_list" onclick="te_change_profile(\''.$row['id'].'\', true);">';
|
||||
|
||||
echo '<div class="theme">';
|
||||
echo '<span class="name">'.$skin_name.'</span>';
|
||||
echo '<span class="name">'.substr($row['name'], 0, 30).(strlen($row['name']) > 30 ? '...' : '').'</span>';
|
||||
echo '<span class="desc">('.$lang['srv_current_theme_general'].')</span>';
|
||||
echo ' <span class="name">'.$skin_name.'</span>';
|
||||
echo ' <span class="name">'.substr($row['name'], 0, 30).(strlen($row['name']) > 30 ? '...' : '').'</span>';
|
||||
echo ' <span class="desc">('.$lang['srv_current_theme_general'].')</span>';
|
||||
echo '</div>';
|
||||
|
||||
//Gumbi
|
||||
echo '<div class="options">';
|
||||
|
||||
//Aktiviraj
|
||||
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
|
||||
echo '<span class="faicon fa-hand-pointer"></span>';
|
||||
echo $lang['srv_te_theme_activate'];
|
||||
echo '</div>';
|
||||
echo '<div class="options options'.$row['id'].'" id="options'.$row['id'].'">';
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
echo '<span class="faicon dots" onclick="show_settings(\''.$row['id'].'\'); event.stopPropagation();"> </span>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
echo '<div class="buttons-window displayNone" id="additional_settings_'.$row['id'].'">';
|
||||
|
||||
//Izbriši
|
||||
if ($groupId == -1) {
|
||||
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
|
||||
echo '<span class="faicon trash empty"></span>';
|
||||
echo $lang['srv_anketadelete_txt'];
|
||||
//Aktiviraj
|
||||
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); event.stopPropagation();" title="'.$lang['srv_te_theme_activate2'].'">';
|
||||
echo '<span class="faicon fa-hand-pointer"></span>';
|
||||
echo '<div class="aktiviraj">';
|
||||
echo $lang['srv_te_theme_activate'] ;
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button palette" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'; event.stopPropagation();" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
|
||||
//Izbriši
|
||||
if ($groupId == -1) {
|
||||
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); event.stopPropagation();" title="'.$lang['srv_te_theme_delete2'].'">';
|
||||
echo '<span class="faicon trash empty"></span>';
|
||||
echo $lang['srv_anketadelete_txt'];
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>'; // additional_settings
|
||||
|
||||
echo '</div>'; //div.options
|
||||
|
||||
@ -622,7 +648,7 @@ class SurveyTheme {
|
||||
$src = ''.SurveyInfo::getSurveyLink().'&grupa='.$grupa.'&no_preview=1&preview=on&theme_profile='.$row['id'].'&mobile=1';
|
||||
$is_current_skin = ($rowa['skin_profile_mobile'] == $row['id']) ? true : false;
|
||||
|
||||
echo '<div class="theme_list">';
|
||||
echo '<div class="theme_list" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;">';
|
||||
|
||||
echo '<div class="theme">';
|
||||
echo '<span class="name">'.$skin_name.'</span>';
|
||||
@ -631,33 +657,40 @@ class SurveyTheme {
|
||||
echo '</div>';
|
||||
|
||||
//Gumbi
|
||||
echo '<div class="options">';
|
||||
echo '<div class="options options_mobile'.$row['id'].'" id="options'.$row['id'].'">';
|
||||
|
||||
//Aktiviraj
|
||||
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
|
||||
echo '<span class="faicon fa-hand-pointer"></span>';
|
||||
echo $lang['srv_te_theme_activate'];
|
||||
echo '</div>';
|
||||
echo '<span class="faicon dots" onclick="show_settings_mobile(\''.$row['id'].'\'); event.stopPropagation();"></span>';
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
|
||||
//Izbriši
|
||||
if ($groupId == -1) {
|
||||
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
|
||||
echo '<span class="faicon trash empty"></span>';
|
||||
echo $lang['srv_anketadelete_txt'];
|
||||
echo '<div class="buttons-window" id="additional_settings_mobile_'.$row['id'].'">';
|
||||
//Aktiviraj
|
||||
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); event.stopPropagation();" title="'.$lang['srv_te_theme_activate2'].'">';
|
||||
echo '<span class="faicon fa-hand-pointer"></span>';
|
||||
echo '<div class="aktiviraj">';
|
||||
echo $lang['srv_te_theme_activate'];
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
//Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo '<span class="faicon fa-desktop"></span>';
|
||||
echo $lang['srv_poglejanketo2'];
|
||||
echo '</div>';
|
||||
|
||||
//Prilagodi
|
||||
echo '<div class="button palette" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'; event.stopPropagation();" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo '<span class="faicon palette"></span>';
|
||||
echo $lang['srv_te_theme_edit'];
|
||||
echo '</div>';
|
||||
|
||||
//Izbriši
|
||||
if ($groupId == -1) {
|
||||
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); event.stopPropagation();" title="'.$lang['srv_te_theme_delete2'].'">';
|
||||
echo '<span class="faicon trash empty"></span>';
|
||||
echo $lang['srv_anketadelete_txt'];
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>'; //additional settings
|
||||
|
||||
echo '</div>'; //div.options
|
||||
|
||||
@ -667,6 +700,17 @@ class SurveyTheme {
|
||||
}
|
||||
}
|
||||
|
||||
// Klik izven - zapremo okno
|
||||
echo '<script>
|
||||
$(document).mouseup(function(e){
|
||||
var container = $(".buttons-window, .options");
|
||||
|
||||
if (!container.is(e.target) && container.has(e.target).length === 0){
|
||||
$(".buttons-window").addClass("displayNone");
|
||||
}
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
// Splošne teme - GRID
|
||||
if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {
|
||||
@ -680,22 +724,33 @@ class SurveyTheme {
|
||||
if(substr($skin, 0, 6) == 'Mobile')
|
||||
$src .= '&mobile=1';
|
||||
|
||||
echo '<div class="theme_label '.($is_current_skin || $is_current_mobile_skin ? 'span_theme_current' : '').'">';
|
||||
// Preview slika
|
||||
$css = urlencode($skin);
|
||||
$gid = $groupId;
|
||||
|
||||
|
||||
echo '<div class="theme_label '.($is_current_skin || $is_current_mobile_skin ? 'span_theme_current' : '').'" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'">';
|
||||
|
||||
echo '<div class="theme_label_content">';
|
||||
|
||||
// Preview slika
|
||||
if ($groupId == -1) echo '<a href="#" class="theme_delete theme" gid="'.$groupId.'" css="'.urlencode($skin).'">'.$lang['srv_anketadelete_txt'].'</a>';
|
||||
if ($groupId == -1)
|
||||
echo '<a href="#" class="theme_delete theme" gid="'.$groupId.'" css="'.urlencode($skin).'">'.$lang['srv_anketadelete_txt'].'</a>';
|
||||
|
||||
if ($groupId == -1) {
|
||||
echo '<img src="'.$site_url.'public/img/skins_previews/'.($groupId==-1?'usertheme':urlencode($simple_name)).'.png" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
|
||||
}
|
||||
else
|
||||
echo '<img src="'.$site_url.'public/img/skins_previews/'.urlencode($simple_name).'.png" class="theme" gid="'.$groupId.'" css="'.urlencode($skin).'" alt="'.$simple_name.'" title="'.$lang['srv_changetheme'].'">';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
|
||||
//Gumbi
|
||||
echo '<div class="theme_label_options">';
|
||||
|
||||
// Ime teme
|
||||
echo "<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>";
|
||||
echo '<span class="theme_name">';
|
||||
echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : ''));
|
||||
echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? '<div class="privzeto"> ('.$lang['default'].') </div>' : ''));
|
||||
|
||||
// Vprasajcki
|
||||
if( in_array($simple_name, array('Fdv', 'Cdi', 'Uni', 'MobileFdv', 'MobileCdi', 'MobileUni')) ){
|
||||
@ -708,25 +763,8 @@ class SurveyTheme {
|
||||
if($groupId == -1)
|
||||
echo ' (CSS)';
|
||||
echo '</span>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
//Gumbi
|
||||
echo '<div class="theme_label_options">';
|
||||
|
||||
$css = urlencode($skin);
|
||||
$gid = $groupId;
|
||||
|
||||
// Aktiviraj
|
||||
echo '<div class="button wtext" onclick="changeTheme(\''.$gid.'\', \''.$css.'\');" title="'.$lang['srv_te_theme_activate2'].'">';
|
||||
echo ' <span class="faicon fa-hand-pointer"></span>';
|
||||
echo $lang['srv_te_theme_activate'];
|
||||
echo '</div>';
|
||||
|
||||
// Predogled
|
||||
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
|
||||
echo ' <span class="faicon fa-desktop"></span>';
|
||||
echo '</div>';
|
||||
echo '<div class="buttons_flex">';
|
||||
|
||||
// Prilagodi - samo ce je tema aktivna
|
||||
if($is_current_skin || $is_current_mobile_skin){
|
||||
@ -736,10 +774,13 @@ class SurveyTheme {
|
||||
else
|
||||
$link = 'index.php?anketa='.$this->sid.'&a=theme-editor&profile_new='.$rowa['skin'];
|
||||
|
||||
echo '<div class="button" onclick="window.location.href=\''.$link.'\'" title="'.$lang['srv_te_theme_edit'].'">';
|
||||
echo ' <span class="faicon palette"></span>';
|
||||
echo '</div>';
|
||||
echo ' <span class="faicon palette" onclick="window.location.href=\''.$link.'\'; event.stopPropagation();" title="'.$lang['srv_te_theme_edit'].'"></span>';
|
||||
}
|
||||
|
||||
// Predogled
|
||||
echo ' <span class="faicon fa-desktop" onclick="window.location.href=\''.$src.'\'; event.stopPropagation();" title="'.$lang['srv_poglejanketo2'].'"></span>';
|
||||
|
||||
echo '</div>'; // div.buttons_flex
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
@ -532,22 +532,22 @@ class SurveyTimeProfiles {
|
||||
echo '<p class="setting_title">' . $lang['srv_time_profile_time'] . '</p>';
|
||||
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label>' . $lang['srv_time_profile_from'] . ':</label>';
|
||||
echo '<input id="startDate" type="text" class="text medium" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/> ';
|
||||
echo '<span class="faicon calendar_icon pointer blue" id="starts_img"></span>';
|
||||
echo '<label>' . $lang['srv_time_profile_to'] . ':</label>';
|
||||
echo '<input id="endDate" type="text" class="text medium" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/> ';
|
||||
echo '<span class="faicon calendar_icon pointer blue" id="expire_img"></span>' . "\n" ;
|
||||
echo ' <input type="radio" name="type" id="time_date_type" value="0" '.($type == '0' ? ' checked="checked"' : '').' autocomplete="off"><label for="time_date_type">' . $lang['srv_time_profile_from'] . ':</label>';
|
||||
echo ' <input id="startDate" type="text" class="text medium" name="startDate" value="' . $p_data['starts'] . '" onclick="changeTimeProfileType();" readonly="true" '.' autocomplete="off"/> ';
|
||||
echo ' <span class="faicon calendar_icon pointer blue" id="starts_img"></span>';
|
||||
echo ' <label>' . $lang['srv_time_profile_to'] . ':</label>';
|
||||
echo ' <input id="endDate" type="text" class="text medium" name="endDate" value="' . $p_data['ends'] . '" onclick="changeTimeProfileType();" readonly="true" '.'cautocomplete="off"/> ';
|
||||
echo ' <span class="faicon calendar_icon pointer blue" id="expire_img"></span>' . "\n" ;
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="setting_item">';
|
||||
echo '<input type="radio" name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off"><label>'.$lang['srv_statistic_period_label'].':</label>';
|
||||
echo '<select class="dropdown medium" name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
|
||||
echo '<option value="" selected="true">'.$lang['srv_time_profile_choose_interval'].'</option>';
|
||||
echo ' <input type="radio" name="type" id="time_date_interval" value="1" '.($type == '0' ? '' : ' checked="checked"').' autocomplete="off"><label for="time_date_interval">'.$lang['srv_statistic_period_label'].':</label>';
|
||||
echo ' <select class="dropdown medium" name="stat_interval" id="stat_interval" onclick="changeTimeProfileType(\'interval\');" '.'autocomplete="off">';
|
||||
echo ' <option value="" selected="true">'.$lang['srv_time_profile_choose_interval'].'</option>';
|
||||
foreach (self::$STP_ARRAYS as $INTERVAL) {
|
||||
echo '<option value="'.$INTERVAL.'"' . ($time == $INTERVAL ? ' selected' : '') . '>'.$lang['srv_diagnostics_'.$INTERVAL].'</option>';
|
||||
echo ' <option value="'.$INTERVAL.'"' . ($time == $INTERVAL ? ' selected' : '') . '>'.$lang['srv_diagnostics_'.$INTERVAL].'</option>';
|
||||
}
|
||||
echo '</select>';
|
||||
echo ' </select>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -1222,6 +1222,20 @@ class Vprasanje {
|
||||
// Lastnosti
|
||||
echo '<fieldset><legend>'.$lang['srv_lastnosti'].'</legend>';
|
||||
|
||||
if ($row['tip'] <= 2 )
|
||||
$this->edit_stolpci();
|
||||
|
||||
if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 6)
|
||||
$this->edit_presetValue();
|
||||
|
||||
if($row['tip'] == 2) {
|
||||
$this->edit_checkbox_max_limit();
|
||||
$this->edit_checkbox_min_limit();
|
||||
}
|
||||
|
||||
if ($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20)
|
||||
$this->edit_grid_dynamic();
|
||||
|
||||
//echo '<p class="heading">'.$lang['srv_prikaz_vprasanja'].'</p>';
|
||||
$this->edit_visible();
|
||||
|
||||
@ -1235,21 +1249,10 @@ class Vprasanje {
|
||||
$this->edit_locked();
|
||||
|
||||
$this->edit_timer();
|
||||
|
||||
if ($row['tip'] <= 2 )
|
||||
$this->edit_stolpci();
|
||||
|
||||
if($row['tip'] == 2) {
|
||||
$this->edit_checkbox_max_limit();
|
||||
$this->edit_checkbox_min_limit();
|
||||
}
|
||||
|
||||
|
||||
if($row['tip'] <= 3)
|
||||
$this->edit_stat();
|
||||
|
||||
if ($row['tip'] == 6)
|
||||
$this->edit_grid_dynamic();
|
||||
|
||||
|
||||
if ($row['tip'] == 1 || $row['tip'] == 6) {
|
||||
$this->edit_onchange_submit();
|
||||
}
|
||||
@ -1262,10 +1265,7 @@ class Vprasanje {
|
||||
|
||||
if ($row['tip'] == 1 || $row['tip'] == 2 && (in_array($row['orientation'], array(0,1,2))))
|
||||
$this->edit_hideRadio();
|
||||
|
||||
if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 6)
|
||||
$this->edit_presetValue();
|
||||
|
||||
|
||||
// Nastavitev za prikaz prejsnjih odgovorov pod text vprasanjem
|
||||
if ($row['tip'] == 21)
|
||||
$this->edit_show_prevAnswers();
|
||||
@ -1758,7 +1758,7 @@ class Vprasanje {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo '<div class="vprasanje_setting_line half-half">';
|
||||
echo '<div class="vprasanje_setting_line right-190">';
|
||||
|
||||
echo '<label>'.$lang['srv_question_type'].':</label>';
|
||||
|
||||
@ -1768,15 +1768,22 @@ class Vprasanje {
|
||||
|
||||
if($this->survey_type != 0){
|
||||
|
||||
if ($row['tip'] == 3) // star tip, ostane samo za kompatibilnost, ce je kje ostal se star tip
|
||||
//echo '<option value="3"' . ($row['tip'] == 3 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_dropdown'] . '</option>';
|
||||
// star tip, ostane samo za kompatibilnost, ce je kje ostal se star tip
|
||||
if ($row['tip'] == 3){
|
||||
if ($row['info']){
|
||||
echo '<option value="3"' . ($row['tip'] == 3 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_checkbox'] .'</option>';
|
||||
}
|
||||
else{
|
||||
echo '<option value="3"' . ($row['tip'] == 3 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_radio'] .'</option>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '<option value="21"' . ($row['tip'] == 21 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_text'] . '</option>';
|
||||
if ($row['tip'] == 4) // star tip, ostane samo za kompatibilnost, ce je kje ostal se star tip
|
||||
echo '<option value="4"' . ($row['tip'] == 4 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_text'] . '</option>';
|
||||
|
||||
echo '<option value="7"' . ($row['tip'] == 7 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_number'] . '</option>';
|
||||
|
||||
echo '<option value="6"' . ($row['tip'] == 6 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_multigrid'] . '</option>';
|
||||
echo '<option value="16"' . ($row['tip'] == 16 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_multicheckbox'] . '</option>';
|
||||
echo '<option value="19"' . ($row['tip'] == 19 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_multitext'] . '</option>';
|
||||
@ -1784,15 +1791,9 @@ class Vprasanje {
|
||||
|
||||
if($userAccess->checkUserAccess($what='question_type_multitable'))
|
||||
echo '<option value="24"' . ($row['tip'] == 24 ? ' selected="true"' : '') . '>' . $lang['srv_survey_table_multiple'] . '</option>';
|
||||
|
||||
echo '<option value="21"' . ($row['tip'] == 21 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_text'] . '</option>';
|
||||
|
||||
if ($row['tip'] == 4) // star tip, ostane samo za kompatibilnost, ce je kje ostal se star tip
|
||||
echo '<option value="4"' . ($row['tip'] == 4 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_text'] . '</option>';
|
||||
|
||||
echo '<option value="7"' . ($row['tip'] == 7 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_number'] . '</option>';
|
||||
|
||||
echo '<option value="5"' . ($row['tip'] == 5 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_label'] . '</option>';
|
||||
|
||||
|
||||
if($userAccess->checkUserAccess($what='question_type_location'))
|
||||
echo '<option value="26"' . ($row['tip'] == 26 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_location'] . '</option>';
|
||||
|
||||
@ -1907,7 +1908,7 @@ class Vprasanje {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
echo ' <div class="vprasanje_setting_line right-190">';
|
||||
if($site_domain == 'anketa.nijz.si'){
|
||||
echo ' <label>'.$lang['srv_variable'].': '.Help::display('edit_variable').'</label>';
|
||||
echo ' <span class="content"><input type="text" name="variable" value="'.$row['variable'].'" '.($disabled?'disabled':'').' /></span>';
|
||||
@ -1933,7 +1934,7 @@ class Vprasanje {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
echo ' <div class="vprasanje_setting_line right-190">';
|
||||
echo ' <label>'.$lang['srv_label'].':</label>';
|
||||
echo ' <span class="content"><input type="text" name="label" value="'.$row['label'].'" maxlength="80" /></span>';
|
||||
echo ' </div>';
|
||||
@ -2380,8 +2381,8 @@ class Vprasanje {
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="visible" value="0" />';
|
||||
echo ' <input type="checkbox" id="visible" name="visible" value="1" '.(($row['visible'] == 1) ? ' checked="checked" ' : '').' onClick="show_dostop(this.checked);" />';
|
||||
echo ' <input type="hidden" name="visible" value="1" />';
|
||||
echo ' <input type="checkbox" id="visible" name="visible" value="0" '.(($row['visible'] != 1) ? ' checked="checked" ' : '').' onClick="show_dostop(this.checked);" />';
|
||||
echo ' <label for="visible" class="title">'.$lang['srv_visible'].'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
@ -2430,15 +2431,19 @@ class Vprasanje {
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
$disabled_vprasanje = ($spremenljivkaParams->get('disabled_vprasanje') ? $spremenljivkaParams->get('disabled_vprasanje') : 0);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
// ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
|
||||
if($disabled_vprasanje == '1'){
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="disabled_vprasanje" value="0" />';
|
||||
echo ' <input type="checkbox" id="disabled_vprasanje" name="disabled_vprasanje" value="1" '.(($disabled_vprasanje == 1) ? ' checked="checked" ' : '').' />';
|
||||
echo ' <label for="disabled_vprasanje">'.$lang['srv_disabled'].' '.Help::display('srv_disabled_question').'</label>';
|
||||
echo ' </div>';
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo '</div>';
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="disabled_vprasanje" value="0" />';
|
||||
echo ' <input type="checkbox" id="disabled_vprasanje" name="disabled_vprasanje" value="1" '.(($disabled_vprasanje == 1) ? ' checked="checked" ' : '').' />';
|
||||
echo ' <label for="disabled_vprasanje">'.$lang['srv_disabled'].' '.Help::display('srv_disabled_question').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2458,6 +2463,28 @@ class Vprasanje {
|
||||
$display = ( ($row['tip'] == 6 && ($row['enota'] == 4 || $row['enota'] == 5 || ($row['enota'] == 1 && $diferencial_trak == 1) || ($row['enota'] == 0 && $diferencial_trak == 1)) ) || ($row['tip'] == 6 && $row['enota'] == 8) || ($row['tip'] == 20 && $row['ranking_k'] == 1)) ? ' style="display:none;"' : '';
|
||||
|
||||
|
||||
if ($row['ranking_k'] != 1){
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
$grid_var = ($spremenljivkaParams->get('grid_var') ? $spremenljivkaParams->get('grid_var') : 0);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder grid_var_class" '.$display.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="grid_var" value="0">';
|
||||
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? ' checked="checked"' : '').'>';
|
||||
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' '.Help::display('srv_grid_var').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// Vrednosti na traku tip
|
||||
if($row['tip'] == 6){
|
||||
$this->edit_trak_tabela();
|
||||
}
|
||||
|
||||
|
||||
echo '<div class="vprasanje_setting_holder drop_grids_num" '.$display_1.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
@ -2490,7 +2517,6 @@ class Vprasanje {
|
||||
// Slikovni tip
|
||||
if($row['tip'] == 6){
|
||||
$this->edit_custom_picture_radio();
|
||||
$this->edit_trak_tabela();
|
||||
}
|
||||
|
||||
|
||||
@ -2512,22 +2538,6 @@ class Vprasanje {
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
if ($row['ranking_k'] != 1){
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
$grid_var = ($spremenljivkaParams->get('grid_var') ? $spremenljivkaParams->get('grid_var') : 0);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder grid_var_class" '.$display.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="grid_var" value="0">';
|
||||
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? ' checked="checked"' : '').'>';
|
||||
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' '.Help::display('srv_grid_var').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2551,17 +2561,18 @@ class Vprasanje {
|
||||
|
||||
if (count($missing_values) > 0) {
|
||||
|
||||
echo '<div id="missing_settings_holder">';
|
||||
echo ' <div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line inline">';
|
||||
foreach ($missing_values AS $mv_key => $mv_text) {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked' : '').' name="missing_value_checkbox[]" id="missing_value_'.$mv_key.'" value="'.$mv_key.'" title="'.$mv_text.'""></input> ';
|
||||
echo ' <label for="missing_value_'.$mv_key.'" class="pointer">'.$mv_text.'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
echo ' <input type="checkbox" '.(isset($already_set_mv[$mv_key]) ? ' checked' : '').' name="missing_value_checkbox[]" id="missing_value_'.$mv_key.'" value="'.$mv_key.'" title="'.$mv_text.'""></input> ';
|
||||
echo ' <label for="missing_value_'.$mv_key.'" class="pointer">'.$mv_text.'</label>';
|
||||
}
|
||||
echo ' </div>';
|
||||
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -2604,64 +2615,6 @@ class Vprasanje {
|
||||
|
||||
$row = Cache::srv_spremenljivka($this->spremenljivka);
|
||||
|
||||
// Če gre za vizualno skalo ali slikovni tip potem opcij ne prikazujemo. Še vedno pa izpišemo, da delujejo če nekdo zamenja tip vprašanaj
|
||||
$displayNone = '';
|
||||
if(in_array($row['orientation'], [9,11]))
|
||||
$displayNone = 'style="display:none";';
|
||||
|
||||
// Prednastavljene vrednosti odgovorov (dropdown)
|
||||
if ($row['tip'] == 1) {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half radio_defaults_class">';
|
||||
echo ' <label>'.$lang['srv_defaultGrid'].':</label>';
|
||||
echo ' <span class="content"><select name="radio_defaults" id="radio_defaults">';
|
||||
echo ' <option value="0">'.$lang['s_without'].'</option>';
|
||||
foreach($default_grid_values AS $key => $value){
|
||||
echo ' <option value="'.$key.'">'.$value['name'].'</option>';
|
||||
}
|
||||
echo ' </select></span>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
// inline urejanje variabel vrednosti
|
||||
if ( in_array($row['tip'], array(1,2,3))) {
|
||||
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
$grid_var = ($spremenljivkaParams->get('grid_var') ? $spremenljivkaParams->get('grid_var') : 0);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="grid_var" value="0" />';
|
||||
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? 'checked="checked"' : '').'>';
|
||||
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' '.Help::display('srv_grid_var').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Obratni vrstni red vrednosti
|
||||
if($row['tip'] == 1 || $row['tip'] == 3){
|
||||
|
||||
$reverse_var = ($spremenljivkaParams->get('reverse_var') ? $spremenljivkaParams->get('reverse_var') : 0);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="reverse_var" value="0" />';
|
||||
echo ' <input type="checkbox" '.($reverse_var == '1' ? ' checked="checked" ': '').' value="1" id="reverse_var" name="reverse_var">';
|
||||
echo ' <label for="reverse_var" class="title">'.$lang['srv_reverse_values'].'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Hitro dodajanje kategorij
|
||||
echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
|
||||
|
||||
@ -2687,7 +2640,7 @@ class Vprasanje {
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
|
||||
// inline hitro dodajanje slik - zaenkrat samo radio in checkbox - v testiranju, zato samo za admine
|
||||
if (in_array($row['tip'], array(1,2)) && $row['orientation'] == 1) {
|
||||
|
||||
@ -2704,6 +2657,68 @@ class Vprasanje {
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// inline urejanje variabel vrednosti
|
||||
if ( in_array($row['tip'], array(1,2,3))) {
|
||||
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
$grid_var = ($spremenljivkaParams->get('grid_var') ? $spremenljivkaParams->get('grid_var') : 0);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="grid_var" value="0" />';
|
||||
echo ' <input type="checkbox" id="grid_var" name="grid_var" value="1" '.($grid_var == 1 ? 'checked="checked"' : '').'>';
|
||||
echo ' <label for="grid_var" class="title">'.$lang['srv_edit_values'].' '.Help::display('srv_grid_var').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Obratni vrstni red vrednosti
|
||||
if($row['tip'] == 1 || $row['tip'] == 3){
|
||||
|
||||
$reverse_var = ($spremenljivkaParams->get('reverse_var') ? $spremenljivkaParams->get('reverse_var') : 0);
|
||||
|
||||
// ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
|
||||
if($reverse_var == '1'){
|
||||
echo '<div class="vprasanje_setting_holder" '.$displayNone.'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="reverse_var" value="0" />';
|
||||
echo ' <input type="checkbox" '.($reverse_var == '1' ? ' checked="checked" ': '').' value="1" id="reverse_var" name="reverse_var">';
|
||||
echo ' <label for="reverse_var" class="title">'.$lang['srv_reverse_values'].'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Če gre za vizualno skalo ali slikovni tip potem opcij ne prikazujemo. Še vedno pa izpišemo, da delujejo če nekdo zamenja tip vprašanaj
|
||||
$displayNone = '';
|
||||
if(in_array($row['orientation'], [9,11]))
|
||||
$displayNone = 'style="display:none";';
|
||||
|
||||
// Prednastavljene vrednosti odgovorov (dropdown)
|
||||
if ($row['tip'] == 1) {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half radio_defaults_class">';
|
||||
echo ' <label>'.$lang['srv_defaultGrid'].':</label>';
|
||||
echo ' <span class="content"><select name="radio_defaults" id="radio_defaults">';
|
||||
echo ' <option value="0">'.$lang['s_without'].'</option>';
|
||||
foreach($default_grid_values AS $key => $value){
|
||||
echo ' <option value="'.$key.'">'.$value['name'].'</option>';
|
||||
}
|
||||
echo ' </select></span>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2986,16 +3001,18 @@ class Vprasanje {
|
||||
echo '<div><textarea id="hotspot_image" name="hotspot_image" style="width:99%">'.$hotspot_image.'</textarea></div>';
|
||||
|
||||
echo '<br />';
|
||||
|
||||
//gumb Potrdi
|
||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
||||
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="hotspot_image_save(\''.$row['id'].'\'); hotspot_image_resize(\''.$row['id'].'\'); show_hot_spot_settings_from_editor (\''.$row['id'].'\', \''.$enota_orientation.'\', \''.$row['tip'].'\'); hotspot_image_button_update(\''.$row['id'].'\', \''.$lang['srv_hot_spot_load_image'].'\', \''.$lang['srv_hot_spot_edit_image'].'\'); return false; "><span>'.$lang['srv_potrdi'].'</span></a>';
|
||||
echo '</span>';
|
||||
|
||||
//Gumba Potrdi in Zapri
|
||||
echo '<div class="button_holder">';
|
||||
|
||||
//gumb Potrdi
|
||||
echo '<button class="small white-blue" href="#" onclick="hotspot_image_save(\''.$row['id'].'\'); hotspot_image_resize(\''.$row['id'].'\'); show_hot_spot_settings_from_editor (\''.$row['id'].'\', \''.$enota_orientation.'\', \''.$row['tip'].'\'); hotspot_image_button_update(\''.$row['id'].'\', \''.$lang['srv_hot_spot_load_image'].'\', \''.$lang['srv_hot_spot_edit_image'].'\'); return false; "><span>'.$lang['srv_potrdi'].'</span></button>';
|
||||
|
||||
//gumb Zapri
|
||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vrednost_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></a>'."\n\r";
|
||||
echo '</span>';
|
||||
echo '<button class="small blue" href="#" onclick="vrednost_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></button>'."\n\r";
|
||||
|
||||
echo '</div>';
|
||||
//Gumba Potrdi in Zapri - konec
|
||||
|
||||
echo '</form>';
|
||||
}
|
||||
@ -3063,7 +3080,9 @@ class Vprasanje {
|
||||
|
||||
}
|
||||
else { //string present
|
||||
$usemap = 'id="hotspot_'.$row['id'].'_image" usemap="#hotspot_'.$row['id'].'_usemap" style="z-index: 1; height:'.$hotspot_image_height.'px; width: '.$hotspot_image_width.'px; position: relative; top: 15px;"'; //z-index: 1, da bo slika pod canvas in prave dimenzije in na pravi poziciji
|
||||
$usemap = 'id="hotspot_'.$row['id'].'_image" usemap="#hotspot_'.$row['id'].'_usemap" style="z-index: 1; height:'.$hotspot_image_height.'px; width: '.
|
||||
$hotspot_image_width.'px; position: relative; top: 0px;"'; //z-index: 1, da bo slika pod canvas in prave dimenzije in na pravi poziciji
|
||||
//$hotspot_image_width.'px; position: relative; top: 15px;"'; //z-index: 1, da bo slika pod canvas in prave dimenzije in na pravi poziciji
|
||||
//v $hotspot_image je potrebno dodati usemap="#hotspot_image_'.$row['id'].'" za identificiranje mape
|
||||
$hotspot_image = substr_replace($hotspot_image, $usemap, 5, 0); //dodaj zeleni string v $hotspot_image
|
||||
}
|
||||
@ -3103,30 +3122,25 @@ class Vprasanje {
|
||||
|
||||
echo '<br />';
|
||||
|
||||
|
||||
//polje za vnos imena obmocja
|
||||
echo '<span class="buttonwrapper spaceRight">';
|
||||
echo $lang['srv_hot_spot_region_name'].': ';
|
||||
echo '<input name="hotspot_region_name" value="'.$region_name.'">';
|
||||
echo '</span>';
|
||||
|
||||
echo '<br />';
|
||||
echo '<br />';
|
||||
|
||||
//Gumba Potrdi in Zapri
|
||||
echo '<div class="button_holder">';
|
||||
// gumb Potrdi
|
||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
||||
echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="hotspot_save_regions('.$row['spr_id'].', '.$last_hotspot_region_index.', '.$vrednost.', '.$hotspot_region_index.'); return false; "><span>'.$lang['srv_potrdi'].'</span></a>';
|
||||
echo '</span>';
|
||||
echo '<button class="small white-blue" href="#" onclick="hotspot_save_regions('.$row['spr_id'].', '.$last_hotspot_region_index.', '.$vrednost.', '.$hotspot_region_index.'); return false; "><span>'.$lang['srv_potrdi'].'</span></button>';
|
||||
|
||||
// gumb Zapri - konec
|
||||
echo '<span class="buttonwrapper spaceRight floatLeft">';
|
||||
echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="hotspot_region_cancel('.$row['spr_id'].', '.$vrednost.'); vrednost_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></a>'."\n\r";
|
||||
echo '</span>';
|
||||
echo '<button class="small blue" href="#" onclick="hotspot_region_cancel('.$row['spr_id'].', '.$vrednost.'); vrednost_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></button>'."\n\r";
|
||||
|
||||
echo '</div>';
|
||||
//Gumba Potrdi in Zapri - konec
|
||||
|
||||
// tekst z navodili
|
||||
echo '<br />';
|
||||
echo '<br />'.$lang['srv_hotspot_edit_region_msg'];
|
||||
echo '<div id="hotspot_tips_'.$row['spr_id'].'" style="display:none">'.$lang['srv_hotspot_edit_region_tip_delete'].' <br />'.$lang['srv_hotspot_edit_region_tip_move'].'</div>';
|
||||
// tekst z navodili - konec
|
||||
|
||||
echo '</form>';
|
||||
}
|
||||
@ -3325,32 +3339,52 @@ class Vprasanje {
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
// dinamicen multigrid
|
||||
// Prilagojen multigrid
|
||||
function edit_grid_dynamic () {
|
||||
global $lang;
|
||||
|
||||
$row = Cache::srv_spremenljivka($this->spremenljivka);
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
|
||||
echo ' <label>'.$lang['srv_dynamic_multigrid'].Help::display('srv_tabela_postopno').':</label>';
|
||||
echo ' <label>Prilagoditev tabele na računalniku:</label>';
|
||||
|
||||
$pc_tables = $spremenljivkaParams->get('pc_tables');
|
||||
|
||||
echo ' <span class="content"><input type="hidden" name="dynamic_mg" value="0" />';
|
||||
echo ' <select id="dynamic_mg" name="dynamic_mg" onChange="onchange_submit_show(this.value);">';
|
||||
echo ' <option value="0" '.(($row['dynamic_mg'] == 0) ? ' selected="true" ' : '').'>'.$lang['no'].'</option>';
|
||||
echo ' <option value="1" '.(($row['dynamic_mg'] == 1) ? ' selected="true" ' : '').'>'.$lang['srv_orientacija_horizontalna_3'].'</option>';
|
||||
echo ' <option value="3" '.(($row['dynamic_mg'] == 3) ? ' selected="true" ' : '').'>'.$lang['srv_orientacija_horizontalna_3'].'_2</option>';
|
||||
echo ' <option value="5" '.(($row['dynamic_mg'] == 5) ? ' selected="true" ' : '').'>'.$lang['srv_orientacija_horizontalna_3'].'_3</option>';
|
||||
echo ' <option value="2" '.(($row['dynamic_mg'] == 2) ? ' selected="true" ' : '').'>'.$lang['srv_orientacija_vertikalna'].'</option>';
|
||||
echo ' <option value="4" '.(($row['dynamic_mg'] == 4) ? ' selected="true" ' : '').'>'.$lang['srv_orientacija_vertikalna'].'_2</option>';
|
||||
echo ' <option value="6" '.(($row['dynamic_mg'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_orientacija_vertikalna'].'_3</option>';
|
||||
echo ' <span class="content">';
|
||||
echo ' <select id="pc_tables" name="pc_tables" onChange="onchange_submit_show(this.value);">';
|
||||
echo ' <option value="0" '.(($pc_tables == 0) ? ' selected="true" ' : '').'>'.$lang['no'].'</option>';
|
||||
echo ' <option value="1" '.(($pc_tables == 1) ? ' selected="true" ' : '').'>'.$lang['yes'].'</option>';
|
||||
echo ' <option value="2" '.(($pc_tables == 2) ? ' selected="true" ' : '').'>'.$lang['srv_settings_mobile_tables_slide'].'</option>';
|
||||
echo ' <option value="3" '.(($pc_tables == 3) ? ' selected="true" ' : '').'>'.$lang['srv_settings_mobile_tables_hor'].'</option>';
|
||||
echo ' </select>';
|
||||
echo ' </span>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
|
||||
echo ' <label>Prilagoditev tabele na mobilni napravi:</label>';
|
||||
|
||||
$mobile_tables = $spremenljivkaParams->get('mobile_tables');
|
||||
|
||||
echo ' <span class="content">';
|
||||
echo ' <select id="mobile_tables" name="mobile_tables" onChange="onchange_submit_show(this.value);">';
|
||||
echo ' <option value="0" '.(($mobile_tables == 0) ? ' selected="true" ' : '').'>'.$lang['no'].'</option>';
|
||||
echo ' <option value="1" '.(($mobile_tables == 1) ? ' selected="true" ' : '').'>'.$lang['yes'].'</option>';
|
||||
echo ' <option value="2" '.(($mobile_tables == 2) ? ' selected="true" ' : '').'>'.$lang['srv_settings_mobile_tables_slide'].'</option>';
|
||||
echo ' <option value="3" '.(($mobile_tables == 3) ? ' selected="true" ' : '').'>'.$lang['srv_settings_mobile_tables_hor'].'</option>';
|
||||
echo ' </select>';
|
||||
echo ' </span>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
@ -3464,7 +3498,7 @@ class Vprasanje {
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
echo ' <label>'.(in_array($row['tip'], array(6, 16, 19, 20)) ? $lang['srv_sort_grid'] : $lang['srv_sort']).': </label>';
|
||||
echo ' <label>'.(in_array($row['tip'], array(6, 16, 19, 20)) ? $lang['srv_sort_grid'] : $lang['srv_sort_answers']).': </label>';
|
||||
echo ' <span class="content"><select name="random">';
|
||||
echo ' <option value="0" '.(($row['random'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_random_off2'].'</option>';
|
||||
echo ' <option value="1" '.(($row['random'] == 1) ? ' selected="true" ' : '').'>'.$lang['srv_random_on2'].'</option>';
|
||||
@ -3641,7 +3675,7 @@ class Vprasanje {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
echo ' <div class="vprasanje_setting_line right-190">';
|
||||
|
||||
echo ' <label>'.$lang['srv_orientacija'].': </label>';
|
||||
|
||||
@ -3673,7 +3707,7 @@ class Vprasanje {
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line half-half">';
|
||||
echo ' <div class="vprasanje_setting_line right-190">';
|
||||
|
||||
echo ' <label>'.$lang['srv_orientacija'].':</label>';
|
||||
|
||||
@ -3744,7 +3778,7 @@ class Vprasanje {
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" name="stat" value="0" />';
|
||||
echo ' <input type="checkbox" id="stat" name="stat" value="1" '.(($row['stat'] == 1) ? ' checked="checked" ' : '').' />';
|
||||
echo ' <label for="stat">'.$lang['srv_stat_on'].' '.Help::display('srv_statistika').'</label>';
|
||||
echo ' <label for="stat">'.$lang['srv_stat_show'].' '.Help::display('srv_statistika').'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
@ -3821,7 +3855,7 @@ class Vprasanje {
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <span class="content"><input type="hidden" name="timer" value="0" />';
|
||||
echo ' <input type="checkbox" id="_timer" name="timer" value="1" '.(($row['timer'] > 0) ? ' checked="checked" ' : '').' onchange="show_timer(this.value);" />';
|
||||
echo ' <label for="_timer" class="title">Timer</label>';
|
||||
echo ' <label for="_timer" class="title">'.$lang['srv_timer'].'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
@ -4696,16 +4730,20 @@ class Vprasanje {
|
||||
|
||||
$row = Cache::srv_spremenljivka($this->spremenljivka);
|
||||
|
||||
// pri multigridu ga prikazemo samo ce imamo vklopljeno postopno resevanje
|
||||
echo '<div id="onchange_submit_div" class="vprasanje_setting_holder" '.($row['dynamic_mg']==0 && $row['tip']!=1 && $row['orientation']>2 ? ' style="display:none;"':'').'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" value="0" name="onchange_submit" />';
|
||||
echo ' <input type="checkbox" value="1" id="onchange_submit" name="onchange_submit" '.($row['onchange_submit']==1?' checked="checked"':'').' />';
|
||||
echo ' <label for="onchange_submit" class="title">'.$lang['srv_onchange_submit'].'</label>';
|
||||
echo ' </div>';
|
||||
// ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
|
||||
if($row['onchange_submit'] == '1'){
|
||||
|
||||
echo '</div>';
|
||||
// pri multigridu ga prikazemo samo ce imamo vklopljeno postopno resevanje
|
||||
echo '<div id="onchange_submit_div" class="vprasanje_setting_holder" '.($row['dynamic_mg']==0 && $row['tip']!=1 && $row['orientation']>2 ? ' style="display:none;"':'').'>';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" value="0" name="onchange_submit" />';
|
||||
echo ' <input type="checkbox" value="1" id="onchange_submit" name="onchange_submit" '.($row['onchange_submit']==1?' checked="checked"':'').' />';
|
||||
echo ' <label for="onchange_submit" class="title">'.$lang['srv_onchange_submit'].'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
function edit_hidden_default() {
|
||||
@ -4790,16 +4828,19 @@ class Vprasanje {
|
||||
|
||||
$row = Cache::srv_spremenljivka($this->spremenljivka);
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" value="0" name="showOnAllPages" />';
|
||||
echo ' <input type="checkbox" value="1" id="showOnAllPages" name="showOnAllPages" '.($row['showOnAllPages']==1?' checked="checked"':'').' />';
|
||||
echo ' <label for="showOnAllPages">'.$lang['srv_showOnAllPages_edit'].'</label>';
|
||||
echo ' </div>';
|
||||
// ODSTRANJENO - ostane samo tam, kjer je vklopljeno zaradi kompatibilnosti za nazaj
|
||||
if($row['showOnAllPages'] == '1'){
|
||||
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="vprasanje_setting_holder">';
|
||||
|
||||
echo ' <div class="vprasanje_setting_line">';
|
||||
echo ' <input type="hidden" value="0" name="showOnAllPages" />';
|
||||
echo ' <input type="checkbox" value="1" id="showOnAllPages" name="showOnAllPages" '.($row['showOnAllPages']==1?' checked="checked"':'').' />';
|
||||
echo ' <label for="showOnAllPages">'.$lang['srv_showOnAllPages_edit'].'</label>';
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
function edit_hideRadio () {
|
||||
@ -6601,6 +6642,8 @@ class Vprasanje {
|
||||
|| isset($_POST['sbSizeVse'])
|
||||
|| isset($_POST['prevAnswers'])
|
||||
|| isset($_POST['disabled_vprasanje'])
|
||||
|| isset($_POST['mobile_tables'])
|
||||
|| isset($_POST['pc_tables'])
|
||||
|| isset($_POST['slider_handle'])
|
||||
|| isset($_POST['slider_MinMaxNumLabel'])
|
||||
|| isset($_POST['slider_MinMaxLabel'])
|
||||
@ -6733,6 +6776,10 @@ class Vprasanje {
|
||||
$newParams->set('prevAnswers', $_POST['prevAnswers']);
|
||||
if (isset($_POST['disabled_vprasanje']))
|
||||
$newParams->set('disabled_vprasanje', $_POST['disabled_vprasanje']);
|
||||
if (isset($_POST['mobile_tables']))
|
||||
$newParams->set('mobile_tables', $_POST['mobile_tables']);
|
||||
if (isset($_POST['pc_tables']))
|
||||
$newParams->set('pc_tables', $_POST['pc_tables']);
|
||||
if ( isset($_POST['slider_handle']) )
|
||||
$newParams->set('slider_handle', $_POST['slider_handle']);
|
||||
if (isset($_POST['slider_MinMaxNumLabel']))
|
||||
@ -7848,15 +7895,50 @@ class Vprasanje {
|
||||
function ajax_grid_multiple_add () {
|
||||
global $lang;
|
||||
|
||||
echo '<p><b>'.$lang['srv_gridmultiple_choose'].'</b></p>';
|
||||
echo '<div class="popup_close"><a href="#" onClick="vrednost_cancel(); return false;">✕</a></div>';
|
||||
|
||||
echo '<h2>'.$lang['srv_gridmultiple_choose'].'</h2>';
|
||||
|
||||
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'6\');"><span class="sprites radio3"></span> '.$lang['srv_vprasanje_tip_1'].'</label></p>';
|
||||
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'16\');"><span class="sprites checkbox3"></span> '.$lang['srv_vprasanje_tip_2'].'</label></p>';
|
||||
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\');"><span class="sprites text"></span> '.$lang['srv_vprasanje_tip_21'].'</label></p>';
|
||||
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'20\');"><span class="sprites text"></span> '.$lang['srv_vprasanje_tip_7'].'</label></p>';
|
||||
echo '<p><label onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\', \'1\');"><span class="sprites text"></span> '.$lang['srv_vprasanje_datum'].'</label></p>';
|
||||
|
||||
echo '<a onclick="$(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#" style="position:absolute; right:10px; bottom:10px">'.$lang['srv_zapri'].'</a>';
|
||||
|
||||
echo '<div class="setting_holder multitable_answer_type">';
|
||||
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'6\');">';
|
||||
echo ' <span class="faicon radio_32"></span>';
|
||||
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_1'].'</span>';
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="setting_holder multitable_answer_type">';
|
||||
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'16\');">';
|
||||
echo ' <span class="faicon check_32"></span>';
|
||||
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_2'].'</span>';
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="setting_holder multitable_answer_type">';
|
||||
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\');">';
|
||||
echo ' <span class="faicon abc_32"></span>';
|
||||
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_21'].'</span>';
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="setting_holder multitable_answer_type">';
|
||||
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'20\');">';
|
||||
echo ' <span class="faicon number_32"></span>';
|
||||
echo ' <span class="item_text">'.$lang['srv_vprasanje_tip_7'].'</span>';
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="setting_holder multitable_answer_type">';
|
||||
echo ' <div class="item" onclick="grid_multiple_addnew(\''.$this->spremenljivka.'\', \'19\', \'1\');">';
|
||||
echo ' <span class="faicon calendar_icon"></span>';
|
||||
echo ' <span class="item_text">'.$lang['srv_vprasanje_datum'].'</span>';
|
||||
echo ' </div>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
function ajax_grid_multiple_addnew () {
|
||||
@ -7912,59 +7994,71 @@ class Vprasanje {
|
||||
$row = Cache::srv_spremenljivka($this->spremenljivka);
|
||||
$spremenljivkaParams = new enkaParameters($row['params']);
|
||||
|
||||
echo '<p><b>'.$lang['srv_analiza_opisne_subquestion'].'</b></p>';
|
||||
|
||||
echo '<div class="popup_close"><a href="#" onClick="vrednost_cancel(); return false;">✕</a></div>';
|
||||
|
||||
echo '<h2>'.$lang['srv_analiza_opisne_subquestion'].'</h2>';
|
||||
|
||||
echo '<p><span class="title">'.$lang['srv_odgovorov'].':</span> ';
|
||||
echo '<span class="content"><select name="multi_grids_count" id="multi_grids_count" onChange="change_selectbox_size(\'' . $row['id'] . '\', $(this).val(), \'' . $lang['srv_select_box_vse'] . '\');">';
|
||||
//echo '<span class="content"><select name="multi_grids_count" id="multi_grids_count" onchange="">';
|
||||
// Vedno imamo najmanj 2 grida (drugace so stvari cudne v analizah) - namesto 1 se uporabi navaden radio tip vprasanja
|
||||
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_odgovorov'].':</span>';
|
||||
|
||||
// Vedno imamo najmanj 2 grida (drugace so stvari cudne v analizah) - namesto 1 se uporabi navaden radio tip vprasanja
|
||||
// Pri number sliderju se rabi 1 (mogoče še kje - npr checkbox itd.... ) analize morajo delati tudi v tem primeru :P
|
||||
echo ' <select name="multi_grids_count" id="multi_grids_count" class="dropdown medium w200" onChange="change_selectbox_size(\'' . $row['id'] . '\', $(this).val(), \'' . $lang['srv_select_box_vse'] . '\');">';
|
||||
for ($i=1; $i<=20; $i++)
|
||||
echo '<option value="'.$i.'"'.($row['grids']==$i?' selected':'').'>'.$i.'</option>';
|
||||
|
||||
echo '</select></span>';
|
||||
echo '</p>';
|
||||
|
||||
echo ' </select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
if ($row['tip'] == 6) {
|
||||
|
||||
echo '<p><span class="title">'.$lang['srv_orientacija'].': </span>';
|
||||
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value);">';
|
||||
echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
|
||||
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota">';
|
||||
echo '<option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
|
||||
echo '<option value="2" '.(($row['enota'] == 2) ? ' selected="true" ' : '').'>'.$lang['srv_dropdown'].'</option>';
|
||||
echo '<option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_radio'].'</option>';
|
||||
echo '</select>';
|
||||
echo '</span></p>';
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_orientacija'].':</span>';
|
||||
|
||||
echo ' <select id="spremenljivka_podtip" class="dropdown medium w200" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
|
||||
echo ' <option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
|
||||
echo ' <option value="2" '.(($row['enota'] == 2) ? ' selected="true" ' : '').'>'.$lang['srv_dropdown'].'</option>';
|
||||
echo ' <option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_radio'].'</option>';
|
||||
echo ' </select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
$this->edit_selectbox_size ();
|
||||
}
|
||||
|
||||
|
||||
if ($row['tip'] == 16) {
|
||||
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_orientacija'].':</span>';
|
||||
|
||||
echo '<p><span class="title">'.$lang['srv_orientacija'].': </span>';
|
||||
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota">';
|
||||
//echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value);">';
|
||||
echo '<span class="content"><select id="spremenljivka_podtip" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
|
||||
echo '<option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
|
||||
echo '<option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_check'].'</option>';
|
||||
echo '</select>';
|
||||
echo '</span></p>';
|
||||
echo ' <select id="spremenljivka_podtip" class="dropdown medium w200" name="enota" onChange="show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
|
||||
echo ' <option value="0" '.(($row['enota'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_classic'].'</option>';
|
||||
echo ' <option value="6" '.(($row['enota'] == 6) ? ' selected="true" ' : '').'>'.$lang['srv_select-box_check'].'</option>';
|
||||
echo ' </select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
$this->edit_selectbox_size ();
|
||||
}
|
||||
|
||||
|
||||
if ($row['tip'] == 19) {
|
||||
|
||||
echo '<p>';
|
||||
// Sirina polja
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_textAreaWidth'].':</span>';
|
||||
|
||||
$taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1);
|
||||
$taHeight = ($spremenljivkaParams->get('taHeight') ? $spremenljivkaParams->get('taHeight') : 1);
|
||||
|
||||
|
||||
// Sirina polja
|
||||
echo $lang['srv_textAreaWidth'].': ';
|
||||
|
||||
$size = $row['grids'];
|
||||
$missing_count = 0;
|
||||
# če imamo missinge size povečamo za 1 + številomissingov
|
||||
@ -7974,92 +8068,94 @@ class Vprasanje {
|
||||
$size += $missing_count + 1;
|
||||
}
|
||||
|
||||
echo '<select name="taWidth" id="multi_taWidth">';
|
||||
$maxWidth = round(50 / $size);
|
||||
$maxWidth = round(50 / $size);
|
||||
$maxWidth = 10;
|
||||
|
||||
echo '<option value="-1"' . ($taWidth == -1 ? ' selected="true"' : '') . '>'.$lang['default'].'</option>';
|
||||
|
||||
echo ' <select name="taWidth" id="multi_taWidth" class="dropdown medium w200">';
|
||||
echo ' <option value="-1"' . ($taWidth == -1 ? ' selected="true"' : '') . '>'.$lang['default'].'</option>';
|
||||
for($i=1; $i<$maxWidth; $i++){
|
||||
echo '<option value="'.$i.'"' . ($taWidth == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
|
||||
echo ' <option value="'.$i.'"' . ($taWidth == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
|
||||
}
|
||||
echo '</select>';
|
||||
echo ' </select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Visina polja
|
||||
echo '<span class="spaceLeft">'.$lang['srv_textAreaHeight'].': <select name="taHeight" id="multi_taHeight">';
|
||||
$maxHeight = 10;
|
||||
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_textAreaHeight'].':</span>';
|
||||
|
||||
$maxHeight = 10;
|
||||
echo ' <select name="taHeight" id="multi_taHeight" class="dropdown medium w200">';
|
||||
for($i=1; $i<=$maxHeight; $i++){
|
||||
echo '<option value="'.$i.'"' . ($taHeight == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
|
||||
echo ' <option value="'.$i.'"' . ($taHeight == $i ? ' selected="true"' : '') . '>' . $i . '</option>';
|
||||
}
|
||||
echo '</select></span>';
|
||||
echo ' </select>';
|
||||
|
||||
echo '</p>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
if ($row['tip'] == 20) {
|
||||
echo '<fieldset><legend>'.$lang['srv_num_limits'].'</legend>';
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
$this->edit_number();
|
||||
echo '</fieldset>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// Prikaz podtabele glede na tip respondenta (admin, manager...)
|
||||
echo '<p>';
|
||||
echo '<span class="title">'.$lang['srv_visible_dostop'].': </span>';
|
||||
echo '<span class="content"><select name="dostop" id="spremenljivka_dostop">';
|
||||
echo '<option value="4"'.($row['dostop']==4?' selected':'').'>'.$lang['see_everybody'].'</option>';
|
||||
echo '<option value="3"'.($row['dostop']==3?' selected':'').'>'.$lang['see_registered'].'</option>';
|
||||
echo '<option value="2"'.($row['dostop']==2?' selected':'').'>'.$lang['see_member'].'</option>';
|
||||
echo '<option value="1"'.($row['dostop']==1?' selected':'').'>'.$lang['see_manager'].'</option>';
|
||||
echo '<option value="0"'.($row['dostop']==0?' selected':'').'>'.$lang['see_admin'].'</option>';
|
||||
echo '</select></span>';
|
||||
echo '</p>';
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_visible_dostop'].':</span>';
|
||||
|
||||
echo ' <select name="dostop" id="spremenljivka_dostop" class="dropdown medium w200">';
|
||||
echo ' <option value="4"'.($row['dostop']==4?' selected':'').'>'.$lang['see_everybody'].'</option>';
|
||||
echo ' <option value="3"'.($row['dostop']==3?' selected':'').'>'.$lang['see_registered'].'</option>';
|
||||
echo ' <option value="2"'.($row['dostop']==2?' selected':'').'>'.$lang['see_member'].'</option>';
|
||||
echo ' <option value="1"'.($row['dostop']==1?' selected':'').'>'.$lang['see_manager'].'</option>';
|
||||
echo ' <option value="0"'.($row['dostop']==0?' selected':'').'>'.$lang['see_admin'].'</option>';
|
||||
echo ' </select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Ce imamo datum
|
||||
if ($row['tip'] == 19){
|
||||
$is_datum = $spremenljivkaParams->get('multigrid-datum');
|
||||
|
||||
if ($is_datum == 1)
|
||||
if ($is_datum == 1){
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
$this->edit_date_range();
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Sirina stolpca
|
||||
echo '<div class="setting_holder multitable_setting">';
|
||||
|
||||
echo ' <span class="setting_title">'.$lang['srv_gridmultiple_width'].':</span>';
|
||||
|
||||
$grid_width = $spremenljivkaParams->get('gridmultiple_width');
|
||||
echo '<p>';
|
||||
echo '<span class="title">'.$lang['srv_gridmultiple_width'].': </span>';
|
||||
echo '<span class="content"><select name="gridmultiple_width" id="gridmultiple_width">';
|
||||
echo '<option value="0"'.($grid_width==0?' selected':'').'>'.$lang['default'].'</option>';
|
||||
echo '<option value="10"'.($grid_width==10?' selected':'').'>10%</option>';
|
||||
echo '<option value="20"'.($grid_width==20?' selected':'').'>20%</option>';
|
||||
echo '<option value="30"'.($grid_width==30?' selected':'').'>30%</option>';
|
||||
echo '<option value="40"'.($grid_width==40?' selected':'').'>40%</option>';
|
||||
echo '<option value="50"'.($grid_width==50?' selected':'').'>50%</option>';
|
||||
echo '<option value="60"'.($grid_width==60?' selected':'').'>60%</option>';
|
||||
echo '</select></span>';
|
||||
echo '</p>';
|
||||
|
||||
|
||||
echo '<br />';
|
||||
|
||||
|
||||
echo '<span class="buttonwrapper spaceLeft floatRight">
|
||||
<a class="ovalbutton ovalbutton_orange" onclick="grid_multiple_save(\''.$this->spremenljivka.'\'); $(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#">
|
||||
<span>'.$lang['srv_potrdi'].'</span>
|
||||
</a>
|
||||
</span>';
|
||||
|
||||
echo '<span class="buttonwrapper spaceLeft floatRight">
|
||||
<a class="ovalbutton ovalbutton_gray" onclick="$(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#">
|
||||
<span>'.$lang['srv_zapri'].'</span>
|
||||
</a>
|
||||
</span>';
|
||||
|
||||
echo '<span class="buttonwrapper spaceLeft floatRight">
|
||||
<a class="ovalbutton ovalbutton_gray" onclick="brisi_spremenljivko(\''.$this->spremenljivka.'\', undefined, \'0\'); $(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').html(\'\').hide(); return false;" href="#">
|
||||
<span>'.$lang['srv_brisispremenljivko'].'</span>
|
||||
</a>
|
||||
</span>';
|
||||
echo ' <select name="gridmultiple_width" id="gridmultiple_width" class="dropdown medium w200">';
|
||||
echo ' <option value="0"'.($grid_width==0?' selected':'').'>'.$lang['default'].'</option>';
|
||||
echo ' <option value="10"'.($grid_width==10?' selected':'').'>10%</option>';
|
||||
echo ' <option value="20"'.($grid_width==20?' selected':'').'>20%</option>';
|
||||
echo ' <option value="30"'.($grid_width==30?' selected':'').'>30%</option>';
|
||||
echo ' <option value="40"'.($grid_width==40?' selected':'').'>40%</option>';
|
||||
echo ' <option value="50"'.($grid_width==50?' selected':'').'>50%</option>';
|
||||
echo ' <option value="60"'.($grid_width==60?' selected':'').'>60%</option>';
|
||||
echo ' </select>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" onclick="vrednost_cancel(); return false;">'.$lang['srv_zapri'].'</button>';
|
||||
echo ' <button class="medium white-blue" onclick="brisi_spremenljivko(\''.$this->spremenljivka.'\', undefined, \'0\'); vrednost_cancel(); return false;">'.$lang['srv_brisispremenljivko'].'</button>';
|
||||
echo ' <button class="medium blue" onclick="grid_multiple_save(\''.$this->spremenljivka.'\'); vrednost_cancel(); return false;">'.$lang['srv_potrdi'].'</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
/**
|
||||
@ -8366,7 +8462,7 @@ class Vprasanje {
|
||||
}
|
||||
|
||||
//posodobi skrite vrednosti odgovorov za diferencial trak
|
||||
function ajax_diferencial_trak_skrite_vrednosti($spr_id, $num_grids, $diferencial_trak_starting_num){
|
||||
function ajax_diferencial_trak_skrite_vrednosti($spr_id=null, $num_grids=null, $diferencial_trak_starting_num=null ){
|
||||
if(isset ($_POST['spr_id'])){
|
||||
$spr_id = $_POST['spr_id'];
|
||||
}
|
||||
|
||||
185
admin/survey/classes/class.VprasanjeDeleted.php
Normal file
185
admin/survey/classes/class.VprasanjeDeleted.php
Normal file
@ -0,0 +1,185 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
*
|
||||
* Pobrisana vprasanja - pred brisanjem se vprasanje kopira med pobrisane - podobno kot knjiznica
|
||||
*
|
||||
*/
|
||||
|
||||
class VprasanjeDeleted {
|
||||
|
||||
var $ank_id; // trenutna anketa
|
||||
|
||||
|
||||
public function __construct ($anketa = 0) {
|
||||
|
||||
if (isset ($_GET['anketa']))
|
||||
$this->ank_id = $_GET['anketa'];
|
||||
elseif (isset ($_POST['anketa']))
|
||||
$this->ank_id = $_POST['anketa'];
|
||||
elseif ($anketa != 0)
|
||||
$this->ank_id = $anketa;
|
||||
}
|
||||
|
||||
|
||||
// Prikazemo seznam pobrisanih vprasanj uporabnika
|
||||
private function displayDeletedVprasanja(){
|
||||
global $lang;
|
||||
global $global_user_id;
|
||||
global $admin_type;
|
||||
|
||||
|
||||
// Naslov v oknu
|
||||
echo '<h2><span class="faicon delete"></span>'.$lang['srv_deleted_vprasanja'].'</h2>';
|
||||
echo '<div class="popup_close"><a href="#" onclick="popupClose();">✕</a></div>';
|
||||
|
||||
|
||||
// Vsebina
|
||||
echo '<div id="vprasanje_deleted_content" class="content">';
|
||||
|
||||
|
||||
// Seznam vseh pobrisanih vprasanj
|
||||
echo '<div class="question_list">';
|
||||
|
||||
// Loop po vseh pobrisanih vprasanjih v anketi
|
||||
$sql = sisplet_query("SELECT sd.*, s.naslov
|
||||
FROM srv_spremenljivka_deleted sd, srv_spremenljivka s
|
||||
WHERE sd.ank_id='".$this->ank_id."' AND sd.spr_id=s.id
|
||||
ORDER BY sd.delete_time DESC
|
||||
");
|
||||
|
||||
while($row = mysqli_fetch_array($sql)){
|
||||
|
||||
echo '<div id="question_item_holder_'.$row['spr_id'].'" class="question_item_holder" onClick="selectVprasanjeDeletedItem(\''.$row['spr_id'].'\');">';
|
||||
|
||||
echo ' <input type="checkbox" id="question_item_check_'.$row['spr_id'].'" class="question_item_check" onClick="selectVprasanjeDeletedItem(\''.$row['spr_id'].'\');"><label for="question_item_check_'.$row['spr_id'].'"></label>';
|
||||
|
||||
echo ' <div id="question_item_info_'.$row['spr_id'].'" item-id="'.$row['spr_id'].'" class="question_item_info">';
|
||||
|
||||
echo ' <div>';
|
||||
echo ' <span class="faicon list"></span>';
|
||||
echo ' <span class="title">'.substr(strip_tags($row['naslov']), 0, 40).'</span>';
|
||||
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="previewVprasanje(\''.$row['spr_id'].'\');"></span>';
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Item counter
|
||||
echo '<div class="selected_items">'.$lang['srv_library_item_counter'].': <span id="selected_item_counter">0</span></div>';
|
||||
|
||||
|
||||
// Gumbi na dnu
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" onClick="popupClose();">'.$lang['edit1338'].'</button>';
|
||||
echo ' <button id="insert_vprasanje_deleted_button" class="medium blue" disabled="disabled" onClick="insertVprasanjeDeletedItemsIntoSurvey();">'.$lang['srv_library_survey_add'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// Pri brisanju najprej skopiramo vprasanje ki ga brisemo
|
||||
public function createDeletedVprasanje($spr_id){
|
||||
global $global_user_id;
|
||||
|
||||
// Skopiramo spremenljivko
|
||||
$b = new Branching($this->ank_id);
|
||||
$new_spr_id = $b->nova_spremenljivka(-3, 0, 0, $spr_id);
|
||||
|
||||
// Zabelezimo v bazi povezavo z anketo in cas brisanja
|
||||
$sql1 = sisplet_query("INSERT INTO srv_spremenljivka_deleted (spr_id, ank_id, delete_time) VALUES ('".$new_spr_id."', '".$this->ank_id."', NOW())");
|
||||
}
|
||||
|
||||
// Vrnemo stevilo pobrisanih vprasanj v anketi
|
||||
public function countDeletedVprasanja(){
|
||||
|
||||
$sql = sisplet_query("SELECT COUNT(id) AS cnt FROM srv_spremenljivka_deleted WHERE ank_id='".$this->ank_id."'");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
return $row['cnt'];
|
||||
}
|
||||
|
||||
|
||||
// Dokoncno brisanje vprasanja
|
||||
public static function permanentDeleteVprasanje($spremenljivka){
|
||||
|
||||
if ($spremenljivka > 0) {
|
||||
|
||||
$rowg = Cache::srv_spremenljivka($spremenljivka);
|
||||
|
||||
// pri brisanju multiple grid vprasanja, moramo pobrisate tudi vse child spremenljivke (ker kljuci niso nastavljeni)
|
||||
if ($rowg['tip'] == 24) {
|
||||
$sqld = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka'");
|
||||
while ($rowd = mysqli_fetch_array($sqld)) {
|
||||
sisplet_query("DELETE FROM srv_spremenljivka WHERE id='$rowd[spr_id]'");
|
||||
}
|
||||
}
|
||||
|
||||
$sql = sisplet_query("DELETE FROM srv_vrednost WHERE spr_id='$spremenljivka'");
|
||||
$sql = sisplet_query("DELETE FROM srv_grid WHERE spr_id='$spremenljivka'");
|
||||
$sql = sisplet_query("DELETE FROM srv_spremenljivka WHERE id='$spremenljivka'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @desc pohendla ajax klice
|
||||
*/
|
||||
public function ajax () {
|
||||
global $lang;
|
||||
global $global_user_id;
|
||||
|
||||
|
||||
// Odpremo popup s pobrisanimi vprasanji
|
||||
if ($_GET['a'] == 'displayVprasanjeDeletedPopup') {
|
||||
$this->displayDeletedVprasanja();
|
||||
|
||||
// Div za dodaten popup za preview
|
||||
echo '<div id="vprasanje_preview" class="displayNone"></div>';
|
||||
}
|
||||
|
||||
// Dodajanje pobrisanega vprasanja nazaj v vprasalnik
|
||||
elseif ($_GET['a'] == 'addIntoSurvey') {
|
||||
|
||||
$items = $_POST['items'];
|
||||
|
||||
$b = new Branching($this->ank_id);
|
||||
$ba = new BranchingAjax($this->ank_id);
|
||||
|
||||
foreach(array_reverse($items) as $item_id){
|
||||
|
||||
$last_spr = $b->find_last_spr();
|
||||
|
||||
// Dodamo vprasanje v anketo
|
||||
$ba->spremenljivka_new($spremenljivka=$last_spr, $if=0, $endif=0, $copy=$item_id, $drop=0);
|
||||
}
|
||||
|
||||
Common::getInstance()->Init($this->ank_id);
|
||||
Common::getInstance()->prestevilci(0, $all=true);
|
||||
|
||||
$b->branching_struktura();
|
||||
}
|
||||
|
||||
|
||||
// Dokoncen izbris pobrisanega vprasanja
|
||||
elseif ($_GET['a'] == 'deleteItem') {
|
||||
|
||||
$item_id = $_POST['item_id'];
|
||||
|
||||
if($item_id != '' && $item_id > 0){
|
||||
sisplet_query("DELETE FROM srv_spremenljivka WHERE id='".$item_id."'AND folder!='0'");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
@ -368,6 +368,11 @@ class MobileSurveyAdmin{
|
||||
'url' => 'index.php?a=diagnostics&t=uporabniki',
|
||||
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m'])? 'active' : '')
|
||||
),
|
||||
array(
|
||||
'title' => $lang['n_users_list_add'],
|
||||
'url' => 'index.php?a=diagnostics&t=uporabniki&m=add',
|
||||
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
|
||||
),
|
||||
array(
|
||||
'title' => $lang['n_users_list_all'],
|
||||
'url' => 'index.php?a=diagnostics&t=uporabniki&m=all',
|
||||
@ -410,6 +415,11 @@ class MobileSurveyAdmin{
|
||||
'url' => 'index.php?a=diagnostics&t=uporabniki',
|
||||
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m']) ? 'active' : '')
|
||||
|
||||
),
|
||||
array(
|
||||
'title' => $lang['n_users_list_add'],
|
||||
'url' => 'index.php?a=diagnostics&t=uporabniki&m=add',
|
||||
'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -493,6 +503,12 @@ class MobileSurveyAdmin{
|
||||
'url' => 'index.php?a=nastavitve&m=global_user_myProfile',
|
||||
'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_myProfile' ? 'active' : '')
|
||||
|
||||
),
|
||||
array(
|
||||
'title' => $lang['srv_survey_archives_tracking_archive'],
|
||||
'url' => 'index.php?a=nastavitve&m=global_user_ChangeArchive',
|
||||
'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_ChangeArchive' ? 'active' : '')
|
||||
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@ -720,7 +720,7 @@ class MailAdapter{
|
||||
$content = str_replace($signature, "", $content);
|
||||
|
||||
// Logo
|
||||
$logo_src = ($lang['id'] == '1') ? 'https://www.1ka.si/public/img/logo/1ka_slo.png' : 'https://www.1ka.si/public/img/logo/1ka_eng.png';
|
||||
$logo_src = ($lang['id'] == '1') ? 'https://www.1ka.si/public/img/logo/1ka_logo_slo.svg' : 'https://www.1ka.si/public/img/logo/1ka_logo_eng.svg';
|
||||
|
||||
// Naslov
|
||||
//$heading = 'Naslovček';
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -50,13 +50,14 @@ class SurveyAnalysisHelper {
|
||||
|
||||
// Samo zvezdica (sums, grafi, freq...)
|
||||
if($type < 5)
|
||||
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span></a>';
|
||||
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span> <div class= "icon_text star_icon"> Vključi v poročilo po meri </div></a>';
|
||||
|
||||
// Zvezdica s textom
|
||||
else{
|
||||
echo '<div class="custom_report_include">';
|
||||
|
||||
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 1); return false;">';
|
||||
echo '<span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span>';
|
||||
echo '<span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"> </span>';
|
||||
echo '<span id="'.$id.'_insert" '.($insert == 0 ? ' style="display:none;" ' : '').'> '.$lang['srv_custom_report_insert'].'</span>';
|
||||
echo '<span id="'.$id.'_inserted" '.($insert == 0 ? '' : ' style="display:none;" ').'> '.$lang['srv_custom_report_inserted'].'</span>';
|
||||
echo '</a>';
|
||||
|
||||
@ -10742,7 +10742,7 @@ class SurveyChart {
|
||||
echo '</script>';
|
||||
echo '</head>';
|
||||
|
||||
echo '<body style="margin:5px; padding:5px;" >';
|
||||
echo '<body class="public_link charts" style="margin:5px; padding:5px;" >';
|
||||
echo '<h2>'.$lang['srv_publc_chart_title_for'] . self::$survey['naslov'].'</h2>';
|
||||
|
||||
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $anketa . '" />';
|
||||
|
||||
@ -508,299 +508,303 @@ class SurveyDataDisplay{
|
||||
static public function setUpFilter() {
|
||||
|
||||
# nastavimo filter po statusih
|
||||
|
||||
if (self::$headFileName != null && self::$headFileName != '' && file_exists(self::$headFileName)) {
|
||||
|
||||
# kadar zbiramo sistemske, moramo obvezno zbirati tudi podatke, ne smemo pa full meta
|
||||
if (self::$_VARS[VAR_SHOW_SYSTEM]){
|
||||
self::$_VARS[VAR_DATA] = true;
|
||||
self::$_VARS[VAR_META] = true;
|
||||
self::$_VARS[VAR_METAFULL] = false;
|
||||
self::$_VARS[VAR_SHOW_DATE] = false;
|
||||
}
|
||||
# filtriranje po statusih
|
||||
self::$_CURRENT_STATUS_FILTER = SurveyStatusProfiles :: getStatusAsAWKString();
|
||||
|
||||
if (self::$dataFileStatus >= 0) {
|
||||
self::$_HEADERS = unserialize(file_get_contents(self::$headFileName));
|
||||
|
||||
# ali imamo filter na testne podatke
|
||||
if (isset(self::$_HEADERS['testdata']['grids'][0]['variables'][0]['sequence']) && (int)self::$_HEADERS['testdata']['grids'][0]['variables'][0]['sequence'] > 0) {
|
||||
$test_data_sequence = self::$_HEADERS['testdata']['grids'][0]['variables'][0]['sequence'];
|
||||
$filter_testdata = SurveyStatusProfiles :: getStatusTestAsAWKString($test_data_sequence);
|
||||
}
|
||||
# filtriranje po časih
|
||||
$_time_profile_awk = SurveyTimeProfiles :: getFilterForAWK(self::$_HEADERS['unx_ins_date']['grids']['0']['variables']['0']['sequence']);
|
||||
|
||||
# ali imamo filter na uporabnost
|
||||
if (isset(self::$_HEADERS['usability']['variables'][0]['sequence']) && (int)self::$_HEADERS['usability']['variables'][0]['sequence'] > 0) {
|
||||
$usability_data_sequence = self::$_HEADERS['usability']['variables'][0]['sequence'];
|
||||
$filter_usability = SurveyStatusProfiles :: getStatusUsableAsAWKString($usability_data_sequence);
|
||||
}
|
||||
|
||||
# če nismo v indikatorjih (sistemske)
|
||||
if (self::$_VARS[VAR_SHOW_SYSTEM] == false) {
|
||||
# dodamo še ife
|
||||
SurveyConditionProfiles :: setHeader(self::$_HEADERS);
|
||||
$_condition_profile_AWK = SurveyConditionProfiles:: getAwkConditionString();
|
||||
|
||||
# dodamo še ife za inspect
|
||||
$SI = new SurveyInspect(self::$sid);
|
||||
$_inspect_condition_awk = $SI->generateAwkCondition();
|
||||
}
|
||||
|
||||
# dodamo pogoj za filter prepoznave uporabnika iz cms
|
||||
# vklopljeno more bit prepoznava userja iz cms
|
||||
if (self::$doCMSUserFilter == true) {
|
||||
$CMSUserCondition = self::createCMSUserFilter();
|
||||
}
|
||||
# kadar zbiramo sistemske, moramo obvezno zbirati tudi podatke, ne smemo pa full meta
|
||||
if (self::$_VARS[VAR_SHOW_SYSTEM]){
|
||||
self::$_VARS[VAR_DATA] = true;
|
||||
self::$_VARS[VAR_META] = true;
|
||||
self::$_VARS[VAR_METAFULL] = false;
|
||||
self::$_VARS[VAR_SHOW_DATE] = false;
|
||||
}
|
||||
|
||||
if (($_condition_profile_AWK != "" && $_condition_profile_AWK != null )
|
||||
|| ($_inspect_condition_awk != "" && $_inspect_condition_awk != null)
|
||||
|| ($_time_profile_awk != "" && $_time_profile_awk != null)
|
||||
|| ($CMSUserCondition != "" && $CMSUserCondition != null)
|
||||
|| ($filter_testdata != null)
|
||||
|| ($filter_usability != null)) {
|
||||
self::$_CURRENT_STATUS_FILTER = '('.self::$_CURRENT_STATUS_FILTER;
|
||||
if ($_condition_profile_AWK != "" && $_condition_profile_AWK != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&'.$_condition_profile_AWK;
|
||||
}
|
||||
if ($_inspect_condition_awk != "" && $_inspect_condition_awk != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= ' && '.$_inspect_condition_awk;
|
||||
}
|
||||
if ($_time_profile_awk != "" && $_time_profile_awk != null) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&'.$_time_profile_awk;
|
||||
}
|
||||
if ($CMSUserCondition != "" && $CMSUserCondition != null) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&'.$CMSUserCondition;
|
||||
}
|
||||
if ($filter_testdata != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&('.$filter_testdata.')';
|
||||
}
|
||||
if ($filter_usability != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&('.$filter_usability.')';
|
||||
}
|
||||
self::$_CURRENT_STATUS_FILTER .= ')';
|
||||
}
|
||||
|
||||
# preštejemo vse zapise ki ustrezajo filtru po statusu
|
||||
if (IS_WINDOWS) {
|
||||
$awk_string = 'awk -F"'.STR_DLMT.'" "'.self::$_CURRENT_STATUS_FILTER.' {cnt++} END {print cnt}" '.self::$dataFileName;
|
||||
$recCount = shell_exec($awk_string);
|
||||
if ($_GET['debug'] == 1) {
|
||||
print_r('<br>'.$awk_string);
|
||||
}
|
||||
|
||||
} else {
|
||||
$awk_string = 'awk -F"'.STR_DLMT.'" \''.self::$_CURRENT_STATUS_FILTER.' {cnt++} END {print cnt}\' \''.self::$dataFileName.'\'';
|
||||
$recCount = shell_exec($awk_string);
|
||||
if ($_GET['debug'] == 1) {
|
||||
print_r('<br>'.$awk_string);
|
||||
}
|
||||
}
|
||||
if ((int)$recCount > 0 ) {
|
||||
self::$_RECORD_COUNT = (int)$recCount;
|
||||
}
|
||||
# filtriranje po statusih
|
||||
self::$_CURRENT_STATUS_FILTER = SurveyStatusProfiles :: getStatusAsAWKString();
|
||||
|
||||
if (self::$dataFileStatus >= 0) {
|
||||
self::$_HEADERS = unserialize(file_get_contents(self::$headFileName));
|
||||
|
||||
# ali imamo filter na testne podatke
|
||||
if (isset(self::$_HEADERS['testdata']['grids'][0]['variables'][0]['sequence']) && (int)self::$_HEADERS['testdata']['grids'][0]['variables'][0]['sequence'] > 0) {
|
||||
$test_data_sequence = self::$_HEADERS['testdata']['grids'][0]['variables'][0]['sequence'];
|
||||
$filter_testdata = SurveyStatusProfiles :: getStatusTestAsAWKString($test_data_sequence);
|
||||
}
|
||||
# filtriranje po časih
|
||||
$_time_profile_awk = SurveyTimeProfiles :: getFilterForAWK(self::$_HEADERS['unx_ins_date']['grids']['0']['variables']['0']['sequence']);
|
||||
|
||||
# ali imamo filter na uporabnost
|
||||
if (isset(self::$_HEADERS['usability']['variables'][0]['sequence']) && (int)self::$_HEADERS['usability']['variables'][0]['sequence'] > 0) {
|
||||
$usability_data_sequence = self::$_HEADERS['usability']['variables'][0]['sequence'];
|
||||
$filter_usability = SurveyStatusProfiles :: getStatusUsableAsAWKString($usability_data_sequence);
|
||||
}
|
||||
|
||||
# če nismo v indikatorjih (sistemske)
|
||||
if (self::$_VARS[VAR_SHOW_SYSTEM] == false) {
|
||||
# dodamo še ife
|
||||
SurveyConditionProfiles :: setHeader(self::$_HEADERS);
|
||||
$_condition_profile_AWK = SurveyConditionProfiles:: getAwkConditionString();
|
||||
|
||||
# dodamo še ife za inspect
|
||||
$SI = new SurveyInspect(self::$sid);
|
||||
$_inspect_condition_awk = $SI->generateAwkCondition();
|
||||
}
|
||||
|
||||
# dodamo pogoj za filter prepoznave uporabnika iz cms
|
||||
# vklopljeno more bit prepoznava userja iz cms
|
||||
if (self::$doCMSUserFilter == true) {
|
||||
$CMSUserCondition = self::createCMSUserFilter();
|
||||
}
|
||||
|
||||
|
||||
if (self::$_VARS[VAR_REC_ON_PAGE] != 'all') {
|
||||
self::$_TOTAL_PAGES = bcdiv(self::$_RECORD_COUNT, self::$_VARS[VAR_REC_ON_PAGE]);
|
||||
|
||||
if (bcmod(self::$_RECORD_COUNT, self::$_VARS[VAR_REC_ON_PAGE]) > 0)
|
||||
self::$_TOTAL_PAGES += 1;
|
||||
if (self::$_VARS[VAR_CUR_REC_PAGE] > self::$_TOTAL_PAGES ) {
|
||||
self::$_VARS[VAR_CUR_REC_PAGE] = self::$_TOTAL_PAGES;
|
||||
} elseif (self::$_VARS[VAR_CUR_REC_PAGE] < 1 ) {
|
||||
self::$_VARS[VAR_CUR_REC_PAGE] = 1;
|
||||
}
|
||||
|
||||
# nastavimo limit za datoteko
|
||||
|
||||
$up = self::$_VARS[VAR_REC_ON_PAGE] * self::$_VARS[VAR_CUR_REC_PAGE];
|
||||
$low = $up - self::$_VARS[VAR_REC_ON_PAGE]+1;
|
||||
|
||||
self::$_REC_LIMIT = ' NR=='.$low.',NR=='.$up.'';
|
||||
} else {
|
||||
# nastavimo limit za datoteko
|
||||
self::$_REC_LIMIT = '';
|
||||
}
|
||||
}
|
||||
if (self::$_VARS[VAR_DATA]) {
|
||||
$tmp_svp_pv = SurveyVariablesProfiles :: getProfileVariables(self::$_PROFILE_ID_VARIABLE );
|
||||
|
||||
# če je $svp_pv = null potem prikazujemo vse variable
|
||||
# oziroma če je sistemski dodamo tudi vse, ker drugače lahko filter skrije telefon in email
|
||||
if (count($tmp_svp_pv) == 0 || self::$_VARS[VAR_SHOW_SYSTEM] == true ) {
|
||||
|
||||
$_sv = self::$SDF->getSurveyVariables();
|
||||
if (count($_sv) > 0) {
|
||||
foreach ( $_sv as $vid => $variable) {
|
||||
$tmp_svp_pv[$vid] = $vid;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
self::$lineoffset=1;
|
||||
# če prikazujemo sistemske ne prikazujemo recnumber
|
||||
if (!self::$_VARS[VAR_SHOW_SYSTEM] && self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL]) {
|
||||
$svp_pv['recnum'] = 'recnum';
|
||||
#$svp_pv['code'] = 'code';
|
||||
self::$lineoffset++;
|
||||
# za code ni ofseta
|
||||
#self::$lineoffset++;
|
||||
}
|
||||
|
||||
if (self::$_VARS[VAR_DATA] && count($tmp_svp_pv) > 0) {
|
||||
foreach ($tmp_svp_pv AS $_svp_pv) {
|
||||
if (($_condition_profile_AWK != "" && $_condition_profile_AWK != null )
|
||||
|| ($_inspect_condition_awk != "" && $_inspect_condition_awk != null)
|
||||
|| ($_time_profile_awk != "" && $_time_profile_awk != null)
|
||||
|| ($CMSUserCondition != "" && $CMSUserCondition != null)
|
||||
|| ($filter_testdata != null)
|
||||
|| ($filter_usability != null)) {
|
||||
self::$_CURRENT_STATUS_FILTER = '('.self::$_CURRENT_STATUS_FILTER;
|
||||
if ($_condition_profile_AWK != "" && $_condition_profile_AWK != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&'.$_condition_profile_AWK;
|
||||
}
|
||||
if ($_inspect_condition_awk != "" && $_inspect_condition_awk != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= ' && '.$_inspect_condition_awk;
|
||||
}
|
||||
if ($_time_profile_awk != "" && $_time_profile_awk != null) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&'.$_time_profile_awk;
|
||||
}
|
||||
if ($CMSUserCondition != "" && $CMSUserCondition != null) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&'.$CMSUserCondition;
|
||||
}
|
||||
if ($filter_testdata != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&('.$filter_testdata.')';
|
||||
}
|
||||
if ($filter_usability != null ) {
|
||||
self::$_CURRENT_STATUS_FILTER .= '&&('.$filter_usability.')';
|
||||
}
|
||||
self::$_CURRENT_STATUS_FILTER .= ')';
|
||||
}
|
||||
|
||||
# preštejemo vse zapise ki ustrezajo filtru po statusu
|
||||
if (IS_WINDOWS) {
|
||||
$awk_string = 'awk -F"'.STR_DLMT.'" "'.self::$_CURRENT_STATUS_FILTER.' {cnt++} END {print cnt}" '.self::$dataFileName;
|
||||
$recCount = shell_exec($awk_string);
|
||||
if ($_GET['debug'] == 1) {
|
||||
print_r('<br>'.$awk_string);
|
||||
}
|
||||
|
||||
} else {
|
||||
$awk_string = 'awk -F"'.STR_DLMT.'" \''.self::$_CURRENT_STATUS_FILTER.' {cnt++} END {print cnt}\' \''.self::$dataFileName.'\'';
|
||||
$recCount = shell_exec($awk_string);
|
||||
if ($_GET['debug'] == 1) {
|
||||
print_r('<br>'.$awk_string);
|
||||
}
|
||||
}
|
||||
if ((int)$recCount > 0 ) {
|
||||
self::$_RECORD_COUNT = (int)$recCount;
|
||||
}
|
||||
|
||||
# če imamo sistemski email ali telefon, ime, priimek (v header je nastavljno "hide_system" = 1)
|
||||
# potem v odvisnosti od nastavitve prikazujemo samo navadne podatke ali pa samo te sistemske, zaradizaščite podatkov
|
||||
$_sistemski = false;
|
||||
if (!self::$_VARS[VAR_SHOW_SYSTEM] && self::$_HEADERS[$_svp_pv]['hide_system'] == '1') {
|
||||
# prikazujemo samo nesistemske (nezaščitene)
|
||||
unset(self::$_HEADERS[$_svp_pv]);
|
||||
} else if (self::$_VARS[VAR_SHOW_SYSTEM] && self::$_HEADERS[$_svp_pv]['hide_system'] !== '1') {
|
||||
# prikazujemo samo sistemske (zaščitene) podatke
|
||||
unset(self::$_HEADERS[$_svp_pv]);
|
||||
} else {
|
||||
# če ne dodamo
|
||||
$svp_pv[$_svp_pv] = $_svp_pv;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (self::$_VARS[VAR_REC_ON_PAGE] != 'all') {
|
||||
self::$_TOTAL_PAGES = bcdiv(self::$_RECORD_COUNT, self::$_VARS[VAR_REC_ON_PAGE]);
|
||||
|
||||
if (bcmod(self::$_RECORD_COUNT, self::$_VARS[VAR_REC_ON_PAGE]) > 0)
|
||||
self::$_TOTAL_PAGES += 1;
|
||||
if (self::$_VARS[VAR_CUR_REC_PAGE] > self::$_TOTAL_PAGES ) {
|
||||
self::$_VARS[VAR_CUR_REC_PAGE] = self::$_TOTAL_PAGES;
|
||||
} elseif (self::$_VARS[VAR_CUR_REC_PAGE] < 1 ) {
|
||||
self::$_VARS[VAR_CUR_REC_PAGE] = 1;
|
||||
}
|
||||
|
||||
# nastavimo limit za datoteko
|
||||
|
||||
$up = self::$_VARS[VAR_REC_ON_PAGE] * self::$_VARS[VAR_CUR_REC_PAGE];
|
||||
$low = $up - self::$_VARS[VAR_REC_ON_PAGE]+1;
|
||||
|
||||
self::$_REC_LIMIT = ' NR=='.$low.',NR=='.$up.'';
|
||||
} else {
|
||||
# nastavimo limit za datoteko
|
||||
self::$_REC_LIMIT = '';
|
||||
}
|
||||
}
|
||||
|
||||
#status - če smo v meta ali imamo profil vse enote
|
||||
if ( (self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL])
|
||||
|| ( $ssp_pid = SurveyStatusProfiles::getCurentProfileId() == 1 )) {
|
||||
$svp_pv['status'] = 'status';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
#lurker
|
||||
if ( (self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL])
|
||||
|| ( $ssp_pid = SurveyStatusProfiles::getCurentProfileId() == 1 )) {
|
||||
// dodamo v array da se prikazujejo tudi ti stolpci
|
||||
$svp_pv['lurker'] = 'lurker';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
# ustreznost
|
||||
if (self::$_VARS[VAR_RELEVANCE] && self::$canDisplayRelevance && self::$_VARS[VAR_SHOW_SYSTEM] == false) {
|
||||
// dodamo v array da se prikazujejo tudi ti stolpci
|
||||
$svp_pv['relevance'] = 'relevance';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
# email tion
|
||||
#email prikazujemo skupaj z ustreznostjo
|
||||
if ( self::$_VARS[VAR_EMAIL] && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
|
||||
// dodamo v array da se prikazujejo tudi ti stolpci
|
||||
$svp_pv['invitation'] = 'invitation';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
if (self::$_VARS[VAR_DATA]) {
|
||||
$tmp_svp_pv = SurveyVariablesProfiles :: getProfileVariables(self::$_PROFILE_ID_VARIABLE );
|
||||
|
||||
# če je $svp_pv = null potem prikazujemo vse variable
|
||||
# oziroma če je sistemski dodamo tudi vse, ker drugače lahko filter skrije telefon in email
|
||||
if (count($tmp_svp_pv) == 0 || self::$_VARS[VAR_SHOW_SYSTEM] == true ) {
|
||||
|
||||
$_sv = self::$SDF->getSurveyVariables();
|
||||
if (count($_sv) > 0) {
|
||||
foreach ( $_sv as $vid => $variable) {
|
||||
$tmp_svp_pv[$vid] = $vid;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset(self::$_HEADERS['testdata'])) {
|
||||
self::$_HAS_TEST_DATA = true;
|
||||
$svp_pv['testdata'] = 'testdata';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
# $svp_pv['unx_ins_date'] = 'unx_ins_date';
|
||||
self::$lineoffset=1;
|
||||
|
||||
if (self::$_VARS[VAR_METAFULL] && self::$_VARS[VAR_SHOW_SYSTEM] == false) {
|
||||
# dodamo tudi special meta
|
||||
$svp_pv['meta'] = 'meta';
|
||||
}
|
||||
|
||||
if (self::$showItime == true) {
|
||||
$svp_pv['itime'] = 'itime';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
// ce imamo vklopljene sistemske ne smemo povezovat podatkov in zato urejamo po abecedi
|
||||
if(self::$_VARS[VAR_SHOW_SYSTEM]){
|
||||
|
||||
$hasEmail = false;
|
||||
|
||||
// Poiscemo sekvenco sistemske spremenljivke
|
||||
foreach (self::$_HEADERS AS $spr => $spremenljivka) {
|
||||
if (isset($spremenljivka['sistem']) && $spremenljivka['sistem'] == 1 && $spremenljivka['variable'] == 'email') {
|
||||
$sequence = $spremenljivka['sequences'];
|
||||
$hasEmail = true;
|
||||
}
|
||||
}
|
||||
|
||||
if($hasEmail){
|
||||
# sortiramo
|
||||
self::$do_sort = true;
|
||||
|
||||
# nastavimo po kateri sekvenci / stolpcu sortiramo
|
||||
self::$sort_seq = $sequence;
|
||||
|
||||
self::$sort_type = 'sort_asc';
|
||||
}
|
||||
}
|
||||
|
||||
self::getQuestionCount();
|
||||
if (self::$_VARS[VAR_SPR_LIMIT] > self::$_ALL_QUESTION_COUNT) {
|
||||
self::$_VARS[VAR_SPR_LIMIT] = 'all';
|
||||
}
|
||||
|
||||
$spr_cont = 0; // za paginacijo spremenljivk
|
||||
|
||||
if(self::$_VARS['spr_limit'] == 'all'){
|
||||
$_spr_on_pages_start = 0;
|
||||
$_spr_on_pages_stop = self::$_VARS['spr_page'];
|
||||
}
|
||||
else{
|
||||
$_spr_on_pages_start = self::$_VARS['spr_page'] * self::$_VARS['spr_limit'] - self::$_VARS['spr_limit'];
|
||||
$_spr_on_pages_stop = self::$_VARS['spr_page'] * self::$_VARS['spr_limit'];
|
||||
}
|
||||
# če prikazujemo sistemske ne prikazujemo recnumber
|
||||
if (!self::$_VARS[VAR_SHOW_SYSTEM] && self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL]) {
|
||||
$svp_pv['recnum'] = 'recnum';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
# skreiramo filter variabel za podatke
|
||||
if (count(self::$_HEADERS) > 0) {
|
||||
// zloopamo skozi spremenljivke in sestavimo filter po stolpcih
|
||||
$_tmp_filter = '';
|
||||
foreach (self::$_HEADERS AS $spid => $spremenljivka) {
|
||||
if (isset($svp_pv[$spid])) {
|
||||
// paginacija spremenljivk
|
||||
if (self::$_VARS['spr_limit'] == 'all' || ($spr_cont >= $_spr_on_pages_start && $spr_cont < $_spr_on_pages_stop)) {
|
||||
if (count($spremenljivka['grids']) > 0 ) {
|
||||
foreach ($spremenljivka['grids'] AS $gid => $grid) {
|
||||
if (count ($grid['variables']) > 0) {
|
||||
foreach ($grid['variables'] AS $vid => $variable ){
|
||||
$_tmp_filter .= $_prfx.$variable['sequence'];
|
||||
$_prfx = ',';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} // end: paginacija spremenljivk
|
||||
$spr_cont++;
|
||||
} else
|
||||
# če prikazujemo samo sistemske
|
||||
if ( self::$_VARS[VAR_SHOW_SYSTEM] && in_array($spremenljivka['variable'], array('email','ime','priimek','telefon','naziv','drugo','odnos'))) {
|
||||
if (count($spremenljivka['grids']) > 0 ) {
|
||||
foreach ($spremenljivka['grids'] AS $gid => $grid) {
|
||||
if (count ($grid['variables']) > 0) {
|
||||
foreach ($grid['variables'] AS $vid => $variable ){
|
||||
$_tmp_filter .= $_prfx.$variable['sequence'];
|
||||
$_prfx = ',';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$svp_pv[$spid] = $spid;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (self::$_VARS[VAR_META]) {
|
||||
$svp_pv['code'] = 'code';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
if (self::$_VARS[VAR_DATA] && count($tmp_svp_pv) > 0) {
|
||||
|
||||
foreach ($tmp_svp_pv AS $_svp_pv) {
|
||||
|
||||
# prilagodimo array profilov variabel
|
||||
self::$_SVP_PV = $svp_pv;
|
||||
if ($_tmp_filter != '')
|
||||
{
|
||||
# če imamo sistemski email ali telefon, ime, priimek (v header je nastavljno "hide_system" = 1)
|
||||
# potem v odvisnosti od nastavitve prikazujemo samo navadne podatke ali pa samo te sistemske, zaradizaščite podatkov
|
||||
$_sistemski = false;
|
||||
if (!self::$_VARS[VAR_SHOW_SYSTEM] && self::$_HEADERS[$_svp_pv]['hide_system'] == '1') {
|
||||
# prikazujemo samo nesistemske (nezaščitene)
|
||||
unset(self::$_HEADERS[$_svp_pv]);
|
||||
} else if (self::$_VARS[VAR_SHOW_SYSTEM] && self::$_HEADERS[$_svp_pv]['hide_system'] !== '1') {
|
||||
# prikazujemo samo sistemske (zaščitene) podatke
|
||||
unset(self::$_HEADERS[$_svp_pv]);
|
||||
} else {
|
||||
# če ne dodamo
|
||||
$svp_pv[$_svp_pv] = $_svp_pv;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#status - če smo v meta ali imamo profil vse enote
|
||||
if ( (self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL])
|
||||
|| ( $ssp_pid = SurveyStatusProfiles::getCurentProfileId() == 1 )) {
|
||||
$svp_pv['status'] = 'status';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
#lurker
|
||||
if ( (self::$_VARS[VAR_META] && self::$_VARS[VAR_METAFULL])
|
||||
|| ( $ssp_pid = SurveyStatusProfiles::getCurentProfileId() == 1 )) {
|
||||
// dodamo v array da se prikazujejo tudi ti stolpci
|
||||
$svp_pv['lurker'] = 'lurker';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
# ustreznost
|
||||
if (self::$_VARS[VAR_RELEVANCE] && self::$canDisplayRelevance && self::$_VARS[VAR_SHOW_SYSTEM] == false) {
|
||||
// dodamo v array da se prikazujejo tudi ti stolpci
|
||||
$svp_pv['relevance'] = 'relevance';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
# email tion
|
||||
#email prikazujemo skupaj z ustreznostjo
|
||||
if ( self::$_VARS[VAR_EMAIL] && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
|
||||
// dodamo v array da se prikazujejo tudi ti stolpci
|
||||
$svp_pv['invitation'] = 'invitation';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
if (isset(self::$_HEADERS['testdata'])) {
|
||||
self::$_HAS_TEST_DATA = true;
|
||||
$svp_pv['testdata'] = 'testdata';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
# $svp_pv['unx_ins_date'] = 'unx_ins_date';
|
||||
|
||||
if (self::$_VARS[VAR_METAFULL] && self::$_VARS[VAR_SHOW_SYSTEM] == false) {
|
||||
# dodamo tudi special meta
|
||||
$svp_pv['meta'] = 'meta';
|
||||
}
|
||||
|
||||
if (self::$showItime == true) {
|
||||
$svp_pv['itime'] = 'itime';
|
||||
self::$lineoffset++;
|
||||
}
|
||||
|
||||
// ce imamo vklopljene sistemske ne smemo povezovat podatkov in zato urejamo po abecedi
|
||||
if(self::$_VARS[VAR_SHOW_SYSTEM]){
|
||||
|
||||
$hasEmail = false;
|
||||
|
||||
// Poiscemo sekvenco sistemske spremenljivke
|
||||
foreach (self::$_HEADERS AS $spr => $spremenljivka) {
|
||||
if (isset($spremenljivka['sistem']) && $spremenljivka['sistem'] == 1 && $spremenljivka['variable'] == 'email') {
|
||||
$sequence = $spremenljivka['sequences'];
|
||||
$hasEmail = true;
|
||||
}
|
||||
}
|
||||
|
||||
if($hasEmail){
|
||||
# sortiramo
|
||||
self::$do_sort = true;
|
||||
|
||||
# nastavimo po kateri sekvenci / stolpcu sortiramo
|
||||
self::$sort_seq = $sequence;
|
||||
|
||||
self::$sort_type = 'sort_asc';
|
||||
}
|
||||
}
|
||||
|
||||
self::getQuestionCount();
|
||||
if (self::$_VARS[VAR_SPR_LIMIT] > self::$_ALL_QUESTION_COUNT) {
|
||||
self::$_VARS[VAR_SPR_LIMIT] = 'all';
|
||||
}
|
||||
|
||||
$spr_cont = 0; // za paginacijo spremenljivk
|
||||
|
||||
if(self::$_VARS['spr_limit'] == 'all'){
|
||||
$_spr_on_pages_start = 0;
|
||||
$_spr_on_pages_stop = self::$_VARS['spr_page'];
|
||||
}
|
||||
else{
|
||||
$_spr_on_pages_start = self::$_VARS['spr_page'] * self::$_VARS['spr_limit'] - self::$_VARS['spr_limit'];
|
||||
$_spr_on_pages_stop = self::$_VARS['spr_page'] * self::$_VARS['spr_limit'];
|
||||
}
|
||||
|
||||
# skreiramo filter variabel za podatke
|
||||
if (count(self::$_HEADERS) > 0) {
|
||||
// zloopamo skozi spremenljivke in sestavimo filter po stolpcih
|
||||
$_tmp_filter = '';
|
||||
foreach (self::$_HEADERS AS $spid => $spremenljivka) {
|
||||
if (isset($svp_pv[$spid])) {
|
||||
// paginacija spremenljivk
|
||||
if (self::$_VARS['spr_limit'] == 'all' || ($spr_cont >= $_spr_on_pages_start && $spr_cont < $_spr_on_pages_stop)) {
|
||||
if (count($spremenljivka['grids']) > 0 ) {
|
||||
foreach ($spremenljivka['grids'] AS $gid => $grid) {
|
||||
if (count ($grid['variables']) > 0) {
|
||||
foreach ($grid['variables'] AS $vid => $variable ){
|
||||
$_tmp_filter .= $_prfx.$variable['sequence'];
|
||||
$_prfx = ',';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} // end: paginacija spremenljivk
|
||||
$spr_cont++;
|
||||
} else
|
||||
# če prikazujemo samo sistemske
|
||||
if ( self::$_VARS[VAR_SHOW_SYSTEM] && in_array($spremenljivka['variable'], array('email','ime','priimek','telefon','naziv','drugo','odnos'))) {
|
||||
if (count($spremenljivka['grids']) > 0 ) {
|
||||
foreach ($spremenljivka['grids'] AS $gid => $grid) {
|
||||
if (count ($grid['variables']) > 0) {
|
||||
foreach ($grid['variables'] AS $vid => $variable ){
|
||||
$_tmp_filter .= $_prfx.$variable['sequence'];
|
||||
$_prfx = ',';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$svp_pv[$spid] = $spid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# prilagodimo array profilov variabel
|
||||
self::$_SVP_PV = $svp_pv;
|
||||
if ($_tmp_filter != ''){
|
||||
self::$_VARIABLE_FILTER = $_tmp_filter;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/** Prikaže filtre za število podatkov....
|
||||
@ -3204,7 +3208,7 @@ class SurveyDataDisplay{
|
||||
echo '</script>';
|
||||
echo '</head>';
|
||||
|
||||
echo '<body style="margin:5px; padding:5px;" >';
|
||||
echo '<body class="public_link data" style="margin:5px; padding:5px;" >';
|
||||
|
||||
echo '<h2>'.$lang['srv_publc_data_title_for'].self::$survey['naslov'].'</h2>';
|
||||
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $anketa . '" />';
|
||||
|
||||
@ -5482,27 +5482,20 @@ class SurveyInvitationsNew {
|
||||
|
||||
echo '<div id="inv_error_note" class="displayNone"></div>';
|
||||
|
||||
echo '<table>';
|
||||
echo '<tr><td class="bold">'.$lang['srv_inv_recipient_list_name'].'</td>';
|
||||
echo '<td>';
|
||||
echo '<input type="text" id="rec_profile_name" value="'.$sqlRow['name'].'" autofocus="autofocus" style="width: 200px;">';
|
||||
echo '</td></tr>';
|
||||
echo '</table>';
|
||||
|
||||
echo '<p>'.$lang['srv_inv_recipient_list_name'].'</p>';
|
||||
echo '<input type="text" id="rec_profile_name" class="text large" value="'.$sqlRow['name'].'" autofocus="autofocus">';
|
||||
echo '<input type="hidden" id="rec_profile_pid" value="'.$pid.'" >';
|
||||
|
||||
echo '<br class="clr" />';
|
||||
echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" ><span>'.$lang['srv_cancel'].'</span></a></span>';
|
||||
echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['save'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_update_rec_profile(); return false;"><span>'.$lang['save'].'</span></a></span>';
|
||||
echo '<br class="clr" />';
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" >'.$lang['srv_cancel'].'</button>';
|
||||
echo ' <button class="medium blue" onclick="inv_update_rec_profile(); return false;">'.$lang['save'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>'; # id="inv_view_arch_recipients"
|
||||
|
||||
sisplet_query("COMMIT");
|
||||
}
|
||||
|
||||
echo json_encode($return);
|
||||
|
||||
exit;
|
||||
}
|
||||
|
||||
@ -6625,39 +6618,49 @@ class SurveyInvitationsNew {
|
||||
global $lang;
|
||||
|
||||
echo '<div id="inv_recipients_profile_name">';
|
||||
echo $lang['srv_inv_message_draft_new_save'].': ';
|
||||
|
||||
# polovimo vsa sporočila
|
||||
$sql_string = "SELECT * FROM srv_invitations_messages WHERE ank_id = '$this->sid'";
|
||||
$sql_query = sisplet_query($sql_string);
|
||||
echo '<h2>'.$lang['message'].'</h2>';
|
||||
echo '<div class="popup_close"><a href="#" onClick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;">✕</a></div>';
|
||||
|
||||
echo '<select onchange="inv_new_message_list_change(this);" autofocus="autofocus" tabindex="2">';
|
||||
echo '<option value="0" selected="selected" class="gray bold">'.$lang['srv_inv_message_draft_new'].'</option>';
|
||||
$messages = array();
|
||||
while ( $row = mysqli_fetch_assoc($sql_query) ) {
|
||||
$messages[$row['id']] = $row;
|
||||
#'.((int)$_POST['mid'] == $row['id'] ? ' selected="selected"' : '').'
|
||||
echo '<option value="'.$row['id'].'" comment="'.$row['comment'].'">'.$row['naslov'].'</option>';
|
||||
}
|
||||
echo '</select>';
|
||||
#'.((int)$_POST['mid'] > 0 ? ' class="displayNone"' : '').'
|
||||
echo '<span id="new_message_list_span">';
|
||||
echo '<br><br/>';
|
||||
echo '<label>'.$lang['srv_inv_message_rename_new_name'];
|
||||
|
||||
echo '<div class="setting_holder">';
|
||||
echo ' <span class="setting_title">'.$lang['srv_inv_message_draft_new_save'].':</span>';
|
||||
|
||||
# polovimo vsa sporočila
|
||||
$sql_string = "SELECT * FROM srv_invitations_messages WHERE ank_id = '$this->sid'";
|
||||
$sql_query = sisplet_query($sql_string);
|
||||
|
||||
echo ' <select onchange="inv_new_message_list_change(this);" class="dropdown medium" autofocus="autofocus" tabindex="2">';
|
||||
echo ' <option value="0" selected="selected" class="gray bold">'.$lang['srv_inv_message_draft_new'].'</option>';
|
||||
$messages = array();
|
||||
while ( $row = mysqli_fetch_assoc($sql_query) ) {
|
||||
$messages[$row['id']] = $row;
|
||||
echo ' <option value="'.$row['id'].'" comment="'.$row['comment'].'">'.$row['naslov'].'</option>';
|
||||
}
|
||||
echo ' </select>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div id="new_message_list_span" class="setting_holder">';
|
||||
echo ' <span class="setting_title">'.$lang['srv_inv_message_rename_new_name'].'</span>';
|
||||
$newName = $this->generateMessageName();
|
||||
echo ' <input type="text" id="rec_profile_name" class="text medium" value="'.$newName.'" tabindex="1" autofocus="autofocus">';
|
||||
echo '</div>';
|
||||
|
||||
echo '<input type="text" id="rec_profile_name" value="'.$newName.'" tabindex="1" autofocus="autofocus">';
|
||||
echo '</label>';
|
||||
echo '</span>';
|
||||
echo '<br/><br/>';
|
||||
echo $lang['srv_inv_message_draft_list_comment'];
|
||||
#.((int)$_POST['mid'] > 0 ? $messages[(int)$_POST['mid']]['comment'] : '').
|
||||
echo '<textarea id="inv_message_comment" tabindex="3" rows="2" style="width:200px;"></textarea>';
|
||||
echo '<br class="clr" /><br class="clr" />';
|
||||
echo '<span class="buttonwrapper floatRight" title="'.$lang['save'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_message_save_details(); return false;"><span>'.$lang['save'].'</span></a></span>';
|
||||
echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" ><span>'.$lang['srv_cancel'].'</span></a></span>';
|
||||
echo '<br class="clr" />';
|
||||
echo '</div>'; # id="inv_view_arch_recipients"
|
||||
|
||||
echo '<div class="setting_holder">';
|
||||
echo ' <span class="setting_title">'.$lang['srv_inv_message_draft_list_comment'].'</span>';
|
||||
echo ' <textarea id="inv_message_comment" tabindex="3" rows="2"></textarea>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" onclick="$(\'#fade\').fadeOut(\'slow\');$(\'#fullscreen\').fadeOut(\'slow\').html(\'\');return false;" >'.$lang['srv_cancel'].'</button>';
|
||||
echo ' <button class="medium blue" onclick="inv_message_save_details(); return false;">'.$lang['save'].'</button>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
|
||||
}
|
||||
|
||||
@ -8747,20 +8750,9 @@ class SurveyInvitationsNew {
|
||||
list($pid, $name, $comment, $uid) = mysqli_fetch_row($sql_query);
|
||||
echo '<div id="inv_recipients_profile_name" class="access">';
|
||||
echo '<form id="inv_list_edit_form" name="inv_list_edit_form" autocomplete="off">';
|
||||
/*
|
||||
echo '<span id="new_recipients_list_span" >';
|
||||
echo '<label>'.$lang['srv_inv_recipient_list_name'];
|
||||
echo '<input type="text" id="rec_profile_name" name="rec_profile_name" value="'.$name.'" tabindex="1" autofocus="autofocus">';
|
||||
echo '</label>';
|
||||
echo '</span>';
|
||||
|
||||
echo '<br/><br/>';
|
||||
echo $lang['srv_inv_recipient_list_comment'];
|
||||
|
||||
echo '<textarea id="rec_profile_comment" name="rec_profile_comment" tabindex="3" rows="5" >'.$comment.'</textarea>';
|
||||
echo '<br/>';
|
||||
*/
|
||||
$this->displayListAccess($pid);
|
||||
|
||||
# skrita polja za respondente in polja
|
||||
echo '<input id="profile_id" name="profile_id" type="hidden" value="'.($_POST['pid']).'" >';
|
||||
|
||||
@ -8771,10 +8763,6 @@ class SurveyInvitationsNew {
|
||||
|
||||
echo '</form>';
|
||||
echo '</div>'; # id="inv_view_arch_recipients"
|
||||
/* echo '<script type="text/javascript">';
|
||||
echo "$('#rec_profile_name').focus();";
|
||||
echo '</script>';
|
||||
*/
|
||||
}
|
||||
|
||||
function listGetName() {
|
||||
|
||||
@ -145,6 +145,7 @@ class CrossRoad {
|
||||
case A_MISSING:
|
||||
case A_METADATA:
|
||||
case A_MOBILESETTINGS:
|
||||
case A_TABLESETTINGS:
|
||||
case A_JEZIK: # nastavitve jezik
|
||||
case A_UREJANJE: # nastavitve komentarjev
|
||||
case A_PRIKAZ: # nastavitve komentarjev
|
||||
|
||||
@ -40,7 +40,7 @@ class UserTrackingClass
|
||||
echo '<div id="div_archive_content" class="tracking">';
|
||||
|
||||
echo '<fieldset>';
|
||||
echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>';
|
||||
echo '<legend>' . $lang['srv_survey_archives_tracking_history'] . '</legend>';
|
||||
|
||||
// Izvoz v Excel
|
||||
echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
|
||||
|
||||
@ -241,6 +241,7 @@
|
||||
define('A_FORMA', 'forma'); # urejanje ankete - manjkajoče vrednosti
|
||||
define('A_METADATA', 'metadata'); # urejanje ankete - prikaz metapodatkov
|
||||
define('A_MOBILESETTINGS', 'mobile_settings'); # urejanje ankete - nastavitve prikaza pri mobitelih
|
||||
define('A_TABLESETTINGS', 'table_settings'); # urejanje ankete - nastavitve prikaza tabel
|
||||
define('A_PRIKAZ', 'prikaz'); # prikaz podatkov in analiz
|
||||
define('A_MAILING', 'advanced_email'); # nastavitve email strežnika
|
||||
define('A_SKUPINE', 'skupine'); # skupine
|
||||
|
||||
@ -859,7 +859,8 @@ class AnalizaSums extends LatexAnalysisElement{
|
||||
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
||||
//echo $dolzinaVprasanja."</br>";
|
||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}else{
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}
|
||||
@ -1033,7 +1034,8 @@ class AnalizaSums extends LatexAnalysisElement{
|
||||
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
||||
//echo $dolzinaVprasanja."</br>";
|
||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}else{
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}
|
||||
@ -1689,7 +1691,8 @@ class AnalizaSums extends LatexAnalysisElement{
|
||||
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
||||
//echo $dolzinaVprasanja."</br>";
|
||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}else{
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}
|
||||
@ -1964,6 +1967,7 @@ class AnalizaSums extends LatexAnalysisElement{
|
||||
//echo $dolzinaVprasanja."</br>";
|
||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}else{
|
||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||
}
|
||||
|
||||
@ -64,9 +64,14 @@ class DatumLatex extends LatexSurveyElement
|
||||
$rowVrednost = mysqli_fetch_array($sqlVrednosti);
|
||||
//$sqlUserAnswer = sisplet_query("SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND vre_id='".$rowVrednost['id']."' AND loop_id $loop_id");
|
||||
//$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND vre_id='".$rowVrednost['id']."' ";
|
||||
//$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' ";
|
||||
$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND loop_id = $loop_id";
|
||||
$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' ";
|
||||
//$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND loop_id = $loop_id";
|
||||
if($loop_id){
|
||||
$sqlUserAnswerString = $sqlUserAnswerString." AND loop_id = '$loop_id'";
|
||||
}
|
||||
|
||||
//echo $sqlUserAnswerString."</br>";
|
||||
|
||||
$sqlUserAnswer = sisplet_query($sqlUserAnswerString);
|
||||
$userAnswer = mysqli_fetch_assoc($sqlUserAnswer);
|
||||
//echo "userAnswer: ".$userAnswer['text']."</br>";
|
||||
|
||||
@ -215,7 +215,8 @@ class MultiGridLatex extends LatexSurveyElement
|
||||
//echo "userAnswer Missing je prisoten in njegov grd_id je: ".$userAnswerMissing['grd_id'].'</br>';
|
||||
$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, 6, $spremenljivke['grids'], count($missingOdgovori), $userAnswerMissing['grd_id']);
|
||||
}else{
|
||||
$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),$this->encodeText($userAnswer['text']));
|
||||
//$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),$this->encodeText($userAnswer['text']));
|
||||
$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),($userAnswer['text']));
|
||||
}
|
||||
|
||||
//$okvirZOdgovori = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], count($missingOdgovori),$this->encodeText($userAnswer['text']));
|
||||
@ -887,7 +888,8 @@ class MultiGridLatex extends LatexSurveyElement
|
||||
$izpis .= '\\textcolor{crta}{'.$data[$j].'}';
|
||||
}else{
|
||||
if($spremenljivke['tip']==19){ //ce je tip vprasanja besedilo
|
||||
$izpis .= '\\textcolor{crta}{'.$data[$j].'}';
|
||||
//$izpis .= '\\textcolor{crta}{'.$data[$j].'}';
|
||||
$izpis .= '\\textcolor{crta}{'.$this->encodeText($data[$j]).'}';
|
||||
}else{
|
||||
$izpis .= '\\textcolor{crta}{'.$vodoravniOdgovori[$i].'}';
|
||||
}
|
||||
|
||||
@ -933,12 +933,12 @@ class LatexAnalysisElement{
|
||||
$text = str_replace('>','\textgreater',$text);
|
||||
$text = str_replace(' ',' ',$text);
|
||||
if(strpos($text, '&')){ //ce je prisotno v besedilu &'
|
||||
$text = str_replace('&','\& ',$text);
|
||||
$text = str_replace('&','\&',$text);
|
||||
}else{
|
||||
$text = str_replace('&','\& ',$text);
|
||||
$text = str_replace('&','\&',$text);
|
||||
}
|
||||
|
||||
$andSymbolPresent = 0;
|
||||
/* $andSymbolPresent = 0;
|
||||
$posAndSymbolPresent = strpos($text,'&');
|
||||
if($posAndSymbolPresent !== false){ //ce je v besedilu prisoten '&' zapisan kot '&'
|
||||
$text = str_replace('&','\&',$text);
|
||||
@ -946,7 +946,7 @@ class LatexAnalysisElement{
|
||||
}
|
||||
if($andSymbolPresent == 0){
|
||||
$text = str_replace('&','\&',$text);
|
||||
}
|
||||
} */
|
||||
|
||||
/* //$text = str_replace('<','\textless ',$text);
|
||||
$text = str_replace('<','\textless',$text);
|
||||
@ -1074,7 +1074,7 @@ class LatexAnalysisElement{
|
||||
$text = "\seqsplit{".$text."}"; //ni v redu seqsplit, ker ne dela, če so posebni znaki
|
||||
}
|
||||
//priprava izpisa zelo dolgega besedila brez presledkov - konec
|
||||
|
||||
//echo "Encoding ".$text."</br>";
|
||||
return strip_tags($text); //vrni tekst brez html tag-ov
|
||||
}
|
||||
|
||||
|
||||
@ -1415,10 +1415,12 @@ class LatexDocument{
|
||||
|
||||
|
||||
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
|
||||
$findAt = '@';
|
||||
$findAt = '@1'; //IZKLOPIL DETEKCIJO, KER DELA TUDI BREZ TEGA
|
||||
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
|
||||
$findNewline = 'br';
|
||||
|
||||
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
|
||||
|
||||
$posAt = strpos($text, $findAt);
|
||||
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
|
||||
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
|
||||
|
||||
@ -1478,19 +1478,24 @@ class LatexSurvey{
|
||||
//echo "text potem: ".$text."</br>";
|
||||
|
||||
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
|
||||
$findAt = '@';
|
||||
$findAt = '@1'; //IZKLOPIL DETEKCIJO, KER DELA TUDI BREZ TEGA
|
||||
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
|
||||
$findNewline = 'br';
|
||||
|
||||
|
||||
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
|
||||
|
||||
$posAt = strpos($text, $findAt);
|
||||
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
|
||||
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
|
||||
|
||||
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
|
||||
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
|
||||
//echo $posSpace1Mail."</br>";
|
||||
//echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."</br>";
|
||||
|
||||
//najdi prvi presledek pred afno
|
||||
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
|
||||
//echo $posSpace2Mail."</br>";
|
||||
//echo "pozicijo zadnjega presledka v besedilu pred e-naslovom: ".$posSpace2Mail."</br>";
|
||||
|
||||
|
||||
|
||||
//najdi prvi simbol za v novo vrstico "br" po afni
|
||||
//echo substr($text, $posAt) ."</br>";
|
||||
@ -1502,15 +1507,17 @@ class LatexSurvey{
|
||||
}else{
|
||||
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
|
||||
}
|
||||
|
||||
//echo "posKonec: ".$posKonec."</br>";
|
||||
|
||||
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
|
||||
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
|
||||
$text = substr_replace($text, '}', $posKonec, 0);
|
||||
|
||||
//dodaj pred e-naslovom potrebno latex kodo za url
|
||||
//substr_replace(string_name, replacement_string, start_pos, length)
|
||||
$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
|
||||
//substr_replace(string_name, replacement_string, start_pos, length)
|
||||
$text = substr_replace($text, ' \url{', $posSpace2Mail, 0);
|
||||
//echo $text."</br>";
|
||||
|
||||
}
|
||||
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec
|
||||
|
||||
|
||||
@ -259,8 +259,9 @@ class LatexSurveyElement{
|
||||
$parents = Cache::srv_branching($spremenljivke['id'], 0)['parent'];
|
||||
//echo "parents: ".$parents."</br>";
|
||||
if($parents){
|
||||
$tex .= $this->displayIf($parents);
|
||||
//echo "blok: ".$this->displayIf($parents)."</br>";
|
||||
$tex .= $this->encodeText($this->displayIf($parents));
|
||||
//$tex .= $this->displayIf($parents);
|
||||
//echo "blok: ".$this->encodeText($this->displayIf($parents))."</br>";
|
||||
$tex .= $this->texNewLine;
|
||||
}
|
||||
#preuredil kodo, da zadeva deluje tako kot ta stara, ki se nahaja nad tem
|
||||
@ -934,9 +935,9 @@ class LatexSurveyElement{
|
||||
$text = str_replace('_','\_ ',$text);
|
||||
$text = str_replace('~','\textasciitilde{} ',$text);
|
||||
if(strpos($text, '&')){ //ce je prisotno v besedilu &'
|
||||
$text = str_replace('&','\& ',$text);
|
||||
$text = str_replace('&','\&',$text);
|
||||
}else{
|
||||
$text = str_replace('&','\& ',$text);
|
||||
$text = str_replace('&','\&',$text);
|
||||
}
|
||||
$text = str_replace(' ','~',$text);
|
||||
//$text = str_replace('<','\textless ',$text);
|
||||
@ -1056,30 +1057,40 @@ class LatexSurveyElement{
|
||||
//echo "text potem: ".$text."</br>";
|
||||
|
||||
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
|
||||
$findAt = '@';
|
||||
$findAt = '@1'; //IZKLOPIL DETEKCIJO, KER DELA TUDI BREZ TEGA
|
||||
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
|
||||
$findNewline = 'br';
|
||||
|
||||
$text = preg_replace("/<\/?a( [^>]*)?>/i", "", $text); //remove anchor tag from string <a href= ... </a>, to se je uredilo za rešiti <a href= mailto: ...
|
||||
|
||||
$posAt = strpos($text, $findAt);
|
||||
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
|
||||
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
|
||||
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
|
||||
//echo $posSpace1Mail."</br>";
|
||||
echo "pozicija prvega presledka v besedilu po e-naslovu: ".$posSpace1Mail."</br>";
|
||||
echo "pozicija @: ".$posAt."</br>";
|
||||
|
||||
//najdi prvi presledek pred afno
|
||||
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
|
||||
//echo $posSpace2Mail."</br>";
|
||||
echo "presledek pred e-naslovom: ".$posSpace2Mail."</br>";
|
||||
|
||||
//najdi prvi simbol za v novo vrstico "br" pred afno
|
||||
$posNewLineBeforeMail = strripos(substr($text, 0, $posAt), $findNewline); //najdi pozicijo prvega simbola za v novo vrstico v besedilu preds e-naslovom
|
||||
echo "nova vrstica pred e-naslovom: ".$posNewLineBeforeMail."</br>";
|
||||
|
||||
//najdi prvi simbol za v novo vrstico "br" po afni
|
||||
//echo substr($text, $posAt) ."</br>";
|
||||
$posNewLineMail = strpos(substr($text, $posAt), $findNewline); //najdi pozicijo prvega simbola za v novo vrstico v besedilu po e-naslovu
|
||||
$posNewLineMail = $posNewLineMail+$posAt-1; //koncna pozicija, ce se gleda celotno besedilo
|
||||
|
||||
echo "pozicija prvega simbola za v novo vrstico v besedilu po e-naslovu: ".$posNewLineMail."</br>";
|
||||
|
||||
if($posSpace1Mail<$posNewLineMail){ //ce se po e-naslovu pojavi prej presledek
|
||||
$posKonec = $posSpace1Mail; //se zakljuci pri presledku, ker je ta lokacija za zakljucek url
|
||||
}else{
|
||||
$posKonec = $posNewLineMail; //se zakljuci pred simbolom za novo vrstico, ker je ta lokacija za zakljucek url
|
||||
}
|
||||
echo "konec: ".$posKonec."</br>";
|
||||
|
||||
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
|
||||
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
|
||||
@ -1088,7 +1099,7 @@ class LatexSurveyElement{
|
||||
//dodaj pred e-naslovom potrebno latex kodo za url
|
||||
//substr_replace(string_name, replacement_string, start_pos, length)
|
||||
$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
|
||||
//echo $text."</br>";
|
||||
echo $text."</br>";
|
||||
}
|
||||
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec
|
||||
|
||||
|
||||
@ -139,7 +139,6 @@
|
||||
// Fonts
|
||||
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,500,500i,600,600i,700,700i&subset=latin-ext" rel="stylesheet">';
|
||||
|
||||
//echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,500,500i,600,600i,700,700i&subset=latin-ext" rel="stylesheet" />';
|
||||
|
||||
?>
|
||||
<!--[if lt IE 7]>
|
||||
@ -176,12 +175,23 @@
|
||||
/**************** BODY ****************/
|
||||
|
||||
// za css - barve ozadja
|
||||
if (isset($_GET['anketa']))
|
||||
if(isset($_GET['anketa'])){
|
||||
$cssBodyClass = 'body_anketa';
|
||||
else if (isset($_GET['a']) && $_GET['a'] == 'knjiznica' )
|
||||
}
|
||||
elseif(isset($_GET['a']) && $_GET['a'] == 'knjiznica'){
|
||||
$cssBodyClass = 'body_library';
|
||||
else
|
||||
$cssBodyClass = 'body_folders';
|
||||
}
|
||||
elseif(!isset($_GET['a']) || $_GET['a'] == 'pregledovanje'){
|
||||
|
||||
// Pogled s folderji
|
||||
if(SurveyList::hasFolders()){
|
||||
$cssBodyClass = 'body_mySurveys_folders';
|
||||
}
|
||||
// Klasicne moje ankete
|
||||
else{
|
||||
$cssBodyClass = 'body_mySurveys';
|
||||
}
|
||||
}
|
||||
|
||||
// Class za jezik
|
||||
$langBodyClass = ($lang['id'] != "1") ? 'eng' : 'slo';
|
||||
|
||||
@ -47,6 +47,7 @@ return [
|
||||
dirname(__FILE__).'/../script/statistika.js',
|
||||
dirname(__FILE__).'/../script/vprasanje.js',
|
||||
dirname(__FILE__).'/../script/vprasanjeInline.js',
|
||||
dirname(__FILE__).'/../script/vprasanjeDeleted.js',
|
||||
dirname(__FILE__).'/../script/prevajanje.js',
|
||||
dirname(__FILE__).'/../script/missingValues.js',
|
||||
dirname(__FILE__).'/../script/missingProfiles.js',
|
||||
|
||||
@ -181,20 +181,21 @@ class GC{
|
||||
'2_6' => 'excel',
|
||||
'2_7' => 'doktorska',
|
||||
|
||||
'3_1' => 'habilitacijska',
|
||||
'3_1' => 'habilitacija',
|
||||
|
||||
'4_1' => 'predmeti'
|
||||
);
|
||||
|
||||
$reports_id = '02032022';
|
||||
$report_type = '1_1';
|
||||
$reports_id = '27102022';
|
||||
$report_type = '4_1';
|
||||
$fak_id = '3000001';
|
||||
$zip_name = '';
|
||||
|
||||
// Nastavimo pot do pdf-jev
|
||||
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
|
||||
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
|
||||
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
|
||||
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
|
||||
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
|
||||
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/povzetki/';
|
||||
|
||||
echo '<span class="bold">Parametri:</span>';
|
||||
echo '<ul><li>ID: <span class="bold">'.$reports_id.'</span></li>';
|
||||
@ -209,16 +210,16 @@ class GC{
|
||||
//$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false);
|
||||
|
||||
// BRANJE POROCIL - IZVAJALEC
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_321', $fakultete[$fak_id]['kratica']);
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_14', $fakultete[$fak_id]['kratica']);
|
||||
|
||||
// BRANJE POROCIL - FAKULTETA
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2020_2021', $fakultete[$fak_id]['kratica']);
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2021_2022', $fakultete[$fak_id]['kratica']);
|
||||
|
||||
// BRANJE POROCIL - PREDMETI
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_predmeti_'.$fak_id.'_2020_2021', $fakultete[$fak_id]['kratica']);
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_predmeti_'.$fak_id.'_2021_2022', $fakultete[$fak_id]['kratica']);
|
||||
|
||||
// BRANJE POROCIL - HABILITACIJA
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_habilitacija_'.$fak_id.'_2020_2021', $fakultete[$fak_id]['kratica']);
|
||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_habilitacija_'.$fak_id.'_2021_2022', $fakultete[$fak_id]['kratica']);
|
||||
|
||||
|
||||
echo '<pre>';
|
||||
@ -230,176 +231,6 @@ class GC{
|
||||
echo '</fieldset>';
|
||||
}
|
||||
|
||||
|
||||
// Izvedemo upload paketa pdf-jev - STARO - ZA POPRAVIT
|
||||
public function executeUpload($reports_id){
|
||||
global $global_user_id;
|
||||
global $site_url;
|
||||
|
||||
if($reports_id <= 0){
|
||||
echo 'Napaka! Manjka id paketa poročil.';
|
||||
echo die();
|
||||
}
|
||||
|
||||
// Dobimo podatke o paketu
|
||||
$sqlPdf = sisplet_query("SELECT * FROM eval_pdf_reports WHERE id='".$reports_id."'");
|
||||
$rowPdf = mysqli_fetch_array($sqlPdf);
|
||||
|
||||
// Razpakiramo zip
|
||||
$zip = new ZipArchive;
|
||||
$res = $zip->open('modules/Evalvacija/pdf/' . $rowPdf['filename'], ZIPARCHIVE::CREATE);
|
||||
if ($res === TRUE) {
|
||||
$zip->extractTo('modules/Evalvacija/pdf/unzipped/');
|
||||
$zip->close();
|
||||
}
|
||||
else{
|
||||
echo 'Napaka pri unzippu paketa!';
|
||||
echo die();
|
||||
}
|
||||
|
||||
// Dobimo vse podatke o fakulteti
|
||||
$fak_id = $rowPdf['fak_id'];
|
||||
$sqlFakulteta = sisplet_query("SELECT * FROM eval_fakulteta WHERE id='".$fak_id."'");
|
||||
$rowFakulteta = mysqli_fetch_array($sqlFakulteta);
|
||||
|
||||
// Kratica fakultete za šport je tukaj drugačna
|
||||
$rowFakulteta['kratica'] = ($fak_id == '3000022') ? 'FSP' : $rowFakulteta['kratica'];
|
||||
|
||||
// Nalagamo porocila PO IZVAJALCIH
|
||||
if($rowPdf['type'] == 1){
|
||||
|
||||
$reports = glob($this->pdf_path.'*');
|
||||
|
||||
// Loop po vseh poročilih
|
||||
foreach($reports as $report){
|
||||
if(is_file($report)){
|
||||
|
||||
$info_array = explode("_", basename($report, ".pdf"));
|
||||
//var_dump($info_array);
|
||||
|
||||
// Dobimo vse podatke o izvajalcu
|
||||
$izv_id = $info_array[1];
|
||||
$sqlIzvajalec = sisplet_query("SELECT * FROM eval_izvajalec".$this->izvajalec_table." WHERE idpedagoga='".$fak_id."_".$rowFakulteta['kratica']."_".$izv_id."' AND fakulteta='".$fak_id."'");
|
||||
|
||||
if(mysqli_num_rows($sqlIzvajalec) > 0){
|
||||
$rowIzvajalec = mysqli_fetch_array($sqlIzvajalec);
|
||||
|
||||
// Ustvarimo zadevo
|
||||
$return = $this->createFolderIzvajalec($izv_id, $rowIzvajalec['ime_pedagoga'], $fak_id, $rowFakulteta['kratica']);
|
||||
|
||||
// Ustvarimo dokument in pripnemo porocilo
|
||||
$return2 = $this->createDocumentIzvajalec(
|
||||
$zadeva_id = 'RezultatiAnket_'.$fak_id.'_'.$izv_id,
|
||||
$filename = basename($report),
|
||||
$filedate = date('d.m.Y'),
|
||||
$izv_id,
|
||||
$rowIzvajalec['ime_pedagoga'],
|
||||
$fak_id,
|
||||
$rowFakulteta['kratica'],
|
||||
$reports_id
|
||||
);
|
||||
|
||||
// Zakljucimo dokument
|
||||
$return3 = $this->closeDocument($return2, $rowFakulteta['kratica']);
|
||||
}
|
||||
else{
|
||||
echo 'Napaka! Izvajalca '.$izv_id.' ni v bazi!<br />';
|
||||
}
|
||||
}
|
||||
else{
|
||||
echo 'Napaka! Poročilo ne obstaja!<br />';
|
||||
}
|
||||
}
|
||||
}
|
||||
// Nalagamo porocila PO PROGRAMIH
|
||||
elseif($rowPdf['type'] == 2){
|
||||
|
||||
// Ustvarimo zadevo
|
||||
$return = $this->createFolderVodstvo($fak_id, $rowFakulteta['kratica']);
|
||||
|
||||
$reports = glob($this->pdf_path.'*');
|
||||
|
||||
// Loop po vseh poročilih
|
||||
foreach($reports as $report){
|
||||
if(is_file($report)){
|
||||
|
||||
$info_array = explode("_", basename($report, ".pdf"));
|
||||
//var_dump($info_array);
|
||||
|
||||
// Dobimo vse podatke o izvajalcu
|
||||
$program_id = $info_array[1];
|
||||
$sqlProgram = sisplet_query("SELECT * FROM eval_program WHERE id='".$program_id."'");
|
||||
$rowProgram = mysqli_fetch_array($sqlProgram);
|
||||
|
||||
// Zgradimo ime programa (iz stopnje in imena) - da je enolično
|
||||
if($rowProgram['stopnja'] == '2')
|
||||
$stopnja = 'druga';
|
||||
elseif($rowProgram['stopnja'] == '3')
|
||||
$stopnja = 'tretja';
|
||||
else
|
||||
$stopnja = 'prva';
|
||||
$program_ime = $stopnja.', '.$rowProgram['program'];
|
||||
|
||||
// Ustvarimo dokument in pripnemo porocilo
|
||||
$return2 = $this->createDocumentProgram(
|
||||
$zadeva_id = 'RezultatiAnket_'.$fak_id.'_'.$this->year,
|
||||
$filename = basename($report),
|
||||
$filedate = date('d.m.Y'),
|
||||
$program_id,
|
||||
$program_ime,
|
||||
$fak_id,
|
||||
$rowFakulteta['kratica'],
|
||||
$reports_id
|
||||
);
|
||||
|
||||
// Zakljucimo dokument
|
||||
$return3 = $this->closeDocument($return2, $rowFakulteta['kratica']);
|
||||
}
|
||||
else{
|
||||
echo 'Napaka! Poročilo ne obstaja!<br />';
|
||||
}
|
||||
}
|
||||
}
|
||||
// Nalagamo porocilo PO FAKULTETI
|
||||
else{
|
||||
|
||||
// Ustvarimo zadevo
|
||||
$return = $this->createFolderVodstvo($fak_id, $rowFakulteta['kratica']);
|
||||
|
||||
$reports = glob($this->pdf_path.'*');
|
||||
|
||||
// Loop po vseh poročilih
|
||||
foreach($reports as $report){
|
||||
if(is_file($report)){
|
||||
|
||||
// Ustvarimo dokument in pripnemo porocilo
|
||||
$return2 = $this->createDocumentFakulteta(
|
||||
$zadeva_id = 'RezultatiAnket_'.$fak_id.'_'.$this->year,
|
||||
$filename = basename($report),
|
||||
$filedate = date('d.m.Y'),
|
||||
$fak_id,
|
||||
$rowFakulteta['kratica'],
|
||||
$reports_id
|
||||
);
|
||||
|
||||
// Zakljucimo dokument
|
||||
$return3 = $this->closeDocument($return2, $rowFakulteta['kratica']);
|
||||
}
|
||||
else{
|
||||
echo 'Napaka! Poročilo ne obstaja!<br />';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Pobrisemo razpakirane pdf-je
|
||||
$files = glob($this->pdf_path.'*');
|
||||
foreach($files as $file){
|
||||
if(is_file($file)){
|
||||
unlink($file);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Izvedemo upload paketa pdf-jev
|
||||
public function executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip){
|
||||
|
||||
@ -9,7 +9,9 @@
|
||||
- kdaj se poslje sporocilo? ob 8h zjutraj?
|
||||
- se lahko zacne sekvenca na npr. 2. anketi (oz. se preskoci anketo 2...?)
|
||||
|
||||
|
||||
- besedilo opomnika, ki se posilja v mailu?
|
||||
- status "koncano" - mora respondent prikilkati do konca ankete? Drugace ne moremo posiljati opomnika.
|
||||
- smtp??
|
||||
|
||||
*/
|
||||
|
||||
@ -17,87 +19,261 @@
|
||||
class Kolektor {
|
||||
|
||||
|
||||
var $sequence = array();
|
||||
var $clients = array();
|
||||
// Statusi responsa
|
||||
private $statuses = array(
|
||||
1 => 'proženo',
|
||||
2 => 'opozorilo 1',
|
||||
3 => 'opozorilo 3',
|
||||
4 => 'neodgovorjeno',
|
||||
5 => 'končano'
|
||||
);
|
||||
|
||||
|
||||
function __construct(){
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
$this->prepareSequence();
|
||||
$this->prepareClients();
|
||||
|
||||
echo '<script src="'.$site_url.'admin/survey/modules/mod_KOLEKTOR/script/script.js" type="text/javascript"></script>';
|
||||
}
|
||||
|
||||
|
||||
private function prepareSequence(){
|
||||
|
||||
// Dobimo sekvenco anket
|
||||
$sql = sisplet_query("SELECT * FROM kolektor_sequence");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$this->sequence = $row;
|
||||
}
|
||||
|
||||
private function prepareClients(){
|
||||
private function getResponses(){
|
||||
global $global_user_id;
|
||||
global $admin_type;
|
||||
|
||||
// Admini vidijo vse kliente
|
||||
$data = array();
|
||||
|
||||
// Admini vidijo vse reposnse
|
||||
if($admin_type == '0'){
|
||||
$sql = sisplet_query("SELECT * FROM kolektor_client");
|
||||
$sql = sisplet_query("SELECT sr.*, s.survey_sequence
|
||||
FROM kolektor_survey s, kolektor_survey_response sr
|
||||
WHERE s.ank_id=sr.ank_id
|
||||
ORDER BY sr.insert_time DESC
|
||||
");
|
||||
|
||||
while($row = mysqli_fetch_array($sql)){
|
||||
$this->clients[$row['id']] = $row;
|
||||
$data[$row['id']] = $row;
|
||||
}
|
||||
}
|
||||
else{
|
||||
// Uporabnik vidi samo svoje kliente
|
||||
$sql = sisplet_query("SELECT * FROM kolektor_client WHERE usr_id='".$global_user_id."'");
|
||||
// Uporabnik vidi samo svoje reponse
|
||||
$sql = sisplet_query("SELECT sr.*, s.survey_sequence
|
||||
FROM kolektor_survey s, kolektor_survey_response sr
|
||||
WHERE sr.usr_id='".$global_user_id."' AND s.ank_id=sr.ank_id
|
||||
ORDER BY sr.insert_time DESC
|
||||
");
|
||||
|
||||
while($row = mysqli_fetch_array($sql)){
|
||||
$this->clients[$row['id']] = $row;
|
||||
$data[$row['id']] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
private function getSurveys(){
|
||||
|
||||
$data = array();
|
||||
|
||||
$sql = sisplet_query("SELECT ks.*, a.hash, a.naslov, a.akronim FROM kolektor_survey ks, srv_anketa a WHERE a.id=ks.ank_id ORDER BY ks.survey_sequence ASC");
|
||||
|
||||
while($row = mysqli_fetch_array($sql)){
|
||||
$data[$row['ank_id']] = $row;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Osnovni pogled
|
||||
public function display(){
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
echo 'kolektor';
|
||||
echo '<button class="large blue kolektor_create_response" onClick="kolektorCreateResponsePopup();">Proži novo anketo</button>';
|
||||
|
||||
$this->displayClientList();
|
||||
echo '<div id="kolektor_reponses_holder">';
|
||||
$this->displayResponses();
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
public function displayClientList(){
|
||||
public function displayResponses(){
|
||||
global $site_url;
|
||||
|
||||
echo '<div class="kolektor_clients_holder">';
|
||||
|
||||
echo ' <div class="kolektor_clients">';
|
||||
echo ' <table class="kolektor_reponses">';
|
||||
|
||||
echo ' <tr>';
|
||||
echo ' <th>Anketa</th>';
|
||||
echo ' <th>ID projekta</th>';
|
||||
echo ' <th>Email respondenta</th>';
|
||||
echo ' <th>Funkcija respondenta</th>';
|
||||
echo ' <th>Čas proženja</th>';
|
||||
echo ' <th>Status</th>';
|
||||
echo ' <th>Odgovori</th>';
|
||||
echo ' <th>Opomnik</th>';
|
||||
echo ' </tr>';
|
||||
|
||||
// Loop cez vse stranke
|
||||
foreach($this->clients as $client_id => $client){
|
||||
$responses = $this->getResponses();
|
||||
$surveys = $this->getSurveys();
|
||||
foreach($responses as $response_id => $response){
|
||||
|
||||
echo ' <div class="kolektor_client">';
|
||||
|
||||
var_dump($client);
|
||||
|
||||
echo ' </div>';
|
||||
echo ' <tr class="kolektor_response">';
|
||||
echo ' <td>'.$surveys[$response['ank_id']]['naslov'].'</td>';
|
||||
echo ' <td>'.$response['respondent_projekt_id'].'</td>';
|
||||
echo ' <td>'.$response['respondent_email'].'</td>';
|
||||
echo ' <td>'.$response['respondent_funkcija'].'</td>';
|
||||
echo ' <td>'.date('j.n.Y H:i:s', strtotime($response['insert_time'])).'</td>';
|
||||
echo ' <td>'.$this->statuses[$response['status']].'</td>';
|
||||
echo ' <td><a href="'.$site_url.'admin/survey/index.php?anketa='.$response['ank_id'].'&a=data">Preglej odgovore</a></td>';
|
||||
echo ' <td><span onClick="kolektorSendRespondentNotificationPopup(\''.$response['respondent_id'].'\');">Pošlji opomnik</span></td>'; // TODO
|
||||
echo ' </tr>';
|
||||
}
|
||||
|
||||
echo ' </div>';
|
||||
|
||||
echo '</div>';
|
||||
echo ' </table>';
|
||||
}
|
||||
|
||||
// Prikaze formo za dodajanje novega responsa
|
||||
public function displayAddResponse(){
|
||||
public function displayAddResponse($data=array(), $error=array()){
|
||||
|
||||
echo '<div class="popup_close"><a href="#" onclick="kolektorCreateResponseClose();">✕</a></div>';
|
||||
|
||||
echo '<h2>Dodajanje novega respondenta</h2>';
|
||||
|
||||
echo '<form id="kolektor_add_response_form" name="kolektor_add_response_form">';
|
||||
|
||||
|
||||
// Izpisemo napake, ce kaksno polje manjka
|
||||
if(!empty($error)){
|
||||
|
||||
echo '<div class="error_messages">';
|
||||
|
||||
echo 'Prosimo izpolnite vsa obvezna polja:';
|
||||
|
||||
echo '<ul>';
|
||||
foreach($error as $error_msg){
|
||||
echo '<li class="error_message">'.$error_msg.'</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
// Seznam 6 kolektor anket
|
||||
echo '<div class="kolektor_setting '.(isset($error['ank_id']) ? 'error' : '').'">';
|
||||
echo ' <div class="setting_line">Anketa:</div>';
|
||||
$surveys = $this->getSurveys();
|
||||
$sequence = 0;
|
||||
foreach($surveys as $kolektor_survey){
|
||||
echo '<div class="setting_line">';
|
||||
echo ' <input type="radio" id="kolektor_survey_'.$kolektor_survey['survey_sequence'].'" name="kolektor_survey" sequence="'.$kolektor_survey['survey_sequence'].'" value="'.$kolektor_survey['ank_id'].'" '.($data['ank_id'] == $kolektor_survey['ank_id'] ? 'checked="checked"' : '').' onChange="kolektorSelectSurvey();">';
|
||||
echo ' <label for="kolektor_survey_'.$kolektor_survey['survey_sequence'].'">'.$kolektor_survey['survey_sequence'].' - '.$kolektor_survey['naslov'].'</label>';
|
||||
echo '</div>';
|
||||
|
||||
if($data['ank_id'] == $kolektor_survey['ank_id'])
|
||||
$sequence = $kolektor_survey['survey_sequence'];
|
||||
}
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div id="kolektor_respondent_settings" '.(($sequence == 0) ? 'style="display:none;"' : '').'>';
|
||||
|
||||
// ID projekta
|
||||
echo '<div class="kolektor_setting '.(isset($error['respondent_projekt_id']) ? 'error' : '').'">';
|
||||
echo ' <div class="setting_line">ID projekta:</div>';
|
||||
echo ' <input type="text" class="medium" name="respondent_projekt_id" value="'.$data['respondent_projekt_id'].'">';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Email
|
||||
echo '<div class="kolektor_setting '.(isset($error['respondent_email']) ? 'error' : '').'">';
|
||||
echo ' <div class="setting_line">Email respondenta:</div>';
|
||||
echo ' <input type="text" class="medium" name="respondent_email" value="'.$data['respondent_email'].'">';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Funkcija respondenta
|
||||
$standard_functions = array('Vodja nabave', 'Vodja projekta', 'Skrbnik pogodbe', 'Nadzornik objekta', 'Član inženirskega tima');
|
||||
$other_function = (isset($data['respondent_funkcija']) && $data['respondent_funkcija'] != '' && !in_array($data['respondent_funkcija'], $standard_functions)) ? true : false;
|
||||
|
||||
echo '<div class="kolektor_setting '.(isset($error['respondent_funkcija']) ? 'error' : '').'">';
|
||||
|
||||
echo ' <div class="setting_line">Funkcija respondenta v podjetju:</div>';
|
||||
echo ' <select name="respondent_funkcija" id="respondent_funkcija_dropdown" class="dropdown medium" '.($other_function ? 'disabled="disabled"' : '').'>';
|
||||
foreach($standard_functions as $standard_function){
|
||||
echo ' <option value="'.$standard_function.'" '.($data['respondent_funkcija'] == $standard_function ? 'selected="selected"' : '').'>'.$standard_function.'</option>';
|
||||
}
|
||||
echo ' </select>';
|
||||
|
||||
echo ' <div class="setting_line"><input type="checkbox" id="respondent_funkcija_other" onClick="kolektorOtherFunction();" '.($other_function ? 'checked="checked"' : '').'><label for="respondent_funkcija_other">Druga funkcija</label></div>';
|
||||
echo ' <input type="text" class="medium" name="respondent_funkcija" id="respondent_funkcija_text" '.($other_function ? 'value="'.$data['respondent_funkcija'].'"' : 'style="display:none;" disabled="disabled"').'>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Aktivacija na daljavo - samo za anketi 5 in 6
|
||||
echo '<div id="kolektor_setting_activation" class="kolektor_setting '.(isset($error['respondent_remote_activation']) ? 'error' : '').'" '.(($sequence == '4' || $sequence == '5') ? '' : 'style="display:none;"').'>';
|
||||
echo ' <div class="setting_line">Aktivacija na daljavo:</div>';
|
||||
echo ' <div class="setting_line"><input type="radio" id="respondent_remote_activation_0" name="respondent_remote_activation" value="0" '.($data['respondent_remote_activation'] != '1' ? 'checked="checked"' : '').' '.(($sequence == '4' || $sequence == '5') ? '' : 'disabled="disabled"').'><label for="respondent_remote_activation_0">Ne</label></div>';
|
||||
echo ' <div class="setting_line"><input type="radio" id="respondent_remote_activation_1" name="respondent_remote_activation" value="1" '.($data['respondent_remote_activation'] == '1' ? 'checked="checked"' : '').' '.(($sequence == '4' || $sequence == '5') ? '' : 'disabled="disabled"').'><label for="respondent_remote_activation_1">Da</label></div>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Sporocilo respondentu
|
||||
$text = 'Pozdravljeni,
|
||||
|
||||
Prosimo vas, če lahko izpolnite anketo. Povezava do ankete: #URL#
|
||||
|
||||
Lep pozdrav,
|
||||
|
||||
Kolektor ETRA';
|
||||
|
||||
echo '<div class="kolektor_setting '.(isset($error['respondent_message']) ? 'error' : '').'">';
|
||||
echo ' <div class="setting_line">Spremno besedilo:</div>';
|
||||
echo ' <textarea name="respondent_message">'.(isset($data['respondent_message']) && $data['respondent_message'] != '' ? $data['respondent_message'] : $text).'</textarea>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
// Gumbi
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" type="button" onClick="kolektorCreateResponseClose();">Zapri</button>';
|
||||
echo ' <button class="medium blue" type="button" onClick="kolektorCreateResponse();">Sproži anketo in pošlji email respondentu</button>';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</form>';
|
||||
}
|
||||
|
||||
// Prikaze formo za posiljanje opomnika respondentu
|
||||
public function displaySendRespondentNotification($respondent_id){
|
||||
|
||||
echo '<div class="popup_close"><a href="#" onclick="kolektorCreateResponseClose();">✕</a></div>';
|
||||
|
||||
echo '<h2>Pošiljanje opomnika respondentu</h2>';
|
||||
|
||||
// Sporocilo respondentu - dobimo prvotnega
|
||||
$sql = sisplet_query("SELECT respondent_message FROM kolektor_survey_response WHERE respondent_id='".$respondent_id."'");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
$text = $row['respondent_message'];
|
||||
|
||||
echo '<div class="kolektor_setting">';
|
||||
echo ' <div class="setting_line">Besedilo opomnika:</div>';
|
||||
echo ' <textarea name="respondent_message">'.$text.'</textarea>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<input type="hidden" name="respondent_id" value="'.$respondent_id.'">';
|
||||
|
||||
// Gumbi
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" type="button" onClick="kolektorCreateResponseClose();">Zapri</button>';
|
||||
echo ' <button class="medium blue" type="button" onClick="kolektorSendRespondentNotification();">Pošlji opomnik respondentu</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
public function displayResponseDetails(){
|
||||
@ -105,6 +281,96 @@ class Kolektor {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Ajax klici
|
||||
public function ajax(){
|
||||
global $lang;
|
||||
global $site_path;
|
||||
global $global_user_id;
|
||||
|
||||
|
||||
if($_GET['a'] == 'add_repsonse_popup'){
|
||||
|
||||
echo '<div id="kolektor_add_response">';
|
||||
$this->displayAddResponse();
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
elseif($_GET['a'] == 'add_repsonse'){
|
||||
|
||||
$response_data['ank_id'] = (isset($_POST['kolektor_survey'])) ? $_POST['kolektor_survey'] : '';
|
||||
$response_data['respondent_email'] = (isset($_POST['respondent_email'])) ? $_POST['respondent_email'] : '';
|
||||
$response_data['respondent_funkcija'] = (isset($_POST['respondent_funkcija'])) ? $_POST['respondent_funkcija'] : '';
|
||||
$response_data['respondent_projekt_id'] = (isset($_POST['respondent_projekt_id'])) ? $_POST['respondent_projekt_id'] : '';
|
||||
$response_data['respondent_remote_activation'] = (isset($_POST['respondent_remote_activation'])) ? $_POST['respondent_remote_activation'] : '';
|
||||
$response_data['respondent_message'] = (isset($_POST['respondent_message'])) ? $_POST['respondent_message'] : '';
|
||||
|
||||
|
||||
// Pohendlamo errorje
|
||||
$error = array();
|
||||
if($response_data['ank_id'] == ''){
|
||||
$error['ank_id'] = 'izberite anketo';
|
||||
}
|
||||
if($response_data['respondent_email'] == ''){
|
||||
$error['respondent_email'] = 'vnesite email respondenta';
|
||||
}
|
||||
if($response_data['respondent_funkcija'] == ''){
|
||||
$error['respondent_funkcija'] = 'vnesite funkcijo respondenta';
|
||||
}
|
||||
if($response_data['respondent_projekt_id'] == ''){
|
||||
$error['respondent_projekt_id'] = 'vnesite ID projekta oz. krovnega projekta';
|
||||
}
|
||||
if($response_data['respondent_remote_activation'] == '' && isset($_POST['respondent_remote_activation'])){
|
||||
$error['respondent_remote_activation'] = 'izberite, če gre za aktivacijo na daljavo';
|
||||
}
|
||||
if($response_data['respondent_message'] == ''){
|
||||
$error['respondent_message'] = 'vnesite spremno besedilo';
|
||||
}
|
||||
|
||||
|
||||
// Imamo napake
|
||||
if(!empty($error)){
|
||||
$this->displayAddResponse($response_data, $error);
|
||||
}
|
||||
else{
|
||||
// Dodamo nov response
|
||||
KolektorResponse::addResponse($response_data);
|
||||
}
|
||||
}
|
||||
|
||||
elseif($_GET['a'] == 'send_respondent_notification_popup'){
|
||||
|
||||
$respondent_id = (isset($_POST['respondent_id'])) ? $_POST['respondent_id'] : 0;
|
||||
|
||||
if($respondent_id > 0){
|
||||
echo '<div id="kolektor_send_respondent_notification">';
|
||||
$this->displaySendRespondentNotification($respondent_id);
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
elseif($_GET['a'] == 'send_respondent_notification'){
|
||||
|
||||
$respondent_id = (isset($_POST['respondent_id'])) ? $_POST['respondent_id'] : '';
|
||||
$notification = (isset($_POST['notification'])) ? $_POST['notification'] : '';
|
||||
|
||||
$kn = new KolektorNotifications($respondent_id);
|
||||
$kn->sendRespondentNotification($notification);
|
||||
|
||||
// Uspesno prozenje
|
||||
echo '<div class="popup_close"><a href="#" onclick="window.location.reload();">✕</a></div>';
|
||||
|
||||
echo '<h2>Pošiljanje opomnika respondentu</h2>';
|
||||
|
||||
echo 'Opomnik uspešno poslan.';
|
||||
|
||||
// Gumb koncaj
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" type="button" onClick="window.location.reload();">Zapri</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
@ -3,48 +3,125 @@
|
||||
|
||||
class KolektorNotifications {
|
||||
|
||||
|
||||
private $response;
|
||||
|
||||
// Statusi responsa
|
||||
private $statuses = array(
|
||||
1 => 'proženo',
|
||||
2 => 'opozorilo 1',
|
||||
3 => 'opozorilo 3',
|
||||
4 => 'neodgovorjeno',
|
||||
5 => 'končano'
|
||||
);
|
||||
|
||||
|
||||
function __construct(){
|
||||
function __construct($respondent_id){
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
|
||||
|
||||
if($respondent_id != '' && $respondent_id > 0){
|
||||
$kr = new KolektorResponse($respondent_id);
|
||||
$this->response = $kr->getResponse();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Loop cez vse response in posljemo notificatione glede na statuse
|
||||
public function executeCronJob(){
|
||||
|
||||
|
||||
// Posljemo mail z obvestilom uredniku, da je bil spremenjen status responsa
|
||||
public function sendNotification(){
|
||||
|
||||
}
|
||||
|
||||
$survey_title = SurveyInfo::getInstance()->getSurveyTitle();
|
||||
$user_email = User::getInstance($this->response['usr_id'])->primaryEmail();
|
||||
|
||||
private function sendNotification($response_id){
|
||||
$subject = 'Kolektor ETRA 1KA - sprememba statusa respondenta';
|
||||
|
||||
$response = new KolektorResponse($response_id);
|
||||
|
||||
// Status 0 - "prozeno" - preklopimo na status 1 "opozorilo 1"
|
||||
if($response->getStatus() == 0){
|
||||
|
||||
}
|
||||
// Status 1 - "opozorilo 1" - preklopimo na status 2 "opozorilo 3"
|
||||
elseif($response->getStatus() == 1){
|
||||
|
||||
}
|
||||
// Status 2 "opozorilo 3" - preklopimo na status 3 "neodgovorjeno"
|
||||
elseif($response->getStatus() == 2){
|
||||
|
||||
|
||||
|
||||
}
|
||||
$body = 'Status respondenta '.$this->response['respondent_email'].' ('.$this->response['respondent_funkcija'].') v anketi '.$survey_title.' je bil spremenjen na '.$this->response['status'].' - '.$this->statuses[$this->response['status']].'.';
|
||||
|
||||
|
||||
// Posljemo mail
|
||||
try{
|
||||
$MA = new MailAdapter();
|
||||
$MA->addRecipients($user_email);
|
||||
|
||||
echo $subject;
|
||||
echo '<br>';
|
||||
echo $body;
|
||||
//$resultX = $MA->sendMail($body, $subject);
|
||||
}
|
||||
catch (Exception $e){
|
||||
}
|
||||
|
||||
// Shranimo, da smo poslali notification in spremenili status
|
||||
$sql_alert = sisplet_query("INSERT INTO kolektor_survey_response_alert
|
||||
(respondent_id, alert_time, new_status)
|
||||
VALUES
|
||||
('".$response['usr_id']."', NOW(), '".$this->response['status']."')
|
||||
");
|
||||
}
|
||||
|
||||
// Posljemo mail respondentu z vabilom na anketo
|
||||
public function sendRespondentNotification($respondent_message=''){
|
||||
|
||||
$subject = 'Kolektor ETRA - vabilo na anketo';
|
||||
|
||||
// Dobimo url povezave na anketo
|
||||
$kr = new KolektorResponse($this->response['respondent_id']);
|
||||
$url = $kr->getResponseURL();
|
||||
|
||||
$body = ($respondent_message != '') ? $respondent_message : $this->response['respondent_message'];
|
||||
|
||||
// Zamenjamo line breake in #URL#
|
||||
//$body = nl2br(stripslashes($body));
|
||||
$body = str_replace('\r\n', '<br>', $body);
|
||||
$body = str_replace('\n', '<br>', $body);
|
||||
$body = stripslashes($body);
|
||||
$body = str_replace('#URL#', '<a href="'.$url.'">Kolektor anketa</a>', $body);
|
||||
|
||||
|
||||
// Spremenimo status
|
||||
// Posljemo mail
|
||||
try{
|
||||
$MA = new MailAdapter();
|
||||
$MA->addRecipients($this->response['respondent_email']);
|
||||
|
||||
echo $subject;
|
||||
echo '<br>';
|
||||
echo $body;
|
||||
//$resultX = $MA->sendMail($body, $subject);
|
||||
}
|
||||
catch (Exception $e){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Loop cez vse response in posljemo notificatione glede na statuse
|
||||
public static function executeCronJob(){
|
||||
|
||||
// Loop po responsih s statusom 1, 2 ali 3 (prozeno, opozorilo 1, opozorilo 3)
|
||||
$sql = sisplet_query("SELECT ksr.*, ksra.alert_time, ksra.new_status
|
||||
FROM kolektor_survey_response ksr, kolektor_survey_response_alert ksra
|
||||
WHERE ksr.respondent_id=ksra.respondent_id
|
||||
AND ((ksr.status='1' AND ksr.insert_time <= NOW() - INTERVAL 7 DAY)
|
||||
OR (ksr.status='2' AND ksr.insert_time <= NOW() - INTERVAL 21 DAY)
|
||||
OR (ksr.status='3' AND ksr.insert_time <= NOW() - INTERVAL 42 DAY))
|
||||
");
|
||||
|
||||
while($row = mysqli_fetch_array($sql)){
|
||||
|
||||
$kr = new KolektorResponse($row['respondent_id']);
|
||||
|
||||
// Status 1 - "prozeno" - preklopimo na status 2 "opozorilo 1"
|
||||
if($this->response['status'] == '1'){
|
||||
$kr->setStatus($status='2');
|
||||
}
|
||||
// Status 2 - "opozorilo 1" - preklopimo na status 3 "opozorilo 3"
|
||||
elseif($this->response['status'] == '2'){
|
||||
$kr->setStatus($status='3');
|
||||
}
|
||||
// Status 3 "opozorilo 3" - preklopimo na status 4 "neodgovorjeno"
|
||||
elseif($this->response['status'] == '3'){
|
||||
$kr->setStatus($status='4');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -6,13 +6,22 @@ class KolektorResponse {
|
||||
|
||||
private $response = array();
|
||||
|
||||
// Statusi responsa
|
||||
private $statuses = array(
|
||||
1 => 'proženo',
|
||||
2 => 'opozorilo 1',
|
||||
3 => 'opozorilo 3',
|
||||
4 => 'neodgovorjeno',
|
||||
5 => 'končano'
|
||||
);
|
||||
|
||||
|
||||
function __construct($response_id){
|
||||
function __construct($respondent_id){
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
// Dobimo podatke responsa
|
||||
$sql = sisplet_query("SELECT * FROM kolektor_survey_response WHERE id='".$response_id."'");
|
||||
$sql = sisplet_query("SELECT * FROM kolektor_survey_response WHERE respondent_id='".$respondent_id."'");
|
||||
|
||||
if(mysqli_num_rows($sql) == 0){
|
||||
echo 'Napaka! Odgovor ne obstaja.';
|
||||
@ -23,38 +32,126 @@ class KolektorResponse {
|
||||
$this->response = $row;
|
||||
}
|
||||
|
||||
public function getStatus(){
|
||||
return $this->response['status'];
|
||||
|
||||
// Vrnemo array response
|
||||
public function getResponse(){ return $this->response; }
|
||||
|
||||
// Vrnemo URL za dostop respondenta do ankete
|
||||
public function getResponseURL(){
|
||||
|
||||
$nice_url = SurveyInfo::getSurveyLink();
|
||||
|
||||
// Dobimo kodo za prepoznavo respondenta
|
||||
$sql = sisplet_query("SELECT pass FROM srv_user WHERE id='".$this->response['respondent_id']."'");
|
||||
if(mysqli_num_rows($sql) == 0){
|
||||
return false;
|
||||
}
|
||||
|
||||
$row = mysqli_fetch_array($sql);
|
||||
|
||||
$url = $nice_url.'&code='.$row['pass'];
|
||||
|
||||
$url .= '&kolemail='.$this->response['respondent_email'];
|
||||
$url .= '&kolprojekt='.$this->response['respondent_projekt_id'];
|
||||
$url .= '&kolfunkc='.$this->response['respondent_funkcija'];
|
||||
if($this->response['respondent_remote_activation'] != '')
|
||||
$url .= '&kolactivat='.$this->response['respondent_remote_activation'];
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
// Shranjevanje novega statusa in posiljanje obvestila uredniku
|
||||
public function setStatus($status){
|
||||
|
||||
// Shranimo nov status za response
|
||||
$sql = sisplet_query("UPDATE kolektor_survey_response SET status='".$status."' WHERE respondent_id='".$this->response['respondent_id']."'");
|
||||
|
||||
// Posljemo obvestilo uredniku
|
||||
$kn = new KolektorNotifications($this->response['respondent_id']);
|
||||
$kn->sendNotification();
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Dodajanje responsa
|
||||
public static function addResponse($response_data){
|
||||
global $global_user_id;
|
||||
|
||||
|
||||
// Najprej zgeneriramo kodo in cookie
|
||||
$SI = new SurveyInvitationsNew($response_data['ank_id']);
|
||||
list($code, $cookie) = $SI->generateCode();
|
||||
|
||||
// Ustvarimo respondenta v srv_user
|
||||
$sql_user = sisplet_query("INSERT INTO srv_user
|
||||
(ank_id, email, cookie, pass, last_status, time_insert)
|
||||
VALUES
|
||||
('".$response_data['ank_id']."', '".$response_data['respondent_email']."', '".$cookie."', '".$code."', '0', NOW())
|
||||
");
|
||||
$respondent_id = mysqli_insert_id($GLOBALS['connect_db']);
|
||||
|
||||
|
||||
// Dodaj respondenta v srv_user
|
||||
// Url za individualiziran dostop do ankete
|
||||
$nice_url = SurveyInfo::getSurveyLink();
|
||||
$url = $nice_url.'&code='.$code;
|
||||
$url .= '&kolemail='.$response_data['respondent_email'];
|
||||
$url .= '&kolprojekt='.$response_data['respondent_projekt_id'];
|
||||
$url .= '&kolfunkc='.$response_data['respondent_funkcija'];
|
||||
$url .= '&kolactivat='.$response_data['respondent_remote_activation'];
|
||||
|
||||
|
||||
// Dodaj respondenta v kolektor bazo
|
||||
$sql_kolektor = sisplet_query("INSERT INTO kolektor_survey_response
|
||||
(ank_id,
|
||||
usr_id,
|
||||
insert_time,
|
||||
status,
|
||||
respondent_id,
|
||||
respondent_email,
|
||||
respondent_funkcija,
|
||||
respondent_projekt_id,
|
||||
respondent_remote_activation,
|
||||
respondent_message)
|
||||
VALUES
|
||||
('".$response_data['ank_id']."',
|
||||
'".$global_user_id."',
|
||||
NOW(),
|
||||
'1',
|
||||
'".$respondent_id."',
|
||||
'".$response_data['respondent_email']."',
|
||||
'".$response_data['respondent_funkcija']."',
|
||||
'".$response_data['respondent_projekt_id']."',
|
||||
'".$response_data['respondent_remote_activation']."',
|
||||
'".$response_data['respondent_message']."')
|
||||
");
|
||||
if (!$sql_kolektor){
|
||||
echo mysqli_error($GLOBALS['connect_db']);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Ce vse ok, nastavimo status na e-posta - neodgovor
|
||||
$sql_user = sisplet_query("UPDATE srv_user SET last_status='1' WHERE id='".$respondent_id."'");
|
||||
|
||||
|
||||
// Poslji email z vabilom na anketo
|
||||
$kn = new KolektorNotifications($respondent_id);
|
||||
$kn->sendRespondentNotification($response_data['respondent_message']);
|
||||
|
||||
|
||||
// Uspesno prozenje
|
||||
echo '<div class="popup_close"><a href="#" onclick="window.location.reload();">✕</a></div>';
|
||||
|
||||
// Dodaj respondenta v kolektor bazo
|
||||
$sql = sisplet_query("INSERT INTO kolektor_survey_response
|
||||
(ank_id, usr_id, inser_time, status, kolektor_client_id, respondent_id)
|
||||
VALUES
|
||||
('".$response_data['ank_id']."', '".$response_data['usr_id']."', NOW(), '0', '".$response_data['kolektor_client_id']."', '".$response_data['respondent_id']."')
|
||||
");
|
||||
echo '<h2>Dodajanje novega respondenta</h2>';
|
||||
|
||||
$response_id = mysqli_insert_id($GLOBALS['connect_db']);
|
||||
echo 'Anketa uspešno sprožena in email uspešno poslan respondentu ('.$response_data['respondent_email'].').';
|
||||
|
||||
/*if($response = new KolektorResponse($response_id)){
|
||||
return $response;
|
||||
}
|
||||
else{
|
||||
echo 'Napaka pri dodajanju odgovora!';
|
||||
return false;
|
||||
}*/
|
||||
// Gumb koncaj
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" type="button" onClick="window.location.reload();">Zapri</button>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
@ -0,0 +1,90 @@
|
||||
|
||||
function kolektorCreateResponsePopup(){
|
||||
|
||||
$("#fullscreen").addClass('PopUpNarrow').addClass('divPopUp');
|
||||
$("#fullscreen").load('ajax.php?t=kolektor&a=add_repsonse_popup', function() {
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#fullscreen').show();
|
||||
});
|
||||
}
|
||||
|
||||
function kolektorCreateResponseClose(){
|
||||
|
||||
$('#fade').fadeOut('slow');
|
||||
$('#fullscreen').fadeOut('slow').html('');
|
||||
}
|
||||
|
||||
function kolektorCreateResponse(){
|
||||
|
||||
var form = $("#kolektor_add_response_form").serializeArray();
|
||||
|
||||
$('#kolektor_add_response').load('ajax.php?t=kolektor&a=add_repsonse', form);
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Oznacevanje ankete pri kreiranju responsa
|
||||
function kolektorSelectSurvey(){
|
||||
|
||||
var survey_sequence = $('input[name="kolektor_survey"]:checked').attr("sequence");
|
||||
|
||||
console.log(survey_sequence);
|
||||
|
||||
if(survey_sequence > 0 && survey_sequence < 7){
|
||||
|
||||
$('#kolektor_respondent_settings').slideDown();
|
||||
|
||||
if(survey_sequence == 4 || survey_sequence == 5){
|
||||
$('input[name="respondent_remote_activation"]').prop("disabled", false);
|
||||
$('#kolektor_setting_activation').slideDown();
|
||||
}
|
||||
else{
|
||||
$('input[name="respondent_remote_activation"]').prop("disabled", true);
|
||||
$('#kolektor_setting_activation').slideUp();
|
||||
}
|
||||
}
|
||||
else{
|
||||
$('#kolektor_respondent_settings').slideUp();
|
||||
}
|
||||
}
|
||||
|
||||
// Preklop na drugo funkcijo v podjetju pri kreiranju responsa
|
||||
function kolektorOtherFunction(){
|
||||
|
||||
// Vnos druge funkcije
|
||||
if($('input#respondent_funkcija_other').is(':checked')){
|
||||
$('#respondent_funkcija_dropdown').prop("disabled", true);
|
||||
$('#respondent_funkcija_text').prop("disabled", false).show();
|
||||
$('#respondent_funkcija_text').focus();
|
||||
}
|
||||
// Vnos funkcije iz dropdowna
|
||||
else{
|
||||
$('#respondent_funkcija_dropdown').prop("disabled", false);
|
||||
$('#respondent_funkcija_text').prop("disabled", true).hide();
|
||||
$('#respondent_funkcija_dropdown').focus();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Popup za posiljanje opomnika respondentu
|
||||
function kolektorSendRespondentNotificationPopup(respondent_id){
|
||||
|
||||
$("#fullscreen").addClass('PopUpNarrow').addClass('divPopUp');
|
||||
$("#fullscreen").load('ajax.php?t=kolektor&a=send_respondent_notification_popup', {respondent_id: respondent_id}, function() {
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#fullscreen').show();
|
||||
});
|
||||
}
|
||||
|
||||
// Posiljanje opomnika respondentu
|
||||
function kolektorSendRespondentNotification(){
|
||||
|
||||
var notification = $('textarea[name="respondent_message"]').val();
|
||||
var respondent_id = $('input[name="respondent_id"]').val();
|
||||
|
||||
$('#kolektor_send_respondent_notification').load('ajax.php?t=kolektor&a=send_respondent_notification', {respondent_id:respondent_id, notification:notification});
|
||||
|
||||
}
|
||||
|
||||
@ -829,32 +829,33 @@ if (!all(is.na(nchar(mju$Q11)))) {
|
||||
#--------------------------------- //SEZNAM ODGOVOROV NA ODPRTA VPRA\u0161ANJA// ---------------------------------#
|
||||
|
||||
|
||||
|
||||
#--------------------------------- START CREATING WORD FILE: TITLE AND LOGO ---------------------------------#
|
||||
# Create a docx object
|
||||
doc = docx()
|
||||
doc = read_docx()
|
||||
# UE logo
|
||||
img.file <- file.path("modules/mod_MJU/logo/MJU.png")
|
||||
# Check if UE logo exist
|
||||
if(file.exists(img.file)){
|
||||
# Insert UE logo in word: FIRST PAGE/ TOP MARGIN
|
||||
doc <- addImage(doc,img.file, width = 2.8, height = 0.8, par.properties = parLeft() )
|
||||
doc <- body_add_img(doc,img.file, width = 2.8, height = 0.8 )
|
||||
}
|
||||
# add a document title
|
||||
doc = addParagraph( doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami upravnih enot v letu 2018", stylename = "TitleDoc")
|
||||
doc = body_add_par( doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami upravnih enot v letu 2018", style = "heading 1")
|
||||
|
||||
# Add text on first page
|
||||
doc <- addParagraph(doc, "Anketiranje uporabnikov storitev upravnih enot je v skladu z Metodologijo \u0161t. 010-37/2014/64 z dne 8.6.2016, potekalo v jesenskih mesecih leta 2016.")
|
||||
doc <- addParagraph(doc, c("")) # 1 line breaks
|
||||
doc <- addParagraph(doc, "Pri prenovi vpra\u0161alnika, so se dimenzije, katere so tvorile splo\u0161no oceno kakovosti storitev upravne enote po prej\u0161nji metodologiji, preslikale v dimenzije vpra\u0161anja \u0161tev. 2 in \u0161tev. 3. Povpre\u010Dna ocena kakovosti storitev je tako izra\u010Dunana na osnovi ocene vseh \u0161estih dimenzij drugega in tretjega vpra\u0161anja oz. odgovorov na drugo in tretje vpra\u0161anje.")
|
||||
doc <- addParagraph(doc, c("")) # 1 line break
|
||||
doc <- addParagraph(doc, "To je prvo anketiranje v skladu s spremenjeno metodologijo in novim, prenovljenim anketnim vpra\u0161alnikom in zaradi tega primerjava za nazaj, torej s preteklimi obdobji, ni mo\u017Ena.")
|
||||
doc <- addPageBreak(doc) # go to the next page
|
||||
doc <- body_add_par(doc, "Anketiranje uporabnikov storitev upravnih enot je v skladu z Metodologijo \u0161t. 010-37/2014/64 z dne 8.6.2016, potekalo v jesenskih mesecih leta 2016.")
|
||||
doc <- body_add_par(doc, c("")) # 1 line breaks
|
||||
doc <- body_add_par(doc, "Pri prenovi vpra\u0161alnika, so se dimenzije, katere so tvorile splo\u0161no oceno kakovosti storitev upravne enote po prej\u0161nji metodologiji, preslikale v dimenzije vpra\u0161anja \u0161tev. 2 in \u0161tev. 3. Povpre\u010Dna ocena kakovosti storitev je tako izra\u010Dunana na osnovi ocene vseh \u0161estih dimenzij drugega in tretjega vpra\u0161anja oz. odgovorov na drugo in tretje vpra\u0161anje.")
|
||||
doc <- body_add_par(doc, c("")) # 1 line break
|
||||
doc <- body_add_par(doc, "To je prvo anketiranje v skladu s spremenjeno metodologijo in novim, prenovljenim anketnim vpra\u0161alnikom in zaradi tega primerjava za nazaj, torej s preteklimi obdobji, ni mo\u017Ena.")
|
||||
doc <- body_add_break(doc) # go to the next page
|
||||
|
||||
# DODAJ KAZALO
|
||||
# Add a table of contents
|
||||
doc <- addTitle(doc, "KAZALO", level = 1)
|
||||
doc <- addTOC(doc)
|
||||
doc <- addPageBreak(doc) # go to the next page
|
||||
doc <- body_add_par(doc, "KAZALO", style = "heading 1")
|
||||
doc <- body_add_toc(doc, level = 3)
|
||||
doc <- body_add_break(doc) # go to the next page
|
||||
# Add text
|
||||
#------------------------------- //START CREATING WORD FILE: TITLE AND LOGO// -------------------------------#
|
||||
|
||||
@ -866,157 +867,161 @@ doc <- addPageBreak(doc) # go to the next page
|
||||
|
||||
#---------------------------------- PART I: SPLO\u0161NO ----------------------------------#
|
||||
# Add a first table : Default table
|
||||
doc <- addTitle(doc, "Splo\u0161no")
|
||||
doc <- addTitle(doc, "\u0160tevilo oddanih vpra\u0161alnikov", level = 2)
|
||||
doc <- addFlexTable(doc, table1)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
|
||||
doc <- body_add_par(doc, "Splo\u0161no", style = "heading 1")
|
||||
doc <- body_add_par(doc, "\u0160tevilo oddanih vpra\u0161alnikov", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table1)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
# TABELA 2 ------------------------------------------------------------------
|
||||
# \u0160tevilo anket glede na spol
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: spol", level = 2)
|
||||
doc <- addFlexTable(doc, table2)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: spol", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table2)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# TABELA 3------------------------------------------------------------------
|
||||
# \u0160tevilo anket glede na starost
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: starostne skupine", level = 2)
|
||||
doc <- addFlexTable(doc, table3)
|
||||
doc <- addPageBreak(doc)
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: starostne skupine", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table3)
|
||||
doc <- body_add_break(doc)
|
||||
|
||||
# TABELA 4------------------------------------------------------------------
|
||||
# \u0160tevilo anket glede na izobrazbo
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: izobrazba", level = 2)
|
||||
doc <- addFlexTable(doc, table4)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: izobrazba", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table4)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# TABELA 5------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocene zadovoljstva strank
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena zadovoljstva strank", level = 2)
|
||||
doc <- addFlexTable(doc, table5)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena zadovoljstva strank", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table5)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
#--------------------------------//PART I: SPLO\u0161NO// -------------------------------#
|
||||
|
||||
|
||||
#------------------------------- PART II: Primerjava -------------------------------#
|
||||
# Graf 1-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na spol
|
||||
doc <- addTitle(doc, "Primerjava med demografskimi podatki in povpre\u010Dno oceno")
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na spol", level = 2)
|
||||
doc = addPlot(doc = doc, fun = print, x = p , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Primerjava med demografskimi podatki in povpre\u010Dno oceno", style = "heading 1")
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na spol", style = "heading 2")
|
||||
doc <- body_add( doc, p , width = 5.5, height = 5)
|
||||
|
||||
# Graf 2-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na starost
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na starost", level = 2)
|
||||
doc = addPlot( doc = doc, fun = print, x = p1 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na starost", style = "heading 2")
|
||||
doc <- body_add(doc, p1, width = 5.5, height = 5)
|
||||
|
||||
# Graf 3-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na izobrazbo
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na izobrazbo", level = 2)
|
||||
doc = addPlot( doc = doc, fun = print, x = p2 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add(doc, p2, width = 5.5, height = 5)
|
||||
#----------------------------- //PART II: Primerjava// ------------------------------#
|
||||
|
||||
|
||||
#------------------------------- PART III: 20 podro\u010Dij ------------------------------#
|
||||
# Graf 4-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: digitalno potrdilo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij") # Naslov
|
||||
doc <- addTitle( doc, "Osebna izkaznica, potne listine", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p3 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij", style = "heading 1") # Naslov
|
||||
doc <- body_add_par( doc, "Osebna izkaznica, potne listine", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p3, width = 5.5, height = 5)
|
||||
|
||||
# Graf 5-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: mati\u010Dni register (rojstva, smrti)
|
||||
doc <- addTitle( doc, "Mati\u010Dni register (rojstva, smrti) ", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p4 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Mati\u010Dni register (rojstva, smrti) ", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p4, width = 5.5, height = 5)
|
||||
|
||||
# Graf 6-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: prijava/odjava prebivali\u0161\u010Da
|
||||
doc <- addTitle( doc, "Prijava/odjava prebivali\u0161\u010Da", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p5 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Prijava/odjava prebivali\u0161\u010Da", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p5, width = 5.5, height = 5)
|
||||
|
||||
# Graf 7-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: dr\u017Eavljanstvo
|
||||
doc <- addTitle( doc, "Dr\u017Eavljanstvo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p6 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dr\u017Eavljanstvo", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p6, width = 5.5, height = 5)
|
||||
|
||||
# Graf 8-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: dru\u0160tva, javne prireditve
|
||||
doc <- addTitle( doc, "Dru\u0161tva, javne prireditve", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p7 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dru\u0161tva, javne prireditve", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p7, width = 5.5, height = 5)
|
||||
|
||||
# Graf 9-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: overitev listin/podpisa
|
||||
doc <- addTitle( doc, "Overitev listin/podpisa", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p8 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Overitev listin/podpisa", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p8, width = 5.5, height = 5)
|
||||
|
||||
# Graf 10------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: glavna pisarna/blagajna
|
||||
doc <- addTitle( doc, "Glavna pisarna/blagajna", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p9 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Glavna pisarna/blagajna", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p9, width = 5.5, height = 5)
|
||||
|
||||
# Graf 11------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: gradbeno/uporabno dovoljenje
|
||||
doc <- addTitle( doc, "Gradbeno/uporabno dovoljenje", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p10 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Gradbeno/uporabno dovoljenje", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p10, width = 5.5, height = 5)
|
||||
|
||||
# Graf 12------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: gradbeno/uporabno dovoljenje
|
||||
doc <- addTitle( doc, "Izpis geodet. podatkov", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p11 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Izpis geodet. podatkov", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p11, width = 5.5, height = 5)
|
||||
|
||||
# Graf 13------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: promet s kmet. zemlji\u0161\u010Di
|
||||
doc <- addTitle( doc, "Promet s kmet. zemlji\u0161\u010Di", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p12 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Promet s kmet. zemlji\u0161\u010Di", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p12, width = 5.5, height = 5)
|
||||
|
||||
# Graf 14------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: GERK-i in RKG
|
||||
doc <- addTitle( doc, "GERK-i in RKG", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p13 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "GERK-i in RKG", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p13, width = 5.5, height = 5)
|
||||
|
||||
# Graf 15------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: GERK-i in RKG
|
||||
doc <- addTitle( doc, "Registracija/odjava vozil", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p14 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Registracija/odjava vozil", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p14, width = 5.5, height = 5)
|
||||
|
||||
# Graf 16------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: vozni\u0161ko/prometno dovoljenje
|
||||
doc <- addTitle( doc, "Vozni\u0161ko/prometno dovoljenje", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p15 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vozni\u0161ko/prometno dovoljenje", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p15, width = 5.5, height = 5)
|
||||
|
||||
# Graf 17------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: zakonska zveza
|
||||
doc <- addTitle( doc, "Zakonska zveza", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p16 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Zakonska zveza", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p16, width = 5.5, height = 5)
|
||||
|
||||
# Graf 18------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: vojni veterani/invalidi
|
||||
doc <- addTitle( doc, "Vojni veterani/invalidi", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p17 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vojni veterani/invalidi", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p17, width = 5.5, height = 5)
|
||||
|
||||
# Graf 19------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: \u017Ertve vojnega nasilja
|
||||
doc <- addTitle( doc, "\u017Drtve vojnega nasilja", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p18 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u017Drtve vojnega nasilja", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p18, width = 5.5, height = 5)
|
||||
|
||||
# Graf 20------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: tujci
|
||||
doc <- addTitle( doc, "Tujci", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p19 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Tujci", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p19, width = 5.5, height = 5)
|
||||
|
||||
# Graf 21------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: E-Vem
|
||||
doc <- addTitle( doc, "E-vem", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p20 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "E-vem", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p20, width = 5.5, height = 5)
|
||||
|
||||
# Graf 22------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: digitalno potrdilo
|
||||
doc <- addTitle( doc, "Digitalno potrdilo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p21 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Digitalno potrdilo", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p21, width = 5.5, height = 5)
|
||||
|
||||
# Graf 23------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: drugo
|
||||
doc <- addTitle( doc, "Drugo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p22 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Drugo", style = "heading 2") # Podnaslov
|
||||
doc <- body_add(doc, p22, width = 5.5, height = 5)
|
||||
#----------------------------- //PART III: 20 podro\u010Dij// ----------------------------#
|
||||
|
||||
|
||||
@ -1026,50 +1031,50 @@ doc = addPlot(doc = doc , fun = print, x = p22 , width = 5.5, height = 5)
|
||||
################
|
||||
# Graf 24------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca (posamezne postavke) glede na starost
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca (kot celote)") # Naslov
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na starost", level = 2) # Podnaslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca (kot celote)", style = "heading 1") # Naslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na starost", style = "heading 2") # Podnaslov
|
||||
|
||||
doc <- addTitle( doc, "Strokoven", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p23 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Strokoven", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p23, width = 5.5, height = 5)
|
||||
# Graf 25-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Nepristranski", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p24 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Nepristranski", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p24, width = 5.5, height = 5)
|
||||
# Graf 26-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Pripravljen pomagati", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p25 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Pripravljen pomagati", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p25, width = 5.5, height = 5)
|
||||
# Graf 27-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljiv", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p26 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljiv", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p26, width = 5.5, height = 5)
|
||||
# Graf 28-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vreden zaupanja", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p27 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vreden zaupanja", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p27, width = 5.5, height = 5)
|
||||
# Graf 29-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vljuden in prijazen", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p28 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vljuden in prijazen", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p28, width = 5.5, height = 5)
|
||||
|
||||
##################
|
||||
# Q15: izobrazba #
|
||||
##################
|
||||
# Graf 30------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca (posamezne postavke) glede na izobrazbo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na izobrazbo", level = 2) # Podnaslov
|
||||
doc <- addTitle( doc, "Strokoven", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p29 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na izobrazbo", style = "heading 2") # Podnaslov
|
||||
doc <- body_add_par( doc, "Strokoven", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p29, width = 5.5, height = 5)
|
||||
# Graf 31-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Nepristranski", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p30 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Nepristranski", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p30, width = 5.5, height = 5)
|
||||
# Graf 32-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Pripravljen pomagati", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p31 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Pripravljen pomagati", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p31, width = 5.5, height = 5)
|
||||
# Graf 33-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljiv", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p32 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljiv", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p32, width = 5.5, height = 5)
|
||||
# Graf 34-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vreden zaupanja", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p33 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vreden zaupanja", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p33, width = 5.5, height = 5)
|
||||
# Graf 35-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vljuden in prijazen", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p34 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vljuden in prijazen", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p34, width = 5.5, height = 5)
|
||||
#-------------------------- //PART IV: Q3 glede na Q14,Q15// ------------------------#
|
||||
|
||||
|
||||
@ -1079,168 +1084,187 @@ doc = addPlot(doc = doc , fun = print, x = p34 , width = 5.5, height = 5)
|
||||
################
|
||||
# Graf 36------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena upravne enote (posamezne postavke) glede na starost
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote (kot celote)") # Naslov
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote glede na starost", level = 2) # Naslov
|
||||
doc <- addTitle( doc, "Dostop do prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p35 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote (kot celote)", style = "heading 1") # Naslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote glede na starost", style = "heading 2") # Naslov
|
||||
doc <- body_add_par( doc, "Dostop do prostorov", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p35, width = 5.5, height = 5)
|
||||
# Graf 37-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Urejenost prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p36 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Urejenost prostorov", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p36, width = 5.5, height = 5)
|
||||
# Graf 38-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Dostopnost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p37 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dostopnost informacij", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p37, width = 5.5, height = 5)
|
||||
# Graf 39-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljivost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p38 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljivost informacij", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p38, width = 5.5, height = 5)
|
||||
# Graf 40-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "\u010Cas \u010Dakanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p39 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u010Cas \u010Dakanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p39, width = 5.5, height = 5)
|
||||
# Graf 41-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Hitrost re\u0161evanja zadev", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p40 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Hitrost re\u0161evanja zadev", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p40, width = 5.5, height = 5)
|
||||
|
||||
##################
|
||||
# Q15: izobrazba #
|
||||
##################
|
||||
# Graf 42------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena upravne enote (posamezne postavke) glede na izobrazbo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote glede na izobrazbo", level = 2) # Naslov
|
||||
doc <- addTitle( doc, "Dostop do prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p41 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote glede na izobrazbo", style = "heading 2") # Naslov
|
||||
doc <- body_add_par( doc, "Dostop do prostorov", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p41, width = 5.5, height = 5)
|
||||
# Graf 43-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Urejenost prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p42 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Urejenost prostorov", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p42, width = 5.5, height = 5)
|
||||
# Graf 44-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Dostopnost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p43 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dostopnost informacij", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p43, width = 5.5, height = 5)
|
||||
# Graf 45-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljivost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p44 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljivost informacij", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p44, width = 5.5, height = 5)
|
||||
# Graf 46-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "\u010Cas \u010Dakanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p45 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u010Cas \u010Dakanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p45, width = 5.5, height = 5)
|
||||
# Graf 47-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Hitrost re\u0161evanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p46 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Hitrost re\u0161evanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc <- body_add(doc, p46, width = 5.5, height = 5)
|
||||
#-------------------------- //PART V: Q4 glede na Q14,Q15// -------------------------#
|
||||
|
||||
|
||||
|
||||
#------------------ PART VI: IZKU\u0161NJE Z ELEKTRONSKIM POSLOVANJEM --------------------#
|
||||
# FREKVEN\u010DNA PORAZDELITEV odgovorov vpra\u0161anja Q5
|
||||
doc <- addTitle(doc, "Izku\u0161nje z elektronskim poslovanjem")
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table6)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Izku\u0161nje z elektronskim poslovanjem", style = "heading 1")
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table6)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Vpra\u0161anje Q5 ima \u0161e tri pogoje za katere posebej prika\u017Eemo frekven\u010Dno
|
||||
# porazdelitev in izra\u010Dunamo Dele\u017Ee
|
||||
# Q6 DA, ampak s storitvijo nisem zadovoljen, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ampak s storitvijo nisem zadovoljen, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table7)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ampak s storitvijo nisem zadovoljen, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table7)
|
||||
if(!is.null(opomba)){
|
||||
doc <- addParagraph(doc, opomba) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# Q7 DA, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table8)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table8)
|
||||
if(!is.null(opomba1)){
|
||||
doc <- addParagraph(doc, opomba1) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba1) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# Q8 Ne, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Ne, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table9)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Ne, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table9)
|
||||
if(!is.null(opomba2)){
|
||||
doc <- addParagraph(doc, opomba2) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba2) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# DODAMO \u0161E DVE FREKVEN\u010DNI TABELI: frekvence Q5 glede na starost in izobrazbo
|
||||
# Starost
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", level = 2)
|
||||
doc <- addFlexTable(doc, table10)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table10)
|
||||
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
# Izobrazba
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", level = 2)
|
||||
doc <- addFlexTable(doc, table11)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table11)
|
||||
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
#---------------- //PART VI: IZKU\u0161NJE Z ELEKTRONSKIM POSLOVANJEM// ------------------#
|
||||
|
||||
|
||||
#--------------------- PART VII: ZADOVOLJSTVO Z URADNIMI URAMI ----------------------#
|
||||
# FREKVEN\u010DNA PORAZDELITEV odgovorov vpra\u0161anja Q9
|
||||
doc <- addTitle(doc, "Uradne ure upravne enote")
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table12)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Uradne ure upravne enote", style = "heading 1")
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table12)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Izrišemo še Tortni diagram za odgovore DA in NE
|
||||
doc <- addTitle( doc, "Tortni diagram: zadovoljstvo z uradnimi urami", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = tort.d , width = 4.5, height = 4)
|
||||
doc <- body_add_par( doc, "Tortni diagram: zadovoljstvo z uradnimi urami", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, tort.d , width = 4.5, height = 4)
|
||||
# FREKVEN\u010DNA PORAZDELITEV odgovorov vpra\u0161anja Q10: z uradnimi urami UE nusem
|
||||
# zadovoljen, ker
|
||||
doc <- addTitle(doc, "Nezadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table13)
|
||||
doc <- body_add_par(doc, "Nezadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table13)
|
||||
if(!is.null(opomba3)){
|
||||
doc <- addParagraph(doc, opomba3) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba3) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# Frekven\u010Dna porazdelitev odgovorov Q9 glede na starost
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", level = 2)
|
||||
doc <- addFlexTable(doc, table14)
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table14)
|
||||
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
# Frekven\u010Dna porazdelitev odgovorov Q9 glede na izobrazbo
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", level = 2)
|
||||
doc <- addFlexTable(doc, table15)
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table15)
|
||||
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
#------------------- //PART VII: ZADOVOLJSTVO Z URADNIMI URAMI// --------------------#
|
||||
|
||||
|
||||
#----------------------------- PART VIII: ODPRTI ODGOVORI ---------------------------#
|
||||
#Odprti odgovori na podvpra\u0161anja (Q6d_text, Q7e_text, Q8f_text) vpra\u0161anja Q5
|
||||
doc <- addTitle(doc, "Seznam odgovorov na odprta vpra\u0161anja")
|
||||
doc <- body_add_par(doc, "Seznam odgovorov na odprta vpra\u0161anja", style = "heading 1")
|
||||
# Q6d_text-------------------------------
|
||||
if (!all(is.na(nchar(mju$Q6d_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Da, ampak s storitvijo nisem zadovoljen, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table16)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Da, ampak s storitvijo nisem zadovoljen, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table16)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
# Q7e_text-------------------------------
|
||||
if (!all(is.na(nchar(mju$Q7e_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Da, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table17)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Da, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table17)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
# Q8f_text-------------------------------
|
||||
if (!all(is.na(nchar(mju$Q8f_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Ne, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table18)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Ne, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table18)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
|
||||
# Q10c_text-------------------------------
|
||||
if (!all(is.na(nchar(mju$Q10c_text)))) {
|
||||
doc <- addTitle(doc, "Ali ste zadovoljni z obstoje\u010Dimi uradnimi urami upravne enote?", level = 2)
|
||||
doc <- addTitle(doc, "Ne, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table19)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali ste zadovoljni z obstoje\u010Dimi uradnimi urami upravne enote?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Ne, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table19)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
|
||||
# Q11------------------------------------
|
||||
if (!all(is.na(nchar(mju$Q11)))) {
|
||||
doc <- addTitle(doc, "Va\u0161a mnenja in predlogi")
|
||||
doc <- addFlexTable(doc, table20)
|
||||
doc <- body_add_par(doc, "Va\u0161a mnenja in predlogi")
|
||||
doc <- body_add_flextable(doc, table20)
|
||||
}
|
||||
#--------------------------- //PART VIII: ODPRTI ODGOVORI// -------------------------#
|
||||
#------------------------------------------- //COMPILING WORD REPORT// --------------------------------------#
|
||||
|
||||
#----------------------------------------- CREATE AND WRITE REPORT ------------------------------------------#
|
||||
writeDoc(doc, file = "modules/mod_MJU/results/Vse_upravne_enote.docx")
|
||||
print(doc,target = "modules/mod_MJU/results/Vse_upravne_enote.docx")
|
||||
#--------------------------------------- //CREATE AND WRITE REPORT// ----------------------------------------#
|
||||
@ -1103,191 +1103,198 @@ for (ID in unique(mju$skupina)) {
|
||||
|
||||
#--------------------------------- START CREATING WORD FILE: TITLE AND LOGO ---------------------------------#
|
||||
# Create a docx object
|
||||
doc = docx()
|
||||
doc = read_docx()
|
||||
# UE logo
|
||||
# Da bi lahko pravilno prikazali logotip UE je potrebno, odstraniti vse znake za šumnike
|
||||
# ki smo jih dodali v "uprenote_labele.R", za pravilni izpis besed v word poročilu.
|
||||
img.file <- file.path(paste0("modules/mod_MJU/logo/",logo,".png"))
|
||||
# Check if UE logo exist
|
||||
if(file.exists(img.file)){
|
||||
# Insert UE logo in word: FIRST PAGE/ TOP MARGIN
|
||||
doc <- addImage(doc,img.file, width = 2.8, height = 0.8, par.properties = parLeft() )
|
||||
doc <- body_add_img(doc,img.file, width = 2.8, height = 0.8 )
|
||||
}
|
||||
# add a document title
|
||||
doc = addParagraph( doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami upravne enote v letu 2018", stylename = "TitleDoc")
|
||||
|
||||
if (ID.rep != 2){
|
||||
doc = body_add_par(doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami upravne enote v letu 2018", style = "heading 1")
|
||||
} else {
|
||||
doc = body_add_par(doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami Upravne enote Ljubljana, SEKTOR ZA UPRAVNE NOTRANJE ZADEVE v letu 2018",
|
||||
style = "heading 1")
|
||||
}
|
||||
# Add text on first page
|
||||
doc <- addParagraph(doc, paste0("Anketiranje uporabnikov storitev Upravne enote ", UE ," je v skladu z Metodologijo \u0160t. 010-37/2014/64 z dne 8.6.2016, potekalo od______________ do_____________."))
|
||||
doc <- addParagraph(doc, c("")) # 1 line breaks
|
||||
doc <- addParagraph(doc, "Pri prenovi vpra\u0161alnika, so se dimenzije, katere so tvorile splo\u0161no oceno kakovosti storitev upravne enote po prej\u0161nji metodologiji, preslikale v dimenzije vpra\u0161anja \u0161tev. 2 in \u0161tev. 3. Povpre\u010Dna ocena kakovosti storitev je tako izra\u010Dunana na osnovi ocene vseh \u0161estih dimenzij drugega in tretjega vpra\u0161anja oz. odgovorov na drugo in tretje vpra\u0161anje.")
|
||||
doc <- addParagraph(doc, c("")) # 1 line break
|
||||
doc <- addParagraph(doc, "To je prvo anketiranje v skladu s spremenjeno metodologijo in novim, prenovljenim anketnim vpra\u0161alnikom in zaradi tega primerjava za nazaj, torej s preteklimi obdobji, ni mo\u017Ena.")
|
||||
doc <- addPageBreak(doc) # go to the next page
|
||||
doc <- body_add_par(doc, paste0("Anketiranje uporabnikov storitev Upravne enote ", UE ," je v skladu z Metodologijo \u0161t. 010-37/2014/64 z dne 8.6.2016, potekalo od______________ do_____________."))
|
||||
doc <- body_add_par(doc, c("")) # 1 line breaks
|
||||
doc <- body_add_par(doc, "Pri prenovi vpra\u0161alnika, so se dimenzije, katere so tvorile splo\u0161no oceno kakovosti storitev upravne enote po prej\u0161nji metodologiji, preslikale v dimenzije vpra\u0161anja \u0161tev. 2 in \u0161tev. 3. Povpre\u010Dna ocena kakovosti storitev je tako izra\u010Dunana na osnovi ocene vseh \u0161estih dimenzij drugega in tretjega vpra\u0161anja oz. odgovorov na drugo in tretje vpra\u0161anje.")
|
||||
doc <- body_add_par(doc, c("")) # 1 line break
|
||||
doc <- body_add_par(doc, "To je prvo anketiranje v skladu s spremenjeno metodologijo in novim, prenovljenim anketnim vpra\u0161alnikom in zaradi tega primerjava za nazaj, torej s preteklimi obdobji, ni mo\u017Ena.")
|
||||
doc <- body_add_break(doc) # go to the next page
|
||||
|
||||
# DODAJ KAZALO
|
||||
doc <- addTitle(doc, "KAZALO", level = 1)
|
||||
doc <- body_add_par(doc, "KAZALO", style = "heading 1")
|
||||
# Add a table of contents
|
||||
doc <- addTOC(doc)
|
||||
doc <- addPageBreak(doc) # go to the next page
|
||||
doc <- body_add_toc(doc, level = 3)
|
||||
doc <- body_add_break(doc) # go to the next page
|
||||
# Add text
|
||||
|
||||
#--------------------------------------------- COMPILING WORD REPORT ----------------------------------------#
|
||||
# Continue creating word report
|
||||
# TABELA 1 ------------------------------------------------------------------
|
||||
## First add General table: \u0160tevilo anket UE, Dele\u017E ter \u0160tevilo vseh anket UE
|
||||
## First add General table: število anket UE, dele\u017E ter število vseh anket UE
|
||||
|
||||
#---------------------------------- PART I: SPLO\u0161NO ----------------------------------#
|
||||
#---------------------------------- PART I: SPLO\u0160NO ----------------------------------#
|
||||
# Add a first table : Default table
|
||||
doc <- addTitle(doc, "Splo\u0161no")
|
||||
doc <- addTitle(doc, "\u0160tevilo oddanih vpra\u0161alnikov", level = 2)
|
||||
doc <- addFlexTable(doc, table1)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
|
||||
doc <- body_add_par(doc, "Splo\u0161no", style = "heading 1")
|
||||
doc <- body_add_par(doc, "\u0160tevilo oddanih vpra\u0161alnikov", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table1)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# TABELA 2 ------------------------------------------------------------------
|
||||
# \u0160tevilo anket glede na spol
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: spol", level = 2)
|
||||
doc <- addFlexTable(doc, table2)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
|
||||
# Število anket glede na spol
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: spol", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table2)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# TABELA 3------------------------------------------------------------------
|
||||
# \u0160tevilo anket glede na starost
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: starostne skupine", level = 2)
|
||||
doc <- addFlexTable(doc, table3)
|
||||
doc <- addPageBreak(doc)
|
||||
# Število anket glede na starost
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: starostne skupine",style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table3)
|
||||
doc <- body_add_break(doc)
|
||||
|
||||
# TABELA 4------------------------------------------------------------------
|
||||
# \u0160tevilo anket glede na izobrazbo
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: izobrazba", level = 2)
|
||||
doc <- addFlexTable(doc, table4)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
# Število anket glede na izobrazbo
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: izobrazba", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table4)
|
||||
doc <- body_add_break(doc)
|
||||
|
||||
# TABELA 5------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocene zadovoljstva strank
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena zadovoljstva strank", level = 2)
|
||||
doc <- addFlexTable(doc, table5)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
#--------------------------------//PART I: SPLO\u0161NO// -------------------------------#
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena zadovoljstva strank",style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table5)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
#--------------------------------//PART I: SPLO\u0160NO// -------------------------------#
|
||||
|
||||
|
||||
#------------------------------- PART II: Primerjava -------------------------------#
|
||||
# Graf 1-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na spol
|
||||
doc <- addTitle(doc, "Primerjava med demografskimi podatki in Povpre\u010Dno oceno")
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na spol", level = 2)
|
||||
doc = addPlot(doc = doc, fun = print, x = p , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Primerjava med demografskimi podatki in povpre\u010Dno oceno", style = "heading 1")
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na spol", style = "heading 2")
|
||||
doc <- body_add( doc, p , width = 5.5, height = 5)
|
||||
|
||||
# Graf 2-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na starost
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na starost", level = 2)
|
||||
doc = addPlot( doc = doc, fun = print, x = p1 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na starost", style = "heading 2")
|
||||
doc = body_add(doc, p1, width = 5.5, height = 5)
|
||||
|
||||
# Graf 3-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na izobrazbo
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na izobrazbo", level = 2)
|
||||
doc = addPlot( doc = doc, fun = print, x = p2 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na izobrazbo", style = "heading 2")
|
||||
doc = body_add(doc, p2, width = 5.5, height = 5)
|
||||
#----------------------------- //PART II: Primerjava// ------------------------------#
|
||||
|
||||
|
||||
#------------------------------- PART III: 20 področij ------------------------------#
|
||||
#------------------------------- PART III: 20 podro\u010Dij ------------------------------#
|
||||
# Graf 4-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: digitalno potrdilo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij") # Naslov
|
||||
doc <- addTitle( doc, "Osebna izkaznica, potne listine", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p3 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: digitalno potrdilo
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij", style = "heading 1") # Naslov
|
||||
doc <- body_add_par( doc, "Osebna izkaznica, potne listine", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p3, width = 5.5, height = 5)
|
||||
|
||||
# Graf 5-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: matični register (rojstva, smrti)
|
||||
doc <- addTitle( doc, "Mati\u010Dni register (rojstva, smrti) ", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p4 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: mati\u010Dni register (rojstva, smrti)
|
||||
doc <- body_add_par( doc, "Mati\u010Dni register (rojstva, smrti) ", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p4, width = 5.5, height = 5)
|
||||
|
||||
# Graf 6-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: prijava/odjava prebivali\u0161ča
|
||||
doc <- addTitle( doc, "Prijava/odjava prebivali\u0161\u010Da", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p5 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: prijava/odjava prebivališča
|
||||
doc <- body_add_par( doc, "Prijava/odjava prebivali\u0161\u010Da", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p5, width = 5.5, height = 5)
|
||||
|
||||
# Graf 7-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: državljanstvo
|
||||
doc <- addTitle( doc, "Dr\u017Eavljanstvo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p6 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: dr\u017Eavljanstvo
|
||||
doc <- body_add_par( doc, "Dr\u017Eavljanstvo", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p6, width = 5.5, height = 5)
|
||||
|
||||
# Graf 8-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: dru\u0160tva, javne prireditve
|
||||
doc <- addTitle( doc, "Dru\u0161tva, javne prireditve", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p7 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: dru\u0161tva, javne prireditve
|
||||
doc <- body_add_par( doc, "Dru\u0161tva, javne prireditve", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p7, width = 5.5, height = 5)
|
||||
|
||||
# Graf 9-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: overitev listin/podpisa
|
||||
doc <- addTitle( doc, "Overitev listin/podpisa", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p8 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: overitev listin/podpisa
|
||||
doc <- body_add_par( doc, "Overitev listin/podpisa", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p8, width = 5.5, height = 5)
|
||||
|
||||
# Graf 10------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: glavna pisarna/blagajna
|
||||
doc <- addTitle( doc, "Glavna pisarna/blagajna", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p9 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: glavna pisarna/blagajna
|
||||
doc <- body_add_par( doc, "Glavna pisarna/blagajna", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p9, width = 5.5, height = 5)
|
||||
|
||||
# Graf 11------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: gradbeno/uporabno dovoljenje
|
||||
doc <- addTitle( doc, "Gradbeno/uporabno dovoljenje", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p10 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: gradbeno/uporabno dovoljenje
|
||||
doc <- body_add_par( doc, "Gradbeno/uporabno dovoljenje", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p10, width = 5.5, height = 5)
|
||||
|
||||
# Graf 12------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: gradbeno/uporabno dovoljenje
|
||||
doc <- addTitle( doc, "Izpis geodet. podatkov", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p11 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: gradbeno/uporabno dovoljenje
|
||||
doc <- body_add_par( doc, "Izpis geodet. podatkov", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p11, width = 5.5, height = 5)
|
||||
|
||||
# Graf 13------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: promet s kmet. zemlji\u0161či
|
||||
doc <- addTitle( doc, "Promet s kmet. zemlji\u0161\u010Di", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p12 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: promet s kmet. zemljišči
|
||||
doc <- body_add_par( doc, "Promet s kmet. zemlji\u0161\u010Di", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p12, width = 5.5, height = 5)
|
||||
|
||||
# Graf 14------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: GERK-i in RKG
|
||||
doc <- addTitle( doc, "GERK-i in RKG", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p13 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: GERK-i in RKG
|
||||
doc <- body_add_par( doc, "GERK-i in RKG", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p13, width = 5.5, height = 5)
|
||||
|
||||
# Graf 15------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: GERK-i in RKG
|
||||
doc <- addTitle( doc, "Registracija/odjava vozil", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p14 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: GERK-i in RKG
|
||||
doc <- body_add_par( doc, "Registracija/odjava vozil", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p14, width = 5.5, height = 5)
|
||||
|
||||
# Graf 16------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: vozni\u0161ko/prometno dovoljenje
|
||||
doc <- addTitle( doc, "Vozni\u0161ko/prometno dovoljenje", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p15 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: vozni\u0161ko/prometno dovoljenje
|
||||
doc <- body_add_par( doc, "Vozni\u0161ko/prometno dovoljenje", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p15, width = 5.5, height = 5)
|
||||
|
||||
# Graf 17------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: zakonska zveza
|
||||
doc <- addTitle( doc, "Zakonska zveza", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p16 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: zakonska zveza
|
||||
doc <- body_add_par( doc, "Zakonska zveza", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p16, width = 5.5, height = 5)
|
||||
|
||||
# Graf 18------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: vojni veterani/invalidi
|
||||
doc <- addTitle( doc, "Vojni veterani/invalidi", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p17 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: vojni veterani/invalidi
|
||||
doc <- body_add_par( doc, "Vojni veterani/invalidi", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p17, width = 5.5, height = 5)
|
||||
|
||||
# Graf 19------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: žrtve vojnega nasilja
|
||||
doc <- addTitle( doc, "\u017Drtve vojnega nasilja", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p18 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: \u017Ertve vojnega nasilja
|
||||
doc <- body_add_par( doc, "\u017Ertve vojnega nasilja", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p18, width = 5.5, height = 5)
|
||||
|
||||
# Graf 20------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: tujci
|
||||
doc <- addTitle( doc, "Tujci", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p19 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: tujci
|
||||
doc <- body_add_par( doc, "Tujci", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p19, width = 5.5, height = 5)
|
||||
|
||||
# Graf 21------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: E-Vem
|
||||
doc <- addTitle( doc, "E-vem", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p20 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: E-Vem
|
||||
doc <- body_add_par( doc, "E-vem", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p20, width = 5.5, height = 5)
|
||||
|
||||
# Graf 22------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: digitalno potrdilo
|
||||
doc <- addTitle( doc, "Digitalno potrdilo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p21 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: digitalno potrdilo
|
||||
doc <- body_add_par( doc, "Digitalno potrdilo", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p21, width = 5.5, height = 5)
|
||||
|
||||
# Graf 23------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca za vsakega od 20 področij: drugo
|
||||
doc <- addTitle( doc, "Drugo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p22 , width = 5.5, height = 5)
|
||||
#----------------------------- //PART III: 20 področij// ----------------------------#
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: drugo
|
||||
doc <- body_add_par( doc, "Drugo", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p22, width = 5.5, height = 5)
|
||||
#----------------------------- //PART III: 20 podro\u010Dij// ----------------------------#
|
||||
|
||||
|
||||
#---------------------------- PART IV: Q3 glede na Q14,Q15 --------------------------#
|
||||
@ -1295,51 +1302,51 @@ for (ID in unique(mju$skupina)) {
|
||||
# Q14: starost #
|
||||
################
|
||||
# Graf 24------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca (posamezne postavke) glede na starost
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca (kot celote)") # Naslov
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na starost", level = 2) # Podnaslov
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca (posamezne postavke) glede na starost
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca (kot celote)", style = "heading 1") # Naslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na starost", style = "heading 2") # Podnaslov
|
||||
|
||||
doc <- addTitle( doc, "Strokoven", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p23 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Strokoven", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p23, width = 5.5, height = 5)
|
||||
# Graf 25-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Nepristranski", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p24 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Nepristranski", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p24, width = 5.5, height = 5)
|
||||
# Graf 26-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Pripravljen pomagati", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p25 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Pripravljen pomagati", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p25, width = 5.5, height = 5)
|
||||
# Graf 27-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljiv", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p26 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljiv", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p26, width = 5.5, height = 5)
|
||||
# Graf 28-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vreden zaupanja", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p27 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vreden zaupanja", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p27, width = 5.5, height = 5)
|
||||
# Graf 29-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vljuden in prijazen", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p28 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vljuden in prijazen", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p28, width = 5.5, height = 5)
|
||||
|
||||
##################
|
||||
# Q15: izobrazba #
|
||||
##################
|
||||
# Graf 30------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslužbenca (posamezne postavke) glede na izobrazbo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na izobrazbo", level = 2) # Podnaslov
|
||||
doc <- addTitle( doc, "Strokoven", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p29 , width = 5.5, height = 5)
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca (posamezne postavke) glede na izobrazbo
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na izobrazbo", style = "heading 2") # Podnaslov
|
||||
doc <- body_add_par( doc, "Strokoven", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p29, width = 5.5, height = 5)
|
||||
# Graf 31-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Nepristranski", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p30 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Nepristranski", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p30, width = 5.5, height = 5)
|
||||
# Graf 32-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Pripravljen pomagati", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p31 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Pripravljen pomagati", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p31, width = 5.5, height = 5)
|
||||
# Graf 33-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljiv", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p32 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljiv", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p32, width = 5.5, height = 5)
|
||||
# Graf 34-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vreden zaupanja", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p33 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vreden zaupanja", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p33, width = 5.5, height = 5)
|
||||
# Graf 35-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vljuden in prijazen", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p34 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vljuden in prijazen", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p34, width = 5.5, height = 5)
|
||||
#-------------------------- //PART IV: Q3 glede na Q14,Q15// ------------------------#
|
||||
|
||||
|
||||
@ -1349,175 +1356,193 @@ for (ID in unique(mju$skupina)) {
|
||||
################
|
||||
# Graf 36------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena upravne enote (posamezne postavke) glede na starost
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote (kot celote)") # Naslov
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote glede na starost", level = 2) # Naslov
|
||||
doc <- addTitle( doc, "Dostop do prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p35 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote (kot celote)") # Naslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote glede na starost", style = "heading 2") # Naslov
|
||||
doc <- body_add_par( doc, "Dostop do prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p35, width = 5.5, height = 5)
|
||||
# Graf 37-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Urejenost prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p36 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Urejenost prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p36, width = 5.5, height = 5)
|
||||
# Graf 38-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Dostopnost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p37 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dostopnost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p37, width = 5.5, height = 5)
|
||||
# Graf 39-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljivost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p38 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljivost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p38, width = 5.5, height = 5)
|
||||
# Graf 40-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "\u010Cas \u010Dakanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p39 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u010Cas \u010Dakanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p39, width = 5.5, height = 5)
|
||||
# Graf 41-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Hitrost re\u0161evanja zadev", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p40 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Hitrost re\u0161evanja zadev", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p40, width = 5.5, height = 5)
|
||||
|
||||
##################
|
||||
# Q15: izobrazba #
|
||||
##################
|
||||
# Graf 42------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena upravne enote (posamezne postavke) glede na izobrazbo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote glede na izobrazbo", level = 2) # Naslov
|
||||
doc <- addTitle( doc, "Dostop do prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p41 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote glede na izobrazbo", style = "heading 2") # Naslov
|
||||
doc <- body_add_par( doc, "Dostop do prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p41, width = 5.5, height = 5)
|
||||
# Graf 43-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Urejenost prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p42 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Urejenost prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p42, width = 5.5, height = 5)
|
||||
# Graf 44-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Dostopnost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p43 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dostopnost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p43, width = 5.5, height = 5)
|
||||
# Graf 45-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljivost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p44 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljivost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p44, width = 5.5, height = 5)
|
||||
# Graf 46-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "\u010Cas \u010Dakanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p45 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u010Cas \u010Dakanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p45, width = 5.5, height = 5)
|
||||
# Graf 47-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Hitrost re\u0161evanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p46 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Hitrost re\u0161evanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p46, width = 5.5, height = 5)
|
||||
#-------------------------- //PART V: Q4 glede na Q14,Q15// -------------------------#
|
||||
|
||||
|
||||
|
||||
#------------------ PART VI: IZKU\u0161NJE Z ELEKTRONSKIM POSLOVANJEM --------------------#
|
||||
# Frekven\u010Dna PORAZDELITEV odgovorov vpra\u0161anja Q5
|
||||
doc <- addTitle(doc, "Izku\u0161nje z elektronskim poslovanjem")
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table6)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
# Vpra\u0161anje Q5 ima \u0161e tri pogoje za katere posebej prikažemo frekvenčno
|
||||
# porazdelitev in izračunamo Dele\u017Ee
|
||||
#------------------ PART VI: IZKU\u0160NJE Z ELEKTRONSKIM POSLOVANJEM --------------------#
|
||||
# FREKVENČNA PORAZDELITEV odgovorov vpra\u0161anja Q5
|
||||
doc <- body_add_par(doc, "Izku\u0161nje z elektronskim poslovanjem", style = "heading 1")
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table6)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Vpra\u0161anje Q5 ima še tri pogoje za katere posebej prika\u017Eemo frekven\u010Dno
|
||||
# porazdelitev in izra\u010Dunamo dele\u017Ee
|
||||
# Q6 DA, ampak s storitvijo nisem zadovoljen, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ampak s storitvijo nisem zadovoljen, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table7)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ampak s storitvijo nisem zadovoljen, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table7)
|
||||
if(!is.null(opomba)){
|
||||
doc <- addParagraph(doc, opomba) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Q7 DA, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table8)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table8)
|
||||
if(!is.null(opomba1)){
|
||||
doc <- addParagraph(doc, opomba1) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba1) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Q8 Ne, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Ne, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table9)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Ne, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table9)
|
||||
if(!is.null(opomba2)){
|
||||
doc <- addParagraph(doc, opomba2) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba2) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# DODAMO \u0161E DVE FREKVENČNI TABELI: frekvence Q5 glede na starost in izobrazbo
|
||||
# DODAMO ŠE DVE FREKVENČNI TABELI: frekvence Q5 glede na starost in izobrazbo
|
||||
# Starost
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", level = 2)
|
||||
doc <- addFlexTable(doc, table10)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table10)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Izobrazba
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", level = 2)
|
||||
doc <- addFlexTable(doc, table11)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table11)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
#---------------- //PART VI: IZKU\u0161NJE Z ELEKTRONSKIM POSLOVANJEM// ------------------#
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
#---------------- //PART VI: IZKU\u0160NJE Z ELEKTRONSKIM POSLOVANJEM// ------------------#
|
||||
|
||||
|
||||
#--------------------- PART VII: ZADOVOLJSTVO Z URADNIMI URAMI ----------------------#
|
||||
# Frekven\u010Dna PORAZDELITEV odgovorov vpra\u0161anja Q9
|
||||
doc <- addTitle(doc, "Uradne ure upravne enote")
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table12)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
# V primeru, da delamo poročil za posamezno upravno enoto, za spremenljivko Q9 naredimo \u0161e strukturni krog
|
||||
doc <- addTitle( doc, "Tortni diagram: zadovoljstvo z uradnimi urami", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = tort.d , width = 4.5, height = 4)
|
||||
# FREKVENČNA PORAZDELITEV odgovorov vpra\u0161anja Q9
|
||||
doc <- body_add_par(doc, "Uradne ure upravne enote")
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table12)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# V primeru, da delamo poro\u010Dil za posamezno upravno enoto, za spremenljivko Q9 naredimo še strukturni krog
|
||||
doc <- body_add_par( doc, "Tortni diagram: zadovoljstvo z uradnimi urami", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, tort.d , width = 4.5, height = 4)
|
||||
|
||||
# Frekven\u010Dna PORAZDELITEV odgovorov vpra\u0161anja Q10: z uradnimi urami UE nusem
|
||||
# FREKVENČNA PORAZDELITEV odgovorov vpra\u0161anja Q10: z uradnimi urami UE nusem
|
||||
# zadovoljen, ker
|
||||
doc <- addTitle(doc, "Nezadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table13)
|
||||
doc <- body_add_par(doc, "Nezadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table13)
|
||||
if(!is.null(opomba3)){
|
||||
doc <- addParagraph(doc, opomba3) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba3) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Frekven\u010Dna porazdelitev odgovorov Q9 glede na starost
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", level = 2)
|
||||
doc <- addFlexTable(doc, table14)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table14)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Frekven\u010Dna porazdelitev odgovorov Q9 glede na izobrazbo
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", level = 2)
|
||||
doc <- addFlexTable(doc, table15)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table15)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
#------------------- //PART VII: ZADOVOLJSTVO Z URADNIMI URAMI// --------------------#
|
||||
|
||||
|
||||
#----------------------------- PART VIII: ODPRTI ODGOVORI ---------------------------#
|
||||
#Odprti odgovori na podvpra\u0161anja (Q6d_text, Q7e_text, Q8f_text) vpra\u0161anja Q5
|
||||
doc <- addTitle(doc, "Seznam odgovorov na odprta vpra\u0161anja")
|
||||
doc <- body_add_par(doc, "Seznam odgovorov na odprta vpra\u0161anja")
|
||||
# Q6d_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q6d_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Da, ampak s storitvijo nisem zadovoljen, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table16)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Da, ampak s storitvijo nisem zadovoljen, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table16)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
# Q7e_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q7e_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Da, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table17)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Da, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table17)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
# Q8f_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q8f_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Ne, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table18)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Ne, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table18)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
|
||||
# Q10c_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q10c_text)))) {
|
||||
doc <- addTitle(doc, "Ali ste zadovoljni z obstoje\u010Dimi uradnimi urami upravne enote?", level = 2)
|
||||
doc <- addTitle(doc, "Ne, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table19)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali ste zadovoljni z obstoje\u010Dimi uradnimi urami upravne enote?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Ne, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table19)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
|
||||
# Q11------------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q11)))) {
|
||||
doc <- addTitle(doc, "Va\u0161a mnenja in predlogi")
|
||||
doc <- addFlexTable(doc, table20)
|
||||
doc <- body_add_par(doc, "Va\u0161a mnenja in predlogi")
|
||||
doc <- body_add_flextable(doc, table20)
|
||||
}
|
||||
#--------------------------- //PART VIII: ODPRTI ODGOVORI// -------------------------#
|
||||
#------------------------------------------- //COMPILING WORD REPORT// --------------------------------------#
|
||||
writeDoc(doc, file = paste0("modules/mod_MJU/results/",logo,".docx"))
|
||||
print(doc, target = paste0("modules/mod_MJU/results/",logo,".docx"))
|
||||
#------------------------------- //START CREATING WORD FILE: TITLE AND LOGO// -------------------------------#
|
||||
}
|
||||
|
||||
@ -188,8 +188,8 @@ table5 <- wordTabela(zad.strank, sirina.stolpca = c(2,2))
|
||||
# Primerjava glede na spol---------------------------------
|
||||
# UPRAVNA ENOTA
|
||||
bar.spol <- mjuID[, grepl("Q13|Q3", colnames(mjuID))]
|
||||
# melt the data frame for plotting
|
||||
bar.spol <- melt(bar.spol, id.vars='Q13')
|
||||
# reshape2::melt the data frame for plotting
|
||||
bar.spol <- reshape2::melt(bar.spol, id.vars='Q13')
|
||||
bar.spol <- subset(bar.spol, !is.na(Q13))
|
||||
bar.spol$value <- as.numeric(bar.spol$value )
|
||||
library(plyr)
|
||||
@ -197,8 +197,8 @@ bar.spol <- ddply(bar.spol, .(Q13), summarize, Povprecje = mean(value,na.rm=TR
|
||||
|
||||
# VSE UPRAVNE ENOTE
|
||||
bar.spol.all <- mju[, grepl("Q13|Q3", colnames(mju))]
|
||||
# melt the data frame for plotting
|
||||
bar.spol.all <- melt(bar.spol.all, id.vars='Q13')
|
||||
# reshape2::melt the data frame for plotting
|
||||
bar.spol.all <- reshape2::melt(bar.spol.all, id.vars='Q13')
|
||||
bar.spol.all <- subset(bar.spol.all, !is.na(Q13))
|
||||
bar.spol.all$value <- as.numeric(bar.spol.all$value )
|
||||
bar.spol.all <- ddply(bar.spol.all, .(Q13), summarize, Povprecje = mean(value,na.rm=TRUE))
|
||||
@ -208,7 +208,7 @@ bar.spolAll$Q13[bar.spolAll$Q13 == "1"] <- "mo\u0161ki"; bar.spolAll$Q13[bar.spo
|
||||
colnames(bar.spolAll) <- c("Spol", "Povpre\u010Dje vse UE", paste0("UE ", UE))
|
||||
bar.spolAll[2:3] <- round2(bar.spolAll[,2:3], 2)
|
||||
# Prepare data for ggplot
|
||||
bar.spolAll <- melt(bar.spolAll, id.vars='Spol')
|
||||
bar.spolAll <- reshape2::melt(bar.spolAll, id.vars='Spol')
|
||||
|
||||
# plot everything
|
||||
p <- graf(bar.spolAll, bar.spolAll$Spol, bar.spolAll$value, bar.spolAll$variable,
|
||||
@ -220,16 +220,16 @@ p <- graf(bar.spolAll, bar.spolAll$Spol, bar.spolAll$value, bar.spolAll$variable
|
||||
# Primerjava glede na starost---------------------------------
|
||||
# UPRAVNA ENOTA
|
||||
bar.star <- mjuID[, grepl("Q14|Q3", colnames(mjuID))]
|
||||
# melt the data frame for plotting
|
||||
bar.star <- melt(bar.star, id.vars='Q14')
|
||||
# reshape2::melt the data frame for plotting
|
||||
bar.star <- reshape2::melt(bar.star, id.vars='Q14')
|
||||
bar.star <- subset(bar.star, !is.na(Q14))
|
||||
bar.star$value <- as.numeric(bar.star$value )
|
||||
bar.star <- ddply(bar.star, .(Q14), summarize, Povprecje = mean(value,na.rm=TRUE))
|
||||
|
||||
# VSE UPRAVNE ENOTE
|
||||
bar.star.all <- mju[, grepl("Q14|Q3", colnames(mju))]
|
||||
# melt the data frame for plotting
|
||||
bar.star.all <- melt(bar.star.all, id.vars='Q14')
|
||||
# reshape2::melt the data frame for plotting
|
||||
bar.star.all <- reshape2::melt(bar.star.all, id.vars='Q14')
|
||||
bar.star.all <- subset(bar.star.all, !is.na(Q14))
|
||||
bar.star.all$value <- as.numeric(bar.star.all$value )
|
||||
bar.star.all <- ddply(bar.star.all, .(Q14), summarize, Povprecje = mean(value,na.rm=TRUE))
|
||||
@ -242,7 +242,7 @@ bar.starAll$Q14[bar.starAll$Q14 == "5"] <- "nad 70 let"
|
||||
colnames(bar.starAll) <- c("Starost", "Povpre\u010Dje vse UE", paste0("UE ", UE) )
|
||||
bar.starAll[2:3] <- round2(bar.starAll[,2:3], 2)
|
||||
# Prepare data for ggplot
|
||||
bar.starAll <- melt(bar.starAll, id.vars='Starost')
|
||||
bar.starAll <- reshape2::melt(bar.starAll, id.vars='Starost')
|
||||
# To have correct order of labels we need to specify is:
|
||||
bar.starAll$Starost <- factor(bar.starAll$Starost, levels = c("nad 70 let", "od 56 do 70 let",
|
||||
"od 41 do 55 let", "od 25 do 40 let",
|
||||
@ -258,16 +258,16 @@ p1 <- graf(bar.starAll, bar.starAll$Starost, bar.starAll$value, bar.starAll$vari
|
||||
# Primerjava glede na izobrazba---------------------------------
|
||||
# UPRAVNA ENOTA
|
||||
bar.izob <- mjuID[, grepl("Q15|Q3", colnames(mjuID))]
|
||||
# melt the data frame for plotting
|
||||
bar.izob <- melt(bar.izob, id.vars='Q15')
|
||||
# reshape2::melt the data frame for plotting
|
||||
bar.izob <- reshape2::melt(bar.izob, id.vars='Q15')
|
||||
bar.izob <- subset(bar.izob, !is.na(Q15))
|
||||
bar.izob$value <- as.numeric(bar.izob$value)
|
||||
bar.izob <- ddply(bar.izob, .(Q15), summarize, Povprecje = mean(value,na.rm=TRUE))
|
||||
|
||||
# VSE UPRAVNE ENOTE
|
||||
bar.izob.all <- mju[, grepl("Q15|Q3", colnames(mju))]
|
||||
# melt the data frame for plotting
|
||||
bar.izob.all <- melt(bar.izob.all, id.vars='Q15')
|
||||
# reshape2::melt the data frame for plotting
|
||||
bar.izob.all <- reshape2::melt(bar.izob.all, id.vars='Q15')
|
||||
bar.izob.all <- subset(bar.izob.all, !is.na(Q15))
|
||||
bar.izob.all$value <- as.numeric(bar.izob.all$value )
|
||||
bar.izob.all <- ddply(bar.izob.all, .(Q15), summarize, Povprecje = mean(value,na.rm=TRUE))
|
||||
@ -279,7 +279,7 @@ bar.izobAll$Q15[bar.izobAll$Q15 == "5"] <- "univerzitetna/magisterij/doktorat"
|
||||
colnames(bar.izobAll) <- c("Izobrazba", "Povpre\u010Dje vse UE", paste0("UE ", UE))
|
||||
bar.izobAll[2:3] <- round2(bar.izobAll[,2:3], 2)
|
||||
# Prepare data for ggplot
|
||||
bar.izobAll <- melt(bar.izobAll, id.vars='Izobrazba')
|
||||
bar.izobAll <- reshape2::melt(bar.izobAll, id.vars='Izobrazba')
|
||||
# To have correct order of labels we need to specify is:
|
||||
bar.izobAll$Izobrazba <- factor(bar.izobAll$Izobrazba, levels = c("univerzitetna/magisterij/doktorat",
|
||||
"vi\u0161ja/visoka strokovna",
|
||||
@ -1110,7 +1110,7 @@ if (!all(is.na(nchar(mjuID$Q11)))) {
|
||||
|
||||
#--------------------------------- START CREATING WORD FILE: TITLE AND LOGO ---------------------------------#
|
||||
# Create a docx object
|
||||
doc = docx()
|
||||
doc = read_docx()
|
||||
# UE logo
|
||||
# Da bi lahko pravilno prikazali logotip UE je potrebno, odstraniti vse znake za šumnike
|
||||
# ki smo jih dodali v "uprenote_labele.R", za pravilni izpis besed v word poročilu.
|
||||
@ -1118,28 +1118,28 @@ img.file <- file.path(paste0("modules/mod_MJU/logo/",logo,".png"))
|
||||
# Check if UE logo exist
|
||||
if(file.exists(img.file)){
|
||||
# Insert UE logo in word: FIRST PAGE/ TOP MARGIN
|
||||
doc <- addImage(doc,img.file, width = 2.8, height = 0.8, par.properties = parLeft() )
|
||||
doc <- body_add_img(doc,img.file, width = 2.8, height = 0.8 )
|
||||
}
|
||||
# add a document title
|
||||
if (ID.rep != 2){
|
||||
doc = addParagraph(doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami upravne enote v letu 2018", stylename = "TitleDoc")
|
||||
doc = body_add_par(doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami upravne enote v letu 2018", style = "heading 1")
|
||||
} else {
|
||||
doc = addParagraph(doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami Upravne enote Ljubljana, SEKTOR ZA UPRAVNE NOTRANJE ZADEVE v letu 2018",
|
||||
stylename = "TitleDoc")
|
||||
doc = body_add_par(doc, "Rezultati ugotavljanja zadovoljstva strank s storitvami Upravne enote Ljubljana, SEKTOR ZA UPRAVNE NOTRANJE ZADEVE v letu 2018",
|
||||
style = "heading 1")
|
||||
}
|
||||
# Add text on first page
|
||||
doc <- addParagraph(doc, paste0("Anketiranje uporabnikov storitev Upravne enote ", UE ," je v skladu z Metodologijo \u0161t. 010-37/2014/64 z dne 8.6.2016, potekalo od______________ do_____________."))
|
||||
doc <- addParagraph(doc, c("")) # 1 line breaks
|
||||
doc <- addParagraph(doc, "Pri prenovi vpra\u0161alnika, so se dimenzije, katere so tvorile splo\u0161no oceno kakovosti storitev upravne enote po prej\u0161nji metodologiji, preslikale v dimenzije vpra\u0161anja \u0161tev. 2 in \u0161tev. 3. Povpre\u010Dna ocena kakovosti storitev je tako izra\u010Dunana na osnovi ocene vseh \u0161estih dimenzij drugega in tretjega vpra\u0161anja oz. odgovorov na drugo in tretje vpra\u0161anje.")
|
||||
doc <- addParagraph(doc, c("")) # 1 line break
|
||||
doc <- addParagraph(doc, "To je prvo anketiranje v skladu s spremenjeno metodologijo in novim, prenovljenim anketnim vpra\u0161alnikom in zaradi tega primerjava za nazaj, torej s preteklimi obdobji, ni mo\u017Ena.")
|
||||
doc <- addPageBreak(doc) # go to the next page
|
||||
doc <- body_add_par(doc, paste0("Anketiranje uporabnikov storitev Upravne enote ", UE ," je v skladu z Metodologijo \u0161t. 010-37/2014/64 z dne 8.6.2016, potekalo od______________ do_____________."))
|
||||
doc <- body_add_par(doc, c("")) # 1 line breaks
|
||||
doc <- body_add_par(doc, "Pri prenovi vpra\u0161alnika, so se dimenzije, katere so tvorile splo\u0161no oceno kakovosti storitev upravne enote po prej\u0161nji metodologiji, preslikale v dimenzije vpra\u0161anja \u0161tev. 2 in \u0161tev. 3. Povpre\u010Dna ocena kakovosti storitev je tako izra\u010Dunana na osnovi ocene vseh \u0161estih dimenzij drugega in tretjega vpra\u0161anja oz. odgovorov na drugo in tretje vpra\u0161anje.")
|
||||
doc <- body_add_par(doc, c("")) # 1 line break
|
||||
doc <- body_add_par(doc, "To je prvo anketiranje v skladu s spremenjeno metodologijo in novim, prenovljenim anketnim vpra\u0161alnikom in zaradi tega primerjava za nazaj, torej s preteklimi obdobji, ni mo\u017Ena.")
|
||||
doc <- body_add_break(doc) # go to the next page
|
||||
|
||||
# DODAJ KAZALO
|
||||
doc <- addTitle(doc, "KAZALO", level = 1)
|
||||
doc <- body_add_par(doc, "KAZALO", style = "heading 1")
|
||||
# Add a table of contents
|
||||
doc <- addTOC(doc)
|
||||
doc <- addPageBreak(doc) # go to the next page
|
||||
doc <- body_add_toc(doc, level = 3)
|
||||
doc <- body_add_break(doc) # go to the next page
|
||||
# Add text
|
||||
|
||||
#--------------------------------------------- COMPILING WORD REPORT ----------------------------------------#
|
||||
@ -1149,157 +1149,160 @@ doc <- addPageBreak(doc) # go to the next page
|
||||
|
||||
#---------------------------------- PART I: SPLO\u0160NO ----------------------------------#
|
||||
# Add a first table : Default table
|
||||
doc <- addTitle(doc, "Splo\u0161no")
|
||||
doc <- addTitle(doc, "\u0160tevilo oddanih vpra\u0161alnikov", level = 2)
|
||||
doc <- addFlexTable(doc, table1)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Splo\u0161no", style = "heading 1")
|
||||
doc <- body_add_par(doc, "\u0160tevilo oddanih vpra\u0161alnikov", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table1)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# TABELA 2 ------------------------------------------------------------------
|
||||
# Število anket glede na spol
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: spol", level = 2)
|
||||
doc <- addFlexTable(doc, table2)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: spol", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table2)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# TABELA 3------------------------------------------------------------------
|
||||
# Število anket glede na starost
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: starostne skupine", level = 2)
|
||||
doc <- addFlexTable(doc, table3)
|
||||
doc <- addPageBreak(doc)
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: starostne skupine",style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table3)
|
||||
doc <- body_add_break(doc)
|
||||
|
||||
# TABELA 4------------------------------------------------------------------
|
||||
# Število anket glede na izobrazbo
|
||||
doc <- addTitle(doc, "Demografski podatki anketirancev: izobrazba", level = 2)
|
||||
doc <- addFlexTable(doc, table4)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Demografski podatki anketirancev: izobrazba", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table4)
|
||||
doc <- body_add_break(doc)
|
||||
|
||||
# TABELA 5------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocene zadovoljstva strank
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena zadovoljstva strank", level = 2)
|
||||
doc <- addFlexTable(doc, table5)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena zadovoljstva strank",style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table5)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
#--------------------------------//PART I: SPLO\u0160NO// -------------------------------#
|
||||
|
||||
|
||||
#------------------------------- PART II: Primerjava -------------------------------#
|
||||
# Graf 1-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na spol
|
||||
doc <- addTitle(doc, "Primerjava med demografskimi podatki in povpre\u010Dno oceno")
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na spol", level = 2)
|
||||
doc = addPlot(doc = doc, fun = print, x = p , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Primerjava med demografskimi podatki in povpre\u010Dno oceno", style = "heading 1")
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na spol", style = "heading 2")
|
||||
doc <- body_add( doc, p , width = 5.5, height = 5)
|
||||
|
||||
# Graf 2-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na starost
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na starost", level = 2)
|
||||
doc = addPlot( doc = doc, fun = print, x = p1 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na starost", style = "heading 2")
|
||||
doc = body_add(doc, p1, width = 5.5, height = 5)
|
||||
|
||||
# Graf 3-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena zadovoljstva glede na izobrazbo
|
||||
doc <- addTitle( doc, "Povpre\u010Dna ocena zadovoljstva glede na izobrazbo", level = 2)
|
||||
doc = addPlot( doc = doc, fun = print, x = p2 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Povpre\u010Dna ocena zadovoljstva glede na izobrazbo", style = "heading 2")
|
||||
doc = body_add(doc, p2, width = 5.5, height = 5)
|
||||
#----------------------------- //PART II: Primerjava// ------------------------------#
|
||||
|
||||
|
||||
#------------------------------- PART III: 20 podro\u010Dij ------------------------------#
|
||||
# Graf 4-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: digitalno potrdilo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij") # Naslov
|
||||
doc <- addTitle( doc, "Osebna izkaznica, potne listine", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p3 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij", style = "heading 1") # Naslov
|
||||
doc <- body_add_par( doc, "Osebna izkaznica, potne listine", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p3, width = 5.5, height = 5)
|
||||
|
||||
# Graf 5-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: mati\u010Dni register (rojstva, smrti)
|
||||
doc <- addTitle( doc, "Mati\u010Dni register (rojstva, smrti) ", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p4 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Mati\u010Dni register (rojstva, smrti) ", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p4, width = 5.5, height = 5)
|
||||
|
||||
# Graf 6-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: prijava/odjava prebivališča
|
||||
doc <- addTitle( doc, "Prijava/odjava prebivali\u0161\u010Da", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p5 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Prijava/odjava prebivali\u0161\u010Da", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p5, width = 5.5, height = 5)
|
||||
|
||||
# Graf 7-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: dr\u017Eavljanstvo
|
||||
doc <- addTitle( doc, "Dr\u017Eavljanstvo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p6 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dr\u017Eavljanstvo", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p6, width = 5.5, height = 5)
|
||||
|
||||
# Graf 8-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: dru\u0161tva, javne prireditve
|
||||
doc <- addTitle( doc, "Dru\u0161tva, javne prireditve", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p7 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dru\u0161tva, javne prireditve", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p7, width = 5.5, height = 5)
|
||||
|
||||
# Graf 9-------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: overitev listin/podpisa
|
||||
doc <- addTitle( doc, "Overitev listin/podpisa", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p8 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Overitev listin/podpisa", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p8, width = 5.5, height = 5)
|
||||
|
||||
# Graf 10------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: glavna pisarna/blagajna
|
||||
doc <- addTitle( doc, "Glavna pisarna/blagajna", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p9 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Glavna pisarna/blagajna", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p9, width = 5.5, height = 5)
|
||||
|
||||
# Graf 11------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: gradbeno/uporabno dovoljenje
|
||||
doc <- addTitle( doc, "Gradbeno/uporabno dovoljenje", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p10 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Gradbeno/uporabno dovoljenje", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p10, width = 5.5, height = 5)
|
||||
|
||||
# Graf 12------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: gradbeno/uporabno dovoljenje
|
||||
doc <- addTitle( doc, "Izpis geodet. podatkov", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p11 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Izpis geodet. podatkov", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p11, width = 5.5, height = 5)
|
||||
|
||||
# Graf 13------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: promet s kmet. zemljišči
|
||||
doc <- addTitle( doc, "Promet s kmet. zemlji\u0161\u010Di", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p12 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Promet s kmet. zemlji\u0161\u010Di", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p12, width = 5.5, height = 5)
|
||||
|
||||
# Graf 14------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: GERK-i in RKG
|
||||
doc <- addTitle( doc, "GERK-i in RKG", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p13 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "GERK-i in RKG", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p13, width = 5.5, height = 5)
|
||||
|
||||
# Graf 15------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: GERK-i in RKG
|
||||
doc <- addTitle( doc, "Registracija/odjava vozil", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p14 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Registracija/odjava vozil", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p14, width = 5.5, height = 5)
|
||||
|
||||
# Graf 16------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: vozni\u0161ko/prometno dovoljenje
|
||||
doc <- addTitle( doc, "Vozni\u0161ko/prometno dovoljenje", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p15 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vozni\u0161ko/prometno dovoljenje", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p15, width = 5.5, height = 5)
|
||||
|
||||
# Graf 17------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: zakonska zveza
|
||||
doc <- addTitle( doc, "Zakonska zveza", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p16 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Zakonska zveza", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p16, width = 5.5, height = 5)
|
||||
|
||||
# Graf 18------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: vojni veterani/invalidi
|
||||
doc <- addTitle( doc, "Vojni veterani/invalidi", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p17 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vojni veterani/invalidi", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p17, width = 5.5, height = 5)
|
||||
|
||||
# Graf 19------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: \u017Ertve vojnega nasilja
|
||||
doc <- addTitle( doc, "\u017Ertve vojnega nasilja", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p18 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u017Ertve vojnega nasilja", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p18, width = 5.5, height = 5)
|
||||
|
||||
# Graf 20------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: tujci
|
||||
doc <- addTitle( doc, "Tujci", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p19 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Tujci", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p19, width = 5.5, height = 5)
|
||||
|
||||
# Graf 21------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: E-Vem
|
||||
doc <- addTitle( doc, "E-vem", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p20 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "E-vem", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p20, width = 5.5, height = 5)
|
||||
|
||||
# Graf 22------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: digitalno potrdilo
|
||||
doc <- addTitle( doc, "Digitalno potrdilo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p21 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Digitalno potrdilo", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p21, width = 5.5, height = 5)
|
||||
|
||||
# Graf 23------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca za vsakega od 20 podro\u010Dij: drugo
|
||||
doc <- addTitle( doc, "Drugo", level = 2) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p22 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Drugo", style = "heading 2") # Podnaslov
|
||||
doc = body_add(doc, p22, width = 5.5, height = 5)
|
||||
#----------------------------- //PART III: 20 podro\u010Dij// ----------------------------#
|
||||
|
||||
|
||||
@ -1309,50 +1312,50 @@ doc = addPlot(doc = doc , fun = print, x = p22 , width = 5.5, height = 5)
|
||||
################
|
||||
# Graf 24------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca (posamezne postavke) glede na starost
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca (kot celote)") # Naslov
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na starost", level = 2) # Podnaslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca (kot celote)", style = "heading 1") # Naslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na starost", style = "heading 2") # Podnaslov
|
||||
|
||||
doc <- addTitle( doc, "Strokoven", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p23 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Strokoven", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p23, width = 5.5, height = 5)
|
||||
# Graf 25-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Nepristranski", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p24 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Nepristranski", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p24, width = 5.5, height = 5)
|
||||
# Graf 26-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Pripravljen pomagati", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p25 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Pripravljen pomagati", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p25, width = 5.5, height = 5)
|
||||
# Graf 27-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljiv", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p26 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljiv", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p26, width = 5.5, height = 5)
|
||||
# Graf 28-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vreden zaupanja", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p27 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vreden zaupanja", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p27, width = 5.5, height = 5)
|
||||
# Graf 29-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vljuden in prijazen", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p28 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vljuden in prijazen", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p28, width = 5.5, height = 5)
|
||||
|
||||
##################
|
||||
# Q15: izobrazba #
|
||||
##################
|
||||
# Graf 30------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena uslu\u017Ebenca (posamezne postavke) glede na izobrazbo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na izobrazbo", level = 2) # Podnaslov
|
||||
doc <- addTitle( doc, "Strokoven", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p29 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena uslu\u017Ebenca glede na izobrazbo", style = "heading 2") # Podnaslov
|
||||
doc <- body_add_par( doc, "Strokoven", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p29, width = 5.5, height = 5)
|
||||
# Graf 31-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Nepristranski", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p30 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Nepristranski", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p30, width = 5.5, height = 5)
|
||||
# Graf 32-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Pripravljen pomagati", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p31 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Pripravljen pomagati", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p31, width = 5.5, height = 5)
|
||||
# Graf 33-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljiv", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p32 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljiv", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p32, width = 5.5, height = 5)
|
||||
# Graf 34-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vreden zaupanja", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p33 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vreden zaupanja", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p33, width = 5.5, height = 5)
|
||||
# Graf 35-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Vljuden in prijazen", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p34 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Vljuden in prijazen", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p34, width = 5.5, height = 5)
|
||||
#-------------------------- //PART IV: Q3 glede na Q14,Q15// ------------------------#
|
||||
|
||||
|
||||
@ -1362,176 +1365,194 @@ doc = addPlot(doc = doc , fun = print, x = p34 , width = 5.5, height = 5)
|
||||
################
|
||||
# Graf 36------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena upravne enote (posamezne postavke) glede na starost
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote (kot celote)") # Naslov
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote glede na starost", level = 2) # Naslov
|
||||
doc <- addTitle( doc, "Dostop do prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p35 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote (kot celote)") # Naslov
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote glede na starost", style = "heading 2") # Naslov
|
||||
doc <- body_add_par( doc, "Dostop do prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p35, width = 5.5, height = 5)
|
||||
# Graf 37-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Urejenost prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p36 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Urejenost prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p36, width = 5.5, height = 5)
|
||||
# Graf 38-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Dostopnost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p37 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dostopnost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p37, width = 5.5, height = 5)
|
||||
# Graf 39-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljivost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p38 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljivost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p38, width = 5.5, height = 5)
|
||||
# Graf 40-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "\u010Cas \u010Dakanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p39 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u010Cas \u010Dakanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p39, width = 5.5, height = 5)
|
||||
# Graf 41-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Hitrost re\u0161evanja zadev", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p40 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Hitrost re\u0161evanja zadev", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p40, width = 5.5, height = 5)
|
||||
|
||||
##################
|
||||
# Q15: izobrazba #
|
||||
##################
|
||||
# Graf 42------------------------------------------------------------------
|
||||
# Povpre\u010Dna ocena upravne enote (posamezne postavke) glede na izobrazbo
|
||||
doc <- addTitle(doc, "Povpre\u010Dna ocena upravne enote glede na izobrazbo", level = 2) # Naslov
|
||||
doc <- addTitle( doc, "Dostop do prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p41 , width = 5.5, height = 5)
|
||||
doc <- body_add_par(doc, "Povpre\u010Dna ocena upravne enote glede na izobrazbo", style = "heading 2") # Naslov
|
||||
doc <- body_add_par( doc, "Dostop do prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p41, width = 5.5, height = 5)
|
||||
# Graf 43-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Urejenost prostorov", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p42 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Urejenost prostorov", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p42, width = 5.5, height = 5)
|
||||
# Graf 44-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Dostopnost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p43 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Dostopnost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p43, width = 5.5, height = 5)
|
||||
# Graf 45-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Razumljivost informacij", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p44 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Razumljivost informacij", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p44, width = 5.5, height = 5)
|
||||
# Graf 46-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "\u010Cas \u010Dakanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p45 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "\u010Cas \u010Dakanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p45, width = 5.5, height = 5)
|
||||
# Graf 47-----------------------------------------------------------------
|
||||
doc <- addTitle( doc, "Hitrost re\u0161evanja pred pisarno", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = p46 , width = 5.5, height = 5)
|
||||
doc <- body_add_par( doc, "Hitrost re\u0161evanja pred pisarno", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, p46, width = 5.5, height = 5)
|
||||
#-------------------------- //PART V: Q4 glede na Q14,Q15// -------------------------#
|
||||
|
||||
|
||||
|
||||
#------------------ PART VI: IZKU\u0160NJE Z ELEKTRONSKIM POSLOVANJEM --------------------#
|
||||
# FREKVENČNA PORAZDELITEV odgovorov vpra\u0161anja Q5
|
||||
doc <- addTitle(doc, "Izku\u0161nje z elektronskim poslovanjem")
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table6)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Izku\u0161nje z elektronskim poslovanjem", style = "heading 1")
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table6)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Vpra\u0161anje Q5 ima še tri pogoje za katere posebej prika\u017Eemo frekven\u010Dno
|
||||
# porazdelitev in izra\u010Dunamo dele\u017Ee
|
||||
# Q6 DA, ampak s storitvijo nisem zadovoljen, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ampak s storitvijo nisem zadovoljen, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table7)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ampak s storitvijo nisem zadovoljen, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table7)
|
||||
if(!is.null(opomba)){
|
||||
doc <- addParagraph(doc, opomba) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Q7 DA, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table8)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Da, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table8)
|
||||
if(!is.null(opomba1)){
|
||||
doc <- addParagraph(doc, opomba1) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba1) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Q8 Ne, ker:
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Ne, ker:'", level = 2)
|
||||
doc <- addFlexTable(doc, table9)
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei: vpra\u0161anja 'Ne, ker:'", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table9)
|
||||
if(!is.null(opomba2)){
|
||||
doc <- addParagraph(doc, opomba2) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba2) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
|
||||
# DODAMO ŠE DVE FREKVENČNI TABELI: frekvence Q5 glede na starost in izobrazbo
|
||||
# Starost
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", level = 2)
|
||||
doc <- addFlexTable(doc, table10)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table10)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
# Izobrazba
|
||||
doc <- addTitle(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", level = 2)
|
||||
doc <- addFlexTable(doc, table11)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Izobrazba
|
||||
doc <- body_add_par(doc, "Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table11)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
#---------------- //PART VI: IZKU\u0160NJE Z ELEKTRONSKIM POSLOVANJEM// ------------------#
|
||||
|
||||
|
||||
#--------------------- PART VII: ZADOVOLJSTVO Z URADNIMI URAMI ----------------------#
|
||||
# FREKVENČNA PORAZDELITEV odgovorov vpra\u0161anja Q9
|
||||
doc <- addTitle(doc, "Uradne ure upravne enote")
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table12)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Uradne ure upravne enote")
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table12)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# V primeru, da delamo poro\u010Dil za posamezno upravno enoto, za spremenljivko Q9 naredimo še strukturni krog
|
||||
doc <- addTitle( doc, "Tortni diagram: zadovoljstvo z uradnimi urami", level = 3) # Podnaslov
|
||||
doc = addPlot(doc = doc , fun = print, x = tort.d , width = 4.5, height = 4)
|
||||
doc <- body_add_par( doc, "Tortni diagram: zadovoljstvo z uradnimi urami", style = "heading 3") # Podnaslov
|
||||
doc = body_add(doc, tort.d , width = 4.5, height = 4)
|
||||
|
||||
# FREKVENČNA PORAZDELITEV odgovorov vpra\u0161anja Q10: z uradnimi urami UE nusem
|
||||
# zadovoljen, ker
|
||||
doc <- addTitle(doc, "Nezadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", level = 2)
|
||||
doc <- addFlexTable(doc, table13)
|
||||
doc <- body_add_par(doc, "Nezadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table13)
|
||||
if(!is.null(opomba3)){
|
||||
doc <- addParagraph(doc, opomba3) # 2 line breaks
|
||||
doc <- body_add_par(doc, opomba3) # 2 line breaks
|
||||
}
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Frekven\u010Dna porazdelitev odgovorov Q9 glede na starost
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", level = 2)
|
||||
doc <- addFlexTable(doc, table14)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na starost", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table14)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
# Frekven\u010Dna porazdelitev odgovorov Q9 glede na izobrazbo
|
||||
doc <- addTitle(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", level = 2)
|
||||
doc <- addFlexTable(doc, table15)
|
||||
doc <- addParagraph(doc, c("", ""))
|
||||
doc <- addParagraph(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
doc <- body_add_par(doc, "Zadovoljstvo z uradnimi urami: Frekven\u010Dna porazdelitev odgovorov in dele\u017Ei glede na izobrazbo", style = "heading 2")
|
||||
doc <- body_add_flextable(doc, table15)
|
||||
doc <- body_add_par(doc, c(" "))
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, paste0("V tabeli so prikazane frekven\u010Dne porazdelitve odgovorov upravne enote ", UE ,". V oklepajih pa so prikazane frekven\u010Dne porazdelitve odgovorov za vse upravne enote."))
|
||||
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
#------------------- //PART VII: ZADOVOLJSTVO Z URADNIMI URAMI// --------------------#
|
||||
|
||||
|
||||
#----------------------------- PART VIII: ODPRTI ODGOVORI ---------------------------#
|
||||
#Odprti odgovori na podvpra\u0161anja (Q6d_text, Q7e_text, Q8f_text) vpra\u0161anja Q5
|
||||
doc <- addTitle(doc, "Seznam odgovorov na odprta vpra\u0161anja")
|
||||
doc <- body_add_par(doc, "Seznam odgovorov na odprta vpra\u0161anja")
|
||||
# Q6d_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q6d_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Da, ampak s storitvijo nisem zadovoljen, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table16)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Da, ampak s storitvijo nisem zadovoljen, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table16)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
# Q7e_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q7e_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Da, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table17)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Da, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table17)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
# Q8f_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q8f_text)))) {
|
||||
doc <- addTitle(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", level = 2)
|
||||
doc <- addTitle(doc, "Ne, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table18)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali imate izku\u0161nje z elektronskim poslovanjem z upravno enoto?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Ne, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table18)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
|
||||
# Q10c_text-------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q10c_text)))) {
|
||||
doc <- addTitle(doc, "Ali ste zadovoljni z obstoje\u010Dimi uradnimi urami upravne enote?", level = 2)
|
||||
doc <- addTitle(doc, "Ne, ker", level = 3)
|
||||
doc <- addFlexTable(doc, table19)
|
||||
doc <- addParagraph(doc, c("", "")) # 2 line breaks
|
||||
doc <- body_add_par(doc, "Ali ste zadovoljni z obstoje\u010Dimi uradnimi urami upravne enote?", style = "heading 2")
|
||||
doc <- body_add_par(doc, "Ne, ker", style = "heading 3")
|
||||
doc <- body_add_flextable(doc, table19)
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
doc <- body_add_par(doc, c(" ")) # 2 line breaks
|
||||
}
|
||||
|
||||
# Q11------------------------------------
|
||||
if (!all(is.na(nchar(mjuID$Q11)))) {
|
||||
doc <- addTitle(doc, "Va\u0161a mnenja in predlogi")
|
||||
doc <- addFlexTable(doc, table20)
|
||||
doc <- body_add_par(doc, "Va\u0161a mnenja in predlogi")
|
||||
doc <- body_add_flextable(doc, table20)
|
||||
}
|
||||
#--------------------------- //PART VIII: ODPRTI ODGOVORI// -------------------------#
|
||||
#------------------------------------------- //COMPILING WORD REPORT// --------------------------------------#
|
||||
#writeDoc(doc, file = paste0("modules/mod_MJU/results/Upravna enota ",UE,".docx"))
|
||||
# Testo
|
||||
writeDoc(doc, file = paste0("modules/mod_MJU/results/Upravna_enota.docx"))
|
||||
print(doc, target = paste0("modules/mod_MJU/results/Upravna_enota.docx"))
|
||||
#------------------------------- //START CREATING WORD FILE: TITLE AND LOGO// -------------------------------#
|
||||
|
||||
@ -47,15 +47,13 @@ class SurveyVoting{
|
||||
|
||||
echo '<fieldset><legend>'.$lang['settings'].'</legend>';
|
||||
|
||||
echo '<br>';
|
||||
|
||||
echo $lang['srv_voting_edit1'].' <a href="index.php?anketa='.$this->anketa.'&a='.A_BRANCHING.'"><span class="bold">'.$lang['srv_voting_edit2'].'</span></a>.';
|
||||
echo ' <p class="bottom16">';
|
||||
echo $lang['srv_voting_edit1'].' <a href="index.php?anketa='.$this->anketa.'&a='.A_BRANCHING.'">'.$lang['srv_voting_edit2'].'</a>.';
|
||||
echo ' </p>';
|
||||
|
||||
echo '<br><br>';
|
||||
|
||||
echo $lang['srv_voting_invitations1'].' <a href="index.php?anketa='.$this->anketa.'&a='.A_INVITATIONS.'"><span class="bold">'.$lang['srv_voting_invitations2'].'</span></a>.';
|
||||
|
||||
echo '<br><br>';
|
||||
echo ' <p>';
|
||||
echo $lang['srv_voting_invitations1'].' <a href="index.php?anketa='.$this->anketa.'&a='.A_INVITATIONS.'">'.$lang['srv_voting_invitations2'].'</a>.';
|
||||
echo ' </p>';
|
||||
|
||||
echo '</fieldset>';
|
||||
}
|
||||
|
||||
@ -213,3 +213,79 @@ function setGDPRRequestCommentSurvey(request_id, text){
|
||||
|
||||
$("#survey_requests").load('ajax.php?t=gdpr&a=gdpr_request_comment_survey', {request_id: request_id, value:value, ank_id:ank_id});
|
||||
}
|
||||
|
||||
|
||||
// Filter po gdpr anketah - seznam anket
|
||||
function gdpr_ankete(){
|
||||
|
||||
var check_gdpr_ankete = document.getElementById('gdpr_ankete_check');
|
||||
|
||||
if (check_gdpr_ankete.checked){
|
||||
check_gdpr_ankete.checked = false;
|
||||
|
||||
// box-u odstranimo barvo
|
||||
$('#num_box1').removeClass('checked');
|
||||
|
||||
// skrijemo vrstice v tabeli
|
||||
$('.green_row').hide();
|
||||
}
|
||||
else {
|
||||
check_gdpr_ankete.checked = true;
|
||||
|
||||
// box-u dodamo barvo
|
||||
$('#num_box1').addClass('checked');
|
||||
|
||||
// prikazemo vrstice v tabeli
|
||||
$('.green_row').show();
|
||||
}
|
||||
}
|
||||
|
||||
// Filter po potencialnih gdpr anketah - seznam anket
|
||||
function potenc_gdpr_ankete(){
|
||||
|
||||
var check_potenc_gdpr = document.getElementById('potenc_gdpr_ankete_check');
|
||||
|
||||
if (check_potenc_gdpr.checked){
|
||||
check_potenc_gdpr.checked = false;
|
||||
|
||||
// box-u odstranimo barvo
|
||||
$('#num_box2').removeClass('checked');
|
||||
|
||||
// skrijemo vrstice v tabeli
|
||||
$('.red_row').hide();
|
||||
}
|
||||
else {
|
||||
check_potenc_gdpr.checked = true;
|
||||
|
||||
// box-u dodamo barvo
|
||||
$('#num_box2').addClass('checked');
|
||||
|
||||
// prikazemo vrstice v tabeli
|
||||
$('.red_row').show();
|
||||
}
|
||||
}
|
||||
|
||||
// Filter po ne-gdpr anketah - seznam anket
|
||||
function ne_gdpr_ankete(){
|
||||
|
||||
var check_negdpr_ankete = document.getElementById('ne_gdpr_ankete');
|
||||
|
||||
if (check_negdpr_ankete.checked){
|
||||
check_negdpr_ankete.checked = false;
|
||||
|
||||
// box-u odstranimo barvo
|
||||
$('#num_box3').removeClass('checked');
|
||||
|
||||
// skrijemo vrstice v tabeli
|
||||
$('.grey_row').hide();
|
||||
}
|
||||
else {
|
||||
check_negdpr_ankete.checked = true;
|
||||
|
||||
// box-u dodamo barvo
|
||||
$('#num_box3').addClass('checked');
|
||||
|
||||
// prikazemo vrstice v tabeli
|
||||
$('.grey_row').show();
|
||||
}
|
||||
}
|
||||
|
||||
@ -564,12 +564,17 @@ function invMessageRename() {
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// najprej dodatno poeditiramo sporočilo
|
||||
function inv_message_save_advanced(mid) {
|
||||
// najprej dodatno poeditiramo sporočilo
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#fullscreen').addClass('divPopUp PopUpNarrow');
|
||||
$('#fullscreen').html('').fadeIn('slow');
|
||||
|
||||
$("#fullscreen").load('ajax.php?t=invitations&a=edit_message_details', {anketa:srv_meta_anketa_id, noNavi:'true', mid:mid});
|
||||
}
|
||||
|
||||
function inv_message_save_forward(mid) {
|
||||
//v kolikor je CKEditor vklopljen potem, ga odstranimo pred skranjevanjem
|
||||
if(CKEDITOR.instances['inv_message_body']){
|
||||
@ -894,6 +899,7 @@ function inv_edit_rec_profile() {
|
||||
var pid = $("#inv_import_list_profiles ol li.active").attr("pid");
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#fullscreen').addClass('divPopUp PopUpNarrow');
|
||||
$('#fullscreen').html('').fadeIn('slow');
|
||||
$("#fullscreen").load('ajax.php?t=invitations&a=edit_rec_profile', {anketa:srv_meta_anketa_id, pid:pid, noNavi:'true'});
|
||||
}
|
||||
|
||||
@ -205,6 +205,8 @@ lang('for');
|
||||
lang('alternative_email_delete');
|
||||
lang('srv_anketa_deleted_restore_confirm');
|
||||
lang('srv_data_deleted_restore_confirm');
|
||||
lang('more2');
|
||||
lang('less2');
|
||||
|
||||
|
||||
//LOKACIJA
|
||||
|
||||
@ -1014,6 +1014,11 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) {
|
||||
//refreshLeft();
|
||||
$('#branching').html(data.output);
|
||||
refreshRight();
|
||||
|
||||
// Prikazemo gumb za pobrisana vprasanja (toolbox na levi) in povecamo counter
|
||||
$('#vprasanje_deleted_border, #vprasanje_deleted_toolbox').removeClass('displayNone');
|
||||
var vprasanje_deleted_count = parseInt($('#vprasanje_deleted_count').html()) + 1;
|
||||
$('#vprasanje_deleted_count').html(vprasanje_deleted_count);
|
||||
}
|
||||
else if (data.error == 1) {
|
||||
$('#fade').fadeIn('slow');
|
||||
@ -1499,7 +1504,33 @@ function normalmode_spremenljivka (spremenljivka) {
|
||||
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
|
||||
function create_editor (id, focus) {
|
||||
|
||||
CKEDITOR.replace(id);
|
||||
editor = CKEDITOR.replace(id);
|
||||
|
||||
// Dodamo gumb vec
|
||||
editor.addCommand("advanced_editor_show", {
|
||||
exec: function(edt) {
|
||||
$('#'+edt.id+'_toolbox').addClass('advanced');
|
||||
}
|
||||
});
|
||||
|
||||
editor.ui.addButton('More', {
|
||||
label: lang['more2'],
|
||||
command: 'advanced_editor_show',
|
||||
name: "More",
|
||||
});
|
||||
|
||||
// Dodamo gumb manj
|
||||
editor.addCommand("advanced_editor_hide", {
|
||||
exec: function(edt) {
|
||||
$('#'+edt.id+'_toolbox').removeClass('advanced');
|
||||
}
|
||||
});
|
||||
|
||||
editor.ui.addButton('Less', {
|
||||
label: lang['less2'],
|
||||
command: 'advanced_editor_hide',
|
||||
name: "Less",
|
||||
});
|
||||
|
||||
//namestitev editorja za tekst pri obveščanju
|
||||
if(gup('a') == 'alert' && focus == false){
|
||||
@ -1639,35 +1670,53 @@ function remove_editor (id) {
|
||||
|
||||
// prikaze editor za spremenljivko (definiran mora biti textarea za idjem naslov_$spremenljivka
|
||||
function editor_display (spremenljivka) {
|
||||
//if (editor_init != true) {
|
||||
|
||||
CKEDITOR.replace( 'naslov_'+spremenljivka );
|
||||
editor = CKEDITOR.replace( 'naslov_'+spremenljivka );
|
||||
|
||||
//v kolikor je default vrednost potem naredimo selectAll
|
||||
var def = $('#naslov_'+spremenljivka).attr("default");
|
||||
if( def == 1) {
|
||||
CKEDITOR.instances['naslov_' + spremenljivka].on('focus', function () {
|
||||
this.execCommand('selectAll');
|
||||
});
|
||||
}
|
||||
// editor_init = true;
|
||||
//}
|
||||
// Dodamo gumb vec
|
||||
editor.addCommand("advanced_editor_show", {
|
||||
exec: function(edt) {
|
||||
$('#'+edt.id+'_toolbox').addClass('advanced');
|
||||
}
|
||||
});
|
||||
editor.ui.addButton('More', {
|
||||
label: lang['more2'],
|
||||
command: 'advanced_editor_show',
|
||||
name: "More",
|
||||
});
|
||||
|
||||
// Dodamo gumb manj
|
||||
editor.addCommand("advanced_editor_hide", {
|
||||
exec: function(edt) {
|
||||
$('#'+edt.id+'_toolbox').removeClass('advanced');
|
||||
}
|
||||
});
|
||||
|
||||
editor.ui.addButton('Less', {
|
||||
label: lang['less2'],
|
||||
command: 'advanced_editor_hide',
|
||||
name: "Less",
|
||||
});
|
||||
|
||||
//v kolikor je default vrednost potem naredimo selectAll
|
||||
var def = $('#naslov_'+spremenljivka).attr("default");
|
||||
if( def == 1) {
|
||||
CKEDITOR.instances['naslov_' + spremenljivka].on('focus', function () {
|
||||
this.execCommand('selectAll');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function editor_display_hotspot (vre_id) {
|
||||
//if (editor_init != true) {
|
||||
|
||||
CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
|
||||
CKEDITOR.replace( 'hotspot_image_'+vre_id, {toolbar: 'HotSpot', width: 300, removePlugins: 'elementspath'}); //izberi config toolbar HotSpot, sirina naj bo 300px, odstrani spodnji tag, kjer po default-u so oznake html (body, p, ipd.)
|
||||
|
||||
//v kolikor je default vrednost potem naredimo selectAll
|
||||
var def = $('#hotspot_image_'+vre_id).attr("default");
|
||||
//if( def == 1) {
|
||||
CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
|
||||
this.execCommand('selectAll');
|
||||
});
|
||||
//}
|
||||
// editor_init = true;
|
||||
//}
|
||||
//v kolikor je default vrednost potem naredimo selectAll
|
||||
var def = $('#hotspot_image_'+vre_id).attr("default");
|
||||
|
||||
CKEDITOR.instances['hotspot_image_' + vre_id].on('focus', function () {
|
||||
this.execCommand('selectAll');
|
||||
});
|
||||
}
|
||||
|
||||
// odstrani editor (treba preden se odstrani html)
|
||||
@ -2110,8 +2159,7 @@ function add_comment (spremenljivka, type, view, vsebina) {
|
||||
$('div#survey_comment_'+spremenljivka+'_'+view).load(siteurl+'ajax.php?t=branching&a=comment_manage', {type: type, view: view, spremenljivka: spremenljivka, vsebina: vsebina, anketa: srv_meta_anketa_id, refresh: '1'},
|
||||
function () {
|
||||
if (view == 0) {
|
||||
$('#surveycomment_'+spremenljivka+'_0').qtip("hide"); // pri opciji Dodaj komentar, skrijemo oblacek po submitu
|
||||
$('#comment_add_'+spremenljivka).show(); // pokazemo opcijo Poglej komentarje
|
||||
$("#comment_inline_add").toggleClass('displayNone'); // pri opciji Dodaj komentar, skrijemo oblacek po submitu
|
||||
} else if (view == 4 || view == 5) {
|
||||
window.location.reload();
|
||||
}
|
||||
@ -5507,13 +5555,13 @@ function toggleParapodatki(){
|
||||
|
||||
if(survey_ip == '0') {
|
||||
$("#save_IP_warning").removeClass('displayNone');
|
||||
$("#save_IP").removeClass('no_margin');
|
||||
$("#save_IP").removeClass('bottom0');
|
||||
$("#connect_IP").removeClass('displayNone');
|
||||
}
|
||||
|
||||
else {
|
||||
$("#save_IP_warning").addClass('displayNone');
|
||||
$("#save_IP").addClass('no_margin');
|
||||
$("#save_IP").addClass('bottom0');
|
||||
$("#connect_IP").addClass('displayNone');
|
||||
}
|
||||
|
||||
@ -5638,4 +5686,57 @@ function oneClickArchive(){
|
||||
$('#general_popup').addClass('PopUpNarrow');
|
||||
$('#general_popup').html('').fadeIn('slow');
|
||||
$("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id});
|
||||
}
|
||||
|
||||
|
||||
|
||||
// kliči popup
|
||||
function show_gdpr_messeage(id_sporocila){
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#general_popup').addClass('PopUpNarrow');
|
||||
$('#general_popup').html('hello').fadeIn('slow');
|
||||
$("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id});
|
||||
|
||||
console.log(id_sporocila);
|
||||
}
|
||||
|
||||
function toggleCommentOptions(id) {
|
||||
$("#options_"+id).toggleClass("displayNone");
|
||||
}
|
||||
|
||||
//Toggle za dodajanje uporabnika (admini in managerji)
|
||||
function toggleAddUser(){
|
||||
|
||||
$("#new_user_option").toggleClass('displayNone');
|
||||
$("#existing_user_option").toggleClass('displayNone');
|
||||
}
|
||||
|
||||
function toggleCommentDropdown () {
|
||||
$("#comment_dropdown").toggleClass('displayNone');
|
||||
}
|
||||
|
||||
function toggleCommentDropdownTestSurvey () {
|
||||
$("#comment_dropdown_test_survey").toggleClass('displayNone');
|
||||
$(".open_comment_box").toggleClass('active');
|
||||
}
|
||||
|
||||
function toggleCommentPopupInline ($type) {
|
||||
|
||||
if ($type==3) // komentarji respondentov
|
||||
$("#comment_inline_respondent").toggleClass('displayNone');
|
||||
if ($type==2) // komentarji urednikov
|
||||
$("#comment_inline_editor").toggleClass('displayNone');
|
||||
if ($type==1) // dodaj komentar
|
||||
$("#comment_inline_add").toggleClass('displayNone');
|
||||
|
||||
}
|
||||
|
||||
function toggleAnketaOpomba () {
|
||||
$("#dodaj-opombo").toggleClass('displayNone');
|
||||
}
|
||||
|
||||
function toggleAnketaMapa () {
|
||||
$("#dodaj-v-mapo").toggleClass('displayNone');
|
||||
$("#anketa-toggle").toggleClass('bottom0');
|
||||
}
|
||||
@ -1386,3 +1386,14 @@ function dataTableScroll(where){
|
||||
}
|
||||
}
|
||||
|
||||
// Prikaz ikon (frekvence, sums...) pri kliku na 3 pikice
|
||||
function show_settings_survey_analysis(id_of_element){
|
||||
|
||||
if($('#options'+id_of_element).is(":visible")){
|
||||
$('#options'+id_of_element).hide();
|
||||
}
|
||||
else{
|
||||
$('.options').hide();
|
||||
$('#options'+id_of_element).show();
|
||||
}
|
||||
}
|
||||
@ -1,37 +1,116 @@
|
||||
// inicializiramo drag/drop anket in folderjev
|
||||
function surveyList_folder_init() {
|
||||
/** Izbrise anketo
|
||||
*
|
||||
* @param anketa
|
||||
* @param confirmtext
|
||||
* @return
|
||||
*/
|
||||
function anketa_delete_list (anketa, confirmtext) {
|
||||
if (confirm(confirmtext)) {
|
||||
$("#anketa_list_"+anketa).slideUp();
|
||||
$.post('ajax.php?a=anketa_delete', {anketa: anketa, 'inList': 'true'}, function(response) {
|
||||
if (response == '0') {
|
||||
window.location = 'index.php';
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
$('#survey_list div.droppable').droppable({
|
||||
accept: '.mySurvey_draggable',
|
||||
/** doda/odstrani anketo v sistemsko knjiznico in refresa ikono za knjiznico ankete
|
||||
*
|
||||
*/
|
||||
function surveyList_knjiznica (anketa) {
|
||||
$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_glb").load('ajax.php?t=surveyList&a=surveyList_knjiznica', {anketa: anketa});
|
||||
}
|
||||
|
||||
/** navadnega uporabnika obvesti da nima dostopa za dodajanje v sistemsko knjiznico
|
||||
*
|
||||
*/
|
||||
function surveyList_knjiznica_noaccess (msg) {
|
||||
genericAlertPopup('alert_parameter_msg');
|
||||
}
|
||||
|
||||
/** doda/odstrani anketo v uporabnisko knjiznico in refresa ikono za knjiznico ankete
|
||||
*
|
||||
*/
|
||||
function surveyList_myknjiznica (anketa) {
|
||||
$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_usr").load('ajax.php?t=surveyList&a=surveyList_myknjiznica', {anketa: anketa});
|
||||
//$('#folders').load('ajax.php?t=folders&a=folders_myknjiznica', {anketa: anketa});
|
||||
}
|
||||
|
||||
function surveyList_myknjiznica_new (anketa) {
|
||||
$.post('ajax.php?t=surveyList&a=surveyList_myknjiznica_new', {anketa: anketa}, function() {
|
||||
window.location.reload(true);
|
||||
});
|
||||
}
|
||||
|
||||
function surveyList_knjiznica_new (anketa) {
|
||||
$.post('ajax.php?t=surveyList&a=surveyList_knjiznica_new', {anketa: anketa}, function() {
|
||||
window.location.reload(true);
|
||||
});
|
||||
}
|
||||
|
||||
// Prikaz vec na tri pikice v tabeli anket
|
||||
function surveyList_show_more(ank_id){
|
||||
|
||||
if($('#survey_other_box_'+ank_id).hasClass('displayNone')){
|
||||
$('.survey_other_box').addClass('displayNone');
|
||||
$('#survey_other_box_'+ank_id).removeClass('displayNone');
|
||||
}
|
||||
else{
|
||||
$('.survey_other_box').addClass('displayNone');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* MOJE ANKETE - pogled z mapami */
|
||||
|
||||
// Preklopimo med prikazom folderjev in navadnim prikazom
|
||||
function switchFolder(show){
|
||||
if(show == 1)
|
||||
var show_folders = 0;
|
||||
else
|
||||
var show_folders = 1;
|
||||
|
||||
$('#survey_list').load('ajax.php?a=surveyList_folders', {show_folders:show_folders}, function(){
|
||||
$('body').toggleClass('body_mySurveys_folders');
|
||||
$('body').toggleClass('body_mySurveys');
|
||||
});
|
||||
}
|
||||
|
||||
// inicializiramo drag/drop anket in folderjev
|
||||
function mySurvey_folder_init() {
|
||||
|
||||
$('#survey_list .mySurvey_droppable').droppable({
|
||||
accept: '#survey_list .mySurvey_draggable',
|
||||
hoverClass: 'folderhover',
|
||||
tolerance: 'pointer',
|
||||
drop: function (e, ui) {
|
||||
|
||||
// Drop folderja
|
||||
if($(ui.draggable).hasClass('folder_title')){
|
||||
var drag_folder = $(ui.draggable).attr('folder_id');
|
||||
var parent = $(this).attr('folder_id');
|
||||
if($(ui.draggable).hasClass('folder_item')){
|
||||
|
||||
var drag_folder_id = $(ui.draggable).attr('folder_id');
|
||||
var parent_folder_id = $(this).attr('folder_id');
|
||||
|
||||
$.post('ajax.php?t=surveyList&a=folder_dropped', {parent: parent, drag_folder: drag_folder}, function(){
|
||||
window.location.reload();
|
||||
});
|
||||
$('#survey_list').load('ajax.php?t=surveyListFolders&a=mysurvey_folder_drop', {parent_folder_id: parent_folder_id, drag_folder_id: drag_folder_id});
|
||||
}
|
||||
|
||||
// Drop ankete
|
||||
if($(ui.draggable).hasClass('anketa_list')){
|
||||
var drag_survey = $(ui.draggable).attr('anketa_id');
|
||||
var parent = $(this).attr('folder_id');
|
||||
|
||||
$.post('ajax.php?t=surveyList&a=survey_dropped', {parent: parent, drag_survey: drag_survey}, function(){
|
||||
window.location.reload();
|
||||
});
|
||||
var drag_survey_id = $(ui.draggable).attr('anketa_id');
|
||||
var parent_folder_id = $(this).attr('folder_id');
|
||||
|
||||
$('#survey_list').load('ajax.php?t=surveyListFolders&a=mysurvey_survey_drop', {parent_folder_id: parent_folder_id, drag_survey_id: drag_survey_id});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$('.mySurvey_draggable').draggable({
|
||||
$('#survey_list .mySurvey_draggable').draggable({
|
||||
revert: 'invalid',
|
||||
opacitiy: '0.7',
|
||||
opacitiy: '0.9',
|
||||
helper: 'clone',
|
||||
cursor: 'move',
|
||||
cursorAt: { left: 20 },
|
||||
@ -41,6 +120,115 @@ function surveyList_folder_init() {
|
||||
});
|
||||
}
|
||||
|
||||
// Razpremo/skrcimo folder
|
||||
function mySurvey_folder_toggle(folder_id){
|
||||
|
||||
if($('#folder_item_'+folder_id).hasClass('open'))
|
||||
var open = 0;
|
||||
else
|
||||
var open = 1;
|
||||
|
||||
$.post('ajax.php?t=surveyListFolders&a=mysurvey_folder_toggle', {folder_id: folder_id, open: open}, function(){
|
||||
|
||||
if($('#folder_item_'+folder_id).hasClass('open')){
|
||||
$('#folder_item_'+folder_id).removeClass('open');
|
||||
$('#folder_list_'+folder_id).slideUp();
|
||||
}
|
||||
else{
|
||||
$('#folder_item_'+folder_id).addClass('open');
|
||||
$('#folder_list_'+folder_id).slideDown();
|
||||
}
|
||||
});
|
||||
|
||||
event.stopPropagation();
|
||||
}
|
||||
|
||||
// Aktiviramo folder
|
||||
function mySurvey_folder_activate(folder_id){
|
||||
|
||||
$('#right_content').load('ajax.php?t=surveyListFolders&a=mysurvey_folder_activate', {folder_id: folder_id}, function(){
|
||||
|
||||
// Pobrisemo aktivni class aktivnega
|
||||
$('.folder_item').removeClass('active');
|
||||
|
||||
// Dodamo aktivni class novemu
|
||||
$('#folder_item_'+folder_id).addClass('active');
|
||||
});
|
||||
}
|
||||
|
||||
// Prikazemo opcije za urejanje folderja
|
||||
function mySurvey_folder_show_edit(element){
|
||||
|
||||
if($(element).parent().find('.folder_item_settings').hasClass('displayNone')){
|
||||
$('.folder_item_settings').addClass('displayNone');
|
||||
$('.dots_ver_folder').removeClass('active');
|
||||
$(element).parent().find('.folder_item_settings').removeClass('displayNone');
|
||||
$(element).addClass('active');
|
||||
}
|
||||
else{
|
||||
$('.folder_item_settings').addClass('displayNone');
|
||||
$('.dots_ver_folder').removeClass('active');
|
||||
$(element).parent().find('.folder_item_settings').addClass('displayNone');
|
||||
$(element).removeClass('active');
|
||||
}
|
||||
|
||||
event.stopPropagation();
|
||||
}
|
||||
|
||||
|
||||
// Zaprtje dodatnega popupa
|
||||
function mySurvey_folder_close_popup(){
|
||||
$('#fade').fadeOut('slow');
|
||||
$("#mySurvey_additional_popup").fadeOut().html();
|
||||
}
|
||||
|
||||
// Ime novega folderja
|
||||
function mySurvey_folder_add_popup(parent_folder_id){
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$("#mySurvey_additional_popup").fadeIn();
|
||||
$("#mySurvey_additional_popup").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_add_popup', {folder_id: parent_folder_id});
|
||||
}
|
||||
|
||||
// Dodamo nov folder
|
||||
function mySurvey_folder_add(parent_folder_id){
|
||||
|
||||
var folder_name = $("#mySurvey_folder_name").val();
|
||||
|
||||
$("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_add', {folder_id: parent_folder_id, folder_name: folder_name}, function(){
|
||||
mySurvey_folder_close_popup();
|
||||
});
|
||||
}
|
||||
|
||||
// Ime obstojecega folderja
|
||||
function mySurvey_folder_rename_popup(folder_id, folder_name){
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$("#mySurvey_additional_popup").fadeIn();
|
||||
$("#mySurvey_additional_popup").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_rename_popup', {folder_id: folder_id, folder_name: folder_name});
|
||||
}
|
||||
|
||||
// Preimenujemo obstojeci folder
|
||||
function mySurvey_folder_rename(folder_id){
|
||||
|
||||
var folder_name = $("#mySurvey_folder_name").val();
|
||||
|
||||
$("#left_content").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_rename', {folder_id: folder_id, folder_name: folder_name}, function(){
|
||||
mySurvey_folder_close_popup();
|
||||
});
|
||||
}
|
||||
|
||||
// Pobrisemo obstojeci folder
|
||||
function mySurvey_folder_delete(folder_id){
|
||||
|
||||
$("#survey_list").load('ajax.php?t=surveyListFolders&a=mysurvey_folder_delete', {folder_id: folder_id});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
||||
// prikazemo/skrijemo ankete v folderju
|
||||
function toggle_folder (folder) {
|
||||
|
||||
@ -65,41 +253,7 @@ function toggle_folder (folder) {
|
||||
});
|
||||
}
|
||||
|
||||
// Pobrisemo folder
|
||||
function delete_folder (folder) {
|
||||
$.post('ajax.php?t=surveyList&a=folder_delete', {folder: folder}, function(){
|
||||
window.location.reload();
|
||||
});
|
||||
}
|
||||
|
||||
// Ustvarimo folder
|
||||
function create_folder (parent) {
|
||||
|
||||
$('#survey_list').load('ajax.php?t=surveyList&a=folder_create', {parent: parent}, function(){
|
||||
|
||||
var added_folder_id = $('#new_added_folder').val();
|
||||
|
||||
edit_title_folder(added_folder_id);
|
||||
});
|
||||
}
|
||||
|
||||
// Urejamo ime folderja
|
||||
function edit_title_folder (folder) {
|
||||
|
||||
var text = $('#folder_title_text_'+folder).text();
|
||||
|
||||
$('#folder_title_text_'+folder).html('<input type="text" name="folder_title_edit" folder="'+folder+'" id="folder_title_edit_'+folder+'" class="folder_title_edit" value="'+text+'" onBlur="rename_folder(\''+folder+'\'); return false;" />');
|
||||
$('#folder_title_edit_'+folder).select();
|
||||
}
|
||||
// Preimenujemo folder
|
||||
function rename_folder(folder){
|
||||
|
||||
var text = $('#folder_title_edit_'+folder).val();
|
||||
|
||||
$.post('ajax.php?t=surveyList&a=folder_rename', {folder: folder, text: text}, function(){
|
||||
$('#folder_title_text_'+folder).html('<a href="#" onClick="edit_title_folder(\''+folder+'\'); return false;">'+text+'</a>');
|
||||
});
|
||||
}
|
||||
// Kopiramo folder
|
||||
function copy_folder(folder){
|
||||
|
||||
@ -108,78 +262,7 @@ function copy_folder(folder){
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Preklopimo med prikazom folderjev in navadnim prikazom
|
||||
function switchFolder(show){
|
||||
if(show == 1)
|
||||
var show_folders = 0;
|
||||
else
|
||||
var show_folders = 1;
|
||||
|
||||
$('#survey_list').load('ajax.php?a=surveyList_folders', {show_folders:show_folders});
|
||||
}
|
||||
|
||||
|
||||
/** Izbrise anketo
|
||||
*
|
||||
* @param anketa
|
||||
* @param confirmtext
|
||||
* @return
|
||||
*/
|
||||
function anketa_delete_list (anketa, confirmtext) {
|
||||
if (confirm(confirmtext)) {
|
||||
$("#anketa_list_"+anketa).slideUp();
|
||||
$.post('ajax.php?a=anketa_delete', {anketa: anketa, 'inList': 'true'}, function(response) {
|
||||
if (response == '0') {
|
||||
window.location = 'index.php';
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** doda/odstrani anketo v sistemsko knjiznico in refresa ikono za knjiznico ankete
|
||||
*
|
||||
*/
|
||||
function surveyList_knjiznica (anketa) {
|
||||
$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_glb").load('ajax.php?t=surveyList&a=surveyList_knjiznica', {anketa: anketa});
|
||||
}
|
||||
/** navadnega uporabnika obvesti da nima dostopa za dodajanje v sistemsko knjiznico
|
||||
*
|
||||
*/
|
||||
function surveyList_knjiznica_noaccess (msg) {
|
||||
genericAlertPopup('alert_parameter_msg');
|
||||
}
|
||||
|
||||
/** doda/odstrani anketo v uporabnisko knjiznico in refresa ikono za knjiznico ankete
|
||||
*
|
||||
*/
|
||||
function surveyList_myknjiznica (anketa) {
|
||||
$("ul#surveyList").find("li#anketa_list_"+anketa).find(".sl_lib_usr").load('ajax.php?t=surveyList&a=surveyList_myknjiznica', {anketa: anketa});
|
||||
//$('#folders').load('ajax.php?t=folders&a=folders_myknjiznica', {anketa: anketa});
|
||||
}
|
||||
|
||||
function surveyList_myknjiznica_new (anketa) {
|
||||
$.post('ajax.php?t=surveyList&a=surveyList_myknjiznica_new', {anketa: anketa}, function() {
|
||||
window.location.reload(true);
|
||||
});
|
||||
}
|
||||
function surveyList_knjiznica_new (anketa) {
|
||||
$.post('ajax.php?t=surveyList&a=surveyList_knjiznica_new', {anketa: anketa}, function() {
|
||||
window.location.reload(true);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Prikaz vec na tri pikice v tabeli anket
|
||||
function surveyList_show_more(ank_id){
|
||||
|
||||
if($('#survey_other_box_'+ank_id).hasClass('displayNone')){
|
||||
$('.survey_other_box').addClass('displayNone');
|
||||
$('#survey_other_box_'+ank_id).removeClass('displayNone');
|
||||
}
|
||||
else{
|
||||
$('.survey_other_box').addClass('displayNone');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -27,13 +27,6 @@ function themes_init() {
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
/*$("#div_theme_group span.theme_links_rename").live('click', function(event) {
|
||||
var theme = $(this).attr('theme');
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#fullscreen').html('').fadeIn('slow');
|
||||
$("#fullscreen").load('ajax.php?t=theme&a=theme_rename', {anketa:srv_meta_anketa_id, theme:theme});
|
||||
});*/
|
||||
|
||||
$("#theme_rename_confirm").live('click', function(event) {
|
||||
var theme_new_name = $("#theme_new_name").val();
|
||||
@ -219,4 +212,58 @@ function changeTheme (gid, css) {
|
||||
$('#div_theme_group_holder').append('<div id="success_save">'+lang['srv_success_save']+'</div>');
|
||||
actionNotePopup('success_save', 'success');
|
||||
}, 'json');
|
||||
}
|
||||
|
||||
|
||||
function teme_options(){
|
||||
|
||||
var toggle_id = document.getElementById("buttons-window1");
|
||||
|
||||
document.onclick = function(e){
|
||||
if(e.target.id !== 'buttons-window1' && e.target.id !== 'btn-1' ){
|
||||
toggle_id.classList.addClass('displayNone');
|
||||
}
|
||||
}
|
||||
toggle_id.classList.toggle('displayNone');
|
||||
}
|
||||
|
||||
function teme_options2(){
|
||||
var toggle_id = document.getElementById("buttons-window2");
|
||||
|
||||
document.onclick = function(e){
|
||||
if(e.target.id !== 'buttons-window2' && e.target.id !== 'btn-2' ){
|
||||
toggle_id.classList.addClass('displayNone');
|
||||
}
|
||||
}
|
||||
toggle_id.classList.toggle('displayNone');
|
||||
}
|
||||
|
||||
function show_settings(id_of_element){
|
||||
|
||||
if($('#additional_settings_'+id_of_element).hasClass('displayNone')){
|
||||
$('.buttons-window').addClass('displayNone');
|
||||
$('#additional_settings_'+id_of_element).removeClass('displayNone');
|
||||
}
|
||||
else{
|
||||
$('.buttons-window').addClass('displayNone');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function show_settings_mobile(id_of_element){
|
||||
|
||||
// var options = document.getElementsByClassName("options_mobile"+id_of_element)[0];
|
||||
var options = document.getElementById("options_mobile"+id_of_element);
|
||||
var additional_settings = document.getElementById("additional_settings_mobile_"+id_of_element);
|
||||
|
||||
additional_settings.classList.toggle("active");
|
||||
|
||||
|
||||
if($('#additional_settings_mobile_'+id_of_element).hasClass('displayNone')){
|
||||
$('.buttons-window').addClass('displayNone');
|
||||
$('#additional_settings_mobile_'+id_of_element).removeClass('displayNone');
|
||||
}
|
||||
else{
|
||||
$('.buttons-window').addClass('displayNone');
|
||||
}
|
||||
}
|
||||
@ -11,7 +11,7 @@ function onload_init_vprasanje() {
|
||||
});
|
||||
}
|
||||
// prikaze fullscreen urejanje vprasanja
|
||||
function vprasanje_fullscreen (spremenljivka, cache, chart_edit, no_close) {
|
||||
function vprasanje_fullscreen (spremenljivka, cache, chart_edit, no_close, focus_last) {
|
||||
if (locked) return;
|
||||
|
||||
//za ureditev custom opisnih label pri drsniku
|
||||
@ -55,7 +55,7 @@ function vprasanje_fullscreen (spremenljivka, cache, chart_edit, no_close) {
|
||||
|
||||
// odpremo okno za dodajanje nove kategorije
|
||||
var last = $('#branching_'+spremenljivka+' .variabla:last-child div.vrednost_inline');
|
||||
inline_nova_vrednost(last);
|
||||
inline_nova_vrednost(last, focus_last);
|
||||
|
||||
//Preklop na tab za urejanje label grafov
|
||||
if(chart_edit == 1){ vprasanje_tab(spremenljivka, 4); }
|
||||
@ -598,6 +598,8 @@ function change_subtype_number (spremenljivka) {
|
||||
}
|
||||
function change_tip(spremenljivka, tip, confirmed) {
|
||||
|
||||
var old_tip = $('li#branching_'+spremenljivka).attr('tip');
|
||||
|
||||
$.post('ajax.php?t=vprasanje&a=change_tip', {spremenljivka: spremenljivka, tip: tip, confirmed: confirmed, anketa: srv_meta_anketa_id},
|
||||
function (data) {
|
||||
|
||||
@ -612,6 +614,9 @@ function change_tip(spremenljivka, tip, confirmed) {
|
||||
}
|
||||
}
|
||||
catch(e){}
|
||||
|
||||
$('li#branching_'+spremenljivka).attr('tip', tip);
|
||||
$('li#branching_'+spremenljivka).removeClass('spr_tip_'+old_tip).addClass('spr_tip_'+tip);
|
||||
|
||||
vprasanje_fullscreen(spremenljivka, data, false, true);
|
||||
vprasanje_save(true);
|
||||
@ -759,6 +764,43 @@ function comment_on_comment (id, user, date, spr_id) {
|
||||
'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'+
|
||||
'</div>'
|
||||
);
|
||||
$(".options_dropdown").addClass("displayNone");
|
||||
|
||||
var toggle = '#comment_toggle_' + spr_id + '_4';
|
||||
|
||||
$(toggle).toggle();
|
||||
}
|
||||
|
||||
function comment_delete (id) {
|
||||
$.post("ajax.php?a=comment_delete", {id: id, anketa: srv_meta_anketa_id}, function(){
|
||||
|
||||
$(".options_dropdown").addClass("displayNone");
|
||||
$("#comment_box_"+id).remove();
|
||||
});
|
||||
}
|
||||
|
||||
function respondent_comment_delete (id) {
|
||||
$.post("ajax.php?a=respondent_comment_delete", {id: id, anketa: srv_meta_anketa_id}, function(){
|
||||
|
||||
$(".options_dropdown").addClass("displayNone");
|
||||
$("#comment_box_"+id).remove();
|
||||
});
|
||||
}
|
||||
|
||||
function survey_respondent_comment_delete (id) {
|
||||
$.post("ajax.php?a=survey_respondent_comment_delete", {id: id, anketa: srv_meta_anketa_id}, function(){
|
||||
|
||||
$(".options_dropdown").addClass("displayNone");
|
||||
$("#comment_box_"+id).remove();
|
||||
});
|
||||
}
|
||||
|
||||
function survey_comment_delete (id) {
|
||||
$.post("ajax.php?a=survey_comment_delete", {id: id, anketa: srv_meta_anketa_id}, function(){
|
||||
|
||||
$(".options_dropdown").addClass("displayNone");
|
||||
$("#comment_box_"+id).remove();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -1664,3 +1706,11 @@ function fieldsetToggle(element){
|
||||
|
||||
}
|
||||
|
||||
// Gumb dodaj kategorijo - doda okno za novo kategorijo in ga fokusira
|
||||
function add_question_category(spremenljivka){
|
||||
|
||||
var last = $('#branching_'+spremenljivka+' .variabla:last-child div.vrednost_inline');
|
||||
|
||||
inline_nova_vrednost(last, true);
|
||||
}
|
||||
|
||||
|
||||
86
admin/survey/script/vprasanjeDeleted.js
Normal file
86
admin/survey/script/vprasanjeDeleted.js
Normal file
@ -0,0 +1,86 @@
|
||||
// Odpremo knjiznico v urejanju ankete
|
||||
function displayVprasanjeDeletedPopup(){
|
||||
|
||||
$('#fade').fadeTo('slow', 1);
|
||||
$('#general_popup').html('').addClass('vprasanje_deleted_popup').fadeIn('slow');
|
||||
|
||||
$("#general_popup").load('ajax.php?t=vprasanjeDeleted&a=displayVprasanjeDeletedPopup', {anketa: srv_meta_anketa_id});
|
||||
}
|
||||
|
||||
|
||||
// Klik na posamezen item na desni
|
||||
function selectVprasanjeDeletedItem(item_id){
|
||||
|
||||
if($('#question_item_holder_'+item_id).hasClass('active')){
|
||||
$('#question_item_holder_'+item_id).removeClass('active');
|
||||
$('#question_item_check_'+item_id).attr("checked", false);
|
||||
}
|
||||
else{
|
||||
$('#question_item_holder_'+item_id).addClass('active');
|
||||
$('#question_item_check_'+item_id).attr("checked", true);
|
||||
}
|
||||
|
||||
// Prestejemo oznacene iteme
|
||||
var count = $('.question_item_check:checkbox:checked').length;
|
||||
$('#selected_item_counter').html(count);
|
||||
|
||||
// Nastavimo gumb dodaj kot disabled glede na to ce imamo elemente ali ne
|
||||
if(count > 0){
|
||||
$("#insert_vprasanje_deleted_button").prop('disabled', false);
|
||||
}
|
||||
else{
|
||||
$("#insert_vprasanje_deleted_button").prop('disabled', true);
|
||||
}
|
||||
}
|
||||
|
||||
function deleteVprasanjeDeleted(item_id, item_type){
|
||||
|
||||
$.post('ajax.php?t=vprasanjeDeleted&a=deleteItem', {anketa: srv_meta_anketa_id, item_id: item_id, item_type: item_type}, function(){
|
||||
$('#question_item_holder_'+item_id).remove();
|
||||
});
|
||||
|
||||
event.stopPropagation();
|
||||
}
|
||||
|
||||
// Restavriramo pobrisano vprasanje nazaj v anketo na konec
|
||||
function insertVprasanjeDeletedItemsIntoSurvey(){
|
||||
|
||||
var items = [];
|
||||
|
||||
var prev = false;
|
||||
var note = '1';
|
||||
|
||||
$('.question_item_check:checkbox:checked').each(function(){
|
||||
var id_string = $(this).attr("id");
|
||||
var id = id_string.substring(20);
|
||||
|
||||
items.push(id);
|
||||
|
||||
// Preverimo za obvestilo, ce dodajamo vec elementov in ce so razlicni
|
||||
if(prev){
|
||||
note = '1m';
|
||||
}
|
||||
|
||||
prev = true;
|
||||
});
|
||||
|
||||
$("#branching").load('ajax.php?t=vprasanjeDeleted&a=addIntoSurvey', {anketa: srv_meta_anketa_id, items: items}, function(){
|
||||
|
||||
popupClose();
|
||||
actionNotePopup('lib_add_to_survey_'+note, 'success');
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Predogled pobrisanega vprasanjaoz. vprasanja iz knjiznice
|
||||
function previewVprasanje(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 closePreviewVprasanje(){
|
||||
$('#vprasanje_preview').addClass('displayNone').empty();
|
||||
}
|
||||
@ -640,7 +640,7 @@ function inline_vrednost_delete(spremenljivka, vrednost, confirmed/*, tip, other
|
||||
}
|
||||
|
||||
// narise polje za dodajanje vrednosti
|
||||
function inline_nova_vrednost (_this) {
|
||||
function inline_nova_vrednost (_this, focus) {
|
||||
|
||||
// ce je anketa zaklenjena
|
||||
if ($(_this).attr('contenteditable') != 'true') return;
|
||||
@ -874,8 +874,12 @@ function inline_nova_vrednost (_this) {
|
||||
}
|
||||
|
||||
$(_this).closest('.variabla').parent().append(new_div);
|
||||
|
||||
// Po potrebi izvedemo focus na novi variabli
|
||||
if(focus === true)
|
||||
$('#branching_'+spremenljivka).find('#vre_id_new').focus();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// skrije (odstrani) polje za dodajanje vrednosti
|
||||
@ -948,7 +952,7 @@ function inline_load_editor (_this) {
|
||||
var def_pogoj = 'default="'+def_text+'"';
|
||||
|
||||
el.replaceWith('<textarea name="naslov_'+spr_id+'" id="naslov_'+spr_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+
|
||||
'<div class="button_holder top8 bottom0"><button class="small blue" onclick="inline_save_editor(\''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
|
||||
'<div class="button_holder editor_button_holder"><button class="small blue" onclick="inline_save_editor(\''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
|
||||
|
||||
editor_display(spr_id);
|
||||
}
|
||||
@ -967,7 +971,7 @@ function inline_load_editor_hotspot (_this, vre_id) {
|
||||
var def_pogoj = 'default="'+def_text+'"';
|
||||
|
||||
el.replaceWith('<textarea name="hotspot_image_'+vre_id+'" id="hotspot_image_'+vre_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+
|
||||
'<div class="button_holder top8 bottom0"><button class="medium blue" onclick="inline_save_editor_hotspot(\''+vre_id+'\', \''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
|
||||
'<div class="button_holder editor_button_holder"><button class="medium blue" onclick="inline_save_editor_hotspot(\''+vre_id+'\', \''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
|
||||
|
||||
editor_display_hotspot(vre_id);
|
||||
}
|
||||
|
||||
91
composer.lock
generated
91
composer.lock
generated
@ -8,16 +8,16 @@
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/ca-bundle",
|
||||
"version": "1.3.2",
|
||||
"version": "1.3.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/ca-bundle.git",
|
||||
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
|
||||
"reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
|
||||
"reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
|
||||
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c",
|
||||
"reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -64,7 +64,7 @@
|
||||
"support": {
|
||||
"irc": "irc://irc.freenode.org/composer",
|
||||
"issues": "https://github.com/composer/ca-bundle/issues",
|
||||
"source": "https://github.com/composer/ca-bundle/tree/1.3.2"
|
||||
"source": "https://github.com/composer/ca-bundle/tree/1.3.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -80,7 +80,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-05-24T11:56:16+00:00"
|
||||
"time": "2022-07-20T07:14:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fgrosse/phpasn1",
|
||||
@ -159,16 +159,16 @@
|
||||
},
|
||||
{
|
||||
"name": "geoip2/geoip2",
|
||||
"version": "v2.12.2",
|
||||
"version": "v2.13.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/maxmind/GeoIP2-php.git",
|
||||
"reference": "83adb44ac4b9553d36b579a14673ed124583082f"
|
||||
"url": "git@github.com:maxmind/GeoIP2-php.git",
|
||||
"reference": "6a41d8fbd6b90052bc34dff3b4252d0f88067b23"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/83adb44ac4b9553d36b579a14673ed124583082f",
|
||||
"reference": "83adb44ac4b9553d36b579a14673ed124583082f",
|
||||
"url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/6a41d8fbd6b90052bc34dff3b4252d0f88067b23",
|
||||
"reference": "6a41d8fbd6b90052bc34dff3b4252d0f88067b23",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -209,11 +209,7 @@
|
||||
"geolocation",
|
||||
"maxmind"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/maxmind/GeoIP2-php/issues",
|
||||
"source": "https://github.com/maxmind/GeoIP2-php/tree/v2.12.2"
|
||||
},
|
||||
"time": "2021-11-30T18:15:25+00:00"
|
||||
"time": "2022-08-05T20:32:58+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
@ -332,16 +328,16 @@
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
"version": "1.5.1",
|
||||
"version": "1.5.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/promises.git",
|
||||
"reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
|
||||
"reference": "b94b2807d85443f9719887892882d0329d1e2598"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
|
||||
"reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
|
||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
|
||||
"reference": "b94b2807d85443f9719887892882d0329d1e2598",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -396,7 +392,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/guzzle/promises/issues",
|
||||
"source": "https://github.com/guzzle/promises/tree/1.5.1"
|
||||
"source": "https://github.com/guzzle/promises/tree/1.5.2"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -412,7 +408,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-10-22T20:56:57+00:00"
|
||||
"time": "2022-08-28T14:55:35+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/psr7",
|
||||
@ -752,16 +748,16 @@
|
||||
},
|
||||
{
|
||||
"name": "paragonie/sodium_compat",
|
||||
"version": "v1.17.1",
|
||||
"version": "v1.18.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/paragonie/sodium_compat.git",
|
||||
"reference": "ac994053faac18d386328c91c7900f930acadf1e"
|
||||
"reference": "906e0b925895d3a5941eda25f371fbafb3cbc22f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
|
||||
"reference": "ac994053faac18d386328c91c7900f930acadf1e",
|
||||
"url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/906e0b925895d3a5941eda25f371fbafb3cbc22f",
|
||||
"reference": "906e0b925895d3a5941eda25f371fbafb3cbc22f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -832,9 +828,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/paragonie/sodium_compat/issues",
|
||||
"source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
|
||||
"source": "https://github.com/paragonie/sodium_compat/tree/v1.18.0"
|
||||
},
|
||||
"time": "2022-03-23T19:32:04+00:00"
|
||||
"time": "2022-09-13T20:54:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "paypal/paypal-checkout-sdk",
|
||||
@ -886,6 +882,7 @@
|
||||
"support": {
|
||||
"source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.2"
|
||||
},
|
||||
"abandoned": true,
|
||||
"time": "2021-09-21T20:57:38+00:00"
|
||||
},
|
||||
{
|
||||
@ -933,16 +930,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpmailer/phpmailer",
|
||||
"version": "v6.6.3",
|
||||
"version": "v6.6.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/PHPMailer/PHPMailer.git",
|
||||
"reference": "9400f305a898f194caff5521f64e5dfa926626f3"
|
||||
"reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3",
|
||||
"reference": "9400f305a898f194caff5521f64e5dfa926626f3",
|
||||
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a94fdebaea6bd17f51be0c2373ab80d3d681269b",
|
||||
"reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -999,7 +996,7 @@
|
||||
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
|
||||
"support": {
|
||||
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
|
||||
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3"
|
||||
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1007,7 +1004,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2022-06-20T09:21:02+00:00"
|
||||
"time": "2022-08-22T09:22:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/http-message",
|
||||
@ -2405,16 +2402,16 @@
|
||||
},
|
||||
{
|
||||
"name": "maximebf/debugbar",
|
||||
"version": "v1.18.0",
|
||||
"version": "v1.18.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/maximebf/php-debugbar.git",
|
||||
"reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"
|
||||
"reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6",
|
||||
"reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6",
|
||||
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/ba0af68dd4316834701ecb30a00ce9604ced3ee9",
|
||||
"reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2434,7 +2431,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.17-dev"
|
||||
"dev-master": "1.18-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -2465,9 +2462,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/maximebf/php-debugbar/issues",
|
||||
"source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0"
|
||||
"source": "https://github.com/maximebf/php-debugbar/tree/v1.18.1"
|
||||
},
|
||||
"time": "2021-12-27T18:49:48+00:00"
|
||||
"time": "2022-03-31T14:55:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
@ -2687,16 +2684,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/var-dumper",
|
||||
"version": "v4.4.42",
|
||||
"version": "v4.4.44",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/var-dumper.git",
|
||||
"reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca"
|
||||
"reference": "f19951007dae942cc79b979c1fe26bfdfbeb54ed"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/742aab50ad097bcb62d91fccb613f66b8047d2ca",
|
||||
"reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/f19951007dae942cc79b979c1fe26bfdfbeb54ed",
|
||||
"reference": "f19951007dae942cc79b979c1fe26bfdfbeb54ed",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2756,7 +2753,7 @@
|
||||
"dump"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/var-dumper/tree/v4.4.42"
|
||||
"source": "https://github.com/symfony/var-dumper/tree/v4.4.44"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -2772,7 +2769,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-05-21T10:00:54+00:00"
|
||||
"time": "2022-07-20T09:59:04+00:00"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
|
||||
@ -13,12 +13,32 @@ var site_url = $('#srv_site_url').val();
|
||||
var lang_code = 'sl';
|
||||
|
||||
CKEDITOR.editorConfig = function (config) {
|
||||
//config.language = 'sl';
|
||||
config.skin = 'moonocolor';
|
||||
|
||||
//config.skin = 'moonocolor';
|
||||
config.skin = 'moono-lisa';
|
||||
config.uiColor = '#FFFFFF';
|
||||
|
||||
config.removePlugins = 'elementspath, resize';
|
||||
|
||||
lang_code = config.language;
|
||||
|
||||
|
||||
config.toolbar = [
|
||||
{name: 'source', items: ['Source']},
|
||||
{name: 'clipboard', items: ['Undo', 'Redo', 'PasteText']},
|
||||
{name: 'font-type', items: ['Font']},
|
||||
{name: 'font-size', items: ['FontSize']},
|
||||
{name: 'basicstyles', items: ['Bold', 'Italic', 'Underline']},
|
||||
{name: 'colors', items: ['TextColor', 'BGColor']},
|
||||
{name: 'align', items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']},
|
||||
{name: 'list', items: ['NumberedList', 'BulletedList']},
|
||||
{name: 'links', items: ['Link', 'Unlink', 'Image', 'SpecialChar']},
|
||||
{name: 'other', items: ['HorizontalRule', 'Abbr']},
|
||||
{name: 'more', items: ['More']},
|
||||
{name: 'less', items: ['Less']},
|
||||
];
|
||||
|
||||
/*config.toolbar = [
|
||||
{name: 'document', items: ['Source', '-']},
|
||||
{name: 'clipboard', items: ['PasteText','RemoveFormat', 'Undo', 'Redo', 'Scayt']},
|
||||
{name: 'basicstyles', items: ['Bold', 'Underline', 'Italic', 'Strike', '-']},
|
||||
@ -27,7 +47,7 @@ CKEDITOR.editorConfig = function (config) {
|
||||
{name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock','-']},
|
||||
{name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']},
|
||||
{name: 'vec', items:['-', 'Styles', 'Format', 'FontSize', 'Font', 'Outdent', 'Indent', 'HorizontalRule']}
|
||||
];
|
||||
];*/
|
||||
|
||||
config.toolbar_Full = [
|
||||
{name: 'document', items: ['Source', '-']},
|
||||
|
||||
BIN
editors/ckeditor_4_4/skins/moono-lisa/dev/icons16.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/dev/icons16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
175
editors/ckeditor_4_4/skins/moono-lisa/dev/icons16.svg
Normal file
175
editors/ckeditor_4_4/skins/moono-lisa/dev/icons16.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 143 KiB |
BIN
editors/ckeditor_4_4/skins/moono-lisa/dev/icons32.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/dev/icons32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 51 KiB |
167
editors/ckeditor_4_4/skins/moono-lisa/dev/icons32.svg
Normal file
167
editors/ckeditor_4_4/skins/moono-lisa/dev/icons32.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 142 KiB |
144
editors/ckeditor_4_4/skins/moono-lisa/dev/locations.json
Normal file
144
editors/ckeditor_4_4/skins/moono-lisa/dev/locations.json
Normal file
@ -0,0 +1,144 @@
|
||||
{
|
||||
"0": [
|
||||
[
|
||||
"plugins/sourcearea/icons/source.png",
|
||||
"plugins/sourcedialog/icons/sourcedialog.png"
|
||||
],
|
||||
[
|
||||
"plugins/sourcearea/icons/source-rtl.png",
|
||||
"plugins/sourcedialog/icons/sourcedialog-rtl.png"
|
||||
],
|
||||
"plugins/save/icons/save.png",
|
||||
"plugins/newpage/icons/newpage.png",
|
||||
"plugins/newpage/icons/newpage-rtl.png",
|
||||
"plugins/preview/icons/preview.png",
|
||||
"plugins/preview/icons/preview-rtl.png",
|
||||
"plugins/print/icons/print.png",
|
||||
[
|
||||
"plugins/templates/icons/templates.png",
|
||||
"plugins/templates/icons/templates-rtl.png"
|
||||
],
|
||||
"plugins/docprops/icons/docprops.png",
|
||||
"plugins/docprops/icons/docprops-rtl.png"
|
||||
],
|
||||
"1": [
|
||||
[
|
||||
"plugins/clipboard/icons/cut-rtl.png",
|
||||
"plugins/clipboard/icons/cut.png"
|
||||
],
|
||||
[
|
||||
"plugins/clipboard/icons/copy.png",
|
||||
"plugins/clipboard/icons/copy-rtl.png"
|
||||
],
|
||||
[
|
||||
"plugins/clipboard/icons/paste.png",
|
||||
"plugins/clipboard/icons/paste-rtl.png"
|
||||
],
|
||||
"plugins/pastetext/icons/pastetext.png",
|
||||
"plugins/pastetext/icons/pastetext-rtl.png",
|
||||
"plugins/pastefromword/icons/pastefromword.png",
|
||||
"plugins/pastefromword/icons/pastefromword-rtl.png",
|
||||
"plugins/undo/icons/undo.png",
|
||||
"plugins/undo/icons/undo-rtl.png",
|
||||
"plugins/undo/icons/redo.png",
|
||||
"plugins/undo/icons/redo-rtl.png"
|
||||
],
|
||||
"2": [
|
||||
[
|
||||
"plugins/find/icons/find-rtl.png",
|
||||
"plugins/find/icons/find.png"
|
||||
],
|
||||
"plugins/find/icons/replace.png",
|
||||
"plugins/selectall/icons/selectall.png",
|
||||
[
|
||||
"plugins/wsc/icons/spellchecker.png",
|
||||
"plugins/scayt/icons/scayt.png"
|
||||
]
|
||||
],
|
||||
"3": [
|
||||
"plugins/forms/icons/form.png",
|
||||
"plugins/forms/icons/checkbox.png",
|
||||
"plugins/forms/icons/radio.png",
|
||||
[
|
||||
"plugins/forms/icons/textfield-rtl.png",
|
||||
"plugins/forms/icons/textfield.png"
|
||||
],
|
||||
"plugins/forms/icons/textarea.png",
|
||||
"plugins/forms/icons/textarea-rtl.png",
|
||||
"plugins/forms/icons/select.png",
|
||||
"plugins/forms/icons/select-rtl.png",
|
||||
"plugins/forms/icons/button.png",
|
||||
"plugins/forms/icons/imagebutton.png",
|
||||
"plugins/forms/icons/hiddenfield.png"
|
||||
],
|
||||
"4": [
|
||||
"plugins/basicstyles/icons/bold.png",
|
||||
"plugins/basicstyles/icons/italic.png",
|
||||
"plugins/basicstyles/icons/underline.png",
|
||||
"plugins/basicstyles/icons/strike.png",
|
||||
"plugins/basicstyles/icons/superscript.png",
|
||||
"plugins/basicstyles/icons/subscript.png",
|
||||
"plugins/removeformat/icons/removeformat.png"
|
||||
],
|
||||
"5": [
|
||||
"plugins/list/icons/numberedlist.png",
|
||||
"plugins/list/icons/numberedlist-rtl.png",
|
||||
"plugins/list/icons/bulletedlist.png",
|
||||
"plugins/list/icons/bulletedlist-rtl.png",
|
||||
"plugins/indent/icons/outdent.png",
|
||||
"plugins/indent/icons/indent.png",
|
||||
"plugins/indent/icons/indent-rtl.png",
|
||||
"plugins/indent/icons/outdent-rtl.png",
|
||||
"plugins/blockquote/icons/blockquote.png",
|
||||
"plugins/div/icons/creatediv.png",
|
||||
"plugins/justify/icons/justifyleft.png",
|
||||
"plugins/justify/icons/justifycenter.png",
|
||||
"plugins/justify/icons/justifyright.png",
|
||||
"plugins/justify/icons/justifyblock.png",
|
||||
"plugins/bidi/icons/bidiltr.png",
|
||||
"plugins/bidi/icons/bidirtl.png"
|
||||
],
|
||||
"6": [
|
||||
"plugins/link/icons/link.png",
|
||||
"plugins/link/icons/unlink.png",
|
||||
"plugins/link/icons/anchor.png",
|
||||
"plugins/link/icons/anchor-rtl.png",
|
||||
"plugins/copyformatting/icons/copyformatting.png"
|
||||
],
|
||||
"7": [
|
||||
[
|
||||
"plugins/image/icons/image.png",
|
||||
"plugins/image2/icons/image.png"
|
||||
],
|
||||
"plugins/table/icons/table.png",
|
||||
"plugins/horizontalrule/icons/horizontalrule.png",
|
||||
"plugins/smiley/icons/smiley.png",
|
||||
"plugins/specialchar/icons/specialchar.png",
|
||||
"plugins/pagebreak/icons/pagebreak.png",
|
||||
"plugins/pagebreak/icons/pagebreak-rtl.png",
|
||||
"plugins/iframe/icons/iframe.png"
|
||||
],
|
||||
"8": [
|
||||
"plugins/colorbutton/icons/textcolor.png",
|
||||
"plugins/colorbutton/icons/bgcolor.png"
|
||||
],
|
||||
"9": [
|
||||
"plugins/maximize/icons/maximize.png",
|
||||
"plugins/showblocks/icons/showblocks.png",
|
||||
"plugins/showblocks/icons/showblocks-rtl.png"
|
||||
],
|
||||
"10": [
|
||||
"plugins/about/icons/about.png",
|
||||
"plugins/uicolor/icons/uicolor.png",
|
||||
"plugins/placeholder/icons/placeholder.png",
|
||||
"plugins/language/icons/language.png",
|
||||
"plugins/codesnippet/icons/codesnippet.png"
|
||||
],
|
||||
"11": [
|
||||
"plugins/link/images/anchor.png",
|
||||
"skins/moono-lisa/images/close.png",
|
||||
"skins/moono-lisa/images/lock.png",
|
||||
"skins/moono-lisa/images/lock-open.png",
|
||||
"skins/moono-lisa/images/refresh.png"
|
||||
]
|
||||
}
|
||||
5
editors/ckeditor_4_4/skins/moono-lisa/dialog.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/dialog.css
Normal file
File diff suppressed because one or more lines are too long
5
editors/ckeditor_4_4/skins/moono-lisa/dialog_ie.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/dialog_ie.css
Normal file
File diff suppressed because one or more lines are too long
5
editors/ckeditor_4_4/skins/moono-lisa/dialog_ie8.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/dialog_ie8.css
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
5
editors/ckeditor_4_4/skins/moono-lisa/editor.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/editor.css
Normal file
File diff suppressed because one or more lines are too long
5
editors/ckeditor_4_4/skins/moono-lisa/editor_gecko.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/editor_gecko.css
Normal file
File diff suppressed because one or more lines are too long
5
editors/ckeditor_4_4/skins/moono-lisa/editor_ie.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/editor_ie.css
Normal file
File diff suppressed because one or more lines are too long
5
editors/ckeditor_4_4/skins/moono-lisa/editor_ie8.css
Normal file
5
editors/ckeditor_4_4/skins/moono-lisa/editor_ie8.css
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/arrow.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/arrow.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 191 B |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/close.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/close.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 615 B |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/close.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/close.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/lock-open.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/lock-open.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/lock.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/lock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/refresh.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/hidpi/refresh.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/lock-open.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/lock-open.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 511 B |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/lock.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/lock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 506 B |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/refresh.png
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/refresh.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 757 B |
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/spinner.gif
Normal file
BIN
editors/ckeditor_4_4/skins/moono-lisa/images/spinner.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
46
editors/ckeditor_4_4/skins/moono-lisa/readme.md
Normal file
46
editors/ckeditor_4_4/skins/moono-lisa/readme.md
Normal file
@ -0,0 +1,46 @@
|
||||
"Moono-lisa" Skin
|
||||
=================
|
||||
|
||||
This skin has been made a **default skin** starting from CKEditor 4.6.0 and is maintained by the core developers.
|
||||
|
||||
For more information about skins, please check the [CKEditor Skin SDK](https://ckeditor.com/docs/ckeditor4/latest/guide/skin_sdk_intro.html)
|
||||
documentation.
|
||||
|
||||
Features
|
||||
-------------------
|
||||
"Moono-lisa" is a monochromatic skin, which offers a modern, flat and minimalistic look which blends very well in modern design.
|
||||
It comes with the following features:
|
||||
|
||||
- Chameleon feature with brightness.
|
||||
- High-contrast compatibility.
|
||||
- Graphics source provided in SVG.
|
||||
|
||||
Directory Structure
|
||||
-------------------
|
||||
|
||||
CSS parts:
|
||||
- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
|
||||
- **mainui.css**: the file contains styles of entire editor outline structures,
|
||||
- **toolbar.css**: the file contains styles of the editor toolbar space (top),
|
||||
- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
|
||||
- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
|
||||
until the first panel open up,
|
||||
- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
|
||||
- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
|
||||
it's not loaded until the first menu open up,
|
||||
- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
|
||||
- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
|
||||
- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
|
||||
- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
|
||||
|
||||
Other parts:
|
||||
- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
|
||||
- **images/**: contains a fill general used images,
|
||||
- **dev/**: contains SVG and PNG source of the skin icons.
|
||||
|
||||
License
|
||||
-------
|
||||
|
||||
Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
||||
|
||||
For licensing, see LICENSE.md or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license)
|
||||
7
editors/ckeditor_4_4/skins/moono-lisa/skin.js
Normal file
7
editors/ckeditor_4_4/skins/moono-lisa/skin.js
Normal file
@ -0,0 +1,7 @@
|
||||
/*
|
||||
Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
||||
For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
||||
*/
|
||||
CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
|
||||
CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,d){for(var a=b.match(/[^#]./g),e=0;3>e;e++){var f=e,c;c=parseInt(a[e],16);c=("0"+(0>d?0|c*(1+d):0|c+(255-c)*d).toString(16)).slice(-2);a[f]=c}return"#"+a.join("")}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
|
||||
return function(g,d){var a=b(g.uiColor,.4),a={id:"."+g.id,defaultBorder:b(a,-.2),toolbarElementsBorder:b(a,-.25),defaultBackground:a,lightBackground:b(a,.8),darkBackground:b(a,-.15),ckeButtonOn:b(a,.4),ckeResizer:b(a,-.4),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTab:b(a,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),menubuttonHover:b(a,.1),menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[d].output(a).replace(/\[/g,"{").replace(/\]/g,"}")}}();
|
||||
@ -116,8 +116,8 @@ if (!isset ($_POST['posted']) && (isset ($_GET['image']) && $_GET['image'] == 1)
|
||||
$UF_obj->NewName = $_FILES['eitorSlika']['name'];
|
||||
|
||||
//Širina in višina slike nastavimo
|
||||
$UF_obj->NewWidth = 600;
|
||||
$UF_obj->NewHeight = 600;
|
||||
$UF_obj->NewWidth = 1920;
|
||||
$UF_obj->NewHeight = 1920;
|
||||
|
||||
$ime = $UF_obj->NameCase = 'lower';
|
||||
$UF_obj->OverWrite = false;
|
||||
|
||||
@ -17,8 +17,12 @@ class ApiLogin
|
||||
|
||||
var $pass;
|
||||
|
||||
var $method;
|
||||
|
||||
var $prijava = '';
|
||||
|
||||
var $data;
|
||||
|
||||
var $EncPass;
|
||||
|
||||
var $page_urls = []; // Url-ji za podstrani - to se bo verjetno nastavljalo v settings.php
|
||||
@ -252,8 +256,7 @@ class ApiLogin
|
||||
if ($cookie_pass != $r[0]) {
|
||||
// najprej poradiraij cookije!
|
||||
setcookie('uid', "", time() - 3600, $cookie_domain);
|
||||
setcookie('secret', "", time() - 3600,
|
||||
$cookie_domain);
|
||||
setcookie('secret', "", time() - 3600, $cookie_domain);
|
||||
|
||||
if (substr_count($cookie_domain, ".") > 1) {
|
||||
$nd = substr($cookie_domain,
|
||||
@ -284,14 +287,13 @@ class ApiLogin
|
||||
|
||||
// Preveri ce je user ze logiran v 1ko in nastavi globalne spremenljivke in cookie (kopirano iz function.php)
|
||||
|
||||
public function executeAction($params, $data)
|
||||
public function executeAction($params, $data, $method)
|
||||
{
|
||||
global $site_url;
|
||||
global $global_user_id;
|
||||
global $lang;
|
||||
global $cookie_domain;
|
||||
|
||||
|
||||
// Nastavimo prejete podatke
|
||||
if (isset($data['ime'])) {
|
||||
$this->ime = $data['ime'];
|
||||
@ -305,6 +307,12 @@ class ApiLogin
|
||||
if (isset($data['pass'])) {
|
||||
$this->pass = $data['pass'];
|
||||
}
|
||||
if (isset($data['method'])){
|
||||
$this->method = $data['method'];
|
||||
}
|
||||
if (isset($data)){
|
||||
$this->data = $data;
|
||||
}
|
||||
|
||||
if (!isset($params['action'])) {
|
||||
$response = 'Napaka! Manjkajo parametri!';
|
||||
@ -416,6 +424,9 @@ class ApiLogin
|
||||
global $originating_domain;
|
||||
global $keep_domain;
|
||||
|
||||
$piskotek = [];
|
||||
$error = [];
|
||||
|
||||
|
||||
// Ce imamo vklopljeno blokiranje dostopa do admina glede na ip
|
||||
$admin_allow_only_ip = AppSettings::getInstance()->getSetting('app_limits-admin_allow_only_ip');
|
||||
@ -425,8 +436,16 @@ class ApiLogin
|
||||
|
||||
// Preverimo ip - ce se ne ujema ne pustimo logina
|
||||
if(!in_array($ip, $admin_allow_only_ip)){
|
||||
header('location: '.$this->page_urls['page_login'.$this->prijava]);
|
||||
die();
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
return $this->ajaxResponse('error', 'Napaka pri prijavi.');
|
||||
|
||||
}else {
|
||||
|
||||
header('location: '.$this->page_urls['page_login'.$this->prijava]);
|
||||
die();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -446,6 +465,7 @@ class ApiLogin
|
||||
$LifeTime = $LifeTime;
|
||||
}
|
||||
|
||||
|
||||
// Preverimo ce obstaja uporabnik s tem emailom
|
||||
$user_id = User::findByEmail($this->email);
|
||||
if (!empty($user_id)) {
|
||||
@ -454,8 +474,17 @@ class ApiLogin
|
||||
|
||||
// BAN
|
||||
if ($r['status'] == 0) {
|
||||
header('Location: '.$this->page_urls['page_user_ban'.$this->prijava].'&error=user_ban&email='.$this->email);
|
||||
die();
|
||||
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
return $this->ajaxResponse('error', $lang['cms_error_user_ban']);
|
||||
|
||||
}else {
|
||||
|
||||
header('Location: '.$this->page_urls['page_user_ban'.$this->prijava].'&error=user_ban&email='.$this->email);
|
||||
die();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
$user_lang = 1;
|
||||
@ -463,6 +492,7 @@ class ApiLogin
|
||||
$user_lang = 2;
|
||||
}
|
||||
|
||||
|
||||
// Preverimo ce je password ok
|
||||
if (base64_encode((hash('SHA256', $this->pass.$pass_salt))) == $r['pass'] || $this->EncPass == $r['pass']) {
|
||||
|
||||
@ -481,41 +511,131 @@ class ApiLogin
|
||||
|
||||
|
||||
// Ustvarimo login cookie
|
||||
setcookie("uid", base64_encode($r['email']), time() + $LifeTime, '/', $cookie_domain);
|
||||
if($this->method == 'AJAX') {
|
||||
$piskotek['uid'] = [
|
||||
'ime' => 'uid',
|
||||
'vrednost' => base64_encode($r['email']),
|
||||
'opcije' => [
|
||||
'expires' => time() + $LifeTime,
|
||||
'path' => '/',
|
||||
'domain' => $cookie_domain,
|
||||
//'secure' => true
|
||||
]
|
||||
];
|
||||
} else {
|
||||
setcookie("uid", base64_encode($r['email']), time() + $LifeTime, '/', $cookie_domain);
|
||||
}
|
||||
|
||||
//Preverimo če gre za Google 2FA
|
||||
$user_2fa_enabled = User::option($r['id'], 'google-2fa-validation');
|
||||
if(!empty($user_2fa_enabled) && $user_2fa_enabled != 'NOT'){
|
||||
setcookie("g2fa", base64_encode($user_2fa_enabled), time() + $LifeTime, '/', $cookie_domain);
|
||||
header('location: '.$this->page_urls['page_login_2fa']);
|
||||
die();
|
||||
|
||||
if($this->method == 'AJAX'){
|
||||
//TODO: preveri kako je s piškoti
|
||||
return $this->ajaxResponse('error', $lang['cms_error_user_ban']);
|
||||
|
||||
} else{
|
||||
header('location: '.$this->page_urls['page_login_2fa']);
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
||||
// Ustvarimo piškotek še z imenom in geslom
|
||||
setcookie("unam", base64_encode($r['name'].' '.$r['surname']),time() + $LifeTime, '/', $cookie_domain);
|
||||
setcookie("secret", $r['pass'], time() + $LifeTime, '/', $cookie_domain);
|
||||
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
$piskotek['unam'] = [
|
||||
'ime' => 'unam',
|
||||
'vrednost' => base64_encode($r['name'].' '.$r['surname']),
|
||||
'opcije' => [
|
||||
'expires' => time() + $LifeTime,
|
||||
'path' => '/',
|
||||
'domain' => $cookie_domain,
|
||||
//'secure' => true
|
||||
]
|
||||
];
|
||||
|
||||
|
||||
$piskotek['secret'] = [
|
||||
'ime' => 'secret',
|
||||
'vrednost' => $r['pass'],
|
||||
'opcije' => [
|
||||
'expires' => time() + $LifeTime,
|
||||
'path' => '/',
|
||||
'domain' => $cookie_domain,
|
||||
//'secure' => true
|
||||
]
|
||||
];
|
||||
|
||||
|
||||
} else {
|
||||
setcookie("unam", base64_encode($r['name'].' '.$r['surname']),time() + $LifeTime, '/', $cookie_domain);
|
||||
setcookie("secret", $r['pass'], time() + $LifeTime, '/', $cookie_domain);
|
||||
}
|
||||
|
||||
|
||||
if ($r['status'] == "2" || $r['status'] == "6") {
|
||||
setcookie("P", time(), time() + $LifeTime, '/', $cookie_domain);
|
||||
header('location: '.$this->page_urls['page_login'.$this->prijava].'&email='.$this->email.'&error=password');
|
||||
die();
|
||||
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
$piskotek['P'] = [
|
||||
'ime' => 'P',
|
||||
'vrednost' => time(),
|
||||
'opcije' => [
|
||||
'expires' => time() + $LifeTime,
|
||||
'path' => '/',
|
||||
'domain' => $cookie_domain,
|
||||
'secure' => true
|
||||
]
|
||||
];
|
||||
$error['password'] = $lang['cms_error_password'];
|
||||
|
||||
return $this->ajaxResponse('error', [
|
||||
'piskotek' => $this->cookieEncode($piskotek),
|
||||
'error' => $error
|
||||
]);
|
||||
|
||||
}else{
|
||||
setcookie("P", time(), time() + $LifeTime, '/', $cookie_domain);
|
||||
header('location: '.$this->page_urls['page_login'.$this->prijava].'&email='.$this->email.'&error=password');
|
||||
die();
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Password prompt
|
||||
header('location: '.$this->page_urls['page_login'.$this->prijava].'&email='.$this->email.'&error=password');
|
||||
die();
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
return $this->ajaxResponse('error', $lang['cms_error_password']);
|
||||
|
||||
}else{
|
||||
header('location: '.$this->page_urls['page_login'.$this->prijava].'&email='.$this->email.'&error=password');
|
||||
die();
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Preverimo, če je sploh vpisal email
|
||||
if (validEmail($this->email)) {
|
||||
// Emaila ni v bazi
|
||||
header('location: '.$this->page_urls['page_login_noEmail'.$this->prijava].'&email='.$this->email);
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
return $this->ajaxResponse('error', $lang['cms_error_email_or_password_doesnt_exist']);
|
||||
|
||||
}else{
|
||||
// Emaila ni v bazi
|
||||
header('location: '.$this->page_urls['page_login_noEmail'.$this->prijava].'&email='.$this->email);
|
||||
}
|
||||
} else {
|
||||
// Ni vpisana prava oblika maila
|
||||
header('location: '.$this->page_urls['page_login_noEmail'.$this->prijava].'&email='.$this->email);
|
||||
if($this->method == 'AJAX'){
|
||||
|
||||
return $this->ajaxResponse('error', $lang['cms_error_email']);
|
||||
|
||||
|
||||
}else{
|
||||
// Ni vpisana prava oblika maila
|
||||
header('location: '.$this->page_urls['page_login_noEmail'.$this->prijava].'&email='.$this->email);
|
||||
}
|
||||
}
|
||||
die();
|
||||
}
|
||||
@ -530,8 +650,17 @@ class ApiLogin
|
||||
die();
|
||||
}
|
||||
|
||||
|
||||
// Vse je ok - prijavljenega preusmerimo na moje ankete
|
||||
if($this->method == 'AJAX'){
|
||||
return $this->ajaxResponse('success', [
|
||||
'url' => $site_url.'admin/survey/index.php?lang='.$user_lang,
|
||||
'piskotek' => $this->cookieEncode($piskotek)
|
||||
]);
|
||||
}
|
||||
|
||||
header('location: '.$site_url.'admin/survey/index.php?lang='.$user_lang);
|
||||
|
||||
die();
|
||||
}
|
||||
|
||||
@ -889,7 +1018,7 @@ class ApiLogin
|
||||
$mails = explode(";", $data[0]);
|
||||
sort($mails);
|
||||
$mail = $mails[0];
|
||||
|
||||
|
||||
// Pridobimo aai (shibboleth) "uuid"
|
||||
$aai_id = $data[1];
|
||||
|
||||
@ -925,7 +1054,7 @@ class ApiLogin
|
||||
else {
|
||||
|
||||
// potegni geslo in mu daj kuki
|
||||
$result = sisplet_query("SELECT pass, email FROM users WHERE id='".$user_id_1ka."'");
|
||||
$result = sisplet_query("SELECT pass, email FROM users WHERE id='".$user_id_1ka."'");
|
||||
$r = mysqli_fetch_row($result);
|
||||
|
||||
$pass = $r[0];
|
||||
@ -977,6 +1106,49 @@ class ApiLogin
|
||||
global $cookie_domain;
|
||||
global $global_user_id;
|
||||
|
||||
if($this->method == 'AJAX') {
|
||||
|
||||
$domene[] = $cookie_domain;
|
||||
if(substr_count($cookie_domain, '.') > 1){
|
||||
$domene[] = substr($cookie_domain, strpos($cookie_domain, '.') + 1);
|
||||
}
|
||||
|
||||
foreach($domene as $key => $domena) {
|
||||
$piskotek['uid_'.$key] = [
|
||||
'ime' => 'uid',
|
||||
'vrednost' => '',
|
||||
'opcije' => [
|
||||
'expires' => time() - 3600,
|
||||
'path' => '/',
|
||||
'domain' => $domena
|
||||
]
|
||||
];
|
||||
$piskotek['unam_'.$key] = [
|
||||
'ime' => 'unam',
|
||||
'vrednost' => '',
|
||||
'opcije' => [
|
||||
'expires' => time() - 3600,
|
||||
'path' => '/',
|
||||
'domain' => $domena
|
||||
]
|
||||
];
|
||||
$piskotek['secret_'.$key] = [
|
||||
'ime' => 'secret',
|
||||
'vrednost' => '',
|
||||
'opcije' => [
|
||||
'expires' => time() - 3600,
|
||||
'path' => '/',
|
||||
'domain' => $domena
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
return $this->ajaxResponse('success', [
|
||||
'url' => $site_url,
|
||||
'piskotek' => $this->cookieEncode($piskotek)
|
||||
]);
|
||||
}
|
||||
|
||||
setcookie('uid', '', time() - 3600, '/', $cookie_domain);
|
||||
setcookie('unam', '', time() - 3600, '/', $cookie_domain);
|
||||
setcookie('secret', '', time() - 3600, '/', $cookie_domain);
|
||||
@ -1031,27 +1203,35 @@ class ApiLogin
|
||||
{
|
||||
$error = [];
|
||||
|
||||
$email = (isset($_POST['email'])) ? $_POST['email'] : '';
|
||||
$ime = (isset($_POST['ime'])) ? $_POST['ime'] : '';
|
||||
$geslo = (isset($_POST['geslo'])) ? $_POST['geslo'] : '';
|
||||
$geslo2 = (isset($_POST['geslo2'])) ? $_POST['geslo2'] : '';
|
||||
$agree = (isset($_POST['agree'])) ? $_POST['agree'] : '0';
|
||||
$gdprAgree = (isset($_POST['gdpr-agree'])) ? $_POST['gdpr-agree'] : '0';
|
||||
$ajaxKlic = (isset($_POST['ajax'])) ? $_POST['ajax'] : '0'; // Če izvajamo registracjo preko drupala, ker se pošlje post request preko ajaxa
|
||||
$email = (isset($this->data['email'])) ? $this->data['email'] : '';
|
||||
$ime = (isset($this->data['ime'])) ? $this->data['ime'] : '';
|
||||
$geslo = (isset($this->data['geslo'])) ? $this->data['geslo'] : '';
|
||||
$geslo2 = (isset($this->data['geslo2'])) ? $this->data['geslo2'] : '';
|
||||
$agree = (isset($this->data['agree'])) ? $this->data['agree'] : '0';
|
||||
$gdprAgree = (isset($this->data['gdpr-agree'])) ? $this->data['gdpr-agree'] : '0';
|
||||
$ajaxKlic = (isset($this->data['ajax'])) ? $this->data['ajax'] : '0'; // Če izvajamo registracjo preko drupala, ker se pošlje post request preko ajaxa
|
||||
|
||||
$varnostno_polje = (isset($_POST['varnostno-polje'])) ? $_POST['varnostno-polje'] : false;
|
||||
$varnostno_polje = (isset($this->data['varnostno-polje'])) ? $this->data['varnostno-polje'] : false;
|
||||
if (!empty($varnostno_polje)) {
|
||||
header('Location: '.$this->page_urls['page_robot_redirect']);
|
||||
die();
|
||||
|
||||
if($this->method == 'AJAX'){
|
||||
return $this->ajaxResponse('error', [
|
||||
'url' => $this->page_urls['page_robot_redirect'],
|
||||
'message' => 'Robot'
|
||||
]);
|
||||
} else {
|
||||
header('Location: ' . $this->page_urls['page_robot_redirect']);
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Preverimo ReCaptcha
|
||||
if (AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) {
|
||||
$recaptchaResponse = $_POST['g-recaptcha-response'];
|
||||
$requestReCaptcha = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".AppSettings::getInstance()->getSetting('google-secret_captcha')."&response=".$recaptchaResponse);
|
||||
$recaptchaResponse = $this->data['g-recaptcha-response'];
|
||||
$requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse);
|
||||
|
||||
if (!strstr($requestReCaptcha, "true")) {
|
||||
if (!strstr($requestReCaptcha, 'true')) {
|
||||
$error['invalid_recaptcha'] = '1';
|
||||
}
|
||||
}
|
||||
@ -1119,8 +1299,7 @@ class ApiLogin
|
||||
if (!empty($error)) {
|
||||
|
||||
if($ajaxKlic){
|
||||
echo json_encode($this->preveriNapake($error));
|
||||
die();
|
||||
return $this->ajaxResponse('error', $this->preveriNapake($error));
|
||||
}
|
||||
|
||||
// Ime in email posljemo nazaj v urlju
|
||||
@ -1137,11 +1316,8 @@ class ApiLogin
|
||||
} // Vse je ok - preusmerimo na potrditveno stran
|
||||
else {
|
||||
|
||||
if($ajaxKlic){
|
||||
echo json_encode([
|
||||
'success' => '1'
|
||||
]);
|
||||
die();
|
||||
if($ajaxKlic || $this->method == 'AJAX'){
|
||||
return $this->ajaxResponse('success');
|
||||
}
|
||||
|
||||
// Hidden form, ki ga z js potem postamo naprej (da prenesemo vnesene podatke na naslednjo stran)
|
||||
@ -1169,15 +1345,15 @@ class ApiLogin
|
||||
|
||||
// Nastavimo jezik
|
||||
$language = 1;
|
||||
if(isset($_POST['language'])){
|
||||
$language = $_POST['language'];
|
||||
if(isset($this->data['language'])){
|
||||
$language = $this->data['language'];
|
||||
}
|
||||
elseif(isset($_POST['jezik'])){
|
||||
$language = ($_POST['jezik'] == 'en' ? 2 : 1);
|
||||
elseif(isset($this->data['jezik'])){
|
||||
$language = ($this->data['jezik'] == 'en' ? 2 : 1);
|
||||
}
|
||||
|
||||
if(is_numeric($language)){
|
||||
include_once('../../lang/'.$language.'.php');
|
||||
include('../../lang/'.$language.'.php');
|
||||
}
|
||||
|
||||
$napaka = [];
|
||||
@ -1261,25 +1437,25 @@ class ApiLogin
|
||||
global $lang;
|
||||
|
||||
|
||||
$email = (isset($_POST['email']) ? $_POST['email'] : '');
|
||||
$ime = (isset($_POST['ime']) ? $_POST['ime'] : '');
|
||||
//$geslo = (isset($_POST['geslo']) ? base64_decode($_POST['geslo']) : '');
|
||||
$geslo = (isset($_POST['geslo']) ? $_POST['geslo'] : '');
|
||||
$gdprAgree = (isset($_POST['gdpr-agree']) ? $_POST['gdpr-agree'] : 0);
|
||||
$ajax = (isset($_POST['ajax']) ? $_POST['ajax'] : 0); // če je Drupal ajax request
|
||||
$email = (isset($this->data['email']) ? $this->data['email'] : '');
|
||||
$ime = (isset($this->data['ime']) ? $this->data['ime'] : '');
|
||||
//$geslo = (isset($this->data['geslo']) ? base64_decode($this->data['geslo']) : '');
|
||||
$geslo = (isset($this->data['geslo']) ? $this->data['geslo'] : '');
|
||||
$gdprAgree = (isset($this->data['gdpr-agree']) ? $this->data['gdpr-agree'] : 0);
|
||||
$ajax = (isset($this->data['ajax']) ? $this->data['ajax'] : 0); // če je Drupal ajax request
|
||||
|
||||
|
||||
// Nastavimo jezik
|
||||
$language = 1;
|
||||
if(isset($_POST['language'])){
|
||||
$language = $_POST['language'];
|
||||
if(isset($this->data['language'])){
|
||||
$language = $this->data['language'];
|
||||
}
|
||||
elseif(isset($_POST['jezik'])){
|
||||
$language = ($_POST['jezik'] == 'en' ? 2 : 1);
|
||||
elseif(isset($this->data['jezik'])){
|
||||
$language = ($this->data['jezik'] == 'en' ? 2 : 1);
|
||||
}
|
||||
|
||||
if(is_numeric($language)){
|
||||
include_once('../../lang/'.$language.'.php');
|
||||
include('../../lang/'.$language.'.php');
|
||||
}
|
||||
|
||||
|
||||
@ -1333,7 +1509,7 @@ class ApiLogin
|
||||
$Content .= $lang['confirm_user_mail_ignore'];
|
||||
|
||||
// Ce gre slucajno za virutalko
|
||||
$Subject = (isVirtual()) ? $lang['confirm_user_mail_subject_virtual'] : $lang['confirm_user_mail_subject'];
|
||||
$Subject = (isVirtual()) ? $lang['confirm_user_mail_subject_virtual'] : $lang['confirm_user_mail_subject'];
|
||||
|
||||
// Ce mora admin potrditi dobi email admin in ne uporabnik!
|
||||
if(AppSettings::getInstance()->getSetting('confirm_registration') === true){
|
||||
@ -1369,7 +1545,8 @@ class ApiLogin
|
||||
|
||||
// Za testiranje brez posiljanja maila
|
||||
if(isDebug()) {
|
||||
echo $ZaMail;
|
||||
return $this->ajaxResponse('success',['mail' => $ZaMail, 'code' => $code]);
|
||||
echo $ZaMail;
|
||||
die();
|
||||
}
|
||||
|
||||
@ -1402,11 +1579,8 @@ class ApiLogin
|
||||
}
|
||||
|
||||
|
||||
if($ajax){
|
||||
echo json_encode([
|
||||
'success' => 1
|
||||
]);
|
||||
die();
|
||||
if($ajax || $this->method == 'AJAX'){
|
||||
return $this->ajaxResponse('success');
|
||||
}
|
||||
|
||||
|
||||
@ -1632,7 +1806,7 @@ class ApiLogin
|
||||
$ByeEmailSubject = 'Uspešna odjava';
|
||||
|
||||
$result = sisplet_query("SELECT name FROM users WHERE email='$email'");
|
||||
list ($ime) = mysqli_fetch_row($result);
|
||||
[$ime] = mysqli_fetch_row($result);
|
||||
|
||||
$PageName = AppSettings::getInstance()->getSetting('app_settings-app_name');
|
||||
|
||||
@ -1709,7 +1883,7 @@ class ApiLogin
|
||||
global $site_domain;
|
||||
global $cookie_domain;
|
||||
|
||||
if (isset ($_GET['email']) || isset ($_POST['email'])) {
|
||||
if (isset ($_GET['email']) || isset ($_POST['email']) || isset($this->email)) {
|
||||
|
||||
if (isset ($_GET['email'])) {
|
||||
$email = strtolower($_GET['email']);
|
||||
@ -1717,15 +1891,18 @@ class ApiLogin
|
||||
if (isset ($_POST['email'])) {
|
||||
$email = strtolower($_POST['email']);
|
||||
}
|
||||
if (isset ($this->email)) {
|
||||
$email = strtolower($this->email);
|
||||
}
|
||||
|
||||
$email = CleanXSS($email);
|
||||
|
||||
// Ali gre za ajax klic
|
||||
$ajaxKlic = false;
|
||||
if(!empty($_POST['ajax'])){
|
||||
if(!empty($_POST['ajax']) || $this->method == 'AJAX'){
|
||||
$ajaxKlic = true;
|
||||
|
||||
if($_POST['lang'] == 'en' || $_POST['jezik'] == 'en'){
|
||||
if($this->data['lang'] == 'en' || $this->data['jezik'] == 'en'){
|
||||
include('../../lang/2.php');
|
||||
}
|
||||
else {
|
||||
@ -1739,24 +1916,22 @@ class ApiLogin
|
||||
|
||||
// Ce emaila ni v bazi
|
||||
$user_id_1ka = User::findByEmail($email);
|
||||
|
||||
if (empty($user_id_1ka)) {
|
||||
|
||||
if($ajaxKlic){
|
||||
echo json_encode([
|
||||
'type' => 'error',
|
||||
'text' => $lang['cms_error_no_email']
|
||||
]);
|
||||
if($ajaxKlic || $this->method == 'AJAX'){
|
||||
return $this->ajaxResponse('error', ['text' => $lang['cms_error_no_email']]);
|
||||
}else {
|
||||
header('location: '.$this->page_urls['page_login_noEmail'.$this->prijava].'&email='.$email);
|
||||
}
|
||||
die();
|
||||
} else {
|
||||
$result = sisplet_query("SELECT name, pass, surname FROM users WHERE id='".$user_id_1ka."'");
|
||||
list ($ime, $geslo, $priimek) = mysqli_fetch_row($result);
|
||||
[$ime, $geslo, $priimek] = mysqli_fetch_row($result);
|
||||
}
|
||||
|
||||
// Novo geslo sestavis iz dveh nakljucnih besed + stevilke
|
||||
include_once($site_path.'lang/words_'.$lang['language_short'].'.php');
|
||||
include($site_path.'lang/words_'.$lang['language_short'].'.php');
|
||||
|
||||
$geslo = strtolower($words[rand(0, 999)].rand(0, 9).$words[rand(0, 999)]);
|
||||
|
||||
@ -1827,11 +2002,8 @@ class ApiLogin
|
||||
}
|
||||
}
|
||||
|
||||
if($ajaxKlic){
|
||||
echo json_encode([
|
||||
'type' => 'success',
|
||||
'text' => $lang['lp_sent'].'.'
|
||||
]);
|
||||
if($ajaxKlic || $this->method == 'AJAX'){
|
||||
return $this->ajaxResponse('success', ['text' => $lang['lp_sent']]);
|
||||
}else {
|
||||
// Preusmerimo na stran potrditve
|
||||
header('location: '.$this->page_urls['page_reset_password'].'&email='.$email);
|
||||
@ -1906,4 +2078,22 @@ class ApiLogin
|
||||
header('location: '.$this->page_urls['page_reset_password_activate'].'&code='.$code.'&error=1');
|
||||
}
|
||||
}
|
||||
|
||||
private function ajaxResponse($type, $data = [])
|
||||
{
|
||||
echo json_encode([
|
||||
'type' => $type,
|
||||
'data' => $data
|
||||
]);
|
||||
|
||||
die();
|
||||
}
|
||||
|
||||
/*
|
||||
* Kodiramo piškotek, ki ga posredujemo preko cUrl-ja
|
||||
*/
|
||||
private function cookieEncode(array $piskotek)
|
||||
{
|
||||
return base64_encode(serialize($piskotek));
|
||||
}
|
||||
}
|
||||
@ -22,8 +22,11 @@ class ApiLoginController{
|
||||
|
||||
|
||||
// Preberemo poslane podatke
|
||||
//$this->processCall();
|
||||
$this->processCallForm();
|
||||
$this->processCall();
|
||||
|
||||
if(empty($this->data)) {
|
||||
$this->processCallForm();
|
||||
}
|
||||
|
||||
|
||||
/*echo 'Params:';
|
||||
@ -31,11 +34,10 @@ class ApiLoginController{
|
||||
echo '<br>Data:';
|
||||
var_dump($this->data);
|
||||
echo 'Metoda: '.$this->method;*/
|
||||
|
||||
|
||||
|
||||
// Izvedemo akcijo
|
||||
$login = new ApiLogin();
|
||||
$login->executeAction($this->params, $this->data);
|
||||
$login = new ApiLogin();
|
||||
$login->executeAction($this->params, $this->data, $this->method);
|
||||
}
|
||||
|
||||
|
||||
@ -51,6 +53,7 @@ class ApiLoginController{
|
||||
|
||||
// Preberemo podatke iz post-a
|
||||
$this->data = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
}
|
||||
|
||||
// Preberemo poslane podatke (ce posiljamo direktno iz forme)
|
||||
|
||||
116
frontend/drupal.php
Normal file
116
frontend/drupal.php
Normal file
@ -0,0 +1,116 @@
|
||||
<?php
|
||||
|
||||
//ini_set('display_errors', 1);
|
||||
//ini_set('display_startup_errors', 1);
|
||||
//error_reporting(E_ALL);
|
||||
|
||||
|
||||
// V koliko ni POST request
|
||||
if(empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) != 'xmlhttprequest')
|
||||
{
|
||||
die();
|
||||
}
|
||||
|
||||
require($_SERVER['DOCUMENT_ROOT'] . '/settings.php');
|
||||
|
||||
$api_url = $site_url . 'frontend/api/api.php';
|
||||
|
||||
|
||||
$parts = explode("/", $_SERVER['REQUEST_URI']);
|
||||
$action = end($parts);
|
||||
|
||||
// V kolikor nimamo get parametra pri naši poizvedbi
|
||||
if(empty($_GET) && empty($action)) {
|
||||
|
||||
echo json_encode([
|
||||
'type' => 'error',
|
||||
'message' => 'Prišlo je do napake.'
|
||||
]);
|
||||
|
||||
die();
|
||||
}
|
||||
|
||||
/* $sporocilo = [
|
||||
'type' => 'success',
|
||||
'text' => 'Prijava'
|
||||
];
|
||||
|
||||
echo json_encode($sporocilo);
|
||||
die();
|
||||
*/
|
||||
|
||||
|
||||
|
||||
// GET params
|
||||
$params = 'action='. $action; // Funkcija, ki jo želimo izvesti
|
||||
|
||||
$post_data = $_POST;
|
||||
|
||||
|
||||
if(!empty($post_data) && sizeof($post_data) > 0){
|
||||
$request_method = 'POST';
|
||||
$raw_post_data = http_build_query($post_data);
|
||||
|
||||
$post_data['method'] = "AJAX";
|
||||
$raw_post_data .= '&method=AJAX';
|
||||
|
||||
} else {
|
||||
|
||||
$request_method = 'GET';
|
||||
$raw_post_data = '';
|
||||
|
||||
}
|
||||
|
||||
// Pripravimo stvari za izdelavo tokena
|
||||
$request_url = $api_url.'?'.$params;
|
||||
$data = $request_method . $request_url .$raw_post_data;
|
||||
|
||||
// Nastavimo identifier in key userja
|
||||
$private_key = 'NLFYb67/[pUE%W-s';
|
||||
|
||||
// Izracunamo hash (token)
|
||||
$token = hash_hmac('sha256', $data, $private_key);
|
||||
|
||||
// Pripravimo klic – dodamo parametra »identifikator« in »token«
|
||||
$ch = curl_init($request_url.'&token='.$token);
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request_method);
|
||||
|
||||
if($request_method == 'POST') {
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($post_data)); // JSON string za POST
|
||||
curl_setopt($ch, CURLOPT_POST, TRUE);
|
||||
}
|
||||
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
//curl_setopt($ch, CURLOPT_HEADER ,1);
|
||||
//curl_setopt($ch, CURLOPT_FOLLOWLOCATION ,1);
|
||||
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
|
||||
//curl_setopt($ch, CURLINFO_HEADER_OUT, true); //Vrne header, kar ni ok, ker drual direktno sprejmo echo
|
||||
|
||||
|
||||
// Izvedemo klic
|
||||
$result = curl_exec($ch);
|
||||
curl_close($ch);
|
||||
|
||||
$result = json_decode($result);
|
||||
|
||||
if(!empty($result->data->piskotek))
|
||||
{
|
||||
$piskotki = piskotekDecode($result->data->piskotek);
|
||||
|
||||
foreach($piskotki as $piskotek){
|
||||
setcookie($piskotek['ime'], $piskotek['vrednost'], $piskotek['opcije']);
|
||||
}
|
||||
|
||||
unset($result->data->piskotek);
|
||||
unset($piskotki);
|
||||
}
|
||||
|
||||
//setcookie('testni_1ka', 'testni-vnos');
|
||||
|
||||
echo json_encode($result);
|
||||
die();
|
||||
|
||||
function piskotekDecode($piskotek)
|
||||
{
|
||||
return unserialize(base64_decode($piskotek));
|
||||
}
|
||||
@ -2,6 +2,8 @@ $oranzna: #FFA608;
|
||||
$modra: #1E88E5;
|
||||
|
||||
$siva: #D1D1D1;
|
||||
$siva-3: #d3d3d3;
|
||||
$siva-9: #999;
|
||||
$siva-burger: #979797;
|
||||
|
||||
$arnes: #E35205;
|
||||
|
||||
BIN
frontend/drupal7.sql.zip
Normal file
BIN
frontend/drupal7.sql.zip
Normal file
Binary file not shown.
BIN
frontend/drupal9.sql.zip
Normal file
BIN
frontend/drupal9.sql.zip
Normal file
Binary file not shown.
17
frontend/drupal9/.editorconfig
Executable file
17
frontend/drupal9/.editorconfig
Executable file
@ -0,0 +1,17 @@
|
||||
# Drupal editor configuration normalization
|
||||
# @see http://editorconfig.org/
|
||||
|
||||
# This is the top-most .editorconfig file; do not search in parent directories.
|
||||
root = true
|
||||
|
||||
# All files.
|
||||
[*]
|
||||
end_of_line = LF
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[composer.{json,lock}]
|
||||
indent_size = 4
|
||||
61
frontend/drupal9/.gitattributes
vendored
Executable file
61
frontend/drupal9/.gitattributes
vendored
Executable file
@ -0,0 +1,61 @@
|
||||
# Drupal git normalization
|
||||
# @see https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
|
||||
# @see https://www.drupal.org/node/1542048
|
||||
|
||||
# Normally these settings would be done with macro attributes for improved
|
||||
# readability and easier maintenance. However macros can only be defined at the
|
||||
# repository root directory. Drupal avoids making any assumptions about where it
|
||||
# is installed.
|
||||
|
||||
# Define text file attributes.
|
||||
# - Treat them as text.
|
||||
# - Ensure no CRLF line-endings, neither on checkout nor on checkin.
|
||||
# - Detect whitespace errors.
|
||||
# - Exposed by default in `git diff --color` on the CLI.
|
||||
# - Validate with `git diff --check`.
|
||||
# - Deny applying with `git apply --whitespace=error-all`.
|
||||
# - Fix automatically with `git apply --whitespace=fix`.
|
||||
|
||||
*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
|
||||
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
|
||||
|
||||
# Define binary file attributes.
|
||||
# - Do not treat them as text.
|
||||
# - Include binary diff in patches instead of "binary files differ."
|
||||
*.eot -text diff
|
||||
*.exe -text diff
|
||||
*.gif -text diff
|
||||
*.gz -text diff
|
||||
*.ico -text diff
|
||||
*.jpeg -text diff
|
||||
*.jpg -text diff
|
||||
*.otf -text diff
|
||||
*.phar -text diff
|
||||
*.png -text diff
|
||||
*.svgz -text diff
|
||||
*.ttf -text diff
|
||||
*.woff -text diff
|
||||
*.woff2 -text diff
|
||||
25
frontend/drupal9/.gitignore
vendored
Normal file
25
frontend/drupal9/.gitignore
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
web/sites/settings.local.php
|
||||
web/sites/default/settings.local.php
|
||||
web/sites/default/settings.php
|
||||
DB_drupal7.sql
|
||||
DB_drupal9.sql.gz
|
||||
|
||||
# Do not ignore config files of EU Cookie Compliance settings, as the config directory is ignored for some reason.
|
||||
!web/sites/default/files/
|
||||
web/sites/default/files/*
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/
|
||||
web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/*
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/
|
||||
web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/*
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/user.role.anonymous.yml
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/user.role.authenticated.yml
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/user.role.content_editor.yml
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/eu_cookie_compliance.settings.yml
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/eu_cookie_compliance.cookie_category.required_cookies.yml
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/eu_cookie_compliance.cookie_category.other_cookies.yml
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/language/
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/language/*
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/language/en/
|
||||
web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/language/en/*
|
||||
!web/sites/default/files/config_IOXQTY15mTNElGpd3J0XvFQ901U51FXMmkfm1WHkhEkfIeWx3p7e7K_IwM7NiHj_MM-BDVeYuA/sync/language/en/eu_cookie_compliance.settings.yml
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user