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

LOGC#42767

Browse Source 
svn path=/Website/trunk/; revision=35405
This commit is contained in:
Peter Feij
2017-09-22 07:24:38 +00:00
parent d8306553d0
commit 79850c65b8
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/PDA/bez_list.asp
View File

@@ -40,6 +40,7 @@
+ ", b.bez_bezoekers_key"
+ ", b.bez_bezoekers_pasnr"
+ ", b.bez_bezoekers_opmerking"
+ ", b.bez_bezoekers_flag"
+ " FROM bez_afspraak a"
+ ", bez_bezoekers b"
+ ", bez_actie t"
@@ -99,9 +100,11 @@
return "../pda/afspraak.asp?afs_key=" + oRs("bez_afspraak_key").Value;
};
function fnBestemming(oRs) {
var flagkey = oRs("bez_bezoekers_flag").Value||0;
return "<div class='listbodykop'>"
+ "<i class='fa fa-user'></i>&nbsp;" +safe.html(oRs("bez_afspraak_gastheer").value)
+ (oRs("bez_afspraak_ruimte").value ? "<br><i class='fa fa-map-marker'></i>&nbsp;" + safe.html(oRs("bez_afspraak_ruimte").value) : "")
+ (flagkey ? "<br><i class='fa fa-circle bezflag"+flagkey+"'></i>&nbsp;" + L("lcl_bez_flag" + flagkey) : "")
+ (oRs("bez_bezoekers_done").value != null ? "<br><i class='fa fa-sign-in'></i>&nbsp;" + toDateTimeString(oRs("bez_bezoekers_done").value) : "")
+ (oRs("bez_bezoekers_out").value != null ? "<br><i class='fa fa-sign-out'></i>&nbsp;" + toDateTimeString(oRs("bez_bezoekers_out").value) : "")
+ "</div>"

15
APPL/PDA/default.css
View File

@@ -88,7 +88,7 @@
.omschr { font-size: 0.6em; font-weight: normal;}
.f1 { font-size: 0.9em;}
.f2 { font-size: 0.8em; font-style: italic;}
.f2 { font-size: 0.8em; font-style: italic; padding-left: 2px;}
.n2 { white-space: nowrap; }
.rticon {
@@ -526,4 +526,15 @@ input[type="file"] {
padding-left: 8px;
}
.btn-disabled { cursor: auto !important; }
.btn-enabled { cursor: pointer !important; }
.btn-enabled { cursor: pointer !important; }
/* kopie */
.mldflag0, .resflag0, .opdrflag0, .bezflag0 { color: #b0b0b0; }
.mldflag1, .resflag1, .opdrflag1, .bezflag1 { color: #4d4d4d; }
.mldflag2, .resflag2, .opdrflag2, .bezflag2 { color: #f15854; }
.mldflag3, .resflag3, .opdrflag3, .bezflag3 { color: #ffd600; }
.mldflag4, .resflag4, .opdrflag4, .bezflag4 { color: #5da5da; }
.mldflag5, .resflag5, .opdrflag5, .bezflag5 { color: #60bd68; }
.mldflag6, .resflag6, .opdrflag6, .bezflag6 { color: #673ab7; }
.mldflag7, .resflag7, .opdrflag7, .bezflag7 { color: #faa43a; }
.mldflag8, .resflag8, .opdrflag8, .bezflag8 { color: #b276b2; }
.mldflag9, .resflag9, .opdrflag9, .bezflag9 { color: #b2912f; }

8
APPL/PDA/mld_list.asp
View File

@@ -154,6 +154,7 @@ var authparams = user.checkAutorisation(autfunction);
+ " , mld_melding_spoed"
+ " , mld_melding_omschrijving"
+ " , mld_melding_onderwerp"
+ " , mld_melding_flag"
+ " , DECODE(v.alg_plaatsaanduiding, '', DECODE (l.alg_locatie_omschrijving, '','',' ('||l.alg_locatie_omschrijving||')'), v.alg_plaatsaanduiding || DECODE(v.alg_plaatsomschrijving, '','' ,' (' || v.alg_plaatsomschrijving || ')'))"
+ " plaatsmelding"
+ " , CASE "
@@ -308,8 +309,11 @@ var authparams = user.checkAutorisation(autfunction);
function fncolSubHeader(oRs)
{
return "<div class='listbodykop'>" + (oRs("plaatsmelding").Value? "<i class='fa fa-map-marker'></i>&nbsp;" + safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
+ "<i class='fa fa-clock-o'></i>&nbsp;" + toDateTimeString(oRs("mld_melding_einddatum").Value, false, false, true) + "</div>"
var flagkey = (S("mld_melding_flags") > 0 && urole!="fe" && oRs("mld_melding_flag").Value)||0;
return "<div class='listbodykop'>" + (oRs("plaatsmelding").Value? "<i class='fa fa-map-marker'></i>&nbsp;" + safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
+ "<i class='fa fa-clock-o'></i>&nbsp;" + toDateTimeString(oRs("mld_melding_einddatum").Value, false, false, true)
+ (flagkey ? "<br><i class='fa fa-circle mldflag"+flagkey+"'></i>&nbsp;" + L("lcl_mld_flag" + flagkey) : "")
+ "</div>"
+ (oRs("mld_melding_onderwerp").Value != null ? "<span class='subject'><i class='fa fa-chevron-right'></i>&nbsp;"+safe.html(oRs("mld_melding_onderwerp").Value) + "</span><br>" : "")
+ (oRs("mld_melding_omschrijving").Value? "<div class='listbodytext'>" + safe.html(shorttxt(oRs("mld_melding_omschrijving").Value, S("rs_mobile_maxchar"))) + "</div>" : "");
};

3
APPL/PDA/orders_list.asp
View File

@@ -144,6 +144,7 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
+ " END actief"
+ " , COALESCE(o.mld_opdr_plandatum, o.mld_opdr_einddatum) einddatum"
+ " , o.mld_opdr_halted halted"
+ " , o.mld_opdr_flag"
+ " FROM mld_opdr o"
+ " , mld_melding m"
+ " , mld_stdmelding std"
@@ -314,6 +315,7 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
var intern = oRs("intern").Value == 1;
var PBtype = oRs("type").Value;
var safeuitv = "";
var flagkey = oRs("mld_opdr_flag").Value||0;
if (contactpersoon != null)
safeuitv = "<i class='fa fa-user-o'></i>&nbsp;" + safe.html(contactpersoon);
else if (listmode !=1 && bedrijf != null && !intern)
@@ -323,6 +325,7 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
return "<div class='listbodykop'>" + (oRs("plaatsmelding").Value? "<i class='fa fa-map-marker'></i>&nbsp;"+safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
+ (safeuitv != "" ? safeuitv + "<br>" : "")
+ "<i class='fa fa-clock-o'></i>&nbsp;" + toDateTimeString(oRs("mld_opdr_einddatum").Value, false, false, true)
+ (flagkey ? "<br><i class='fa fa-circle opdrflag"+flagkey+"'></i>&nbsp;" + L("lcl_opdr_flag" + flagkey) : "")
+ "</div>"
+ "<div class='listbodytext'>" + safe.html(shorttxt(oRs("mld_opdr_omschrijving").Value, S("rs_mobile_maxchar"))) + "</div>";
};