diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index ad0ed350d..9e3afc1e7 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -215,44 +215,53 @@ class SurveyCustomReport {
echo '
';
- if ($this->isArchive == false && $this->publicCReport == false) {
+
+ if ($this->isArchive == false && $this->publicCReport == false) {
echo '- ';
echo '
';
$this->addNewElement(-1);
echo '
';
echo ' ';
}
-
+
+
// Loop po vseh dodanih elementih porocila
while($row = mysqli_fetch_array($sql)){
+ // V arhivih nimamo pagebreakov
+ if( $row['type'] == '-1' && ($this->isArchive != false || $this->publicCReport != false) ){
+ continue;
+ }
+
+
+ echo '- ';
+
// Pagebreak
- if($row['type'] == '-1'){
- if ($this->isArchive == false && $this->publicCReport == false){
- echo '
- ';
- $this->displayBreak($row);
- echo '
';
- }
+ if($row['type'] == '-1'){
+ echo '';
+ $this->displayBreak($row);
+ echo '
';
}
+ // Navaden element
else{
- echo '- ';
echo '
';
$this->displayReportElement($row['id'], $this->expanded);
echo '
';
- echo ' ';
}
+ // Separator za elementom
if ($this->isArchive == false && $this->publicCReport == false) {
- echo '- ';
- if($row['vrstni_red'] < $counter){
- echo '
';
- $this->addNewElement($row['id']);
- echo '
';
- }
- echo ' ';
+ echo '';
+ echo '
';
+ $this->addNewElement($row['id']);
+ echo '
';
+ echo '
';
}
+
+ echo '';
}
+
echo '
';
}
else{
@@ -856,7 +865,7 @@ class SurveyCustomReport {
function displayReportElementText($reportElement, $expanded){
global $lang;
- echo '