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 - Preimenuj, izbriši, deli z uredniki

Browse Source
This commit is contained in:
tejagerjovic 2022-05-20 13:14:54 +02:00
parent 74132ee649
commit 9098a22f8a
3 changed files with 72 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1889,19 +1889,32 @@ class SurveyCustomReport {
// div za preimenovanje // div za preimenovanje
echo '<div id="renameCReportProfile">'.$lang['srv_custom_report_name'].': '."\n"; echo '<div id="renameCReportProfile">';
echo '<input id="renameCReportProfileName" name="renameCReportProfileName" type="text" size="45" />'."\n";
echo '<input id="renameCReportProfileId" type="hidden" value="' . $this->creportProfile . '" />'."\n"; echo '<p>'.$lang['srv_custom_report_name'].':</p>';
echo '<br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n"; echo '<input id="renameCReportProfileName" name="renameCReportProfileName" type="text" class="text large" />';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
echo '</div>'."\n"; echo '<input id="renameCReportProfileId" type="hidden" value="' . $this->creportProfile . '" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="creport_profile_action(\'rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
echo '</div>';
echo '</div>';
// div za brisanje // div za brisanje
echo '<div id="deleteCReportProfile">'.$lang['srv_custom_report_delete_confirm'].': <span id="deleteCReportProfileName" style="font-weight:bold;"></span>?'."\n"; echo '<div id="deleteCReportProfile">';
echo '<p>'.$lang['srv_custom_report_delete_confirm'].':<span id="deleteCReportProfileName" class="semi-bold"></span>?</p>';
echo '<input id="deleteCReportProfileId" type="hidden" value="' . $this->creportProfile . '" />'."\n"; echo '<input id="deleteCReportProfileId" type="hidden" value="' . $this->creportProfile . '" />'."\n";
echo '<br /><br /><span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n"; echo '<div class="button_holder">';
echo '</div>'."\n"; echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="creport_profile_action(\'delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
echo '</div>';
echo '</div>';
// div za deljenje z drugimi uredniki // div za deljenje z drugimi uredniki
echo '<div id="shareCReportProfile">'; echo '<div id="shareCReportProfile">';
@ -2580,9 +2593,12 @@ class SurveyCustomReport {
// prikazemo deljenje profila z drugimi uredniki // prikazemo deljenje profila z drugimi uredniki
if($_GET['a'] == 'shareProfileShow') { if($_GET['a'] == 'shareProfileShow') {
echo '<span class="bold clr" style="display:block; margin-bottom:25px;">'.$lang['srv_custom_report_share_long'].':</span>'."\n";
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_custom_report_share_long'].':</span>';
if (isset ($_POST['id'])){ if (isset ($_POST['id'])){
$id = $_POST['id']; $id = $_POST['id'];
@ -2594,16 +2610,25 @@ class SurveyCustomReport {
if($user['id'] != $global_user_id){ if($user['id'] != $global_user_id){
$sql = sisplet_query("SELECT * FROM srv_custom_report_share WHERE ank_id='".$this->ank_id."' AND profile_id='".$id."' AND author_usr_id='".$global_user_id."' AND share_usr_id='".$user['id']."' LIMIT 1"); $sql = sisplet_query("SELECT * FROM srv_custom_report_share WHERE ank_id='".$this->ank_id."' AND profile_id='".$id."' AND author_usr_id='".$global_user_id."' AND share_usr_id='".$user['id']."' LIMIT 1");
$checked = (mysqli_num_rows($sql) > 0) ? ' checked="checked"' : ''; $checked = (mysqli_num_rows($sql) > 0) ? ' checked="checked"' : '';
echo '<div class="setting_item">';
echo '<input type="checkbox" '.$checked.' name="share_usr_id[]" id="share_usr_id'.$user['id'].'" value="'.$user['id'].'"> '; echo '<input type="checkbox" '.$checked.' name="share_usr_id[]" id="share_usr_id'.$user['id'].'" value="'.$user['id'].'"> ';
echo '<label for="share_usr_id'.$user['id'].'">'.$user['email'].'</label><br />'; echo '<label for="share_usr_id'.$user['id'].'">'.$user['email'].'</label>';
echo '</div>';
} }
} }
} }
echo '<input id="shareCReportProfileId" type="hidden" value="' . $id . '" />'."\n"; echo '</div>';
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="creport_profile_action(\'share\'); return false;"><span>'.$lang['srv_custom_report_share'].'</span></a></span></span>'."\n";
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="creport_profile_action(\'cancel_share\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n"; echo '<input id="shareCReportProfileId" type="hidden" value="' . $id . '" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="creport_profile_action(\'cancel_share\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="creport_profile_action(\'share\'); return false;">'.$lang['srv_custom_report_share'].'</button>';
echo '</div>';
} }
// delimo profil z drugimi uredniki // delimo profil z drugimi uredniki

14
public/css/admin_new.css
View File

@ -8323,10 +8323,22 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 100%; width: 100%;
} }
#newCReportProfile .text { #newCReportProfile .text,
#renameCReportProfile .text {
width: 100%; width: 100%;
} }
#renameCReportProfile .button_holder,
#deleteCReportProfile .button_holder {
margin-top: 32px;
justify-content: flex-end;
margin-bottom: 0;
}
#renameCReportProfile .button_holder button,
#deleteCReportProfile .button_holder button {
margin: 0 0 0 16px;
}
.pbLabel { .pbLabel {
height: 20px; height: 20px;
width: 160px; width: 160px;

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

@ -242,12 +242,26 @@ div#div_analiza_archive_name {
} }
} }
#newCReportProfile { #newCReportProfile,
#renameCReportProfile {
.text { .text {
width: 100%; width: 100%;
} }
} }
#renameCReportProfile,
#deleteCReportProfile {
.button_holder {
margin-top: 32px;
justify-content: flex-end;
margin-bottom: 0;
button {
margin: 0 0 0 16px;
}
}
}
//// TESTIRANJE ///// //// TESTIRANJE /////
//Avtomatski vnosi - progress bar //Avtomatski vnosi - progress bar