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 - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-06-07 06:09:43 +02:00
parent cd70890f26
commit 5efdaddb92
4 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1807,19 +1807,17 @@ class SurveyCustomReport {
// Preimenuje, brise in share lahko samo za lastna porocila
if($this->creportAuthor == $global_user_id){
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</button>';
echo '<p class="blue pointer top16 bottom8" onClick="creport_profile_action(\'show_rename\'); return false;">'.$lang['srv_rename_profile'].'</p>';
if($this->creportProfile > 0)
echo '<button class="medium white-blue" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</button>';
echo '<p class="blue pointer bottom8" onclick="creport_profile_action(\'show_delete\'); return false;">'.$lang['srv_delete_profile'].'</p>';
echo '<button class="medium blue" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</button>';
echo '<p class="blue pointer bottom16" onclick="creport_profile_action(\'show_share\'); return false;">'.$lang['srv_custom_report_share'].'</p>';
echo '</div>';
}
// Preberemo najkasneje editiran element (cas spreminjanja)
/*/ Preberemo najkasneje editiran element (cas spreminjanja)
$sqlt = sisplet_query("SELECT MAX(time_edit) FROM srv_custom_report WHERE ank_id='$this->ank_id' AND usr_id='$this->creportAuthor' AND profile='$this->creportProfile'");
if(mysqli_num_rows($sqlt) > 0){
$rowt = mysqli_fetch_array($sqlt);
@ -1838,7 +1836,7 @@ class SurveyCustomReport {
if($time_edit != '' && $time_edit != '0000-00-00 00:00:00'){
$time_edit = strtotime($time_edit);
echo '<p>'.$lang['srv_custom_report_time_edited'].': <span class="bold">'.date("d.m.Y H:i", $time_edit).'</span></p>';
}
}*/
echo '</div>';
@ -1858,7 +1856,7 @@ class SurveyCustomReport {
$comment = $row['value'];
}
echo '<p class="bold">'.$lang['srv_inv_archive_comment'].':</p>';
echo '<p>'.$lang['srv_inv_archive_comment'].':</p>';
// Komentar lahko popravlja samo avtor porocila
if($this->creportAuthor == $global_user_id)
echo '<textarea class="textarea" onBlur="creport_profile_comment(this.value)">'.$comment.'</textarea>';

40
public/css/admin_new.css
View File

@ -8313,24 +8313,31 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%;
}
#creport_profiles {
#div_creport_settings_profiles #creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid #E5E5E5;
}
#creport_profiles .option {
padding: 1px;
#div_creport_settings_profiles #creport_profiles .option {
padding: 8px;
border: 1px solid #E5E5E5;
}
#creport_profiles .active {
background-color: #1E88E5;
color: white;
border-bottom: 1px solid #E5E5E5;
#div_creport_settings_profiles #creport_profiles .active {
background-color: #EAF9FE;
color: #1E88E5;
}
#creport_settings_profiles_comment textarea {
#div_creport_settings_profiles #creport_settings_profiles_comment textarea {
width: 100%;
height: 80px;
}
#div_creport_settings_profiles .button_holder {
display: flex;
border-top: 1px solid #E5E5E5;
padding-top: 16px !important;
margin-top: 16px !important;
justify-content: space-between !important;
}
#newCReportProfile .text,
@ -29888,21 +29895,6 @@ ul.vrednost_sort input[type=text] {
width: 98%;
height: 30px;
}
.subpage_analysis_creport #anketa_custom_report #creport_profiles {
cursor: pointer;
width: 99%;
height: 140px;
display: inline-block;
border: 1px solid #E5E5E5;
}
.subpage_analysis_creport #anketa_custom_report #creport_profiles .option {
padding: 1px;
}
.subpage_analysis_creport #anketa_custom_report #creport_profiles .active {
background-color: #1E88E5;
color: white;
border-bottom: 1px solid #E5E5E5;
}
div.reports_holder {
display: flex;

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

@ -224,6 +224,7 @@ div#div_analiza_archive_name {
}
//Poročila
#div_creport_settings_profiles {
#creport_profiles {
cursor: pointer;
width: 99%;
@ -231,21 +232,32 @@ div#div_analiza_archive_name {
display: inline-block;
border: 1px solid $gray;
.option {
padding: 1px;
padding: 8px;
border: 1px solid $gray;
}
.active {
background-color: $blue;
color: white;
border-bottom: 1px solid $gray;
background-color: $light-blue;
color: $blue;
}
}
#creport_settings_profiles_comment {
textarea {
width: 100%;
height: 80px;
}
}
.button_holder {
display: flex;
border-top: 1px solid $gray;
padding-top: 16px !important;
margin-top: 16px !important;
justify-content: space-between !important;
}
}
#newCReportProfile,
#renameCReportProfile {
.text {

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

@ -504,20 +504,5 @@
}
}
}
#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;
}
}
}