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

FSN#40747 fixes tbv app

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34091
This commit is contained in:
Peter Feij
2017-05-31 16:00:25 +00:00
parent 7f7ffe395c
commit 04c1b421ef
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/PDA/bestelling.asp
View File

@@ -219,7 +219,7 @@ if (bes_key > -1)
trackinglines = mobile.hastrackingpage('bestelling', bes_key); trackinglines = mobile.hastrackingpage('bestelling', bes_key);
if (trackinglines>0) if (trackinglines>0)
{ {
BUTTON(L("lcl_history"), {linkid: "#bes-2-"+bes_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#bes-2-"+bes_key, dataicon: "bullets"});
} }
} }
CONTROLGROUP_END() CONTROLGROUP_END()
@@ -234,7 +234,7 @@ if (bes_key > -1)
{ {
if (trackinglines>0) if (trackinglines>0)
{ {
PAGE_START({id: "bes-2-"+bes_key}) PAGE_START({id: "bes-2-"+bes_key, dialog: true})
mobile.trackingpage('bestelling', bes_key, S("bes_bestelling_prefix") + bes_key); mobile.trackingpage('bestelling', bes_key, S("bes_bestelling_prefix") + bes_key);
PAGE_END(); PAGE_END();
} }

4
APPL/PDA/contract.asp
View File

@@ -336,7 +336,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
trackinglines = mobile.hastrackingpage('contract', cnt_key); trackinglines = mobile.hastrackingpage('contract', cnt_key);
if (trackinglines > 0) if (trackinglines > 0)
{ {
BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "bullets"});
} }
var tsql = "SELECT COUNT(*) FROM cnt_contract_note n WHERE n.cnt_contract_key = " + cnt_key; var tsql = "SELECT COUNT(*) FROM cnt_contract_note n WHERE n.cnt_contract_key = " + cnt_key;
@@ -367,7 +367,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
if (trackinglines > 0) if (trackinglines > 0)
{ {
PAGE_START({id: "cnt-2-" + cnt_key}) PAGE_START({id: "cnt-2-" + cnt_key, dialog: true})
mobile.trackingpage('contract', cnt_key, subject); mobile.trackingpage('contract', cnt_key, subject);
PAGE_END(); PAGE_END();
} }

4
APPL/PDA/factuur.asp
View File

@@ -150,7 +150,7 @@ var subject = L("lcl_fin_invoice") + " " + fin_key;
} }
trackinglines = mobile.hastrackingpage('factuur', fin_key); trackinglines = mobile.hastrackingpage('factuur', fin_key);
if (trackinglines > 0) { if (trackinglines > 0) {
BUTTON(L("lcl_history"), {linkid: "#page-2-"+fin_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#page-2-"+fin_key, dataicon: "bullets"});
} }
CONTROLGROUP_END(); CONTROLGROUP_END();
@@ -159,7 +159,7 @@ var subject = L("lcl_fin_invoice") + " " + fin_key;
PAGE_END(); PAGE_END();
if (trackinglines > 0) { if (trackinglines > 0) {
PAGE_START({id: "page-2-"+fin_key}) PAGE_START({id: "page-2-"+fin_key, dialog: true})
mobile.trackingpage('factuur', fin_key, subject); mobile.trackingpage('factuur', fin_key, subject);
PAGE_END(); PAGE_END();
} }

2
APPL/PDA/iface.inc
View File

@@ -144,7 +144,7 @@ function FOOTER(params)
function PAGE_START(params) function PAGE_START(params)
{ {
if (!params) params = {}; if (!params) params = {};
%><div data-role="page" id="<%=params.id ? params.id : 'page'%>" data-theme="<%= params.datatheme ? params.datatheme : jQDataTheme%>" %><div data-role="page" id="<%=params.id ? params.id : 'page'%>" data-theme="<%= params.datatheme ? params.datatheme : jQDataTheme%>" data-dialog="<%=params.dialog ? params.dialog : 'false'%>"
<%= params.pclass?" class='"+params.pclass+"'":"" %> ><% <%= params.pclass?" class='"+params.pclass+"'":"" %> ><%
} }
function PAGE_END() function PAGE_END()

4
APPL/PDA/ins_deel.asp
View File

@@ -231,7 +231,7 @@ oRs.Close();
} }
trackinglines = mobile.hastrackingpage('deel', ins_key); trackinglines = mobile.hastrackingpage('deel', ins_key);
if (trackinglines>0) { if (trackinglines>0) {
BUTTON(L("lcl_history"), {linkid: "#ins-2-"+ins_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#ins-2-"+ins_key, dataicon: "bullets"});
} }
if (user.checkAutorisation( "WEB_MLDUSE", true)) { if (user.checkAutorisation( "WEB_MLDUSE", true)) {
var tsql = "SELECT COUNT(m.mld_melding_key)" var tsql = "SELECT COUNT(m.mld_melding_key)"
@@ -265,7 +265,7 @@ oRs.Close();
PAGE_END(); PAGE_END();
if (trackinglines>0) { if (trackinglines>0) {
PAGE_START({id: "ins-2-"+ins_key}) PAGE_START({id: "ins-2-"+ins_key, dialog: true})
mobile.trackingpage('deel', ins_key, subject); mobile.trackingpage('deel', ins_key, subject);
PAGE_END(); PAGE_END();
} }

8
APPL/PDA/ins_inspect.asp
View File

@@ -590,10 +590,10 @@ else
CONTROLGROUP_START(); CONTROLGROUP_START();
if (oAr.length > 0) if (oAr.length > 0)
BUTTON(L("lcl_ins_controle_previous")+" ("+oAr.length+")", {linkid: "#ins-3-"+ins_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_ins_controle_previous")+" ("+oAr.length+")", {linkid: "#ins-3-"+ins_key, dataicon: "bullets"});
if (srtcontrole_info) if (srtcontrole_info)
BUTTON(L("ins_srtcontrole_info"), {linkid: "#ins-2-"+ins_key, dataicon: "info", transition: "pop", datarel: "dialog"}); BUTTON(L("ins_srtcontrole_info"), {linkid: "#ins-2-"+ins_key, dataicon: "info"});
switch (ins_deelsrtcontrole_status) switch (ins_deelsrtcontrole_status)
{ {
case -1: case -1:
@@ -650,14 +650,14 @@ else
CONTENT_END(); CONTENT_END();
FOOTER(); FOOTER();
PAGE_END(); PAGE_END();
PAGE_START({id: "ins-2-"+ins_key}) PAGE_START({id: "ins-2-"+ins_key, dialog: true})
HEADER({title: srtcontrole_oms, back: false, nohome: true}) ; HEADER({title: srtcontrole_oms, back: false, nohome: true}) ;
CONTENT_START(); CONTENT_START();
ROFIELD("fclthtml", "", srtcontrole_info, {multi: true}); ROFIELD("fclthtml", "", srtcontrole_info, {multi: true});
CONTENT_END(); CONTENT_END();
PAGE_END(); PAGE_END();
PAGE_START({id: "ins-3-"+ins_key}); PAGE_START({id: "ins-3-"+ins_key, dialog: true});
HEADER({title: L("lcl_ins_controle_previous"), back: true, nohome: true}); HEADER({title: L("lcl_ins_controle_previous"), back: true, nohome: true});
CONTENT_START(); CONTENT_START();

4
APPL/PDA/melding.asp
View File

@@ -811,7 +811,7 @@ if (action != "forward")
} }
trackinglines = mobile.hastrackingpage('melding', mld_key); trackinglines = mobile.hastrackingpage('melding', mld_key);
if (trackinglines>0) { if (trackinglines>0) {
BUTTON(L("lcl_history"), {linkid: "#mld-2-"+mld_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#mld-2-"+mld_key, dataicon: "bullets"});
} }
if (mfe.canReadNotes) { // Heb ik rechten om notities te zien if (mfe.canReadNotes) { // Heb ik rechten om notities te zien
var tsql = "SELECT COUNT(*) FROM mld_melding_note n WHERE n.mld_melding_key = " + mld_key; var tsql = "SELECT COUNT(*) FROM mld_melding_note n WHERE n.mld_melding_key = " + mld_key;
@@ -839,7 +839,7 @@ if (action != "forward")
if (mld_key > -1) if (mld_key > -1)
{ {
if (trackinglines>0) { if (trackinglines>0) {
PAGE_START({id: "mld-2-"+mld_key}) PAGE_START({id: "mld-2-"+mld_key, dialog: true})
mobile.trackingpage('melding', mld_key, (mld_info.prefix || "")+ mld_key); mobile.trackingpage('melding', mld_key, (mld_info.prefix || "")+ mld_key);
PAGE_END(); PAGE_END();
} }

12
APPL/PDA/order.asp
View File

@@ -547,7 +547,7 @@ else
BUTTON(L("lcl_accept"), {click: "opdr_accept()", dataicon: "check"}); BUTTON(L("lcl_accept"), {click: "opdr_accept()", dataicon: "check"});
// DIT VEREIST NOG EEN OMZETTING IN opdr_cancel_save.asp > TODO // DIT VEREIST NOG EEN OMZETTING IN opdr_cancel_save.asp > TODO
if (this_opdr.canCancel) if (this_opdr.canCancel)
BUTTON(L("lcl_mld_opdr_cancel_button"), {linkid: "#opdr-3-"+opdr_key, dataicon: "delete", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_mld_opdr_cancel_button"), {linkid: "#opdr-3-"+opdr_key, dataicon: "delete"});
if (this_opdr.canChange) if (this_opdr.canChange)
BUTTON(L("lcl_submit"), {click: "opdr_submit()", dataicon: "refresh"}); BUTTON(L("lcl_submit"), {click: "opdr_submit()", dataicon: "refresh"});
if (this_opdr.canGoedkeur || if (this_opdr.canGoedkeur ||
@@ -576,14 +576,14 @@ else
if (this_opdr.canClose) if (this_opdr.canClose)
{ // Afmelden { // Afmelden
if (this_opdr.canOpmChange || hltopdr.aantal == 1) if (this_opdr.canOpmChange || hltopdr.aantal == 1)
BUTTON(L("lcl_close"), {linkid: "#opdr-4-" + opdr_key, dataicon: "check", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_close"), {linkid: "#opdr-4-" + opdr_key, dataicon: "check"});
else else
BUTTON(L("lcl_close"), {click: "opdr_close()", dataicon: "check"}); BUTTON(L("lcl_close"), {click: "opdr_close()", dataicon: "check"});
} }
trackinglines = mobile.hastrackingpage('opdracht', opdr_key); trackinglines = mobile.hastrackingpage('opdracht', opdr_key);
if (trackinglines > 0) if (trackinglines > 0)
{ {
BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "bullets"});
} }
if (this_opdr.canShowOpdrNote) // Heb ik rechten om notities te zien if (this_opdr.canShowOpdrNote) // Heb ik rechten om notities te zien
{ {
@@ -613,13 +613,13 @@ else
if (trackinglines > 0) if (trackinglines > 0)
{ {
PAGE_START({id: "opdr-2-"+opdr_key}) PAGE_START({id: "opdr-2-"+opdr_key, dialog: true})
mobile.trackingpage('opdracht', opdr_key, subject); mobile.trackingpage('opdracht', opdr_key, subject);
PAGE_END(); PAGE_END();
} }
// scherm: Annuleren opdracht // scherm: Annuleren opdracht
PAGE_START({id: "opdr-3-"+opdr_key}) PAGE_START({id: "opdr-3-"+opdr_key, dialog: true})
HEADER({title: L("lcl_mld_opdr_cancel_button")+" "+subject, back: false, nohome: true}); HEADER({title: L("lcl_mld_opdr_cancel_button")+" "+subject, back: false, nohome: true});
CONTENT_START(); CONTENT_START();
%> %>
@@ -637,7 +637,7 @@ else
PAGE_END(); PAGE_END();
// scherm: Afmelden opdracht // scherm: Afmelden opdracht
PAGE_START({id: "opdr-4-" + opdr_key}) PAGE_START({id: "opdr-4-" + opdr_key, dialog: true})
HEADER({title: L("lcl_close") + " " + subject, back: false, nohome:true}); HEADER({title: L("lcl_close") + " " + subject, back: false, nohome:true});
CONTENT_START(); CONTENT_START();
var nu = new Date; var nu = new Date;

4
APPL/PDA/ruimte.asp
View File

@@ -125,7 +125,7 @@ var subject = oRs("plaats").value;
} }
trackinglines = mobile.hastrackingpage('ruimte', ruimte_key); trackinglines = mobile.hastrackingpage('ruimte', ruimte_key);
if (trackinglines > 0 && !tiny) { if (trackinglines > 0 && !tiny) {
BUTTON(L("lcl_history"), {linkid: "#page-2-"+ruimte_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); BUTTON(L("lcl_history"), {linkid: "#page-2-"+ruimte_key, dataicon: "bullets"});
} }
// Toon meldingenknop als er lopende meldingen zijn en ik die mag zien (kan vast nog scherper) // Toon meldingenknop als er lopende meldingen zijn en ik die mag zien (kan vast nog scherper)
@@ -210,7 +210,7 @@ var subject = oRs("plaats").value;
PAGE_END(); PAGE_END();
if (trackinglines > 0) { if (trackinglines > 0) {
PAGE_START({id: "page-2-"+ruimte_key}) PAGE_START({id: "page-2-"+ruimte_key, dialog: true})
mobile.trackingpage('ruimte', ruimte_key, subject); mobile.trackingpage('ruimte', ruimte_key, subject);
PAGE_END(); PAGE_END();
} }