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

[Redizajn 1KA] Popupi: Analize - Filtri > Skupine

Browse Source
This commit is contained in:
tejagerjovic 2022-06-17 06:50:05 +02:00
parent 28739ba82e
commit 727804d44e
4 changed files with 167 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
admin/survey/classes/class.SurveyZankaProfiles.php
View File

@ -262,26 +262,25 @@ class SurveyZankaProfiles {
// izrišemo dva stolpca z možnostjo premikanja enih in drugih variabelS
echo '<div id="fs_list" class="popup_right">'.NEW_LINE;
echo '<div class="left link_no_decoration">'.NEW_LINE;
echo '<div id="skupine_left">';
echo '<div class="top">'.NEW_LINE;
echo '<div class="select">'.NEW_LINE;
echo $lang['srv_select'].NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_3\');">'.$lang['srv_all'].'</a>'.NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_3\');">'.$lang['srv_none'].'</a> '.NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectInvert(\'fs_list_3\');">'.$lang['srv_invert'].'</a>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<div class="left link_no_decoration" style="width:200px; text-align:center">'.NEW_LINE;
echo '<div class="clear_multiply">'.NEW_LINE;
echo '<a href="#" onclick="zankaProfileAction(\'clearDdsZanka\'); return false;">'.$lang['srv_clear'].'</a>'.NEW_LINE;
echo '<input type="checkbox" name="mnozenje" id="mnozenje" value="1"'.($mnozenje==1?' checked="checked"':'').' autocomplete="off"/><label for="mnozenje">'.$lang['srv_analiza_krat'].'</label>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<div class="right link_no_decoration">'.NEW_LINE;
echo $lang['srv_select'].NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_4\');">'.$lang['srv_all'].'</a>'.NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_4\');">'.$lang['srv_none'].'</a> '.NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectInvert(\'fs_list_4\');">'.$lang['srv_invert'].'</a>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<br class="clr" />'.NEW_LINE;
echo '<br />'.NEW_LINE;
echo '<div class="left fs_container">'.NEW_LINE;
echo '</div>'.NEW_LINE; #top
echo '<div class="fs_container">'.NEW_LINE;
echo '<ul id="fs_list_3" class="left">'.NEW_LINE;
$sdf = SurveyDataFile::get_instance();
$sdf->init($sid);
@ -293,7 +292,31 @@ class SurveyZankaProfiles {
}
echo '</ul>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<div class="right fs_container">'.NEW_LINE;
echo '</div>'; #left
echo '<div id="skupine_right">';
echo '<div class="top">'.NEW_LINE;
echo '<div class="select">'.NEW_LINE;
echo $lang['srv_select'].NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectAll(\'fs_list_4\');">'.$lang['srv_all'].'</a>'.NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectNone(\'fs_list_4\');">'.$lang['srv_none'].'</a> '.NEW_LINE;
echo '<a href="#" onclick="return $.dds.selectInvert(\'fs_list_4\');">'.$lang['srv_invert'].'</a>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '<div class="clear_multiply">'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '</div>'.NEW_LINE; #top
echo '<div class="fs_container">'.NEW_LINE;
echo '<ul id="fs_list_4" class="left">'.NEW_LINE;
if (count($selected_variables) > 0 ) {
foreach($selected_variables as $key => $variabla) {
@ -303,6 +326,9 @@ class SurveyZankaProfiles {
}
echo '</ul>'.NEW_LINE;
echo '</div>'.NEW_LINE;
echo '</div>'; #right
echo '<script type="text/javascript">'.NEW_LINE;
echo '$(document).ready(function() {';
echo '$(function(){'.NEW_LINE;
@ -340,26 +366,53 @@ class SurveyZankaProfiles {
echo '<div id="zankaProfileCoverDiv"></div>'.NEW_LINE;
// div za shranjevanje novega profila
echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': '.NEW_LINE;
echo '<input id="newProfileName" name="newProfileName" type="text" size="45" />'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'newCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'newCreate\'); return false;"><span>'.$lang['srv_save_profile'].'</span></a></span></span>'.NEW_LINE;
echo '<div id="newProfileDiv">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="zankaProfileAction(\'newCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="zankaProfileAction(\'newCreate\'); return false;">'.$lang['srv_save_profile'].'</button>';
echo '</div>';
echo '</div>'.NEW_LINE;
// div za preimenovanje
echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '.NEW_LINE;
echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" size="45" />'.NEW_LINE;
echo '<input id="renameProfileId" type="hidden" value="' . $czp . '" />'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'renameConfirm\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'renameCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
echo '<div id="renameProfileDiv">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . self::$profiles[$pid]['name'] . '" class="text large"/>';
echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="zankaProfileAction(\'renameCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="zankaProfileAction(\'renameConfirm\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
echo '</div>';
echo '</div>'.NEW_LINE;
// div za brisanje
echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . self::$profiles[$pid]['name'] . '</b>?'.NEW_LINE;
echo '<input id="deleteProfileId" type="hidden" value="' . $czp . '" />'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zankaProfileAction(\'deleteConfirm\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'.NEW_LINE;
echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zankaProfileAction(\'deleteCancle\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'.NEW_LINE;
echo '<div id="deleteProfileDiv">';
echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . self::$profiles[$pid]['name'] . '</span>?';
echo '<input id="deleteProfileId" type="hidden" value="' . $czp . '" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="zankaProfileAction(\'deleteCancle\'); return false;">'.$lang['srv_close_profile'].'</button>';
echo '<button class="medium blue" onclick="zankaProfileAction(\'deleteConfirm\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
echo '</div>';
echo '</div>'.NEW_LINE;
}

42
public/css/admin_new.css
View File

@ -8266,6 +8266,47 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
margin: 0 0 0 16px;
}
div#div_zanka_profiles {
width: 880px !important;
}
div#fs_list {
display: flex;
flex-direction: row;
width: 100%;
gap: 8px;
}
div#fs_list div#skupine_left,
div#fs_list div#skupine_right {
width: 50%;
}
div#fs_list div#skupine_left div.top,
div#fs_list div#skupine_right div.top {
margin-bottom: 16px;
font-size: 14px;
display: flex;
flex-direction: row;
justify-content: space-between;
}
div#fs_list div#skupine_left div.top div.clear_multiply,
div#fs_list div#skupine_right div.top div.clear_multiply {
margin-right: 18px;
}
div#fs_list div#skupine_left div.top div.clear_multiply label,
div#fs_list div#skupine_right div.top div.clear_multiply label {
margin: 0 0 0 8px;
font-size: 14px;
}
div#fs_list div#skupine_left div.fs_container ul,
div#fs_list div#skupine_right div.fs_container ul {
width: 100% !important;
}
div#fs_list div#skupine_left div.fs_container ul li,
div#fs_list div#skupine_right div.fs_container ul li {
width: 100% !important;
font-size: 14px;
}
.pbLabel {
height: 20px;
width: 160px;
@ -30718,7 +30759,6 @@ and open the template in the editor.
.fs_container {
height: 280px;
width: 235px;
overflow: auto;
padding: 3px 0px 3px 0px;
}

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

@ -412,6 +412,54 @@ div#div_analiza_archive_name {
}
}
//Filtri > Skupine
div#div_zanka_profiles {
width: 880px !important;
}
div#fs_list {
display: flex;
flex-direction: row;
width: 100%;
gap: 8px;
div#skupine_left,
div#skupine_right {
width: 50%;
div.top {
margin-bottom: 16px;
font-size: 14px;
display: flex;
flex-direction: row;
justify-content: space-between;
div.clear_multiply {
margin-right: 18px;
label {
margin: 0 0 0 8px;
font-size: 14px;
}
}
}
div.fs_container {
ul {
width: 100%!important;
li {
width: 100%!important;
font-size: 14px;
}
}
}
}
}
//// TESTIRANJE /////
//Avtomatski vnosi - progress bar

1
resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss
View File

@ -143,7 +143,6 @@ and open the template in the editor.
.fs_container {
height: 280px;
width: 235px;
overflow: auto;
padding: 3px 0px 3px 0px;
}