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

FSN#31070 enhancements

Browse Source 
svn path=/Website/trunk/; revision=23454
This commit is contained in:
Peter Feij
2014-11-26 08:20:34 +00:00
parent be875c504c
commit 85f33f8ae4
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/PDA/bestelling.asp
View File

@@ -215,7 +215,7 @@ if (bes_key > -1)
trackinglines = mobile.hastrackingpage('bestelling', bes_key);
if (trackinglines>0)
{
BUTTON(L("lcl_history"), {linkid: "#bes-2-"+bes_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
BUTTON(L("lcl_history"), {linkid: "#bes-2-"+bes_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
}
CONTROLGROUP_END()

2
APPL/PDA/contract.asp
View File

@@ -383,7 +383,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_key+ (cnt_info.versie == null ||
trackinglines = mobile.hastrackingpage('contract', cnt_key);
if (trackinglines > 0)
{
BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
}
else

2
APPL/PDA/ins_deel.asp
View File

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

11
APPL/PDA/melding.asp
View File

@@ -619,21 +619,20 @@ if (addSubheader)
{
tsql = "SELECT ins_deel_key FROM mld_melding_object WHERE mld_melding_object_verwijder IS NULL AND mld_melding_key = " + mld_key;
toRs1 = Oracle.Execute(tsql);
BUTTON(L("lcl_mobile_objecten")+"("+toRs(0).value+")", {linkid: "./ins_deel.asp?ins_key="+toRs1("ins_deel_key").value, dataicon: "info"});
BUTTON(L("lcl_mobile_objecten")+" ("+toRs(0).value+")", {linkid: "./ins_deel.asp?ins_key="+toRs1("ins_deel_key").value, dataicon: "info"});
}
else
BUTTON(L("lcl_mobile_objecten")+"("+toRs(0).value+")", {linkid: "./ins_list.asp?mld_key="+mld_key, dataicon: "info"});
BUTTON(L("lcl_mobile_objecten")+" ("+toRs(0).value+")", {linkid: "./ins_list.asp?mld_key="+mld_key, dataicon: "info"});
}
trackinglines = mobile.hastrackingpage('melding', mld_key);
if (trackinglines>0) {
BUTTON(L("lcl_history"), {linkid: "#mld-2-"+mld_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
//BUTTON(mld.getmldstatustext(mld_info.mld_status), {linkid: "#mld-2-"+mld_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
BUTTON(L("lcl_history"), {linkid: "#mld-2-"+mld_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
// Knop voor notities als die er zijn (later: als ik die MAG maken)
var tsql = "SELECT COUNT(*) FROM mld_melding_note n WHERE n.mld_melding_key = " + mld_key;
toRs = Oracle.Execute(tsql);
if (toRs(0).value > 0) { // Nu kan ik nog niet toevoegen, dus 0 hoeft niet; spaart button
BUTTON(L("lcl_mld_frame_notes")+"("+toRs(0).value+")", {linkid: "#mld-3-"+mld_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
BUTTON(L("lcl_mld_frame_notes")+" ("+toRs(0).value+")", {linkid: "#mld-3-"+mld_key, dataicon: "comment", transition: "pop", datarel: "dialog"});
}
if (ruimte_key > -1 && user.checkAutorisation( "WEB_ALGUSE", true)) {
BUTTON(L("lcl_room"), {linkid: "./ruimte.asp?ruimte_key="+ruimte_key, dataicon: "info"});
@@ -642,7 +641,7 @@ if (addSubheader)
var tsql = "SELECT COUNT(*) FROM mld_opdr o WHERE o.mld_melding_key = " + mld_key
+ " AND o.mld_statusopdr_key IN (4, 5, 8)"; // zelfde als die in orders_list worden getoond
toRs = Oracle.Execute(tsql);
BUTTON(L("lcl_mobile_opdrachten")+"("+toRs(0).value+")", {linkid: opdr_page, dataicon: "info", dataajax: "false"});
BUTTON(L("lcl_mobile_opdrachten")+" ("+toRs(0).value+")", {linkid: opdr_page, dataicon: "action", dataajax: "false"});
}
}
CONTROLGROUP_END()

2
APPL/PDA/order.asp
View File

@@ -381,7 +381,7 @@ else
trackinglines = mobile.hastrackingpage('opdracht', opdr_key);
if (trackinglines > 0)
{
BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
if (user.checkAutorisation( "WEB_MLDBOF", true))
{

12
APPL/PDA/ruimte.asp
View File

@@ -116,7 +116,7 @@ var subject = oRs("plaats").value;
}
trackinglines = mobile.hastrackingpage('ruimte', ruimte_key);
if (trackinglines > 0) {
BUTTON(L("lcl_history"), {linkid: "#page-2-"+ruimte_key, dataicon: "arrow-d", transition: "pop", datarel: "dialog"});
BUTTON(L("lcl_history"), {linkid: "#page-2-"+ruimte_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
// Toon meldingenknop als er lopende meldingen zijn en ik die mag zien (kan vast nog scherper)
@@ -129,11 +129,11 @@ var subject = oRs("plaats").value;
+ " AND v.alg_ruimte_key = " + ruimte_key;
toRs = Oracle.Execute(tsql);
if (toRs(0).value == 1) { // eentje slechts, dan naar de details; max is vanzelfsprekend die ene
BUTTON(L("lcl_mobile_meldingen")+ "(1)", {linkid: "./melding.asp?mld_key="+toRs(1).value , dataicon: "alert", dataajax: 'false'});
BUTTON(L("lcl_mobile_meldingen")+ " (1)", {linkid: "./melding.asp?mld_key="+toRs(1).value , dataicon: "alert", dataajax: 'false'});
} else if (toRs(0).value == 0) { // geen, misschien wil ik toevoegen
BUTTON(L("lcl_mobile_newmelding"), {linkid: "./melding.asp?mld_key=-1&ruimte_key="+ruimte_key , dataicon: "plus", dataajax: 'false'});
} else if (toRs(0).value > 0) { // meerdere, dan naar lijst
BUTTON(L("lcl_mobile_meldingen")+"("+toRs(0).value+")", {linkid: "./mld_list.asp?ruimte_key="+ruimte_key , dataicon: "alert", dataajax: 'false'});
BUTTON(L("lcl_mobile_meldingen")+" ("+toRs(0).value+")", {linkid: "./mld_list.asp?ruimte_key="+ruimte_key , dataicon: "alert", dataajax: 'false'});
}
}
// Toon Objectenknop als er in deze ruimte objecten zijn.
@@ -174,9 +174,9 @@ var subject = oRs("plaats").value;
toRs = Oracle.Execute(tsql);
if (toRs(0).value == 1) { // eentje slechts, dan naar de details; max is vanzelfsprekend die ene
BUTTON(L("lcl_mobile_objecten")+"(1)", {linkid: "./ins_deel.asp?ins_key="+toRs(1).value, dataicon: "info", dataajax: 'false'});
BUTTON(L("lcl_mobile_objecten")+" (1)", {linkid: "./ins_deel.asp?ins_key="+toRs(1).value, dataicon: "info", dataajax: 'false'});
} else if (toRs(0).value > 0) { // meerdere, dan naar lijst
BUTTON(L("lcl_mobile_objecten")+"("+toRs(0).value+")", {linkid: "./ins_list.asp?ruimte_key="+ruimte_key, dataicon: "info"});
BUTTON(L("lcl_mobile_objecten")+" ("+toRs(0).value+")", {linkid: "./ins_list.asp?ruimte_key="+ruimte_key, dataicon: "info"});
}
}
if (user.checkAutorisation( "WEB_PRSBOF", true)) { // Werkplekbeheer
@@ -184,7 +184,7 @@ var subject = oRs("plaats").value;
+ " FROM prs_werkplek WHERE prs_werkplek_virtueel=0 AND prs_alg_ruimte_key = " + ruimte_key;
toRs = Oracle.Execute(tsql);
if (toRs(0).value > 0) {
BUTTON(L("lcl_mobile_werkplekken")+"(1)", {linkid: "./wp_list.asp?ruimte_key="+ruimte_key, dataicon: "info"});
BUTTON(L("lcl_mobile_werkplekken")+" (1)", {linkid: "./wp_list.asp?ruimte_key="+ruimte_key, dataicon: "info"});
}
}