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

[Redizajn 1KA] Popupi: Podatki - Filtri > Statusi - v3

Browse Source 
Tabela za ustrezne enote razbita v flexbox
This commit is contained in:
tejagerjovic 2022-05-27 01:32:06 +02:00
parent 1bbe9905c1
commit e409263873
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
admin/survey/classes/class.SurveyStatusProfiles.php
View File

@ -349,50 +349,42 @@ class SurveyStatusProfiles
# preverimo kaere statuse disejblamo na podlagi izbire načina kreiranja datoteke (samo 5,6 / vsi satusi) # preverimo kaere statuse disejblamo na podlagi izbire načina kreiranja datoteke (samo 5,6 / vsi satusi)
list($collect_all_status) = mysqli_fetch_row(sisplet_query("SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'")); list($collect_all_status) = mysqli_fetch_row(sisplet_query("SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'"));
echo '<table>';
echo '<tr>'; echo '<div class="valid_units_wrap">';
// dodamo veljavne // dodamo veljavne
foreach (self::$appropriateStatus as $index) { foreach (self::$appropriateStatus as $index) {
echo '<td style="width:50%">'; echo '<div class="valid_units_box">';
echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' . echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' disabled' : '' ). '/><label for="' . $index . '">'; ($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' disabled' : '' ). '/><label for="' . $index . '">';
echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>'; echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
echo '</label></td>'; echo '</label></div>';
$cnt++;
} }
echo '</tr>';
// dodamo neveljavne // dodamo neveljavne
echo '<tr>';
foreach (self::$unAppropriateStatus as $index) { foreach (self::$unAppropriateStatus as $index) {
echo '<td style="width:50%">'; echo '<div class="valid_units_box">';
echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' . echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' disabled' : '' ) . '/><label for="' . $index . '">'; ($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' disabled' : '' ) . '/><label for="' . $index . '">';
//echo $lang['srv_userstatus_' . $index]. " (".$index.")"; //echo $lang['srv_userstatus_' . $index]. " (".$index.")";
echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>'; echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
echo '</label></td>'; echo '</label></div>';
$cnt++;
} }
echo '</tr>';
// dodamo null // dodamo null
echo '<tr>';
foreach (self::$unKnownStatus as $index) { foreach (self::$unKnownStatus as $index) {
echo '<td style="width:50%">'; echo '<div class="valid_units_box">';
echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' . echo '<input name="srv_userstatus[]" type="checkbox" id="' . $index . '"' .
($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') . ($curentProfileData['status'.$index] == 1 ? ' checked="checked"' : '') .
($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' disabled' : '' ) . '/><label for="' . $index . '">'; ($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' disabled' : '' ) . '/><label for="' . $index . '">';
//echo $lang['srv_userstatus_' . $index]. " (".$index.")"; //echo $lang['srv_userstatus_' . $index]. " (".$index.")";
echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>'; echo '<span'.($disabled || ( (int)$collect_all_status == 0 && $index < 5 ) ? ' class="gray"' : '' ).'>'.$lang['srv_userstatus_' . $index]. ' ('.$index.')</span>';
echo '</label></td>'; echo '</label></div>';
$cnt++;
} }
echo '</tr>';
echo '</table>'; echo '</div>'; #valid_units_wrap
echo '</fieldset>'; echo '</fieldset>';

16
public/css/admin_new.css
View File

@ -8420,11 +8420,19 @@ div#testiranje_preview_settings .testiranje_preview_settings_right .setting_hold
display: inline-block; display: inline-block;
} }
fieldset.statusProfileFieldset table { fieldset.statusProfileFieldset div.valid_units_wrap {
font-size: 14px !important; display: flex;
white-space: nowrap; flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
width: 500px;
margin-top: -8px;
} }
fieldset.statusProfileFieldset table td input[type=checkbox][disabled] + label:before { fieldset.statusProfileFieldset div.valid_units_wrap div.valid_units_box {
width: 50%;
margin-top: 8px;
}
fieldset.statusProfileFieldset div.valid_units_wrap div.valid_units_box input[type=checkbox][disabled] + label:before {
color: #C4C4C4; color: #C4C4C4;
pointer-events: none; pointer-events: none;
} }

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

@ -340,11 +340,18 @@ div#testiranje_preview_settings {
//Statusi //Statusi
fieldset.statusProfileFieldset { fieldset.statusProfileFieldset {
table { div.valid_units_wrap {
font-size: 14px !important; display: flex;
white-space: nowrap; flex-direction: row;
flex-wrap: wrap;
justify-content: space-between;
width: 500px;
margin-top: -8px;
div.valid_units_box {
width: 50%;
margin-top: 8px;
td {
input { input {
&[type=checkbox][disabled] + label:before { &[type=checkbox][disabled] + label:before {
color: $dark-gray; color: $dark-gray;