[Redizajn 1KA] Popupi: Urejanje > Arhivi - Arhiv analiz

This commit is contained in:
tejagerjovic 2022-05-05 20:41:05 +02:00
parent f0cf3be940
commit 0abcddfd07
8 changed files with 216 additions and 115 deletions

View File

@ -408,7 +408,7 @@ class SurveyAdmin
echo '<div id="branching" style="display:none"></div>';
// fullscreen urejanje spremenljivke
echo '<div id="fullscreen" class="'.($_GET['a'] == A_ANALYSIS ? ' analiza' : ($_GET['a'] == 'telephone' ? ' divPopUp PopUpNarrow' : '')).'"></div>';
echo '<div id="fullscreen" class="'.($_GET['a'] == A_ANALYSIS ? ' analiza' : '') . ($_GET['a'] == 'telephone' || $_GET['m'] == 'anal_arch' ? ' divPopUp PopUpNarrow' : '').'"></div>';
// fullscreen urejanje vprasanja
echo '<div id="vprasanje" class="divPopUp"></div>';

View File

@ -322,98 +322,124 @@ class SurveyAnalysisArchive {
static function DisplayDoArchive() {
global $lang, $site_url;
echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
echo '<div id="div_analiza_archive_name">';
echo '<div class="popup_close"><a href="#" onClick="cancleArchiveAnaliza(); return false;">✕</a></div>';
echo '<h2>'.$lang['srv_analiza_arhiv'].'</h2>';
echo $lang['srv_analiza_arhiviraj_ime'];
echo ':&nbsp;<input id="newAnalysisArchiveName" name="newAnalysisArchiveName" type="text" size="60" />'."\n";
echo '<h2><span class="faicon arhiv blue"></span>'.$lang['srv_analiza_archive_generate_quick_button'].'</h2>';
echo '<br class="clr" />';
echo '<div>';
echo $lang['srv_analiza_archive_note'].':';
echo '<textarea name="newAnalysisArchiveNote" id="newAnalysisArchiveNote" style="height:50px; width:100%"></textarea>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_analiza_arhiviraj_ime'].':</span>';
echo '<input id="newAnalysisArchiveName" class="text large" name="newAnalysisArchiveName" type="text"/>';
echo '</div>';
echo '<br class="clr" />';
echo '<div>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_analiza_archive_note'].':</span>';
echo '<textarea class="textarea" name="newAnalysisArchiveNote" id="newAnalysisArchiveNote"></textarea>';
echo '</div>';
echo '<div class="alaysis_archive_wrap">';
// dostop
echo '<div class="floatLeft">';
echo $lang['srv_analiza_archive_access'].':';
echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="0" checked="true" onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_all'];
echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="1" onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_admins'];
echo '<br/><input type="radio" name="newAnalysisArchiveAccess" value="2" onchange="toggleAnalysisArchiveAccessPassword();"/>&nbsp;'.$lang['srv_analiza_archive_access_password'];
echo '<br/><div id="newAnalysisArchiveAccessPasswordDiv" style="visibility: hidden;">'.$lang['srv_analiza_archive_access_password_label'].'<input type="text" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25" />';
echo '</div></div>';
echo '<div class="floatLeft anl_w110" >&nbsp;</div>';
echo '<div class="alaysis_archive_left">';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_analiza_archive_access'].':</span>';
echo '<div class="setting_item">';
echo '<input type="radio" id="newAnalysisArchiveAccess0" name="newAnalysisArchiveAccess" value="0" checked="true" onchange="toggleAnalysisArchiveAccessPassword();"/>';
echo '<label for="newAnalysisArchiveAccess0">'.$lang['srv_analiza_archive_access_all'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" id="newAnalysisArchiveAccess1" name="newAnalysisArchiveAccess" value="1" onchange="toggleAnalysisArchiveAccessPassword();"/>';
echo '<label for="newAnalysisArchiveAccess1">'.$lang['srv_analiza_archive_access_admins'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" id="newAnalysisArchiveAccess2" name="newAnalysisArchiveAccess" value="2" onchange="toggleAnalysisArchiveAccessPassword();"/>';
echo '<label for="newAnalysisArchiveAccess2">'.$lang['srv_analiza_archive_access_password'].'</label>';
echo '</div>';
echo '<div class="setting_item indent" id="newAnalysisArchiveAccessPasswordDiv">';
echo $lang['srv_analiza_archive_access_password_label'].':';
echo '<input type="text" class="text large" name="newAnalysisArchiveAccessPassword" id="newAnalysisArchiveAccessPassword" maxlength="25" />';
echo '</div>';
echo '</div>';
echo '</div>'; //left
// trajanje
echo '<div class="floatLeft">';
echo $lang['srv_analiza_archive_duration'].':';
echo '<br/>';
echo '<div class="alaysis_archive_right">';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_analiza_archive_duration'].':</span>';
$date = date("Y-m-d");// current date
$duration = strtotime(date("Y-m-d", strtotime($date)) . " +3 month");
$duration = date("d.m.Y",$duration);
echo '<input type="radio" name="newAADurationType" id="newAADurationFixed" value="0" checked="true" />';
printf ($lang['srv_analiza_archive_duration_default'], $duration);
echo '<br/>';
echo '<input type="radio" name="newAADurationType" id="newAADurationUser" value="1" />'.$lang['srv_analiza_archive_duration_custom'].'&nbsp;<input id="newAnalysisArchiveDuration" type="text" name="newAnalysisArchiveDuration" value="' . $duration . '" disabled/>
<span class="faicon calendar_icon icon-as_link" id="duration_img"></span>
<script type="text/javascript">
Calendar.setup({
inputField : "newAnalysisArchiveDuration",
ifFormat : "%d.%m.%Y",
button : "duration_img",
singleClick : true
});
</script>
';
echo '<br/>';
echo '<input type="radio" name="newAADurationType" id="newAADurationPermanent" value="2" />'.$lang['srv_permanent_archive'];
echo '</div>';
echo '<div class="clr"></div>';
echo '</div>';
echo '<div class="div_curent_archives">'."\n";
echo $lang['srv_analiza_current_archives'];
if (true) {
self :: ListArchive(array('create_new'=>false, 'delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false));
#self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>false, 'access'=>false, 'name_link'=>true, 'duration'=>false, 'insert'=>false, 'edit'=>false));
} else {
echo $lang['srv_analiza_no_current_archives'];
}
echo '</div>'."\n"; // end: div_curent_archives
echo '<div class="setting_item">';
echo '<input type="radio" name="newAADurationType" id="newAADurationFixed" value="0" checked="true" />';
echo '<label for="newAADurationFixed">';
printf ($lang['srv_analiza_archive_duration_default'], $duration);
echo '</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="newAADurationType" id="newAADurationUser" value="1" />';
echo '<label for="newAADurationUser">'.$lang['srv_analiza_archive_duration_custom'].'</label>';
echo '<input id="newAnalysisArchiveDuration" class="text medium" type="text" name="newAnalysisArchiveDuration" value="' . $duration . '" readonly/>';
echo '<span class="faicon calendar_icon blue pointer" id="duration_img"></span>
<script type="text/javascript">
Calendar.setup({
inputField : "newAnalysisArchiveDuration",
ifFormat : "%d.%m.%Y",
button : "duration_img",
singleClick : true
});
</script>
';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="newAADurationType" id="newAADurationPermanent" value="2" />';
echo '<label for="newAADurationPermanent">'.$lang['srv_permanent_archive'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>'; //right
echo '</div>'; //wrap
echo '<div class="button_holder">';
echo '<button class="medium white-blue" title="'.$lang['srv_analiza_arhiviraj_cancle'].'" onClick="cancleArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</button>';
$action = '';
if ($_GET['podstran'] == M_ANALYSIS_CROSSTAB || $_POST['podstran'] == M_ANALYSIS_CROSSTAB) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveCrosstabs(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveCrosstabs();';
} else if ($_GET['podstran'] == M_ANALYSIS_MEANS || $_POST['podstran'] == M_ANALYSIS_MEANS) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveMeans(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveMeans();';
} else if ($_GET['podstran'] == M_ANALYSIS_TTEST || $_POST['podstran'] == M_ANALYSIS_TTEST) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveTTest(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveTTest();';
} else if ($_GET['podstran'] == M_ANALYSIS_BREAK || $_POST['podstran'] == M_ANALYSIS_BREAK) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveBreak(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveBreak();';
} else if ($_GET['podstran'] == M_ANALYSIS_CHARTS || $_POST['podstran'] == M_ANALYSIS_CHARTS) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveChart(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveChart();';
} else if ($_GET['podstran'] == M_ANALYSIS_CREPORT || $_POST['podstran'] == M_ANALYSIS_CREPORT) {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveCReport(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveCReport();';
} else {
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_create'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="submitArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_create'].'</span></a></span></span>'."\n";
$action = 'submitArchiveAnaliza();';
}
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_cancle'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="cancleArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span></span>'."\n";
echo '</div>'."\n"; // end div_analiza_archive_name
echo '<button class="medium blue" title="'.$lang['srv_analiza_arhiviraj_create'].'" onclick="'.$action.' return false;">'.$lang['srv_analiza_arhiviraj_create'].'</button>';
echo '</div>';
echo '</div>'; // end div_analiza_archive_name
}
static function DisplayCreatedArchive($aid=null, $name) {
global $lang, $site_url;
echo '<div id="div_analiza_archive_name" class="divPopUp">'."\n";
echo '<div id="div_analiza_archive_name">';
echo '<div class="popup_close"><a href="#" onClick="closeArchiveAnaliza(); return false;">✕</a></div>';
@ -421,39 +447,29 @@ class SurveyAnalysisArchive {
$CAE = self::CheckArchiveExistance($aid);
if ( $CAE > 0) {
echo '<div>';
echo '<p class="bottom16">';
printf( $lang['srv_analiza_arhiviraj_success'],$name);
echo '</div>';
echo '<br/>';
echo '</p>';
echo '<div>';
$archive_link = $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid;
echo '<p>';
echo $lang['srv_analiza_arhiviraj_success_note'];
echo '<br/>';
echo '<span>';
echo '<a href="'.$site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid . '" target="_blank" title="">';
echo $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid;
echo ': <a href="'.$site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid . '" target="_blank" title="">';
echo $archive_link;
echo '</a>';
echo '</span>';
echo '<span class="faicon copy empty pointer blue link-left" onClick="CopyToClipboard(\''.$archive_link.'\'); actionNotePopup(\'text_copied\', \'success\');"></span>';
echo '</p>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" title="'.$lang['srv_analiza_arhiviraj_close'].'" onClick="closeArchiveAnaliza(); return false;">'.$lang['srv_analiza_arhiviraj_close'].'</button>';
//echo '<button class="medium blue" title="'.$lang['srv_analiza_arhiviraj_send_mail'].'" onclick="emailArchiveAnaliza(\''.$aid.'\'); return false;">'.$lang['srv_analiza_arhiviraj_send_mail'].'</button>';
echo '</div>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_close'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="closeArchiveAnaliza(); return false;"><span>'.$lang['srv_analiza_arhiviraj_close'].'</span></a></span></span>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper" title="'.$lang['srv_analiza_arhiviraj_send_mail'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="emailArchiveAnaliza(\''.$aid.'\'); return false;" ><span><img src="icons/icons/email_link.png" alt="" /> '.$lang['srv_analiza_arhiviraj_send_mail'].'</span></a></span></span>'."\n";
} else {
self::DisplayError($CAE);
}
# seznam arhivov
echo '<br class="clr" />';
echo '<div class="div_curent_archives">'."\n";
echo $lang['srv_analiza_current_archives'];
if (true) {
self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false));
} else {
echo $lang['srv_analiza_no_current_archives'];
}
echo '</div>'."\n"; // end: div_curent_archives
echo '</div>'."\n"; // end div_analiza_archive_name
echo '</div>'; // end div_analiza_archive_name
}
static function EmailArchive($aid) {

View File

@ -919,7 +919,7 @@ function saveArchiveAnaliza(aid) {
function toggleAnalysisArchiveAccessPassword() {
var value = $("input[name=newAnalysisArchiveAccess]:checked").val();
var pass_div = document.getElementById("newAnalysisArchiveAccessPasswordDiv");
value == 2 ? pass_div.style.visibility='visible' : pass_div.style.visibility='hidden';
value == 2 ? pass_div.style.display='block' : pass_div.style.display='none';
}
function AnalysisArchiveDelete(aid) {

View File

@ -4083,7 +4083,7 @@ $lang = array (
"srv_testni_nakonec" => "Statistično analizo testnih podatkov v zavihku 'ANALIZE' naredite tako, da v Statusih izberete Vse statuse oziroma status null.",
"srv_analiza_arhiv" => "Arhiv",
"srv_analiza_arhiviraj" => "Arhiviraj",
"srv_analiza_arhiviraj_ttl" => "Ustvari arhiv analize",
"srv_analiza_arhiviraj_ttl" => "Izdelaj arhiv analize",
"srv_analiza_arhiviraj_email" => "Po&#353;lji",
"srv_analiza_arhiviraj_email_ttl" => "Po&#353;lji arhiv analize prijatelju",
"srv_analiza_arhiviraj_ime" => "Ime arhiva",
@ -4099,14 +4099,14 @@ $lang = array (
"srv_analiza_archive_access_wrong_pass" => "Napa&#269;no geslo",
"srv_analiza_archive_duration" => "Trajanje",
"srv_analiza_archive_duration_default" => "Privzeto 3 mesece (do: %s)",
"srv_analiza_archive_duration_custom" => "Poljubno. Izberi datum:",
"srv_analiza_arhiviraj_create" => "Ustvari arhivski naslov",
"srv_analiza_archive_duration_custom" => "Poljubno:",
"srv_analiza_arhiviraj_create" => "Ustvari arhiv",
"srv_analiza_arhiviraj_save" => "Shrani",
"srv_analiza_arhiviraj_delete" => "Izbri&#353;i",
"srv_analiza_arhiviraj_cancle" => "Prekli&#269;i",
"srv_analiza_arhiviraj_close" => "Zapri",
"srv_analiza_arhiviraj_success" => "Arhiv analize z imenom: <b><i>%s</i></b> je bil uspe&#353;no ustvarjen!",
"srv_analiza_arhiviraj_success_note" => "Dostopen je na naslovu:",
"srv_analiza_arhiviraj_success" => "Arhiv analize z imenom: <span class=\"semi-bold\">%s</span> je bil uspešno ustvarjen!",
"srv_analiza_arhiviraj_success_note" => "Dostopen je na naslovu",
"srv_analiza_arhiviraj_error_note" => "Pri ustvarjanju arhiva analize je pri&#353;lo do napake!",
"srv_analiza_arhiviraj_access_0" => "Vsi",
"srv_analiza_arhiviraj_access_1" => "Administratorji ankete",

View File

@ -4080,14 +4080,14 @@ $lang = array (
"srv_analiza_archive_access_wrong_pass" => "Wrong password",
"srv_analiza_archive_duration" => "Duration",
"srv_analiza_archive_duration_default" => "Default. 3 months(to date: %s)",
"srv_analiza_archive_duration_custom" => "Custom. Choose date:",
"srv_analiza_arhiviraj_create" => "Create archive link",
"srv_analiza_archive_duration_custom" => "Custom:",
"srv_analiza_arhiviraj_create" => "Create archive",
"srv_analiza_arhiviraj_save" => "Save",
"srv_analiza_arhiviraj_delete" => "Delete",
"srv_analiza_arhiviraj_cancle" => "Cancel",
"srv_analiza_arhiviraj_close" => "Close",
"srv_analiza_arhiviraj_success" => "Archive with name: <b><i>%s</i></b> was successfully created!",
"srv_analiza_arhiviraj_success_note" => "Accessible on url:",
"srv_analiza_arhiviraj_success_note" => "Accessible on URL",
"srv_analiza_arhiviraj_error_note" => "There was an error creating the analysis archive!",
"srv_analiza_arhiviraj_access_0" => "All",
"srv_analiza_arhiviraj_access_1" => "Only survey administrators",

View File

@ -8240,6 +8240,48 @@ div#telephone_popup .setting_holder .setting_item span.faicon {
margin-right: 16px;
}
div#div_analiza_archive_name .setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
}
div#div_analiza_archive_name .setting_holder:first-of-type {
margin-top: 0;
}
div#div_analiza_archive_name .setting_holder .setting_item {
margin-top: 8px;
}
div#div_analiza_archive_name .setting_holder .setting_item label {
cursor: pointer;
margin-right: 0;
}
div#div_analiza_archive_name .setting_holder .setting_item.indent {
margin-left: 25px;
margin-top: 0;
display: none;
}
div#div_analiza_archive_name .setting_holder .setting_item.indent input.text {
margin-left: 4px;
}
div#div_analiza_archive_name .setting_holder .setting_item input.text.medium {
width: 40% !important;
margin-left: 4px;
margin-right: 4px;
}
div#div_analiza_archive_name .setting_holder input.text,
div#div_analiza_archive_name .setting_holder textarea {
width: 100% !important;
}
div#div_analiza_archive_name .alaysis_archive_wrap {
display: flex;
flex-direction: row;
gap: 32px;
}
div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_right,
div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%;
}
/*
Header scss - top line, menu...
*/
@ -21207,13 +21249,6 @@ and open the template in the editor.
Created on : 14-Aug-2018, 11:40:15
Author : podkrizniku
*/
/* Arhiv */
#div_analiza_archive_name {
min-width: 900px;
width: auto;
padding-bottom: 50px !important;
}
.div_curent_archives {
margin-top: 10px;
padding: 20px 5px 20px 5px;

View File

@ -159,4 +159,62 @@ div#telephone_popup {
}
}
}
////// ANALIZE //////
//Ustvari arhiv analize
div#div_analiza_archive_name {
.setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
&:first-of-type{
margin-top: 0;
}
.setting_item {
margin-top: 8px;
label {
cursor: pointer;
margin-right: 0;
}
&.indent {
margin-left: 25px;
margin-top: 0;
display: none;
input.text {
margin-left: 4px;
}
}
input.text.medium {
width: 40% !important;
margin-left: 4px;
margin-right: 4px;
}
}
input.text,
textarea {
width: 100% !important;
}
}
.alaysis_archive_wrap {
display: flex;
flex-direction: row;
gap: 32px;
.alaysis_archive_right,
.alaysis_archive_left {
width: 50%;
}
}
}

View File

@ -9,14 +9,6 @@ and open the template in the editor.
*/
/* Arhiv */
#div_analiza_archive_name {
min-width: 900px;
width: auto;
padding-bottom: 50px !important;
}
.div_curent_archives {
margin-top: 10px;
padding: 20px 5px 20px 5px;