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

FSN#37797 opdrachten accepteren en wat meer info in de lijst

Browse Source 
svn path=/Website/trunk/; revision=30833
This commit is contained in:
Peter Feij
2016-09-22 17:43:26 +00:00
parent 093e38b742
commit 32d45b79f5
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
APPL/PDA/order.asp
View File

@@ -149,6 +149,21 @@ else
);
}
}
function opdr_accept()
{
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_accept_1") + opdr_nr + L("lcl_mld_opdr_accept_2")))
{
var data = { opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post( "../mld/opdr_accept.asp"
, data
, McltCallbackAndThenAlways(opdr_action_callback)
, "json"
);
}
}
function opdr_reject()
{
var opmerk = prompt(L("lcl_mld_inf_opmerking_fiat"), "");
@@ -423,6 +438,10 @@ else
// Buttons
if (opdr_key > -1)
{
if (this_opdr.canAccept)
BUTTON(L("lcl_accept"), {click: "opdr_accept()", dataicon: "check"});
if (this_opdr.canReject)
BUTTON(L("lcl_reject"), {click: "opdr_reject()", dataicon: "delete"});
if (this_opdr.canChange)
BUTTON(L("lcl_submit"), {click: "opdr_submit()", dataicon: "refresh"});
if (this_opdr.canGoedkeur ||
@@ -433,8 +452,6 @@ else
BUTTON(L("lcl_goedkeur"), {click: "opdr_goedkeur()", dataicon: "check"});
if (this_opdr.canApprove)
BUTTON(L("lcl_approve"), {click: "opdr_approve()", dataicon: "check"});
if (this_opdr.canReject)
BUTTON(L("lcl_reject"), {click: "opdr_reject()", dataicon: "delete"});
if (this_opdr.canAcceptOffer)
BUTTON(L("lcl_approve"), {click: "opdr_accept_offer()", dataicon: "check"});
if (this_opdr.canRejectOffer)

11
APPL/PDA/orders_list.asp
View File

@@ -18,6 +18,7 @@
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/discxalg3d.inc" -->
<!-- #include file="../Shared/status.inc" -->
<!-- #include file="../MLD/mld.inc" -->
<!-- #include file="./resultset_table.inc" -->
<!-- #include file="./mobile.inc" -->
@@ -127,8 +128,10 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
+ " , NVL(va.plaatsmelding, l.alg_locatie_code) plaatsmelding"
+ " , m.mld_melding_spoed "
+ " , o.mld_opdr_datumbegin "
+ " , o.mld_opdr_einddatum "
+ " , o.mld_opdr_omschrijving "
+ " , o.mld_opdr_bedrijfopdr_volgnr "
+ " , o.mld_statusopdr_key "
+ " , mu.naam "
+ " FROM mld_opdr o "
+ " , mld_melding m "
@@ -257,9 +260,14 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
return url;
};
function fncolaside(oRs)
{
return status.getopdrstatustext(oRs("mld_statusopdr_key").value);
}
function fncolSubHeader(oRs)
{
return (oRs("plaatsmelding").Value? "<div class='listbodykop'>" + safe.html(oRs("plaatsmelding").Value) + "</div>" : "")
return (oRs("plaatsmelding").Value? "<div class='listbodykop'>" + safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
+ L("lcl_mld_enddate") + ": " + toDateTimeString(oRs("mld_opdr_einddatum").Value, false, false, true) + "</div>"
+ "<div class='listbodytext'>" + safe.html(shorttxt(oRs("mld_opdr_omschrijving").Value, S("rs_mobile_maxchar"))) + "</div>";
};
@@ -290,6 +298,7 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
headerColumn: "opdracht",
detailColumn: "mld_stdmelding_omschrijving",
subheaderColumn: fncolSubHeader,
asideColumn: fncolaside,
showAll: true
});