admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2015.3 Gold A patches

Browse Source 
svn path=/Website/trunk/; revision=27597
This commit is contained in:
Jos Groot Lipman
2016-01-05 08:12:18 +00:00
parent 352de12797
commit 9ea3a17190
26 changed files with 168 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/API2/model_bez_actie.inc
View File

@@ -34,18 +34,19 @@ function model_bez_actie()
"filter": "exact",
"seq": "bez_s_bez_actie_key"
},
"bez_actie_omschrijving": {
"name": {
"dbs": "bez_actie_omschrijving",
"label": L("bez_actie_omschrijving"),
"typ": "varchar",
"required": true,
"translate": true
},
"bez_actie_default": {
"default": {
"dbs": "bez_actie_default",
"label": L("bez_actie_default"),
"typ": "check"
},
"bez_actie_flags": {
"action": {
"dbs": "bez_actie_flags",
"label": L("bez_actie_flags"),
"typ": "key",

51
APPL/API2/model_bez_kenmerk.inc
View File

@@ -34,46 +34,47 @@ function model_bez_kenmerk()
"filter": "exact",
"seq": "bez_s_bez_kenmerk_key"
},
"bez_kenmerk_volgnr": {
"sequence": {
"dbs": "bez_kenmerk_volgnr",
"label": L("mgt_kenmerk_volgnr"),
"label": L("mgt_kenmerk_volgnummer"),
"typ": "number",
"required": true
},
"bez_kenmerk_omschrijving": {
"name": {
"dbs": "bez_kenmerk_omschrijving",
"label": L("mgt_kenmerk_omschrijving"),
"typ": "varchar",
"translate": true,
"required": true
},
"bez_kenmerk_hint": {
"hint": {
"dbs": "bez_kenmerk_hint",
"label": L("mgt_kenmerk_hint"),
"typ": "memo",
"translate": true
},
"bez_kenmerk_dimensie": {
"unit": {
"dbs": "bez_kenmerk_dimensie",
"label": L("mgt_kenmerk_dimensie"),
"label": L("mgt_srtkenmerk_dimensie"),
"typ": "varchar",
"translate": true
},
"bez_kenmerk_kenmerktype": {
"property_type": {
"dbs": "bez_kenmerk_kenmerktype",
"label": L("mgt_kenmerk_kenmerktype"),
"typ": "key",
"label": L("mgt_srtkenmerk_kenmerktype"),
"typ": "varchar",
"required": true,
"filter": "exact",
"LOV": buildKenmerktypeLOV()
},
"bez_kenmerk_verplicht": {
"required": {
"dbs": "bez_kenmerk_verplicht",
"label": L("mgt_kenmerk_verplicht"),
"typ": "key",
"LOV": buildVerplichtingList(),
"emptyoption": null
},
"bez_kenmerk_groep": {
"property_group": {
"dbs": "bez_kenmerk_groep",
"label": L("mgt_kenmerk_groep"),
"typ": "key",
@@ -81,37 +82,37 @@ function model_bez_kenmerk()
"LOV": buildGroepsverplichtingList(),
"emptyoption": null
},
"bez_kenmerk_toonbaar": {
"readonly": {
"dbs": "bez_kenmerk_toonbaar",
"label": L("mgt_kenmerk_toonbaar"),
"typ": "check"
},
"bez_kenmerk_systeem": {
"system": {
"dbs": "bez_kenmerk_systeem",
"label": L("mgt_kenmerk_systeem"),
"label": L("mgt_srtkenmerk_systeem"),
"typ": "check"
},
"bez_kenmerk_lengte": {
"length": {
"dbs": "bez_kenmerk_lengte",
"label": L("mgt_kenmerk_lengte"),
"label": L("mgt_srtkenmerk_lengte"),
"typ": "number"
},
"bez_kenmerk_dec": {
"decimals": {
"dbs": "bez_kenmerk_dec",
"label": L("mgt_kenmerk_dec"),
"label": L("mgt_srtkenmerk_dec"),
"typ": "number"
},
"bez_kenmerk_nmin": {
"minimum": {
"dbs": "bez_kenmerk_nmin",
"label": L("mgt_kenmerk_nmin"),
"label": L("mgt_srtkenmerk_nmin"),
"typ": "number"
},
"bez_kenmerk_nmax": {
"maximum": {
"dbs": "bez_kenmerk_nmax",
"label": L("mgt_kenmerk_nmax"),
"label": L("mgt_srtkenmerk_nmax"),
"typ": "number"
},
"fac_kenmerkdomein_key": {
"domain": {
"dbs": "fac_kenmerkdomein_key",
"label": L("mgt_kenmerkdomein_key"),
"typ": "key",
@@ -119,13 +120,13 @@ function model_bez_kenmerk()
"filter": "exact",
"LOVinit": ""
},
"bez_kenmerk_default": {
"default": {
"dbs": "bez_kenmerk_default",
"label": L("mgt_kenmerk_default"),
"typ": "memo",
"translate": true
},
"bez_kenmerk_regexp": {
"regexp": {
"dbs": "bez_kenmerk_regexp",
"label": L("mgt_kenmerk_regexp"),
"typ": "varchar"

2
APPL/BES/bes_edit_opdr.asp
View File

@@ -256,7 +256,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
<td><%=safe.html(bes_bestelopdr.artikel_arr[i].omschr)%></td>
<td align="right">
<input type="text" maxlength=5 style="width:100%;text-align:right" onBlur="recalcPrice(<%=i+1%>);"
id="cnt<%=i+1%>" name="cnt<%=i+1%>" value="<%=bes_bestelopdr.artikel_arr[i].aantal%>"
id="cnt<%=i+1%>" class="fld_dlvrnr" name="cnt<%=i+1%>" value="<%=bes_bestelopdr.artikel_arr[i].aantal%>"
aantalontv="<%=bes_bestelopdr.artikel_arr[i].aantalontv%>">
<input type='hidden' id='am<%=i+1%>' name='am<%=i+1%>' value='<%=bes_bestelopdr.artikel_arr[i].aantal%>'>
<input type='hidden' id='max<%=i+1%>' name='max<%=i+1%>' value='<%=bes_bestelopdr.artikel_arr[i].aantal%>'>

3
APPL/BEZ/bez.inc
View File

@@ -317,6 +317,9 @@ bez =
+ " from bez_afspraak"
+ " where bez_afspraak_key = " + afspr_key;
var oRs = Oracle.Execute(sql);
if (oRs.eof)
shared.record_not_found("<!--" + afspr_key + "-->");
host_key = oRs("bez_afspraak_host_key").value;
contact_key = oRs("bez_afspraak_contact_key").value;
alg_key = oRs("alg_onrgoed_keys").value;

2
APPL/CAD/ShowGoogleMap.asp
View File

@@ -75,7 +75,7 @@
<head>
<style type="text/css">
html, body { height: 100%; margin: 0; padding: 0; }
#map { height: 100%; }
geenhekjeaanbeginregel,#map { height: 100%; }
</style>
<script type="text/javascript" async defer
src='//maps.googleapis.com/maps/api/js?key=<%=safe.htmlattr(fg_remote_maps)%>&callback=initMap'>

4
APPL/FAC/fac_user_info.asp
View File

@@ -211,8 +211,8 @@ oRs.Close();
ROFIELDTR('fld', L("lcl_prs_person_nr"), thisUser.prs_perslid_nr(), {suppressEmpty: true});
var xfunc = user.func_enabled2("ALG", { isOptional: true });
var anyALG = xfunc && xfunc.anyfound;
var algfunc = user.func_enabled2("ALG", { isOptional: true });
var anyALG = algfunc && algfunc.anyfound;
for (i = 0; i<thisUser.werkplekken().length; i++)
{ // order by ?

2
APPL/MGT/bez_actie.asp
View File

@@ -14,7 +14,7 @@ scaffolding(this_model,
"list": {
"columns": [
"id",
"bez_actie_omschrijving"
"name"
]
}
});

16
APPL/MGT/bez_kenmerk.asp
View File

@@ -8,26 +8,30 @@ var this_model = new model_bez_kenmerk();
this_model.hook_pre_edit = function (obj, fld)
{
var kenmerktype = (obj.property_type ? obj.property_type.id : "");
fld.property_type.LOV = buildKenmerktypeLOV(kenmerktype);
%>
<script type="text/javascript">
var module = "BEZ";
var property_type = "<%=kenmerktype%>";
</script>
<%
var kenmerktype = (obj.bez_kenmerk_kenmerktype ? obj.bez_kenmerk_kenmerktype.id : "");
fld.bez_kenmerk_kenmerktype.LOV = buildKenmerktypeLOV(kenmerktype);
}
scaffolding(this_model,
{
"search": {
"autosearch": true
"autosearch": true,
"filters": [
"property_type"
]
},
"list": {
"columns": [
"id",
"bez_kenmerk_volgnr",
"bez_kenmerk_omschrijving",
"bez_kenmerk_kenmerktype"
"sequence",
"name",
"property_type"
]
},
"edit": {

18
APPL/MGT/ins_srtkenmerk.asp
View File

@@ -7,6 +7,18 @@
<%
var this_model = new model_ins_srtkenmerk();
this_model.hook_pre_edit = function (obj, fld)
{
var kenmerktype = (obj.property_type ? obj.property_type.id : "");
fld.property_type.LOV = buildKenmerktypeLOV(kenmerktype);
%>
<script type="text/javascript">
var module = "INS";
var property_type = "<%=kenmerktype%>";
</script>
<%
}
scaffolding(this_model,
{
"search": {
@@ -23,7 +35,11 @@ scaffolding(this_model,
"property_type"
]
},
"edit": {},
"edit": {
"requires": {
js: ["./mgt_srtkenmerk.js"]
}
},
"print": {}
});
%>

6
APPL/MGT/srtinstallatieselector.js
View File

@@ -115,17 +115,17 @@ function pre_submit()
{
if (srtdeel_key != -1)
{
$("#ins_kenmerk_niveau").val("S");
$("#level").val("S");
$("#object_key").val(srtdeel_key);
}
else if (srtgroep_key != -1)
{
$("#ins_kenmerk_niveau").val("G");
$("#level").val("G");
$("#object_key").val(srtgroep_key);
}
else
{
$("#ins_kenmerk_niveau").val("D");
$("#level").val("D");
$("#object_key").val(discipline_key);
}
}

1
APPL/MLD/mld.inc
View File

@@ -568,6 +568,7 @@ mld = {setmeldingstatus:
{
var sql = "";
alias = alias || "mld_melding";
mldstatus_str = String(mldstatus_str);
if (mldstatus_str)
{
// Aantal openstaande opdrachten of offertes

4
APPL/MLD/mld_edit_melding_save.asp
View File

@@ -395,8 +395,8 @@ if (savemode)
+ " WHERE mld_statusopdr_key IN (3, 4, 5, 8)"
+ (stdm_info.startdatum == 1
? " AND (TRUNC(mld_opdr_datumbegin) < " + startdate.beginToSQL()
+ " OR mld_opdr_einddatum >" + enddate.beginToSQL()+")"
: " AND mld_opdr_einddatum > " + enddate.beginToSQL())
+ " OR TRUNC(mld_opdr_einddatum) >" + enddate.beginToSQL()+")"
: " AND TRUNC(mld_opdr_einddatum) > " + enddate.beginToSQL())
+ " AND mld_melding_key = " + mld_key;
oRs = Oracle.Execute(sql);
if (oRs("aantal") > 0)

36
APPL/PDA/afspraak.asp
View File

@@ -372,26 +372,45 @@ var subject = (isReservering
if (!validateForm("afspraak"))
return false;
var submit_url = $("form[name=afspraak]")[0].action
+ (<%=rsv_ruimte_key%> != -1 ? "&rsv_ruimte_key=<%=rsv_ruimte_key%>" : "");
var data = $("form[name=afspraak]").serialize();
if (<%=afs_key%> == -1)
{
var submit_url = $("form[name=afspraak]")[0].action
+ (<%=rsv_ruimte_key%> != -1 ? "&rsv_ruimte_key=<%=rsv_ruimte_key%>" : "");
$.post( submit_url
, $("form[name=afspraak]").serialize()
$.post( submit_url, data
, McltCallbackAndThen(gotoVis?bez_add_vis:afs_submit_callback)
, "json");
}
else
{
// Gegevens van bezoekers aanpassen.
$.post( submit_url, data
, McltCallbackAndThen(gotoVis?bez_submit_add:bez_submit)
, "json");
}
return false;
}
function bez_submit()
{
// Gegevens van bezoekers aanpassen en afsluiten
var submit_url = "../bez/bez_edit_bezoekers_save.asp?urole=fe&mobile=1&afspr_key=<%=afs_key%>"
+ "&rsv_ruimte_key=<%=rsv_ruimte_key%>";
$.post( submit_url
, $("form[name=afspraak]").serialize()
, McltCallbackAndThen(gotoVis?bez_add_vis:null)
, McltCallbackClose
, "json");
}
return false;
}
function bez_submit_add()
{
// Gegevens van bezoekers aanpassen en nieuwe bezoeker toevoegen
var submit_url = "../bez/bez_edit_bezoekers_save.asp?urole=fe&mobile=1&afspr_key=<%=afs_key%>"
+ "&rsv_ruimte_key=<%=rsv_ruimte_key%>";
$.post( submit_url
, $("form[name=afspraak]").serialize()
, McltCallbackAndThen(bez_add_vis)
, "json");
return false;
}
function bez_add_vis()
@@ -503,7 +522,6 @@ var subject = (isReservering
, maxPast : 0
, maxFuture: ((urole == "fe" && S("vis_fe_afspraak_limiet") > 0)? S("vis_fe_afspraak_limiet") : S("vis_afspraak_limiet"))
, initTimeEmpty: timeEindInitEmpty
, initEmpty: (afs_key < 0 && urole != "bo" && rsv_ruimte_key == -1)
, timeField: true
, timeStep: S("vis_h") * 60
, startTime: S("vis_t1")

7
APPL/PDA/melding.asp
View File

@@ -525,8 +525,11 @@ if (action != "forward")
if (mld_info.mprio != 3) {
ROFIELD("attention", L("lcl_mld_urg") , mld.getpriotext(mld_info.mprio));
}
var prs_behandelaar = new Perslid(mld_info.behandel_key);
ROFIELD((mld_info._behandel_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar") , prs_behandelaar.naam(), {suppressEmpty: true });
if (mld_info.behandel_key)
{
var prs_behandelaar = new Perslid(mld_info.behandel_key);
ROFIELD((mld_info._behandel_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar") , prs_behandelaar.naam(), {suppressEmpty: true });
}
generateFlexKenmerkBlock ({
fnpre : function () {},

4
APPL/PDA/productsearch.asp
View File

@@ -116,8 +116,10 @@ function fncolLink(oRs)
case "besartikel":
case "faq":
case "prsperslid":
break;
}
url += "&from_search_key=" + counter_key;
if (url != "")
url += "&from_search_key=" + counter_key;
return url;
}

5
APPL/PDA/resultset_table.inc
View File

@@ -155,7 +155,10 @@ function __rsProcessResultset(processParams)
}
if (!oRs.EOF) // en dus overLimit
html += "<ul data-role='listview' data-theme='c'><li>" + L("lcl_max_lines_reached").format(S("qp_maxrows2")) + "</li></ul>";
{
var maxrows = (this.showAll ? S("qp_maxrows2") : S("qp_maxrows_mobile"));
html += "<ul data-role='listview' data-theme='c'><li>" + L("lcl_max_lines_reached").format(maxrows) + "</li></ul>";
}
Response.Write(html);

12
APPL/RES/res.inc
View File

@@ -625,6 +625,7 @@ res = {
var earliest_expire_change = new Date(1000, 1, 1); // Wijzigingshorizon
var earliest_expire_cancel = new Date(1000, 1, 1); // Annuleringshorizon
var hasCV = false;
var max_dbkosten = 0; // Maximale doorberekeningskosten van alle disciplines binnen een reservering;
var canWritePresentPrk = true; // Kan ik de parkeerplaatsen die AANWEZIG zijn zien en wijzigen.
var disc_key_arr = [];
@@ -666,7 +667,11 @@ res = {
+ " AND rrd.res_rsv_ruimte_key = " + rsv_ruimte_key;
var oRs = Oracle.Execute(discs);
if (oRs.eof)
if (!oRs.eof)
{
hasCV = true; // Er bestaan artikelen bij de reservering.
}
else
{ // Als er nog geen artikelen bij de reservering bestaan, dan kijken welke disciplines er mogelijk zijn.
oRs.Close();
var discs = "SELECT rdp.res_ins_discipline_key res_discipline_key"
@@ -712,6 +717,7 @@ res = {
var expire_cancel = res.discipline_expire(oRs("res_discipline_key").Value, 1);
if (oRs("has_cv").Value > 0)
{ // Wijzig earliest_expire_cancel alleen als voor deze discipline ook echt catering/voorziening aanwezig is
hasCV = true;
if (expire_cancel > earliest_expire_cancel) earliest_expire_cancel = expire_cancel;
}
@@ -806,7 +812,9 @@ res = {
rresult.earliest_expire_cancel = earliest_expire_cancel;
// Voorkom dat in earliest_expire_changeCV startdatum 1/1/1000 blijft staan.
rresult.earliest_expire_changeCV = (earliest_expire_changeCV.getTime() == (new Date(1000, 1, 1)).getTime() ? earliest_expire_change: earliest_expire_changeCV);
if (rresult.earliest_expire_changeCV > rresult.earliest_expire_change)
// Als er geen verbruiksartikelen zijn geboekt dan de canChange (ruimte) niet afhankelijk maken van de canChangeCV (artikelen).
if (hasCV && rresult.earliest_expire_changeCV > rresult.earliest_expire_change)
rresult.earliest_expire_change = rresult.earliest_expire_changeCV;
rresult.max_dbkosten = max_dbkosten;

4
APPL/RES/res_cat.inc
View File

@@ -89,6 +89,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
+ " , 0"
+ " , NULL"
+ " , NULL"
+ " , 0"
+ " , NULL"
+ " FROM res_v_aanwezigartikel r_art"
+ " WHERE r_art.res_artikel_key = " + res_artikel_key
@@ -260,6 +261,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
<% } %>
<td>
<input type='number' id="inpb_c_<%=art_str%>"
class='fld_catamount'
name="inpb_c_<%=art_str%>"
value="<%=aantal%>"
minimum="<%=minimum%>"
@@ -291,6 +293,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
<td>
<input type='number' id='inpbh1_c_<%=art_str%>'
class='fld_cattime'
name='inpbh1_c_<%=art_str%>'
value='<%=ch%>'
maxlength='2' size='2'
@@ -301,6 +304,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
</td>
<td>
<input type='number' id='inpbm1_c_<%=art_str%>'
class='fld_cattime'
name='inpbm1_c_<%=art_str%>'
value='<%=cm%>'
maxlength='2' size='2'

4
APPL/Shared/Login.inc
View File

@@ -352,6 +352,10 @@ function testpassword(prs_key, wachtwoord, pmobile)
}
}
// geen wachtwoord
if (!passhash)
return false;
// gewoon wachtwoord
// Noot: we zouden hier kunnen testen op
// AND (prs_perslid_wachtwoord_exp IS NULL OR prs_perslid_wachtwoord_exp > SYSDATE)

5
APPL/Shared/Suggest/persoonFilter.inc
View File

@@ -67,9 +67,10 @@ function getFiltClausePersoon(pfiltcode, params)
+ " FROM mld_opdr o"
+ " WHERE prs_perslid_key IS NOT NULL"
+ (pfiltcode == 'BEHOC'
? " AND o.mld_uitvoerende_keys = (SELECT prs_bedrijf_key"
? " AND o.mld_uitvoerende_keys in (SELECT prs_bedrijf_key"
+ " FROM prs_contactpersoon cp"
+ " WHERE cp.prs_perslid_key = " + user_key + ")"
+ " WHERE cp.prs_contactpersoon_verwijder is null"
+ " AND cp.prs_perslid_key = " + user_key + ")"
: "")
+ " )";
break;

24
APPL/Shared/default.csx
View File

@@ -1183,7 +1183,7 @@ label.cadselect:hover,
.bijlage:focus, .bijlage1:focus, .fldflexF:focus, button:focus, input.button:focus {
border: 0px!important;
}
.bijlage1 {
background-image: url(../appl/Pictures/doc_text_image.png);
}
@@ -1637,6 +1637,7 @@ input[type=button].required:hover, input[type=text].button.required:hover
* html .missing,
missing,
input[type=text].required.missing,
input[type=button].required.missing,
input[type=password].required.missing,
select.required.missing, option.required.missing,
textarea.required.missing,
@@ -2118,7 +2119,8 @@ table#vis_tab .suggest, table#vis_tab .suggestBusy{width: 218px !important;}
select.flddisc, select.fldsrtdeelmulti, select.fldsrtgroup, .fldprio, .flddeliveryAddr, .fldmld_adrlkey, .fldmld_adrfkey,
select.fldbudgeth, select.fldkstplgr, select.fldkpn_module, select.fldkpn_grpkey, .fldfac_prkey, .fldmld_adrkey, .fldsrt, .fldmld_adres,
.fldroom_srt, .fldbld_srtkey, .fldfintype, .fldfinstatus, .fldter_srkey, .fldmodule, .fldusrtabkey, .fldgroep, .fldverplicht, .fldsrtkenmerk_key,
.fldsrtgroep, .fldmsggroup, .flddel_address, .fldcategorie, .fldprs_bdrkey, select.fldsrtdeel, .fldmantel, .select.fldsupplier
.fldsrtgroep, .fldmsggroup, .flddel_address, .fldcategorie, .fldprs_bdrkey, select.fldsrtdeel, .fldmantel, .select.fldsupplier,
select.fldcnt_cancel_period, select.fldcnt_rappel_period, select.fldgroup
{
width: 224px;
}
@@ -2150,6 +2152,18 @@ input.button, input.materiaal{
width: 204px !important;
}
.fld_dlvrnr {
max-width: 50px;
}
.fld_cattime {
max-width: 35px;
}
.fld_catamount {
max-width: 50px;
}
@media all and (min-width: 60em) {
/* inputs en suggests */
.fld, .fldkp,
@@ -2179,7 +2193,7 @@ input.button, input.materiaal{
select.fldbudgeth, select.fldkstplgr, select.fldkpn_module, select.fldkpn_grpkey, .fldfac_prkey, .fldmld_adrkey, .fldsrt, .fldmld_adres,
.fldroom_srt, .fldbld_srtkey, .fldfintype, .fldfinstatus, .fldter_srkey, .fldmodule, .fldusrtabkey, .fldgroep, .fldverplicht, .fldsrtkenmerk_key,
.fldsrtgroep, .fldmsggroup, .fldcontroletype, .fldsel_srtcontrole, .flddel_address, .fldcategorie, .fldprs_bdrkey, select.fldsrtdeel, select.fldmantel,
select.fldsupplier
select.fldsupplier, select.fldcnt_cancel_period, select.fldcnt_rappel_period, select.fldgroup
{
width: 346px;
}
@@ -2392,6 +2406,10 @@ tr.flexcollapsable td {
background-position: right 5px;
}
#showbody .lhint {
background-image: none;
}
.fldflexD, .fldSflexD {
width: 196px;
}

2
APPL/Shared/default.inc
View File

@@ -9,7 +9,7 @@
Note: Sinds 5.2.2 zitten de settings in de database
*/
var FCLTVersion="2015.3";
var FCLTVersion="2015.3a";
var FCLTMinDatabaseSchema="26";
var custpath = rooturl + "/cust/" + customerId; // path to customer files

9
APPL/Shared/ie-fix.css
View File

@@ -49,7 +49,8 @@ div.leftcontainer,
#prsUsrFlex,
#prsFlex,
#mrkInfo,
#sleInfo
#sleInfo,
#mldFaqedit
{
clear: left;
float:left;
@@ -109,10 +110,14 @@ div.leftcontainer,
select {
background-image: none!important;
background-image: none !important;
}
input[readonly], select[readonly], textarea[readonly], td span[readonly], td div[readonly] {
filter: alpha(opacity=100)!important;
opacity: 1!important;
}
#navigationCell .suggest {
background-position:188px!important;
}

5
APPL/Shared/kenmerk_common.inc
View File

@@ -1647,8 +1647,9 @@ function _saveFlexKenmerken(parentKey, params, flexdata) // TODO: support multiM
if (vold != vnew)
{
var oRsk = Oracle.Execute(params.allKenmerkenSQL + flex.id);
var label = oRsk("kenmerk_omschrijving");
var kdomein_key = oRsk("fac_kenmerkdomein_key");
var label = oRsk("kenmerk_omschrijving").Value;
var kdomein_key = oRsk("fac_kenmerkdomein_key").Value;
oRsk.Close();
if (flex.type == "S" || flex.type == "R")
{
if (vold != "")

2
APPL/Shared/resultset_table_v2.inc
View File

@@ -1550,7 +1550,7 @@ ResultsetTable.formatValue = function (val, params) //datatype, decimals)
// Eerst de geforceerde datatypes
switch (params.datatype)
{
case "date" : return toDateString(val, isExcel, params.prettydate); // isExcel-->noDay
case "date" : return toDateString(val, isExcel||isCSV, params.prettydate); // isExcel-->noDay
case "datetime": return toDateTimeString(val, false, isExcel);
case "time" : { val = toTimeString(val);
if (params.datatype == "time" && params.nomidnight && val == "00:00")

6
APPL/Shared/touch.css
View File

@@ -112,7 +112,7 @@ div#touchmenu li a {
#tProfFAC, #tPersFAC, #tMgtFAC {
height: 100%;
text-align: left;
min-height: 768px;
}
#tProfFAC ul li, #tPersFAC ul li, #tMgtFAC ul li, #portalmenu li.mi {
font-size: 1.5em;
@@ -255,4 +255,6 @@ div.time-holder table.times td.time {
padding: 12px;
height: 80px;
}
}
}
#mod_prs_pwdchange {width:500px;}