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

Redesign - popravek urejanja vprasalnika - kombinirana tabela

Browse Source
This commit is contained in:
pero1203 2022-04-26 10:56:39 +02:00
parent 34d9780b1c
commit 047189ab39
4 changed files with 82 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
admin/survey/Branching.php
View File

@ -5519,7 +5519,7 @@ class Branching {
echo ' <div class="variabla_vsota_border"></div>';
echo ' <div style="width:'.$gridWidth.'%;" id="vsota_'.$row['id'].'" name="vsota" class="variabla_vsota_inline vrednost_inline_vsota" style="display:inline" contenteditable="'.(!$locked?'true':'false').'" '.(strpos($vsota, $lang['srv_vsota_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $vsota . '</div>';
echo ' <div style="width:'.$gridWidth.'%;" id="vsota_'.$row['id'].'" name="vsota" class="variabla_vsota_inline vrednost_inline_vsota" style="display:inline; width:'.$gridWidth.'%;" contenteditable="'.(!$locked?'true':'false').'" '.(strpos($vsota, $lang['srv_vsota_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $vsota . '</div>';
echo ' <input type="text" name="foo_' . $row['id'] . '" maxlength="8" size="5" >';
if ($row['vsota_show'] == 1)
@ -5868,15 +5868,24 @@ class Branching {
echo ' <td></td>';
echo ' <td></td>';
$col = 1;
$tip_prev = 0;
$id_prev = 0;
while ($row2 = mysqli_fetch_array($sql2)) {
if ($id_prev == 0) $id_prev = $row2['id'];
if ($tip_prev != $row2['tip']) $col++;
$tip_prev = $row2['tip'];
if ($this->lang_id != null) {
save('lang_id', $this->lang_id);
$rowl = \App\Controllers\LanguageController::srv_language_spremenljivka($row2['id']);
if (strip_tags($rowl['naslov']) != '') $row2['naslov'] = $rowl['naslov'];
}
echo ' <td colspan="'.$row2['grids'].'" class="grid_header" grd="g_'.$row2['id'].'"><div class="naslov_inline grid_subtitle_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row2['id'].'" '.(strpos($row2['naslov'], $lang['srv_new_vprasanje'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
echo ' <td colspan="'.$row2['grids'].'" class="grid_header '.($id_prev!=$row2['id']?'col_border ':'').'" grd="g_'.$row2['id'].'"><div class="naslov_inline grid_subtitle_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row2['id'].'" '.(strpos($row2['naslov'], $lang['srv_new_vprasanje'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
}
echo ' </tr>';
@ -5899,18 +5908,25 @@ class Branching {
$sql2 = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode(',', $multiple).") ORDER BY m.vrstni_red, g.vrstni_red");
$row2 = mysqli_fetch_array($sql2);
$col = 1;
$tip_prev = 0;
$id_prev = 0;
for ($i = 1; $i <= mysqli_num_rows($sql2); $i++) {
if ($id_prev == 0) $id_prev = $row2['id'];
if ($tip_prev != $row2['tip']) $col++;
$tip_prev = $row2['tip'];
if ($this->lang_id != null) {
$naslov = \App\Controllers\LanguageController::srv_language_grid($row2['spr_id'], $row2['id']);
if ($naslov != '') $row2['naslov'] = $naslov;
}
if (true) {
echo ' <td class="grid_header ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" grd="g_'.$row2['id'].'"><div class="grid_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" grd_id="'.$row2['id'].'" spr_id="'.$row2['spr_id'].'" '.(strpos($row2['naslov'], $lang['srv_new_grid'])!==false || strpos($row2['naslov'], $lang1['srv_new_grid'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
$row2 = mysqli_fetch_array($sql2);
} else {
echo ' <td class="grid_header ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"></td>';
}
echo ' <td class="grid_header '.($bg % 2 == 0 ? 'grid_light' : 'grid_dark').' '.($id_prev==$row2['id'] && $col!=2?'col_border ':'').'" grd="g_'.$row2['id'].'"><div class="grid_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" grd_id="'.$row2['id'].'" spr_id="'.$row2['spr_id'].'" '.(strpos($row2['naslov'], $lang['srv_new_grid'])!==false || strpos($row2['naslov'], $lang1['srv_new_grid'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
$row2 = mysqli_fetch_array($sql2);
}
echo ' </tr>';

48
public/css/admin_new.css
View File

@ -16381,6 +16381,51 @@ div.jezik_row.tip_24.spr_tip_24 .variable_holder,
div.jezik_row.tip_24.jezik_row.tip_24 .variable_holder {
overflow-x: auto;
}
li.spr_tip_6.spr_tip_24 table tr td.col_border, li.spr_tip_6.spr_tip_24 table tr td.col_border, li.spr_tip_6.jezik_row.tip_24 table tr td.col_border,
li.spr_tip_16.spr_tip_24 table tr td.col_border,
li.spr_tip_16.spr_tip_24 table tr td.col_border,
li.spr_tip_16.jezik_row.tip_24 table tr td.col_border,
li.spr_tip_19.spr_tip_24 table tr td.col_border,
li.spr_tip_19.spr_tip_24 table tr td.col_border,
li.spr_tip_19.jezik_row.tip_24 table tr td.col_border,
li.spr_tip_20.spr_tip_24 table tr td.col_border,
li.spr_tip_20.spr_tip_24 table tr td.col_border,
li.spr_tip_20.jezik_row.tip_24 table tr td.col_border,
li.spr_tip_24.spr_tip_24 table tr td.col_border,
li.spr_tip_24.spr_tip_24 table tr td.col_border,
li.spr_tip_24.jezik_row.tip_24 table tr td.col_border,
div.spr_tip_6.spr_tip_24 table tr td.col_border,
div.spr_tip_6.spr_tip_24 table tr td.col_border,
div.spr_tip_6.jezik_row.tip_24 table tr td.col_border,
div.spr_tip_16.spr_tip_24 table tr td.col_border,
div.spr_tip_16.spr_tip_24 table tr td.col_border,
div.spr_tip_16.jezik_row.tip_24 table tr td.col_border,
div.spr_tip_19.spr_tip_24 table tr td.col_border,
div.spr_tip_19.spr_tip_24 table tr td.col_border,
div.spr_tip_19.jezik_row.tip_24 table tr td.col_border,
div.spr_tip_20.spr_tip_24 table tr td.col_border,
div.spr_tip_20.spr_tip_24 table tr td.col_border,
div.spr_tip_20.jezik_row.tip_24 table tr td.col_border,
div.spr_tip_24.spr_tip_24 table tr td.col_border,
div.spr_tip_24.spr_tip_24 table tr td.col_border,
div.spr_tip_24.jezik_row.tip_24 table tr td.col_border,
div.jezik_row.tip_6.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_6.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_6.jezik_row.tip_24 table tr td.col_border,
div.jezik_row.tip_16.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_16.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_16.jezik_row.tip_24 table tr td.col_border,
div.jezik_row.tip_19.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_19.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_19.jezik_row.tip_24 table tr td.col_border,
div.jezik_row.tip_20.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_20.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_20.jezik_row.tip_24 table tr td.col_border,
div.jezik_row.tip_24.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_24.spr_tip_24 table tr td.col_border,
div.jezik_row.tip_24.jezik_row.tip_24 table tr td.col_border {
border-left: 1px #E5E5E5 solid !important;
}
li.spr_tip_6.spr_tip_24 table tr td:first-child, li.spr_tip_6.spr_tip_24 table tr td:first-child, li.spr_tip_6.jezik_row.tip_24 table tr td:first-child,
li.spr_tip_16.spr_tip_24 table tr td:first-child,
li.spr_tip_16.spr_tip_24 table tr td:first-child,
@ -16739,6 +16784,9 @@ and open the template in the editor.
word-break: break-all;
flex-grow: 0 !important;
}
.variabla_vsota#variabla_new #vre_id_new {
max-width: none;
}
.variabla_vsota .variabla_vsota_inline {
word-break: break-all;
box-sizing: border-box;

7
resources/sass/admin_new/pages/survey_edit/questions/grids.scss
View File

@ -245,7 +245,12 @@ div.jezik_row.tip_24{
table{
tr{
td{
&.col_border{
border-left: 1px $gray solid !important;
}
}
td:first-child{
width: 270px !important;
}

4
resources/sass/admin_new/pages/survey_edit/questions/sum.scss
View File

@ -33,6 +33,10 @@ and open the template in the editor.
word-break:break-all;
flex-grow: 0 !important;
}
&#variabla_new #vre_id_new{
max-width: none;
}
.variabla_vsota_inline{
word-break:break-all;