2018.2 Gold E changes

svn path=/Website/trunk/; revision=41053
This commit is contained in:
Jos Groot Lipman
2019-02-19 16:13:10 +00:00
parent a4e1ae4906
commit 9abd6a8129
6 changed files with 27 additions and 4 deletions

View File

@@ -30,7 +30,7 @@ var deletedvis = false;
var sql = "SELECT distinct bez_afspraak_key"
+ " FROM bez_bezoekers"
+ " WHERE bez_bezoekers_key " + (bez_key_arr.length > 0? " IN (" + bez_key_arr.join(",") + ")" : " = -1");
oRs = Oracle.Execute(sql);
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
afspr_key = oRs("bez_afspraak_key").value;
@@ -64,11 +64,12 @@ for (i = 0 ; i < bez_key_arr.length; i++)
var bezoeker = oRs("bez_afspraak_naam").value;
var prs_key = oRs("prs_perslid_key").value || -1;
var cps_key = oRs("prs_contactpersoon_key").value || -1;
oRs.Close();
sql = "UPDATE bez_bezoekers"
+ " SET bez_bezoekers_out = " + bezoekers_out
+ " WHERE bez_bezoekers_key = " + bez_key_arr[i];
oRs = Oracle.Execute(sql);
Oracle.Execute(sql);
tobeapproved++;
// Undo ook afzonderlijk tracken! (gebruikt zelfde label als bij undo checkin)
var trackstr = L("lcl_bez_is_out_1") + bezoeker + (undo_check_out ? L("lcl_bez_is_in_3") : L("lcl_bez_is_out_2") );
@@ -137,6 +138,7 @@ for (i = 0 ; i < bez_key_arr.length; i++)
oRs = Oracle.Execute(sql_a);
aantal_ojb = oRs("aantal").value;
oRs.Close();
}
}
else

View File

@@ -767,6 +767,7 @@ else
+ " AND ins_scenario_key = " + ingesloten[i].scen_key;
oRs = Oracle.Execute(sql);
hasActionFinish = (oRs("ins_srtcontrole_options").Value & 8) == 8 || oRs("ctr_ismjob").Value == 1;
oRs.Close();
}
// Afhankelijk van de modus de inspectie(s) opslaan.

View File

@@ -533,7 +533,24 @@ var elems = { hiddenHeight: function() {return (this.$floatingHeaderRow.hasClass
headFootRowHeight: function() {return (this.$originalHeaderRow.length? this.$floatingHeaderRow.height()+this.footHeight : this.fcltHeight+this.histHeight+this.fcltPaddingTopBottom());},
fcltPaddingTopBottom: function() {return (parseInt(this.$fcltFrameHeader.css("paddingTop"), 10)+parseInt(this.$fcltFrameHeader.css("paddingBottom"), 10));}
};
function updateTableHeaders(event) {
var timeout_timer = false;
function updateTableHeaders(event)
{
function startTableHeaders ()
{
slowUpdateTableHeaders(event);
}
if (is_ie_or_edge )
{
if (timeout_timer) { clearTimeout(timeout_timer); }
timeout_timer = setTimeout(startTableHeaders, 50);
}
else
{
startTableHeaders();
}
}
function slowUpdateTableHeaders(event) {
$("div.divrstable, body#showbody, body#editbody").each(function() {
if (is_ie_or_edge && $(".tableFloatingHeader", this).hasClass("float-alone"))
{ // Prevent floating headers and footer in case of Internet Explorer: legacy 2018.1
@@ -689,6 +706,7 @@ function updateTableHeaders(event) {
}
}
}
timeout_timer = false;
});
}

View File

@@ -82,6 +82,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
+ " AND ins_scenario_key = " + scen_key;
oRs = Oracle.Execute(sql);
notexist = oRs.eof;
oRs.Close();
}
var this_ins = ins.func_enabled_deel(ins_key_arr[i], {srtcont_key: srtcont_key_arr[i]});

View File

@@ -615,6 +615,7 @@ else
, urole: "fe" // altijd voor mobile ?
, res_key : rsv.reservering_key
, act_key : rsv.act_key
, reqId : user_key
, defaults : rsv.flex_defaults
, rsv_ruimte_key : rsv_ruimte_key
, reado: false

View File

@@ -8,7 +8,7 @@
Context: Vanuit ELK asp bestand
*/
var FCLTVersion="2018.2c";
var FCLTVersion="2018.2d";
var FCLTMinDatabaseSchema="35";
var custpath = rooturl + "/cust/" + customerId; // path to customer files