diff --git a/APPL/MLD/mld_show_melding.asp b/APPL/MLD/mld_show_melding.asp index 64e7109cf9..ebef1b3888 100644 --- a/APPL/MLD/mld_show_melding.asp +++ b/APPL/MLD/mld_show_melding.asp @@ -486,10 +486,10 @@ function parentButton() if (mld_melding.Startkey && mld_melding.Startkey != mld_key) mld.referentielink("M", mld_melding.Startkey, L("lcl_mld_continue_of")); - if ((urole == "bo" || urole == "fo") && (S("mld_melding_flags") > 0) && mld_melding.flag) + if ((urole == "bo" || urole == "fo") && mld_melding.flag) { - ROFIELDTR("fld", L("lcl_mld_flags"), L("lcl_mld_flag" + mld_melding.flag), - { html: 'style="padding-left: 20px; background-repeat: no-repeat; background-image: url(../Pictures/mldflag'+mld_melding.flag+'.png)"' }); + // I would like the circle icon in the value instead of the label, but that is html-safe + ROFIELDTR("fld", L("lcl_mld_flags")+I("fa-circle mldflag"+ mld_melding.flag), L("lcl_mld_flag" + mld_melding.flag)); } BLOCK_END(); diff --git a/APPL/RES/res.css b/APPL/RES/res.css index 731e43b30c..076e6caab6 100644 --- a/APPL/RES/res.css +++ b/APPL/RES/res.css @@ -1,6 +1,6 @@ /* * $Revision$ - * $Id$ + * $Id$ TODO: FONTAWESOME icons */ @@ -153,14 +153,14 @@ table.planbord div.click { cursor: pointer;} table.planbord input[type=checkbox] { height:16px; width: 16px; } table.planbord input[type=radio] { height:16px; width: 16px; } -div.res_optie_eigen { background-color: #88BBEE; } /* Optie eigen reservering: lichtblauw */ -div.res_definitief_eigen { background-color: #FF6666; } /* Definitief eigen reservering: lichtrood */ -div.res_optie { background-color: #31398C; } /* Optie: blauw */ -div.res_definitief { background-color: #990000; } /* Definitief: rood */ -div.res_blok { background-color: #000000; } /* Blokkade: zwart */ -div.res_vervallen { background-color: #990099; } /* Vervallen: paars */ -div.res_nietvrij { background-color: #F5B70F; } /* Niet beschikbaar: oranje */ -div.res_cleaning { border-left-style: solid; +.res_optie_eigen { background-color: #E37B00; color: #fff; } /* Optie eigen reservering: lichtblauw */ +.res_definitief_eigen { background-color: #009979; color: #fff; } /* Definitief eigen reservering: lichtrood */ +.res_optie { background-color: rgb(238,176,102); color: #fff; } /* Optie: blauw ORANJE */ +.res_definitief { background-color: #66C2AF; color: #fff; } /* Definitief: rood GROEN */ +.res_blok { background-color: #747578; color: #fff;} /* Blokkade: zwart GRIJS */ +.res_vervallen { background-color: #AB1455; color: #fff;} /* Vervallen: paars */ +.res_nietvrij { background-color: #B1B3B4; color: #fff; } /* Niet beschikbaar: oranje LICHTGROEN */ +.res_cleaning { border-left-style: solid; border-left-color: #808080; border-right-style: solid; border-right-color: #808080; @@ -261,6 +261,7 @@ input[type=text].button.required.res_fatal background-image:url(../pictures/delete.png)!important; padding-left : 20px; z-index: 1; } +.res_fatalicon i { color: red; font-size: 1.3em;} #timetip {position:absolute;border:1px solid #666;background-color:#fff;padding:2px;z-index:999;display:none;} diff --git a/APPL/RES/res_list.inc b/APPL/RES/res_list.inc index 4ac4fe8a02..fc9c4cc123 100644 --- a/APPL/RES/res_list.inc +++ b/APPL/RES/res_list.inc @@ -218,19 +218,30 @@ function res_list (pautfunction, params) // Functie fncolFlags kan in alle overzichten worden gebruikt. function fncolFlags(oRs) { - var resRsvRuimteKey = oRs("rsv_ruimte_key").Value; // rsv_ruimte_key + var reskey = oRs("rsv_ruimte_key").Value; // rsv_ruimte_key var flagkey = oRs("res_rsv_ruimte_flag").Value || 0; - + var ttl = L("lcl_res_flag" + flagkey); var displ = flagkey||""; - if (!excel) // maak er dan nog leuke plaatjes van + + if (print) { - var flagimg = ""; - // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan - var ttl = L("lcl_res_flag" + flagkey); - displ = "
" - + flagimg - + "" + (flagkey || 999 )+ "
"; + if (flagkey != 0) displ = safe.html(ttl); // else blijft-ie gewoon leeg + } + else if (excel) // dan gewoon maar de code, handig groeperen + { + displ = flagkey||""; + } + else // maak er dan nog leuke plaatjes van + { + if (flagkey == 0) + var flagimg = ""; + else + var flagimg = ""; + // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan + displ = "
" + + flagimg + + ""+(flagkey||999)+"
"; } return displ; } diff --git a/APPL/RES/res_list.js b/APPL/RES/res_list.js index e04eea0d51..d161900165 100644 --- a/APPL/RES/res_list.js +++ b/APPL/RES/res_list.js @@ -154,13 +154,13 @@ function setFlag(data) { // Zet de flag en het volgnummer van de flag. var rsv_ruimte_key = data.rsv_ruimte_key; var flagkey = data.newflag; - var flagimg = '../Pictures/resflag' + flagkey + '.png'; + var flagimg = 'fa fa-circle resflag'+flagkey;; // Alle gekleurde balletjes met dezelfde id. Met $(#id) pak je alleen het eerste bolletje. Alle voorzieningen (en ruimte) pakken. - $("img[id^='resflagimg" + rsv_ruimte_key + "']").attr('flagkey', flagkey); - $("img[id^='resflagimg" + rsv_ruimte_key + "']").attr('src', flagimg); - $("img[id^='resflagimg" + rsv_ruimte_key + "']").parent().attr('title', L("lcl_res_flag" + flagkey)); - $("img[id^='resflagimg" + rsv_ruimte_key + "']").next().text(flagkey || 999); // Hidden span voor sorteren + $("i[id^='resflagimg" + rsv_ruimte_key + "']").attr('flagkey', flagkey); + $("i[id^='resflagimg" + rsv_ruimte_key + "']").attr('class', flagimg); + $("i[id^='resflagimg" + rsv_ruimte_key + "']").parent().attr('title', L("lcl_res_flag" + flagkey)); + $("i[id^='resflagimg" + rsv_ruimte_key + "']").next().text(flagkey || 999); // Hidden span voor sorteren $('#restable th').removeClass('sorttable_sorted sorttable_sorted_reverse'); // sortable cache't namelijk } diff --git a/APPL/RES/res_plan_obj.inc b/APPL/RES/res_plan_obj.inc index ff8e6e0a34..ebf6a5edf3 100644 --- a/APPL/RES/res_plan_obj.inc +++ b/APPL/RES/res_plan_obj.inc @@ -56,9 +56,9 @@ function make_plan_obj(disc_key, res_van, res_tot, params) var theStyleRight = ""; var res_flag = ""; - if ((S("res_reservering_flags") > 0) && (flag_status > 0)) + if (flag_status > 0) { - res_flag = ""; + res_flag = I("fa-circle respl resflag"+flag_status); } // Perhaps cleaning time, (TODO delen? alleen optie en definitief) @@ -329,7 +329,7 @@ function make_plan_obj(disc_key, res_van, res_tot, params) <% } txt = res_deel_omschrijving + (params.rsv_ruimte_key>0 ? '':(prijs_text?' ('+prijs_text+')':'')) var safe_txt = safe.html(txt.substr(0,25)); if (showLendOut) - safe_txt += " "; // de absolute voorkomt invloed op layout + safe_txt += " "; // de absolute voorkomt invloed op layout var safe_tooltip = safe.html(res_deel_omschrijving); if (res_deel_image) diff --git a/APPL/RES/res_plan_room.inc b/APPL/RES/res_plan_room.inc index f4847049f4..eb82ba75ca 100644 --- a/APPL/RES/res_plan_room.inc +++ b/APPL/RES/res_plan_room.inc @@ -190,9 +190,10 @@ function make_plan_regel(room, ar, params, nr_days, hour_px) } var res_flag = ""; - if ((S("res_reservering_flags") > 0) && (ar[ci].flag_status > 0)) + if (ar[ci].flag_status > 0) { - res_flag = ""; + //res_flag = ""; + res_flag = I("fa-circle respl resflag"+ar[ci].flag_status); } if (!ar[ci].na_koppel && !not_available && !params.forSelectRoom) @@ -353,7 +354,7 @@ __Log("start make_plan_room"); > <% if (cad_button && !params.extern) - Response.Write(""+L("lcl_fg_gotofg")+""); + Response.Write(""); var capc_txt = ''+room.bMin+((room.bMin!=room.bMax)?"-"+room.bMax:"")+" pers." diff --git a/APPL/RES/res_search.asp b/APPL/RES/res_search.asp index 088079ff6b..17265a120d 100644 --- a/APPL/RES/res_search.asp +++ b/APPL/RES/res_search.asp @@ -299,43 +299,26 @@ var authparams = user.checkAutorisation(autfunction); requiredlevel: (S("res_search_require_locatie")==1 ? 2 : null), whenEmpty: L("lcl_search_generic") // want filter }); - // - //if (!frontend) - { - sql = "SELECT 1, " + safe.quoted_sql(res.getfostatustext(1)) + " FROM DUAL" - + " UNION SELECT 2, " + safe.quoted_sql(res.getfostatustext(2)) + " FROM DUAL" - + " UNION SELECT 3, " + safe.quoted_sql(res.getfostatustext(3)) + " FROM DUAL" - + " UNION SELECT 4, " + safe.quoted_sql(res.getfostatustext(4)) + " FROM DUAL" - + " ORDER BY 2"; - FCLTselector("resstatus", - sql, - { initKey: resstatus, - label: L("lcl_status_FO"), - trclass: "primsearch", - emptyOption: "" - }); - - // - sql = "SELECT res_activiteit_key, " - + "CASE WHEN sa.res_srtactiviteit_prefix IS NULL" - + " THEN ''" - + " ELSE sa.res_srtactiviteit_prefix || '-'" - + " END" - + "|| "+ lcl.xsqla("a.res_activiteit_omschrijving", "a.res_activiteit_key") - + " FROM res_activiteit a, res_srtactiviteit sa" - + " WHERE a.res_srtactiviteit_key = sa.res_srtactiviteit_key" - + " AND res_activiteit_verwijder IS NULL" - + (srtact>0?" AND a.res_srtactiviteit_key="+srtact:"") - + " ORDER BY res_activiteit_volgnr, sa.res_srtactiviteit_prefix, UPPER("+ lcl.xsql('a.res_activiteit_omschrijving', 'a.res_activiteit_key')+")"; - FCLTselector("act", - sql, - { initKey: act, - label: L("lcl_activity"), - emptyOption: "", - selectjustone: true, - trclass: "primsearch" - }); - } // !frontend + // + sql = "SELECT res_activiteit_key, " + + "CASE WHEN sa.res_srtactiviteit_prefix IS NULL" + + " THEN ''" + + " ELSE sa.res_srtactiviteit_prefix || '-'" + + " END" + + "|| "+ lcl.xsqla("a.res_activiteit_omschrijving", "a.res_activiteit_key") + + " FROM res_activiteit a, res_srtactiviteit sa" + + " WHERE a.res_srtactiviteit_key = sa.res_srtactiviteit_key" + + " AND res_activiteit_verwijder IS NULL" + + (srtact>0?" AND a.res_srtactiviteit_key="+srtact:"") + + " ORDER BY res_activiteit_volgnr, sa.res_srtactiviteit_prefix, UPPER("+ lcl.xsql('a.res_activiteit_omschrijving', 'a.res_activiteit_key')+")"; + FCLTselector("act", + sql, + { initKey: act, + label: L("lcl_activity"), + emptyOption: "", + selectjustone: true, + trclass: "primsearch" + }); if (backo || minfo) { %> @@ -410,15 +393,18 @@ var authparams = user.checkAutorisation(autfunction); %> - -<% // Vlag0 heeft dezelfde betekenis als 'geen vlag' en krijgt geen vinkje - for (flagkey=1; flagkey < S("res_reservering_flags"); flagkey++) + +<% for (flagkey=0; flagkey < S('res_reservering_flags'); flagkey++) { -%> - -<% - } -%> + if (flagkey == 0) + { + %>
+<% } + else + { + %>
+<% } + } %> <% @@ -514,6 +500,21 @@ var authparams = user.checkAutorisation(autfunction); emptyOption: L("lcl_all") }); } + + // + sql = "SELECT 1, " + safe.quoted_sql(res.getfostatustext(1)) + " FROM DUAL" + + " UNION SELECT 2, " + safe.quoted_sql(res.getfostatustext(2)) + " FROM DUAL" + + " UNION SELECT 3, " + safe.quoted_sql(res.getfostatustext(3)) + " FROM DUAL" + + " UNION SELECT 4, " + safe.quoted_sql(res.getfostatustext(4)) + " FROM DUAL" + + " ORDER BY 2"; + FCLTselector("resstatus", + sql, + { initKey: resstatus, + label: L("lcl_status_FO"), + trclass: "primsearch", + emptyOption: "" + }); + if (backo || minfo) { // diff --git a/APPL/RES/res_search_plan_obj.asp b/APPL/RES/res_search_plan_obj.asp index 760f3d9a6f..0f6c343612 100644 --- a/APPL/RES/res_search_plan_obj.asp +++ b/APPL/RES/res_search_plan_obj.asp @@ -270,7 +270,7 @@ IFRAMER_HEADER(L("lcl_res_frame_voorziening"), buttons); - + diff --git a/APPL/RES/res_search_plan_room.asp b/APPL/RES/res_search_plan_room.asp index 57ec9a54c1..fa3a3ac846 100644 --- a/APPL/RES/res_search_plan_room.asp +++ b/APPL/RES/res_search_plan_room.asp @@ -356,69 +356,29 @@ while (nnregels < 8) $('div#legenda').dialog(params).dialog('open'); } -