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

STAM#39620 mogelijkheid voor externe meldingen via ons menu

Browse Source 
svn path=/Website/trunk/; revision=33710
This commit is contained in:
Peter Feij
2017-05-05 21:24:41 +00:00
parent e27f3c9bf3
commit c8c0be9ebc
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/mld.inc
View File

@@ -2456,6 +2456,7 @@ mld = {setmeldingstatus:
+ " , ms.mld_stdmelding_vervaldatum" + " , ms.mld_stdmelding_vervaldatum"
+ " , ms.mld_stdmelding_kanverwijzen" + " , ms.mld_stdmelding_kanverwijzen"
+ " , ms.mld_stdmelding_slabewaken" + " , ms.mld_stdmelding_slabewaken"
+ " , ms.mld_stdmelding_externurl"
+ " , (SELECT COUNT(*)" + " , (SELECT COUNT(*)"
+ " FROM fac_faq ff" + " FROM fac_faq ff"
+ " , mld_stdmeldingfaq sf" + " , mld_stdmeldingfaq sf"
@@ -2568,6 +2569,7 @@ mld = {setmeldingstatus:
vervaldatum: oRs("mld_stdmelding_vervaldatum").Value != null? new Date(oRs("mld_stdmelding_vervaldatum").Value) : oRs("mld_stdmelding_vervaldatum").Value, vervaldatum: oRs("mld_stdmelding_vervaldatum").Value != null? new Date(oRs("mld_stdmelding_vervaldatum").Value) : oRs("mld_stdmelding_vervaldatum").Value,
kanverwijzen: oRs("mld_stdmelding_kanverwijzen").Value, kanverwijzen: oRs("mld_stdmelding_kanverwijzen").Value,
slabewaken: oRs("mld_stdmelding_slabewaken").Value == 1, slabewaken: oRs("mld_stdmelding_slabewaken").Value == 1,
externurl: oRs("mld_stdmelding_externurl").Value,
aantal_faq: oRs("aantal_faq").Value, // Totaal aantal aantal_faq: oRs("aantal_faq").Value, // Totaal aantal
fixed_faq: [], // deze worden altijd getoond fixed_faq: [], // deze worden altijd getoond
popup_faq: false, // Popupje tonen? popup_faq: false, // Popupje tonen?

12
APPL/MLD/mld_fe_menu.asp
View File

@@ -32,9 +32,12 @@ var lvl = getQParamInt("lvl", 1);
<head> <head>
<% FCLTHeader.Generate(); %> <% FCLTHeader.Generate(); %>
<script type="text/javascript"> <script type="text/javascript">
function run_create_mld (p_srtdisc, p_mld_stdkey) function run_create_mld (p_srtdisc, p_mld_stdkey, p_url)
{ {
FcltMgr.openDetail('appl/mld/mld_melding.asp?urole=fe&srtdisc=' + p_srtdisc + '&mld_defaultstdmelding=' + p_mld_stdkey,L("lcl_complain")); if (p_url)
FcltMgr.openDetail(p_url, L("lcl_complain"));
else
FcltMgr.openDetail('appl/mld/mld_melding.asp?urole=fe&srtdisc=' + p_srtdisc + '&mld_defaultstdmelding=' + p_mld_stdkey,L("lcl_complain"));
} }
$(function () $(function ()
@@ -80,7 +83,8 @@ var sql = "SELECT sm.mld_stdmelding_key,"
+ " d.ins_discipline_key," + " d.ins_discipline_key,"
+ " sd.ins_srtdiscipline_key," + " sd.ins_srtdiscipline_key,"
+ " ins_srtdiscipline_prefix," + " ins_srtdiscipline_prefix,"
+ " mld_stdmelding_image foto" + " mld_stdmelding_image foto,"
+ " mld_stdmelding_externurl"
+ " FROM mld_stdmelding sm," + " FROM mld_stdmelding sm,"
+ " mld_stdmeldinggroep mg," + " mld_stdmeldinggroep mg,"
+ " mld_discipline d," + " mld_discipline d,"
@@ -185,7 +189,7 @@ switch (lvl) {
} }
%><td class='iconmenu' width='<%=Math.floor(100/maxcol)%>%' %><td class='iconmenu' width='<%=Math.floor(100/maxcol)%>%'
title='<%=safe.htmlattr(oRs("mld_stdmelding_hint").Value || oRs("mld_stdmelding_omschrijving").Value)%>' title='<%=safe.htmlattr(oRs("mld_stdmelding_hint").Value || oRs("mld_stdmelding_omschrijving").Value)%>'
onclick='run_create_mld (<%=oRs("ins_srtdiscipline_key").Value%>,<%=oRs("mld_stdmelding_key").Value%>);'> onclick='run_create_mld (<%=oRs("ins_srtdiscipline_key").Value%>,<%=oRs("mld_stdmelding_key").Value%>,"<%=safe.jsstring(oRs("mld_stdmelding_externurl").Value)%>");'>
<%if (url) <%if (url)
{ %> { %>
<img theSrc='<%=safe.htmlattr(url)%>'> <img theSrc='<%=safe.htmlattr(url)%>'>

8
APPL/MLD/mld_stdmelding.asp
View File

@@ -159,7 +159,8 @@ else if (stdm_info.ins_srtinst_niveau == "S")
{ dbs: "mld_stdmelding_t_uitvoertijd.tijdsduur", { dbs: "mld_stdmelding_t_uitvoertijd.tijdsduur",
obj: "MLD_T_UITVOERTIJD", typ: "float", frm: "uitvoertijd3" }, obj: "MLD_T_UITVOERTIJD", typ: "float", frm: "uitvoertijd3" },
{ dbs: "mld_stdmelding_t_uitvoertijd.eenheid", { dbs: "mld_stdmelding_t_uitvoertijd.eenheid",
obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours3" } obj: "MLD_T_UITVOERTIJD", typ: "varchar", frm: "dayshours3" },
{ dbs: "mld_stdmelding_externurl", typ: "varchar", frm: "stdm_externurl" }
]; ];
// Checken of het eenheden selectveld met dagen/uren bij "Acceptatietijd" niet readonly was en wel is meegegeven. // Checken of het eenheden selectveld met dagen/uren bij "Acceptatietijd" niet readonly was en wel is meegegeven.
@@ -757,6 +758,9 @@ else if (stdm_info.ins_srtinst_niveau == "S")
stdm_info.hint_dblang, stdm_info.hint_dblang,
{translate: { fld: "mld_stdmelding_hint", key : stdm_info.mld_stdmelding_key }, suppressEmpty: true} {translate: { fld: "mld_stdmelding_hint", key : stdm_info.mld_stdmelding_key }, suppressEmpty: true}
); );
myFIELD("stdm_externurl", "fld fldexturl", L("lcl_mld_externurl"), stdm_info.externurl, {suppressEmpty: true});
if (mode == 'edit') if (mode == 'edit')
{ {
var params = { type: "button", var params = { type: "button",
@@ -764,7 +768,7 @@ else if (stdm_info.ins_srtinst_niveau == "S")
} }
ROFIELDTR("stdmsymbol_button", L("lcl_mld_symbol_upload"), L("lcl_mld_browse_upload"), params); ROFIELDTR("stdmsymbol_button", L("lcl_mld_symbol_upload"), L("lcl_mld_browse_upload"), params);
} }
myFIELD("image", "fldtxt", L("lcl_mld_symbol_name"), stdm_info.image, {maxlength: 255, suppressEmpty: true}); myFIELD("image", "fld", L("lcl_mld_symbol_name"), stdm_info.image, {maxlength: 255, suppressEmpty: true});
sql = "SELECT 0, " + safe.quoted_sql(L("lcl_mld_never")) + " FROM DUAL" sql = "SELECT 0, " + safe.quoted_sql(L("lcl_mld_never")) + " FROM DUAL"
+ " UNION SELECT 1, " + safe.quoted_sql(L("lcl_mld_always")) + " FROM DUAL" + " UNION SELECT 1, " + safe.quoted_sql(L("lcl_mld_always")) + " FROM DUAL"
+ " UNION SELECT 2, " + safe.quoted_sql(L("lcl_mld_opt_in")) + " FROM DUAL" + " UNION SELECT 2, " + safe.quoted_sql(L("lcl_mld_opt_in")) + " FROM DUAL"

3
APPL/Shared/default.csx
View File

@@ -2867,6 +2867,9 @@ i.timeklikker {
#fldmldurentotal.afwijk { #fldmldurentotal.afwijk {
color: red; color: red;
} }
.fldexturl {
color: red;
}
/* haltewerkzaamheden: jaar, km, /* haltewerkzaamheden: jaar, km,
bestellingen: retour */ bestellingen: retour */