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

Popravek zapiranja popupa kvota

Browse Source
This commit is contained in:
pero1203 2021-08-25 10:06:06 +02:00
parent 8e21f8100c
commit 7f6ed1e179
2 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
admin/survey/script/branching.js
View File

@ -1050,8 +1050,6 @@ function if_tip(_if, tip) {
'if': _if,
anketa: srv_meta_anketa_id,
tip: tip
}, function () {
centerDiv2Page('#div_condition_editing');
});
}
@ -1138,9 +1136,6 @@ function vrednost_condition_editing(vrednost) {
'ajax.php?t=branching&a=vrednost_condition_editing', {
'vrednost': vrednost,
'anketa': srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#div_condition_editing_conditions .clr_if').children('span').show(); //prikažemo zvezdico *IF
}
);
}
@ -1308,7 +1303,6 @@ function condition_add(_if, conjunction, negation, vrednost) {
'noupdate': __vnosi + __analiza,
'anketa': srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$("#div_condition_editing_container").attr({scrollTop: $("#div_condition_editing_container").attr("scrollHeight")});
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
});
@ -1485,7 +1479,6 @@ function bracket_edit_new(condition, vrednost, who, what) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
});
@ -1501,7 +1494,6 @@ function conjunction_edit(condition, conjunction, negation) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
});
@ -1522,7 +1514,6 @@ function conjunction_dropdown_edit(condition) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
}
);
@ -1540,7 +1531,6 @@ function fill_value(condition, vrednost) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
});
@ -1601,7 +1591,6 @@ function condition_remove(_if, condition, vrednost) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#div_condition_editing_inner').resize(); // trigger, da se poklice resize event
});
@ -1639,8 +1628,6 @@ function calculation_editing_close(condition, vrednost) {
anketa: srv_meta_anketa_id,
condition: condition,
vrednost: vrednost
}, function () {
centerDiv2Page('#div_condition_editing');
});
// kalkulacija kot tip vprasanja
@ -1659,9 +1646,8 @@ function calculation_editing_close(condition, vrednost) {
'ajax.php?t=branching&a=calculation_editing_close', {
anketa: srv_meta_anketa_id,
condition: condition
}, function () {
centerDiv2Page('#div_condition_editing');
});
}
);
}
}
}
@ -1701,7 +1687,6 @@ function calculation_operator_edit(calculation, operator) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#calculation_editing_inner').scroll();
});
}
@ -1761,7 +1746,6 @@ function calculation_bracket_edit_new(calculation, vrednost, who, what) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#calculation_editing_inner').scroll();
});
}
@ -2205,12 +2189,6 @@ function branch_brisi_grupo(id, text) {
}
}
// document ready funkcijo sem prestavil na vrh strani, da je vse skupaj
function centerDiv2Page(id) {
return false;
}
// prestevilci anketo v branchingu
function prestevilci() {

38
admin/survey/script/quota.js
View File

@ -19,40 +19,44 @@ function quota_editing(condition, new_spremenljivka, vrednost) {
function quota_editing_close(condition, vrednost) {
document.getElementById('quota').style.display = "none";
if (condition < 0) $('#branching_' + (-condition)).delay('3000').removeClass('spr_editing', 500);
$('#quota').fadeOut('slow');
// kalkulacija v pogojih
if (condition >= 0) {
$('#fade').fadeOut('slow');
// Ce imamo spodaj odprt popup za if, ga pustimo odprtega
if($('#div_condition_editing').is(':hidden')){
$('#fade').fadeOut('slow');
}
$('#div_condition_editing').load(
'ajax.php?t=quota&a=quota_editing_close', {
anketa: srv_meta_anketa_id,
condition: condition,
vrednost: vrednost
}, function () {
centerDiv2Page('#div_condition_editing');
});
}
);
}
// kalkulacija kot tip vprasanja
else {
// kalkulacija kot tip vprasanja
} else {
$('#branching_' + (-condition)).delay('3000').removeClass('spr_editing', 500);
// ce smo v vnosih, refreshamo stran, da se izpise nova kalkulacija..
if (__vnosi == 1) {
window.location.reload();
// obicajno zapiranje kalkulacije v urejanju
} else {
window.location.reload();
}
// obicajno zapiranje kalkulacije v urejanju
else {
$('#fade').fadeOut('slow');
$('#branching_' + (-condition)).load(
'ajax.php?t=quota&a=quota_editing_close', {
anketa: srv_meta_anketa_id,
condition: condition
}, function () {
centerDiv2Page('#div_condition_editing');
});
}
);
}
}
}
@ -92,7 +96,6 @@ function quota_operator_edit(quota, operator) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#quota_editing_inner').scroll();
});
}
@ -163,7 +166,6 @@ function quota_bracket_edit_new(quota, vrednost, who, what) {
noupdate: __vnosi + __analiza,
anketa: srv_meta_anketa_id
}, function () {
centerDiv2Page('#div_condition_editing');
$('#quota_editing_inner').scroll();
});
}