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

[Redizajn 1KA] Popupi: Analize → Poročila → Poročila po meri - Edit ikona ob imenu poročila

Browse Source
This commit is contained in:
tejagerjovic 2022-05-20 12:47:09 +02:00
parent 3e11258558
commit e12cb114b2
4 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -487,7 +487,7 @@ class SurveyAdmin
echo '<div id="custom_report_alert" class="divPopUp PopUpNarrow"></div>';
// Skriti divi za profile
echo '<div id="div_creport_settings_profiles" class="divPopUp"></div>';
echo '<div id="div_creport_settings_profiles" class="divPopUp PopUpNarrow"></div>';
// Creport
echo '<div id="div_mc_tables" class="divPopUp PopUpNarrow"></div>';

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

@ -1727,7 +1727,8 @@ class SurveyCustomReport {
$name = $profile['name'];
echo '<h2>'.$lang['srv_custom_report_profile_title'].'</h2>';
echo '<h2>'.$lang['srv_custom_report_profile_title'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="close_creport_profile(); return false;">✕</a></div>';
echo '<div id="creport_settings_profiles_left">';
@ -1789,14 +1790,15 @@ class SurveyCustomReport {
// Ce je izbran custom profil imamo na dnu gumba brisi in preimenuj, pri default pa samo preimenuj
// Preimenuje, brise in share lahko samo za lastna porocila
if($this->creportAuthor == $global_user_id){
echo '<div style="float:left; margin-bottom:10px;">';
echo '<a href="#" onclick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</a>'."\n";
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</button>';
if($this->creportProfile > 0)
echo '<br /><a href="#" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</a>'."\n";
echo '<button class="medium white-blue" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</button>';
echo '<button class="medium blue" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</button>';
// Deli poročilo z drugimi uredniki
echo '<br /><a href="#" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</a>'."\n";
echo '</div>';
}
@ -1811,15 +1813,15 @@ class SurveyCustomReport {
$time_edit = $time_created;
// Cas kreirranja in urejanja profila
echo '<div style="float:right; text-align:right;">';
echo '<div class="top16 bottom16">';
if($time_created != '' && $time_created != '0000-00-00 00:00:00'){
$time_created = strtotime($time_created);
echo $lang['srv_custom_report_time_created'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span><br />';
echo '<p>'.$lang['srv_custom_report_time_created'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span></p>';
}
if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){
$time_edit = strtotime($time_edit);
echo $lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span>';
echo '<p>'.$lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span></p>';
}
echo '</div>';
@ -1840,10 +1842,10 @@ class SurveyCustomReport {
$comment = $row['value'];
}
echo '<span class="bold clr">'.$lang['srv_inv_archive_comment'].':</span>';
echo '<p class="bold">'.$lang['srv_inv_archive_comment'].':</p>';
// Komentar lahko popravlja samo avtor porocila
if($this->creportAuthor == $global_user_id)
echo '<textarea onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>';
echo '<textarea class="textarea" onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>';
else
echo '<span>'.$comment.'</span>';
@ -1852,15 +1854,13 @@ class SurveyCustomReport {
// cover Div
echo '<div id="dsp_cover_div"></div>'."\n";
echo '<span class="clr"></span>';
echo '<div style="position:absolute; bottom:20px; right:20px;">';
echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="use_creport_profile(); return false;"><span>'.$lang['srv_save_and_run_profile'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_custom_report_create'].'"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="creport_profile_action(\'show_new\'); return false;"><span>'.$lang['srv_custom_report_create'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton" href="#" onclick="close_creport_profile(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<div class="button_holder">';
echo '<button class="medium white-black" onClick="close_creport_profile(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium white-blue" onClick="use_creport_profile(); return false;">'.$lang['srv_save_and_run_profile'].'</button>';
echo '<button class="medium blue" onclick="creport_profile_action(\'show_new\'); return false;">'.$lang['srv_custom_report_create'].'</button>';
echo '</div>';
echo '</div>';
}
function displayProfilePopups(){

20
public/css/admin_new.css
View File

@ -8303,6 +8303,26 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%;
}
#creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid #E5E5E5;
}
#creport_profiles .option {
padding: 1px;
}
#creport_profiles .active {
background-color: #1E88E5;
color: white;
border-bottom: 1px solid #E5E5E5;
}
#creport_settings_profiles_comment textarea {
width: 100%;
}
.pbLabel {
height: 20px;
width: 160px;

23
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -219,6 +219,29 @@ div#div_analiza_archive_name {
}
}
//Poročila
#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;
}
}
#creport_settings_profiles_comment {
textarea {
width: 100%;
}
}
//// TESTIRANJE /////
//Avtomatski vnosi - progress bar