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

Redesign - popravki napak - arhiv analiz

Browse Source
This commit is contained in:
pero1203 2022-05-31 09:57:31 +02:00
parent b33e773a7f
commit d8baef60cc
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php
View File

@ -1259,7 +1259,9 @@ class SurveyAnalysisArchive {
* *
*/ */
static function createArchiveFromAnaliza() { static function createArchiveFromAnaliza() {
$content = null; $content = null;
if($_POST['podstran'] == 'charts'){ if($_POST['podstran'] == 'charts'){
# kreiramo arhiv za grafe # kreiramo arhiv za grafe
$SC = new SurveyChart(); $SC = new SurveyChart();
@ -1280,13 +1282,15 @@ class SurveyAnalysisArchive {
if ($_POST['podstran'] == 'anal_arch') { if ($_POST['podstran'] == 'anal_arch') {
$_POST['podstran'] = 'sumarnik'; $_POST['podstran'] = 'sumarnik';
} }
if (!isset($_POST['content'])) { if (!isset($_POST['content'])) {
SurveyAnalysis::Init(self::$sid); SurveyAnalysis::Init(self::$sid);
SurveyAnalysis::setUpIsForArchive(true); SurveyAnalysis::setUpIsForArchive(true);
SurveyAnalysis::setUpReturnAsHtml(true); SurveyAnalysis::setUpReturnAsHtml(true);
$content = SurveyAnalysis::Display(); $content = SurveyAnalysis::Display();
} else { }
else {
$content = $_POST['content']; $content = $_POST['content'];
} }
} }
@ -1301,12 +1305,12 @@ class SurveyAnalysisArchive {
$ArchiveTypes = array(M_ANALIZA_SUMS => 0, M_ANALIZA_DESCRIPTOR=>1, M_ANALIZA_FREQUENCY=>2, M_ANALIZA_CROSSTAB=>3, M_ANALYSIS_MEANS=>4, M_ANALYSIS_TTEST=>5, M_ANALYSIS_BREAK=>6, M_ANALYSIS_CHARTS=>7, M_ANALYSIS_CREPORT=>8); $ArchiveTypes = array(M_ANALIZA_SUMS => 0, M_ANALIZA_DESCRIPTOR=>1, M_ANALIZA_FREQUENCY=>2, M_ANALIZA_CROSSTAB=>3, M_ANALYSIS_MEANS=>4, M_ANALYSIS_TTEST=>5, M_ANALYSIS_BREAK=>6, M_ANALYSIS_CHARTS=>7, M_ANALYSIS_CREPORT=>8);
if (isset($_POST['podstran'])) if (isset($_POST['podstran']))
$type = $ArchiveTypes[$_POST['podstran']]; $type = $ArchiveTypes[$_POST['podstran']];
if (isset($content) && trim($content) != null && self::$sid > 0) {
if (isset($content) && trim($content) != null && self::$sid > 0) {
SurveyAnalysisArchive :: Init(self::$sid); SurveyAnalysisArchive :: Init(self::$sid);
SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password); SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password);
}
} else { else {
echo 'Error! (SurveyAnalysisArchive :: CreateArchive)'; echo 'Error! (SurveyAnalysisArchive :: CreateArchive)';
} }

2
public/css/admin_new.css
View File

@ -30394,6 +30394,8 @@ input#endDate {
#arch_body_div .analysis_bottom_settings { #arch_body_div .analysis_bottom_settings {
margin-bottom: 32px; margin-bottom: 32px;
} }
#arch_body_div .analysis_bottom_settings .comment_holder,
#arch_body_div .analysis_bottom_settings a:nth-child(2),
#arch_body_div .analysis_bottom_settings a:nth-child(6) { #arch_body_div .analysis_bottom_settings a:nth-child(6) {
display: none; display: none;
} }

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

@ -16,6 +16,8 @@
.analysis_bottom_settings{ .analysis_bottom_settings{
margin-bottom: 32px; margin-bottom: 32px;
.comment_holder,
a:nth-child(2),
a:nth-child(6){ a:nth-child(6){
display: none; display: none;
} }