Redesign - porocilo po meri

This commit is contained in:
pero1203 2022-04-14 11:45:27 +02:00
parent 1354677f0e
commit 9bdd539921
10 changed files with 1549 additions and 2815 deletions

View File

@ -88,55 +88,90 @@ class SurveyCustomReport {
ob_start();
}
if ($this->isArchive == false && $this->publicCReport == false) {
if ($this->isArchive == false && $this->publicCReport == false) {
echo '<input type="hidden" value="'.$this->expanded.'" id="creport_expanded" />';
$this->displayProfilePopups();
// Prva vrstica - seznam poročil
echo '<div>';
echo '<span class="pointer blue bold" style="font-size:14px;" onClick="showCReportProfiles();">'.$lang['srv_custom_report_list'].'</span>';
echo ' <span id="creport_profile_setting_plus" class="pointer faicon add icon-as_link spaceLeft" title="'.$lang['srv_custom_report_create'].'" style="padding-bottom:1px;"></span>';
echo '</div>';
// Naslov
echo '<h2 style="display:inline-block; color:#333;">';
// Profil
if($this->creportProfile == 0){
echo '<div id="custom_report_top">';
$what = 'creport_default_profile_name';
$sql = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$this->ank_id' AND uid='$this->creportAuthor' AND what='$what'");
if(mysqli_num_rows($sql) == 0){
$name = $lang['srv_custom_report_default'];
}
else{
$row = mysqli_fetch_array($sql);
$name = $row['value'];
}
}
else{
$profile = $this->getProfile($this->creportProfile);
$name = $profile['name'];
}
echo '<span style="font-weight: normal;">';
echo $lang['srv_custom_report_profile'].': <span class="bold pointer blue" onClick="showCReportProfiles();">"'.$name.'"</span>';
echo '</span>';
// Seznam porocil
echo ' <div class="custom_report_list">';
// Seznam avtorjevih porocil
// Prvo default porocilo
$sql = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$this->ank_id' AND uid='$global_user_id' AND what='creport_default_profile_name'");
if(mysqli_num_rows($sql) == 0){
echo '<div class="list_item '.($this->creportProfile == 0 && $this->creportAuthor == $global_user_id ? 'active' : '').'" onClick="change_creport_profile(\'0\', \''.$global_user_id.'\');">';
echo $lang['srv_custom_report_default'];
echo '</div>';
}
else{
$row = mysqli_fetch_array($sql);
echo '<div class="list_item '.($this->creportProfile == 0 && $this->creportAuthor == $global_user_id ? 'active' : '').'" onClick="change_creport_profile(\'0\', \''.$global_user_id.'\');">';
echo $row['value'];
echo '</div>';
}
// Loop po ostalih lastnih porocilih
$sqlReports = sisplet_query("SELECT * FROM srv_custom_report_profiles WHERE ank_id='$this->ank_id' AND usr_id='$global_user_id'");
while($rowReports = mysqli_fetch_array($sqlReports)){
echo '<div class="list_item '.($this->creportProfile == $rowReports['id'] && $this->creportAuthor == $global_user_id ? 'active' : '').'" onClick="change_creport_profile(\''.$rowReports['id'].'\', \''.$global_user_id.'\');">';
echo $rowReports['name'];
echo '</div>';
}
// Loop po deljenih porocilih
$sqlSharedReports = sisplet_query("SELECT s.*, u.email FROM srv_custom_report_share s, users u WHERE ank_id='$this->ank_id' AND share_usr_id='$global_user_id' AND u.id=s.author_usr_id");
while($rowSharedReports = mysqli_fetch_array($sqlSharedReports)){
// Ce gre za osnovno porocilo ki ga ne more pobrisati
if($rowSharedReports['profile_id'] == 0){
// Dobimo ime osnovnega porocila
$what = 'creport_default_profile_name';
$sqlN = sisplet_query("SELECT value FROM srv_user_setting_for_survey WHERE sid='$this->ank_id' AND uid='".$rowSharedReports['author_usr_id']."' AND what='$what'");
if(mysqli_num_rows($sqlN) == '0'){
$default_name = $lang['srv_custom_report_default'];
}
else{
$rowN = mysqli_fetch_array($sqlN);
$default_name = ($rowN['value'] == '') ? $lang['srv_custom_report_default'] : $rowN['value'];
}
echo '<div class="list_item '.($this->creportProfile == 0 && $this->creportAuthor == $rowSharedReports['author_usr_id'] ? 'active' : '').'" onClick="change_creport_profile(\'0\', \''.$rowSharedReports['author_usr_id'].'\');" id="creport_profile_0_'.$rowSharedReports['author_usr_id'].'" author="'.$rowSharedReports['author_usr_id'].'" value="0">';
echo $default_name . ' ('.$rowSharedReports['email'].')';
echo '</div>';
}
// Ce gre za dodatno porocilo ga imamo normalno v bazi
else{
$sql = sisplet_query("SELECT * FROM srv_custom_report_profiles WHERE ank_id='$this->ank_id' AND usr_id='".$rowSharedReports['author_usr_id']."'");
while($row = mysqli_fetch_array($sql)){
echo '<div class="list_item '.($this->creportProfile == $row['id'] && $this->creportAuthor == $rowSharedReports['author_usr_id'] ? 'active' : '').'" onClick="change_creport_profile(\''.$row['id'].'\', \''.$rowSharedReports['author_usr_id'].'\');">';
echo $row['name'] . ' ('.$rowSharedReports['email'].')';
echo '</div>';
}
}
}
echo '</div>';
echo '</h2>';
// Edit in add porocilo
echo '<div style="display:inline-block; line-height:10px;">';
echo ' <span id="creport_profile_setting_edit" class="faicon edit icon-as_link spaceLeft" style="margin-bottom:1px;" title="'.$lang['srv_custom_report_edit'].'"></span>';
echo ' <span id="creport_profile_setting_edit" class="faicon edit" title="'.$lang['srv_custom_report_edit'].'"></span>';
echo ' <span id="creport_profile_setting_plus" class="faicon add" title="'.$lang['srv_custom_report_create'].'"></span>';
// Osnova porocila (prazna, vsi grafi, vse frekvence...) - prikazemo samo ce je porocilo prazno
if($this->checkEmpty($this->ank_id)){
echo '<span style="font-size:14px; font-weight: normal; margin-left: 20px;">';
echo '<span class="custom_report_base">';
echo $lang['srv_custom_report_base'].': ';
echo '<select name="custom_report_base" id="custom_report_base" onChange="addCustomReportAllElementsAlert(this.value);">';
echo '<select name="custom_report_base" id="custom_report_base" class="dropdown medium" onChange="addCustomReportAllElementsAlert(this.value);">';
echo ' <option value="0">'.$lang['srv_custom_report_base_0'].'</option>';
echo ' <option value="1">'.$lang['srv_sumarnik'].'</option>';
echo ' <option value="2">'.$lang['srv_frequency'].'</option>';
@ -145,37 +180,27 @@ class SurveyCustomReport {
echo '</select>';
echo '</span>';
}
echo '</div>';
echo '</div>';
// Stevilo vseh porocil
$sqlC = sisplet_query("SELECT id FROM srv_custom_report_profiles WHERE ank_id='$this->ank_id' AND usr_id='$global_user_id'");
$report_count = mysqli_num_rows($sqlC);
if($report_count > 0)
echo '<div style="margin:-12px 0 20px 0; color:#555555; font-size:10px;">'.$lang['srv_custom_report_count'].': '.($report_count + 1).'</div>';
// Preklop na skrcen/razsirjen pogled in predogled
if ($this->isArchive == false && $this->publicCReport == false) {
echo '<div id="custom_report_view">';
if($this->expanded == 0)
echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=1"><span class="faicon compress"></span> '.$lang['srv_custom_report_expanded_0'].'</a>';
else
echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=0"><span class="faicon expand"></span> '.$lang['srv_custom_report_expanded_1'].'</a>';
// Preview
echo ' &nbsp;<a title="'.$lang['srv_custom_report_preview'].'" onClick="showCReportPreview(); return false;" href="#"><span class="faicon preview pointer"></span> '.$lang['srv_custom_report_preview_short'].'</a>';
echo '</div>';
}
}
echo '<div id="custom_report_elements">';
// Preklop na skrcen/razsirjen pogled in predogled
echo '<div id="custom_report_view">';
if($this->expanded == 0)
echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=1" class="noline"><span class="faicon compress"></span> '.$lang['srv_custom_report_expanded_0'].'</a>';
else
echo '<a href="index.php?anketa='.$this->ank_id.'&a=analysis&m=analysis_creport&expanded=0" class="noline"><span class="faicon expand"></span> '.$lang['srv_custom_report_expanded_1'].'</a>';
// Preview
echo '<a title="'.$lang['srv_custom_report_preview'].'" class="noline" onClick="showCReportPreview(); return false;" href="#"><span class="faicon monitor"></span> '.$lang['srv_custom_report_preview_short'].'</a>';
echo '</div>';
}
echo '<div id="custom_report_elements" class="div_analiza_holder">';
// ce arhiviramo imamo razsirjene elemente
$this->expanded = ($this->isArchive == false && $this->publicCReport == false) ? $this->expanded : 1;
@ -191,51 +216,53 @@ class SurveyCustomReport {
echo '<ul id="custom_report_sortable">';
if ($this->isArchive == false && $this->publicCReport == false) {
echo '<div class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'">';
echo '<li class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'">';
echo '<div class="add_element">';
$this->addNewElement(-1);
echo '</div>';
echo '</div>';
echo '</li>';
}
// Loop po vseh dodanih elementih porocila
while($row = mysqli_fetch_array($sql)){
echo '<li id="sortable_report_element_'.$row['id'].'">';
// Pagebreak
if($row['type'] == '-1'){
if ($this->isArchive == false && $this->publicCReport == false){
echo '<li id="sortable_report_element_'.$row['id'].'" class="report_element_break">';
$this->displayBreak($row);
echo '</li>';
}
}
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'].'">';
$this->displayReportElement($row['id'], $this->expanded);
echo '</div>';
echo '</li>';
}
if ($this->isArchive == false && $this->publicCReport == false) {
echo '<div class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'" id="report_element_separator_'.$row['id'].'">';
echo '<li class="report_element_separator '.($this->expanded == 1 ? 'expanded' : '').'" id="report_element_separator_'.$row['id'].'">';
if($row['vrstni_red'] < $counter){
echo '<div class="add_element">';
$this->addNewElement($row['id']);
echo '</div>';
}
echo '</div>';
echo '</li>';
}
echo '</li>';
}
echo '</ul>';
}
else
echo '<br /><br />';
else{
echo '<div class="first_element_text">'.$lang['srv_custom_report_begin'].'</div>';
}
if ($this->isArchive == false && $this->publicCReport == false) {
// Dodajanje novega porocila
echo '<br />';
echo '<div class="add_element">';
echo '<div class="add_element bottom">';
$this->addNewElement();
echo '</div>';
}
@ -318,7 +345,7 @@ class SurveyCustomReport {
echo '<div class="report_element_settings" '.($expanded == 0 ? ' style="display:none;"' : '').'>';
// Tip izpisa (sums, freq, opisne...)
echo '<select name="report_element_type_'.$reportElement['id'].'" id="report_element_type_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'type\', this.value)">';
echo '<select name="report_element_type_'.$reportElement['id'].'" id="report_element_type_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'type\', this.value)">';
// Ce ni izbrana
if ( $reportElement['type'] == null || $reportElement['type'] == 0 ) {
@ -344,7 +371,7 @@ class SurveyCustomReport {
if($reportElement['type'] > 0 && $reportElement['type'] < 5){
// Izbira spremneljivke
echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
// Ce ni izbrana
if ( $reportElement['spr1'] == null || $reportElement['spr1'] == '' ) {
@ -391,7 +418,7 @@ class SurveyCustomReport {
$crossData2 = explode("-", $reportElement['spr2']);
// Izbira spremneljivke 1
echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@ -414,7 +441,7 @@ class SurveyCustomReport {
// Izbira spremneljivke 2
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@ -450,7 +477,7 @@ class SurveyCustomReport {
}
else{
// Izbira ze ustvarjene tabele
echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@ -475,7 +502,7 @@ class SurveyCustomReport {
$meanData2 = explode("-", $reportElement['spr2']);
// Izbira spremneljivke 1
echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@ -498,7 +525,7 @@ class SurveyCustomReport {
// Izbira spremneljivke 2
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@ -537,7 +564,7 @@ class SurveyCustomReport {
$ttestData2 = explode("-", $reportElement['spr2']);
// Izbira spremneljivke 1
echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0 ) {
@ -560,7 +587,7 @@ class SurveyCustomReport {
// Izbira spremneljivke 2
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@ -603,7 +630,7 @@ class SurveyCustomReport {
// Izbira spremneljivke 1
$variables = $this->classInstance->getVariableList(2);
echo ' <select style="margin-left:20px;" name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
echo ' <select name="report_element_spr_id_'.$reportElement['id'].'" id="report_element_spr_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr1\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr1'] == null || $reportElement['spr1'] == 0){
@ -632,7 +659,7 @@ class SurveyCustomReport {
// Izbira spremneljivke 2
$variables = $this->getBreakDependentVariableList();
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
echo ' <select name="report_element_spr2_id_'.$reportElement['id'].'" id="report_element_spr2_id_'.$reportElement['id'].'" class="dropdown medium" onChange="editCustomReportElement(\''.$reportElement['id'].'\', \'spr2\', this.value)">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $reportElement['spr2'] == null || $reportElement['spr2'] == 0 ) {
@ -671,14 +698,14 @@ class SurveyCustomReport {
global $site_path;
global $lang;
echo '<div class="creport_bottom_settings">';
echo '<div class="analysis_bottom_settings printHide">';
echo '<a href="#" onclick="doArchiveCReport();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv black very_large"></span></a>';
echo '<a href="#" onclick="createArchiveCReportBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '"><span class="faicon arhiv_mail black very_large"></span></a>';
echo '<a href="#" onClick="printAnaliza(\'CReport\'); return false;" title="'.$lang['hour_print2'].'"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_pdf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_rtf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_rtf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=creport_pdf&anketa=' . $this->ank_id) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span></a>';
echo '<a href="#" onclick="doArchiveCReport();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv"></span></a>';
echo '<a href="#" onclick="createArchiveCReportBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '"><span class="faicon arhiv_mail"></span></a>';
echo '<a href="#" onClick="printAnaliza(\'CReport\'); return false;" title="'.$lang['hour_print2'].'"><span class="faicon print"></span></a>';
echo '</div>';
}
@ -791,14 +818,6 @@ class SurveyCustomReport {
echo ' <span class="faicon copy icon-grey_dark_link" style="margin-left: 10px;" title="'.$lang['srv_custom_report_copy'].'" onClick="copyCustomReportElement(\''.$reportElement['id'].'\');"></span>';
// Brisi element
echo ' <span class="faicon delete icon-grey_dark_link" style="margin-left: 10px;" title="'.$lang['srv_custom_report_delete'].'" onClick="deleteCustomReportElement(\''.$reportElement['id'].'\');"></span>';
// Uredi element
/*if($reportElement['type'] != 8)
if($expanded == 1)
echo ' <span class="sprites pointer arrow_contract" style="margin-left: 10px;" title="'.$lang['srv_custom_report_contract'].'" onClick="expandCustomReportElement(\''.$reportElement['id'].'\');"></span>';
else
echo ' <span class="sprites pointer arrow_expand" style="margin-left: 10px;" title="'.$lang['srv_custom_report_expand'].'" onClick="expandCustomReportElement(\''.$reportElement['id'].'\');"></span>';
*/
echo '</div>';
@ -1632,19 +1651,18 @@ class SurveyCustomReport {
// Dodajanje vmes in na zacetku
if($id != 0){
echo '<span class="pointer" title="'.$lang['srv_custom_report_add'].'" style="margin-left: 20px; " onClick="addEmptyCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_light"></span> '.$lang['srv_custom_report_add'].'</span>';
echo '<span title="'.$lang['srv_custom_report_add'].'" onClick="addEmptyCustomReportElement(\''.$id.'\');"><span class="faicon add"></span>'.$lang['srv_custom_report_add'].'</span>';
echo '<span class="pointer" title="'.$lang['srv_custom_report_add_text'].'" style="margin-left: 20px;" onClick="addTextCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_dark"></span> '.$lang['srv_custom_report_add_text'].'</span>';
echo '<span title="'.$lang['srv_custom_report_add_text'].'" onClick="addTextCustomReportElement(\''.$id.'\');"><span class="faicon add"></span>'.$lang['srv_custom_report_add_text'].'</span>';
if($id > 0)
echo '<span class="pointer" title="'.$lang['srv_add_pagebreak'].'" style="margin-left: 20px;" onClick="addPBCustomReportElement(\''.$id.'\');"><span class="faicon paragraph icon-blue"></span> '.$lang['srv_add_pagebreak'].'</span>';
echo '<span title="'.$lang['srv_add_pagebreak'].'" onClick="addPBCustomReportElement(\''.$id.'\');"><span class="faicon paragraph"></span>'.$lang['srv_add_pagebreak'].'</span>';
}
// Dodajanje na dnu (brez page breaka)
if($id == 0){
echo '<span class="pointer" style="margin:-10px 0 10px 20px;" onClick="addEmptyCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_light" title="'.$lang['srv_custom_report_add'].'"></span> '.$lang['srv_custom_report_add'].'</span>';
echo '<span class="pointer" style="margin:-10px 0 10px 20px;" onClick="addTextCustomReportElement(\''.$id.'\');"><span class="faicon add small icon-blue_dark" title="'.$lang['srv_custom_report_add_text'].'"></span> '.$lang['srv_custom_report_add_text'].'</span>';
echo '<button class="medium white-blue" onClick="addTextCustomReportElement(\''.$id.'\');" title="'.$lang['srv_custom_report_add_text'].'">'.$lang['srv_custom_report_add_text'].'</button>';
echo '<button class="medium blue" onClick="addEmptyCustomReportElement(\''.$id.'\');" title="'.$lang['srv_custom_report_add'].'">'.$lang['srv_custom_report_add'].'</button>';
}
}
@ -2540,8 +2558,6 @@ class SurveyCustomReport {
SurveyUserSetting :: getInstance()->saveSettings('default_creport_profile', $id);
SurveyUserSetting :: getInstance()->saveSettings('default_creport_author', $author);
//$this->displayReport();
}
// urejanje komentarja profila

View File

@ -7127,19 +7127,18 @@ class SurveyChart {
global $site_path;
global $lang;
echo '<div class="chart_bottom_settings">';
echo '<div class="analysis_bottom_settings printHide">';
echo '<div class="comment_holder">';
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'" style="margin-right: 40px;"><span class="spaceRight faicon comments_creport" ></span><span class="bold">'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'"><span class="faicon comments_creport" ></span>'.$lang['srv_custom_report_comments_add'].'</a>';
echo '</div>';
//echo '<a href="#" onClick="printAnaliza(\'Grafi\'); return false;" title="'.$lang['hour_print2'].'" class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf black very_large" ></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv black very_large"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '"><span class="faicon arhiv_mail black very_large"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '"><span class="faicon arhiv_mail"></span></a>';
echo '</div>';
}

View File

@ -340,26 +340,12 @@ function addCustomReportAllElements(type) {
* nastavi editor na contenteditable element za naslov
*/
function creport_load_editor (_this) {
/*$(_this).css('display', 'none');
var el = $(_this).parent().find('.creport_textarea');
var el_id = el.attr('el_id');
el.replaceWith('<textarea id="report_element_texteditor_'+el_id+'" class="creport_textarea" style="width:99%">'+el.html()+'</textarea>'+
'<span class="buttonwrapper" style="margin:5px 0"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_save_editor(\''+el_id+'\'); return false;"><span>'+lang['save']+'</span></a></span>');
create_editor('report_element_texteditor_'+el_id);*/
$(_this).css('display', 'none');
var el = $(_this).parent().find('.creport_text_inline');
var el_id = el.attr('el_id');
el.replaceWith('<textarea id="report_element_texteditor_'+el_id+'" class="creport_textarea" style="width:99%">'+el.html()+'</textarea>'+
'<span class="buttonwrapper floatLeft" style="margin:5px 0"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_save_editor(\''+el_id+'\'); return false;"><span>'+lang['save']+'</span></a></span>');
@ -370,17 +356,7 @@ function creport_load_editor (_this) {
* shrani editor in nastavi nazaj contenteditable
*/
function creport_save_editor(el_id) {
/*get_editor_close('report_element_texteditor_'+el_id);
var el = $('#report_element_texteditor_'+el_id);
var parent = el.parent();
el.replaceWith('<textarea style="width:90%; height: 80px;" class="creport_textarea" el_id="'+el_id+'" id="report_element_text_'+el_id+'" onBlur="editCustomReportElement('+el_id+', text, this.value)">');
parent.find('span.buttonwrapper').remove();
editCustomReportElement(el_id, 'text', el.val());*/
get_editor_close('report_element_texteditor_'+el_id);
var el = $('#report_element_texteditor_'+el_id);
@ -405,10 +381,11 @@ function doArchiveCReport() {
genericAlertPopup('alert_no_archive_tables');
}
}
function submitArchiveCReport() {
//preverimo ali obstaja vsebina meansa
if ($("#custom_report_elements").html().length > 0 ) {
//var content = $("#custom_report_elements").html();
var name = $("#newAnalysisArchiveName").val();
var note = $("#newAnalysisArchiveNote").val();
@ -418,7 +395,8 @@ function submitArchiveCReport() {
$("#fullscreen").load('ajax.php?a=submitArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran, name:name, note:note, access:access, duration:duration, durationType:durationType}, function() {
$("#fullscreen").show();
});
} else {
}
else {
genericAlertPopup('alert_no_archive_tables');
}
}
@ -516,6 +494,16 @@ function use_creport_profile() {
});
}
// Preklopimo porocilo
function change_creport_profile(profile_id, author) {
$.post('ajax.php?t=custom_report&a=use_creport_profile', {anketa:srv_meta_anketa_id, id:profile_id, author:author}, function(){
var srv_site_url = $("#srv_site_url").val();
srv_site_url += 'admin/survey/index.php?anketa='+srv_meta_anketa_id+'&a=analysis&m=analysis_creport&expanded='+global_expanded;
window.location.href = srv_site_url;
});
}
// popravljamo custom report profil
function creport_profile_action(action){

View File

@ -6027,6 +6027,7 @@ $lang = array (
"srv_data_subnavigation_append" => 'Dodaj podatke',
"srv_data_subnavigation_merge" => 'Združi podatke',
"srv_custom_report" => "Poro&#269;ilo po meri",
"srv_custom_report_begin" => "Dodajte prvi element ali besedilo, ki ga želite vključiti v analizo raziskave.",
"srv_custom_report_title" => "Izdelava poro&#269;ila po meri",
"srv_custom_report_preview" => "Predogled poročila po meri",
"srv_custom_report_preview_short" => "Predogled",

View File

@ -5922,6 +5922,7 @@ $lang = array (
"srv_data_subnavigation_append" => 'Add data',
"srv_data_subnavigation_merge" => 'Merge data',
"srv_custom_report" => 'Custom report',
"srv_custom_report_begin" => "Add first element or text you would like to include in research analysis.",
"srv_custom_report_title" => "Custom report creation",
"srv_custom_report_preview" => "Custom report preview",
"srv_custom_report_profile" => "Report",

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,8 @@
#div_analiza_data:not(.anal_arch),
#div_means_data,
#div_break_data,
#ttestResults{
#ttestResults,
.subpage_analysis_creport{
.div_analiza_holder {
display: flex;
@ -490,269 +491,3 @@ iframe#ifmcontentstoprint {
border: 0;
}
/*sum vertical checkbox*/
/*.anl_bck_2 {
background-color: white;
}
.anl_bck {
background-color: $blue;
}*/
/*plain text*/
/*.anl_tbl_inner {
border-spacing: 0px;
padding: 0px;
margin: 0px;
border-collapse: collapse;
width: 100%;
}
.tbl_clps {
padding: 0px !important;
margin: 0px !important;
border-collapse: collapse !important;
}
.anl_tbl {
width: 100%;
border-spacing: 0px;
padding: 0px;
margin: 0px;
margin-bottom: 20px;
border-collapse: collapse;
th {
padding: 6px;
}
td {
padding: 6px;
}
}
.cll_clps {
padding: 0px !important;
margin: 0px !important;
border-collapse: collapse !important;
}
.anl_bck_0_0 {
background-color: $gray;
}
.anl_bck_0_1 {
background-color: white;
}
.anl_bck_1_0 {
background-color: white;
}
.anl_bck_1_1 {
background-color: white;
}
.anl_bck_2_1 {
background-color: white;
}
.anl_bck_2_0 {
background-color: #f9f9f7;
}
.anl_bck_text_0 {
background-color: #FFFFE3;
}
.anl_bck_text_1 {
background-color: #FFFFF0;
}
.anl_bck_desc_1 {
background-color: $light-blue;
}
.anl_bck_desc_2 {
background-color: white;
}
.anl_bck_desc_3 {
background-color: #FFFFE3;
}
.anl_bck_freq_1 {
background-color: $light-blue;
}
.anl_bck_freq_2 {
background-color: white;
}
.anl_tin {
text-indent: 8px;
}
.anl_tin1 {
text-indent: 16px;
}
.anl_tin2 {
text-indent: 24px;
}
.anl_variabla {
font-weight: bold;
color: $blue;
a {
font-weight: bold;
color: $blue;
cursor: pointer;
}
}
.anl_variabla_sub {
color: $blue;
}
.anl_variabla_label {
color: $blue;
color: black;
}
.anl_variabla_info {
color: $gray;
font-size: 10px;
}
.anl_variabla_line {
color: $gray;
}
.anl_ita {
font-style: italic;
}
.anl_detail_percent {
color: $red;
width: 70px;
text-align: right;
font-weight: normal;
a {
color: $red;
width: 70px;
text-align: right;
font-weight: normal;
}
}
.anl_detail_cnt {
color: silver;
}
.anl_ac {
text-align: center;
}
.anl_al {
text-align: left;
}
.anl_ar {
border: 1px solid $light-blue;
text-align: right;
}
.anl_ba {
border: 1px solid $light-blue;
}
.anl_bl {
border-left: 1px solid $light-blue;
}
.anl_br {
border-right: 1px solid $light-blue;
}
.anl_bt {
border-top: 1px solid $light-blue;
}
.anl_bb {
border-bottom: 1px solid $light-blue;
}
.anl_red_ba {
border: 1px solid $red;
}
.anl_dash_bl {
border-left: 1px dashed silver;
}
.anl_dash_br {
border-right: 1px dashed silver;
}
.anl_dash_bt {
border-top: 1px dashed silver;
}
.anl_dash_bb {
border-bottom: 1px dashed silver;
}
.anl_dash_red_bb {
border-bottom: 1px dashed #red;
}
.anl_double_bt {
border-top: 3px double $gray;
}
.anl_legenda_freq {
font-weight: normal;
}
.anl_variable_type {
span {
color: $gray;
}
float: right;
}
.anl_str {
font-weight: bold;
}
.anl_w15 {
width: 15px !important;
}
.anl_w30 {
width: 30px !important;
}
.anl_w50 {
width: 50px !important;
}
.anl_w70 {
width: 70px !important;
}
.anl_w90 {
width: 90px !important;
}
.anl_w110 {
width: 110px !important;
}
.anl_w140 {
width: 140px !important;
}
.anl_p5 {
padding: 5px !important;
}
.anl_p10 {
padding: 10px !important;
}
.anl_indent {
text-indent: 20px;
}
.anl_ba_dot {
border: 1px dotted $gray;
}
.anl_bl_dot {
border-left: 1px dotted $gray;
}
.anl_br_dot {
border-right: 1px dotted $gray;
}
.anl_bt_dot {
border-top: 1px dotted $gray;
}
.anl_bb_dot {
border-bottom: 1px dotted $gray;
}
.anl_user_text {
color: #B30080;
}
.anl_user_text_more {
float: left;
padding: 0px 5px;
text-indent: 0px;
color: #B30080;
}
.anl_ti_20 {
text-indent: 20px;
}
.anl_click_missing {
color: black;
font-weight: normal;
cursor: pointer;
&:hover {
color: $blue;
}
}
.anl_click_missing_hide {
color: black;
font-weight: normal;
cursor: pointer;
&:hover {
color: $blue;
}
}*/

View File

@ -0,0 +1,570 @@
/*
Porocilo po meri
*/
.subpage_analysis_creport #anketa_custom_report{
// Zgornja vrstica s seznamom porocil in urejenjem
#custom_report_top{
display: flex;
justify-content: center;
align-items: center;
box-sizing: border-box;
height: 25px;
margin-bottom: 32px;
.custom_report_list{
display: flex;
align-items: center;
border-right: 1px $gray solid;
.list_item{
cursor: pointer;
height: 25px;
min-width: 175px;
padding: 0 16px;
margin-right: 16px;
text-align: center;
color: #A0A0A0;
border-bottom: 1px $gray solid;
transition: 0.2s;
&.active,
&:hover{
color: $blue;
border-bottom: 1px $blue solid;
}
}
}
.faicon{
cursor: pointer;
margin-left: 16px;
&:before{
color: $blue;
font-size: 16px;
transition: 0.2s;
}
&:hover:before{
color: $dark-blue;
}
}
.custom_report_base{
margin-left: 16px;
font-size: 16px;
select{
margin: 0;
width: auto;
}
}
}
// Pogled - skrcen, predogled
#custom_report_view {
display: flex;
margin-bottom: 8px;
a{
margin-right: 16px;
.faicon{
margin-right: 8px;
}
}
}
// Glavni div z elementi
#custom_report_elements {
box-sizing: border-box;
padding: 16px 32px 32px 32px;
border: 1px solid $gray;
border-radius: 2px;
// Naslov porocila
.custom_report_title{
.creport_title_inline {
padding: 8px 16px;
font-size: 20px;
font-weight: 600;
text-align: center;
border: 1px solid $white;
&:hover {
cursor: text;
border: 1px solid $gray;
}
}
&.writing {
.creport_title_inline {
border: 1px solid $blue;
outline: 0;
}
}
}
// Seznam elementov
ul#custom_report_sortable{
list-style-type: none !important;
padding: 0;
margin: 0;
// Posamezen element
li{
margin: 16px 0;
&.report_element_separator{
.add_element{
display: flex;
align-items: center;
>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{
display: flex;
flex-direction: column;
border: 1px solid $gray;
border-radius: 2px;
transition: 0.2s;
&:hover{
box-shadow: 0px 2px 10px rgba(0,0,0,.07);
}
&.active{
border-color: $blue;
box-shadow: 0px 2px 10px rgba(0,0,0,.07);
.report_element_head{
background-color: $white;
border-bottom: 1px $gray solid;
}
}
.report_element_head{
display: flex;
align-items: center;
justify-content: space-between;
padding: 8px 8px 8px 16px;
background-color: $light-gray;
.report_element_title{
font-weight: 600;
text-transform: uppercase;
}
.report_element_icons{
.faicon{
&:before{
color: $blue;
font-size: 16px;
}
}
}
}
.report_element_settings{
display: flex;
padding: 16px 16px 8px 16px;
select{
margin: 0 16px 0 0;
}
}
.report_element_data{
padding: 8px 16px;
}
.report_element_text{
padding: 8px 16px;
}
}
}
&.report_element_break{
border-bottom: 1px $gray solid;
}
/*.report_element {
width: 95%;
border: 1px $blue 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 {
opacity: 0;
filter: alpha(opacity=0);
}
}
.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{
margin-top: 16px;
text-align: center;
}
.add_element.bottom{
display: flex;
align-items: center;
&.bottom{
display: flex;
justify-content: center;
margin-top: 32px;
button{
margin: 0 8px;
}
}
}
}
/*#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 {
clear: both;
margin: 5px 10px;
text-align: left;
a {
color: black;
background-color: white;
}
}
#custom_report_alert {
display: none;
margin-left: -200px;
width: 280px;
height: 100px;
.buttons {
position: absolute;
right: 10px;
bottom: 15px;
}
}
table.analysis_reports {
width: 100%;
tr {
td {
vertical-align: top;
width: 30%;
fieldset {
padding: 0px 10px 10px 10px;
}
span.subtitle {
font-weight: 600;
display: block;
padding: 10px 0 5px 0;
}
a {
line-height: 24px;
}
}
}
}
/*popups for custom reports*/
#newCReportProfile {
@include popup_general();
display: none;
position: fixed;
left: calc(50% - 210px);
top: 45vh;
z-index: 999;
margin: 10px;
width: 420px;
}
#renameCReportProfile {
display: none;
position: fixed;
left: 250px;
top: 200px;
z-index: 999;
padding: 10px;
margin: 10px;
width: 550px;
background-color: white;
border: 4px solid $gray;
box-shadow: 0 0 20px black;
-moz-box-shadow: 0 0 20px black;
-webkit-box-shadow: 0 0 20px black;
}
#shareCReportProfile {
display: none;
position: fixed;
left: 250px;
top: 200px;
z-index: 999;
padding: 10px;
margin: 10px;
width: 550px;
background-color: white;
border: 4px solid $gray;
box-shadow: 0 0 20px black;
-moz-box-shadow: 0 0 20px black;
-webkit-box-shadow: 0 0 20px black;
width: 550px;
height: auto;
}
#deleteCReportProfile {
display: none;
position: fixed;
left: 250px;
top: 200px;
z-index: 999;
padding: 10px;
margin: 10px;
width: 550px;
background-color: white;
border: 4px solid $gray;
box-shadow: 0 0 20px black;
-moz-box-shadow: 0 0 20px black;
-webkit-box-shadow: 0 0 20px black;
}
#div_creport_settings_profiles {
display: none;
width: 350px;
height: 350px;
#creport_settings_profiles_left {
margin-bottom: 10px;
}
#creport_settings_profiles_comment {
clear: both;
margin-top: 40px;
textarea {
width: 98%;
height: 30px;
}
}
}
#creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid $gray;
.option {
padding: 1px;
}
.active {
background-color: $blue;
color: white;
border-bottom: 1px solid $gray;
}
}
}

View File

@ -1,5 +1,6 @@
#div_analiza_data table.table_desc{
#div_analiza_data table.table_desc,
.custom_report_elements table.table_desc{
tr td{
text-align: center;

File diff suppressed because it is too large Load Diff