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

[Redizajn 1KA] - Analize - Poročila --> Poročila - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-02-17 00:20:08 +01:00
parent d367c9d33d
commit 79c78a4cf6
6 changed files with 122 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -6995,85 +6995,89 @@ class SurveyAnalysis {
echo '<div id="custom_report_switch"><a href="index.php?anketa='.self::$sid.'&a=analysis&m=analysis_creport"><span>'.$lang['srv_custom_report'].'</span></a></div>';
*/
echo '<table class="analysis_reports"><tr>';
echo '<div class="reports_holder">';
// ANALIZE
echo '<td>';
echo '<fieldset>';
echo '<legend>'.$lang['srv_analiza'].'</legend>';
echo '<ul>';
# linki - analize sumarnik
echo '<span class="subtitle">' . $lang['srv_sumarnik'] . '</span>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums&anketa='.self::$sid).'" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_rtf&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_xls&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon xls" title="' . $lang['srv_reporti'] . '"></span>&nbsp;XLS - (Microsoft Excel)</a>';
echo '<li class="title">' . $lang['srv_sumarnik'] . '</li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums&anketa='.self::$sid).'" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_rtf&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_xls&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon xls" title="' . $lang['srv_reporti'] . '"></span>&nbsp;XLS - (Microsoft Excel)</a></li>';
# linki - analize opisne statistike
echo '<span class="subtitle">' . $lang['srv_descriptor'] . '</span>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_rtf&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_xls&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon xls" title="' . $lang['srv_reporti'] . '"></span>&nbsp;XLS - (Microsoft Excel)</a>';
echo '<li class="title">' . $lang['srv_descriptor'] . '</li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_rtf&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_xls&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon xls" title="' . $lang['srv_reporti'] . '"></span>&nbsp;XLS - (Microsoft Excel)</a></li>';
# linki - analize frekvence
echo '<span class="subtitle">' . $lang['srv_frequency'] . '</span>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_rtf&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_xls&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon xls" title="' . $lang['srv_reporti'] . '"></span>&nbsp;XLS - (Microsoft Excel)</a>';
echo '<li class="title">' . $lang['srv_frequency'] . '</li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_rtf&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_xls&anketa=' . self::$sid).'" target="_blank">' .
'<span class="faicon xls" title="' . $lang['srv_reporti'] . '"></span>&nbsp;XLS - (Microsoft Excel)</a></li>';
echo '</ul>';
echo '</fieldset>';
// VPRASALNIK
echo '</td><td>';
echo '<fieldset style="padding-top: 10px;">';
echo '<fieldset>';
echo '<legend>'.$lang['srv_analysis_links_survey'].'</legend>';
echo '<ul>';
# linki - vprašalnik
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=' . A_REPORT_VPRASALNIK_PDF . '&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=' . A_REPORT_VPRASALNIK_RTF . '&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?a=' . A_REPORT_VPRASALNIK_PDF . '&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?a=' . A_REPORT_VPRASALNIK_RTF . '&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a></li>';
echo '</ul>';
echo '</fieldset>';
// IZPIS
echo '</td><td>';
echo '<fieldset>';
echo '<legend>'.$lang['srv_statistic'].'</legend>';
echo '<ul>';
# linki - vpogled
echo '<span class="subtitle">' . $lang['srv_analysis_links_vpogled'] . '</span>';
echo '<a href="index.php?anketa='.self::$sid.'&a=data&m=quick_edit&quick_view=1" >' .
'<span title="' . $lang['srv_link_data_view'] . '"></span>' . $lang['srv_link_data_view'] . '</a>';
echo '<li class="title">' . $lang['srv_analysis_links_vpogled'] . '</li>';
echo '<li><a class="hasline" href="index.php?anketa='.self::$sid.'&a=data&m=quick_edit&quick_view=1" >' .
'<span title="' . $lang['srv_link_data_view'] . '"></span>' . $lang['srv_link_data_view'] . '</a></li>';
# linki - izpis vseh odgovorov
echo '<span class="subtitle">' . $lang['srv_analysis_links_allAnswers'] . '</span>';
echo '<span class="clr">' . $lang['srv_analysis_links_allAnswers_note'] . '</span><br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_results&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a>';
echo '<br/>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_results&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a>';
echo '<li class="title">' . $lang['srv_analysis_links_allAnswers'] . '</li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?a=pdf_results&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon pdf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;PDF - (Adobe Acrobat)</a></li>';
echo '<li><a href="'.makeEncodedIzvozUrlString('izvoz.php?a=rtf_results&anketa=' . self::$sid) . '" target="_blank">' .
'<span class="faicon rtf" title="' . $lang['srv_reporti'] . '"></span>&nbsp;DOC - (Microsoft Word)</a></li>';
echo '<li>' . $lang['srv_analysis_links_allAnswers_note'] . '</li>';
echo '</ul>';
echo '</fieldset>';
echo '</td>';
echo '</tr></table>';
echo '</div>';
}
private static function printAnalizaSingleVar() {

2
lang/1.php
View File

@ -5422,7 +5422,7 @@ $lang = array (
"social_login" => 'Prijava preko socialnih omre&#382;ij',
"srv_max_answers" => 'max število odgovorov',
"srv_analysis_links_allAnswers" => 'Izpis odgovorov vseh ustreznih respondentov',
"srv_analysis_links_allAnswers_note" => '(pozor – ne gre za podatke, ampak za dobeseden izpis vprašalnikov in odgovorov za vsakega respondenta, kar je lahko izjemno obsežno; privzeta omejitev je zato 300 enot)',
"srv_analysis_links_allAnswers_note" => '<span class="red">Opozorilo!</span> Pri tej možnosti ne gre za izpis podatkov, ampak za dobeseden izpis vprašanj in odgovorov za vsakega respondenta. Izpis je časovno zamuden, zato je možno izpisati odgovore za največ 300 enot.',
"srv_analysis_links_vpogled" => 'Vpogled v individualne ankete',
"srv_means_izberi_prvo" => "Izberite prvo vpra&#353;anje",
"srv_means_najprej_prvo" => "Najprej izberite prvo vpra&#353;anje",

2
lang/2.php
View File

@ -5386,7 +5386,7 @@ $lang = array (
"social_login" => 'Social network login',
"srv_max_answers" => 'max number of answers',
"srv_analysis_links_allAnswers" => 'Export all surveys with data (max 300 respondents)',
"srv_analysis_links_allAnswers_note" => '(Alert! – Here you do not export the data but the entire questionnaire for each respondent; the limit is set to 300).',
"srv_analysis_links_allAnswers_note" => '<span class="red">Warning!</span> This option is not a data output, but a direct output of the questions and answers for each respondent. The output is time-consuming, so it is possible to output responses for a maximum of 300 units.',
"srv_analysis_links_vpogled" => 'View by individual surveys',
"srv_means_izberi_prvo" => "Select the first question",
"srv_means_najprej_prvo" => "First, select the first question",

30
public/css/admin_new.css
View File

@ -17431,6 +17431,36 @@ ul.vrednost_sort input[type=text] {
-webkit-box-shadow: 0 0 20px black;
}
div.reports_holder {
display: flex;
flex: row;
justify-content: space-between;
gap: 32px;
}
div.reports_holder fieldset {
flex-basis: 100%;
}
div.reports_holder fieldset ul {
list-style-type: none;
padding: 0;
margin: 0;
}
div.reports_holder fieldset ul li {
margin-bottom: 16px;
}
div.reports_holder fieldset ul li:last-of-type {
margin-bottom: 0;
}
div.reports_holder fieldset ul li.title {
font-weight: 800;
}
div.reports_holder fieldset ul li a:not(.hasline) {
text-decoration: none;
}
div.reports_holder fieldset ul li span.faicon {
margin-right: 12px;
}
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates

35
resources/sass/admin_new/pages/survey_analysis/page_reports.scss Normal file
View File

@ -0,0 +1,35 @@
div.reports_holder {
display: flex;
flex: row;
justify-content: space-between;
gap: 32px;
fieldset {
flex-basis: 100%;
ul {
list-style-type: none;
padding: 0;
margin: 0;
li {
margin-bottom: 16px;
&:last-of-type{
margin-bottom: 0;
}
&.title {
font-weight: $extra-bold;
}
a:not(.hasline) {
text-decoration: none;
}
span.faicon {
margin-right: 12px;
}
}
}
}
}

2
resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss
View File

@ -16,6 +16,8 @@
@import "page_charts";
@import "page_custom_report";
@import "page_reports";
// Popupi analiz