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

Redesign - popravki analiz - porocilo po meri

Browse Source
This commit is contained in:
pero1203 2022-04-24 22:38:55 +02:00
parent d045d700e4
commit 9bd144c718
5 changed files with 1548 additions and 1831 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
admin/survey/classes/class.SurveyCustomReport.php
View File

@ -215,7 +215,8 @@ class SurveyCustomReport {
echo '<ul id="custom_report_sortable">'; echo '<ul id="custom_report_sortable">';
if ($this->isArchive == false && $this->publicCReport == false) {
if ($this->isArchive == false && $this->publicCReport == false) {
echo '<li class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'">'; echo '<li class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'">';
echo '<div class="add_element">'; echo '<div class="add_element">';
$this->addNewElement(-1); $this->addNewElement(-1);
@ -223,36 +224,44 @@ class SurveyCustomReport {
echo '</li>'; echo '</li>';
} }
// Loop po vseh dodanih elementih porocila // Loop po vseh dodanih elementih porocila
while($row = mysqli_fetch_array($sql)){ while($row = mysqli_fetch_array($sql)){
// V arhivih nimamo pagebreakov
if( $row['type'] == '-1' && ($this->isArchive != false || $this->publicCReport != false) ){
continue;
}
echo '<li id="sortable_report_element_'.$row['id'].'" class="'.($row['type'] == '-1' ? 'report_element_break' : 'report_element_standard').'">';
// Pagebreak // Pagebreak
if($row['type'] == '-1'){ if($row['type'] == '-1'){
if ($this->isArchive == false && $this->publicCReport == false){ echo '<div class="report_element">';
echo '<li id="sortable_report_element_'.$row['id'].'" class="report_element_break">'; $this->displayBreak($row);
$this->displayBreak($row); echo '</div>';
echo '</li>';
}
} }
// Navaden element
else{ else{
echo '<li id="sortable_report_element_'.$row['id'].'" class="report_element_standard">';
echo '<div class="report_element '.($this->expanded == 1 && $this->isArchive == false && $this->publicCReport == false ? ' active':'').'" id="report_element_'.$row['id'].'">'; echo '<div class="report_element '.($this->expanded == 1 && $this->isArchive == false && $this->publicCReport == false ? ' active':'').'" id="report_element_'.$row['id'].'">';
$this->displayReportElement($row['id'], $this->expanded); $this->displayReportElement($row['id'], $this->expanded);
echo '</div>'; echo '</div>';
echo '</li>';
} }
// Separator za elementom
if ($this->isArchive == false && $this->publicCReport == false) { if ($this->isArchive == false && $this->publicCReport == false) {
echo '<li class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'" id="report_element_separator_'.$row['id'].'">'; echo '<div id="report_element_separator_'.$row['id'].'" class="report_element_separator '.($row['vrstni_red'] == $counter ? 'last_separator' : '').'" >';
if($row['vrstni_red'] < $counter){ echo '<div class="add_element">';
echo '<div class="add_element">'; $this->addNewElement($row['id']);
$this->addNewElement($row['id']); echo '</div>';
echo '</div>'; echo '</div>';
}
echo '</li>';
} }
echo '</li>';
} }
echo '</ul>'; echo '</ul>';
} }
else{ else{
@ -856,7 +865,7 @@ class SurveyCustomReport {
function displayReportElementText($reportElement, $expanded){ function displayReportElementText($reportElement, $expanded){
global $lang; global $lang;
echo '<div class="report_element_text report_element_comment" '.($expanded == 0 ? ' style="display:none;"' : '').'>'; echo '<div class="report_element_text report_element_comment" '.($expanded == 0 ? 'style="display:none;"' : '').'>';
if($expanded == 1 && $this->isArchive == false && $this->publicCReport == false){ if($expanded == 1 && $this->isArchive == false && $this->publicCReport == false){
echo '<span class="title">'.$lang['srv_inv_archive_comment'].':</span>'; echo '<span class="title">'.$lang['srv_inv_archive_comment'].':</span>';
@ -1617,7 +1626,7 @@ class SurveyCustomReport {
// Glava elementa (naslov, ikone...) // Glava elementa (naslov, ikone...)
$this->displayReportElementHead($reportElement, $expanded); $this->displayReportElementHead($reportElement, $expanded);
echo '<div class="report_element_text" '.($expanded == 0 ? ' display:none;' : '').'">'; echo '<div class="report_element_text" '.($expanded == 0 ? 'style="display:none;"' : '').'">';
if ($this->isArchive == false && $this->publicCReport == false) { if ($this->isArchive == false && $this->publicCReport == false) {
echo '<span class="faicon edit" title="'.$lang['srv_editor_title'].'" onclick="creport_load_editor(this); return false;"></span>'; echo '<span class="faicon edit" title="'.$lang['srv_editor_title'].'" onclick="creport_load_editor(this); return false;"></span>';

11
admin/survey/script/cReport.js
View File

@ -7,7 +7,7 @@ function creport_init () {
// sortable za custom report // sortable za custom report
$('.report_element').live('mouseover', function (event) { $('.report_element').live('mouseover', function (event) {
$('#custom_report_sortable').sortable({ $('#custom_report_sortable').sortable({
items: 'li', items: 'li.report_element_standard, li.report_element_break',
handle: '.report_element_head', handle: '.report_element_head',
opacity: 0.8, opacity: 0.8,
revert: true, revert: true,
@ -32,11 +32,16 @@ function creport_init () {
}); });
$(".report_element_separator").live({ $(".report_element_separator").live({
mouseenter: function(){ mouseenter: function(){
$(this).find('.add_element').stop().animate({opacity:1}, 500); //if(!$(this).hasClass('last_separator')){
$(this).find('.add_element').stop().animate({opacity:1}, 500);
//}
}, },
mouseleave: function(){ mouseleave: function(){
$(this).find('.add_element').stop().animate({opacity:0}, 500); //if(!$(this).hasClass('last_separator')){
$(this).find('.add_element').stop().animate({opacity:0}, 500);
//}
} }
}); });

3063
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

252
resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
View File

@ -133,44 +133,6 @@
// Posamezen element // Posamezen element
li{ li{
margin: 8px 0;
&.report_element_separator{
.add_element{
display: flex;
align-items: center;
opacity: 0;
>span{
cursor: pointer;
margin-right: 16px;
font-size: 14px;
color: $blue;
.faicon{
margin-right: 4px;
&:before{
font-size: 14px;
color: $blue;
}
}
&:hover{
color: $dark-blue;
.faicon::before{
color: $dark-blue;
}
}
}
}
}
&.report_element_standard{ &.report_element_standard{
@ -306,62 +268,64 @@
} }
&.report_element_break{ &.report_element_break{
display: flex;
align-items: center;
.pb_text{ .report_element{
cursor: pointer; display: flex;
width: 170px; align-items: center;
font-size: 14px;
color: #A0A0A0;
}
.pb_line{ .pb_text{
width: 100%; cursor: pointer;
border-bottom: 1px $gray solid; width: 170px;
} font-size: 14px;
} color: #A0A0A0;
}
/*.report_element { .pb_line{
width: 95%; width: 100%;
border: 1px $blue solid; border-bottom: 1px $gray solid;
&:hover {
background-color: white;
border: 1px $blue solid;
}
}
.report_element.active {
background-color: white;
border: 1px $blue solid;
}
.report_element_text {
.creport_text_inline {
&:hover {
cursor: text;
background-color: $light-blue;
} }
} }
.edit2 { }
&.report_element_separator,
.report_element_separator{
margin: 8px 0;
.add_element{
display: flex;
align-items: center;
opacity: 0; opacity: 0;
filter: alpha(opacity=0);
>span{
cursor: pointer;
margin-right: 16px;
font-size: 14px;
color: $blue;
.faicon{
margin-right: 4px;
&:before{
font-size: 14px;
color: $blue;
}
}
&:hover{
color: $dark-blue;
.faicon::before{
color: $dark-blue;
}
}
}
} }
} }
.report_element_text.writing {
.creport_text_inline {
background-color: $light-blue;
border: 1px dashed $blue;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.edit2 {
opacity: 100;
filter: alpha(opacity=100);
}
}*/
} }
} }
.first_element_text{ .first_element_text{
@ -383,124 +347,6 @@
} }
/*#custom_report_elements {
.report_element {
.report_element_head {
overflow: auto;
min-height: 22px;
padding: 5px 5px 3px;
background-color: $light-blue;
font-size: 12px;
font-weight: 600;
.report_element_icons {
float: right;
margin: 0 10px;
display: none;
}
.report_element_title {
cursor: pointer;
float: left;
position: relative;
margin: 0 10px;
color: $blue;
width: 85%;
}
span.sprites.printer {
margin-bottom: 2px;
}
}
.report_element_head.hover {
background-color: $light-blue;
.report_element_icons {
display: block;
background-color: $light-blue;
}
}
.report_element_head.active {
overflow: auto;
min-height: 22px;
padding: 5px 5px 3px;
font-size: 12px;
font-weight: 600;
background-color: $light-blue;
.report_element_icons {
display: block;
background-color: $light-blue;
}
}
.report_element_settings {
clear: both;
margin: 15px 10px 20px 30px;
}
.report_element_data {
padding: 10px 20px;
}
.chart_img {
background-color: white;
}
.report_element_text {
clear: both;
overflow: auto;
margin: 0 10px 20px 30px;
width: 80%;
}
text-align: left;
}
.report_element_text {
.creport_text_inline {
width: 95%;
min-height: 15px;
padding: 5px 15px;
}
}
.report_element_pb {
cursor: pointer;
background: url("../../../admin/survey/img_0/sprites_pb_expanded.png") no-repeat scroll 0 10px transparent;
color: $blue;
font-size: 15px;
font-weight: bold;
height: 18px;
line-height: 18px;
display: inline-block;
width: 95%;
&:hover {
background: url('../../../admin/survey/img_0/sprites_pb_expanded.png') no-repeat 0 -52px transparent;
}
}
.report_element_separator {
height: 25px;
width: 95%;
font-size: 10px;
.add_element {
opacity: 0;
padding: 5px 0 0 0;
margin-left: -40px;
filter: alpha(opacity = 0);
}
}
.report_element_separator.expanded {
height: 38px;
width: 95%;
font-size: 11px;
.add_element {
opacity: 0;
padding: 10px 0 0 0;
margin-left: -40px;
filter: alpha(opacity = 0);
}
}
.add_element {
span {
&:hover {
color: $blue;
}
}
}
}*/
.custom_report_include { .custom_report_include {
clear: both; clear: both;
margin: 5px 10px; margin: 5px 10px;

2
resources/sass/admin_new/pages/survey_edit/branching.scss
View File

@ -47,6 +47,8 @@ $branching_main_size_small: calc(100% - 525px);
margin: 0; margin: 0;
li { li {
position: relative;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
margin: 0; margin: 0;