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

NMPC#52340 randen van res op planbord nu onderscheidbaar van aansluitende res

Browse Source 
svn path=/Website/trunk/; revision=37855
This commit is contained in:
Koen Reefman
2018-05-07 09:33:17 +00:00
parent f76a42c32d
commit ff30d96ce6
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/RES/res.css
View File

@@ -187,8 +187,10 @@ div.gepland { border-left: 1px solid #999; border-right: 1px solid #999; }
table.planbord4 div.gepland { border-left: 0px solid #999; border-right: 0px solid #999; }
div.continueleft,
div.res_nopre,
div.overflowleft { border-left: 0px; }
div.continueright,
div.res_nopost,
div.overflowright { border-right: 0px; }
tr.selected div.res_current { background-color: #F00; }

22
APPL/RES/res_plan_room.inc
View File

@@ -201,13 +201,16 @@ function make_plan_regel(room, ar, params, nr_days, hour_px)
// Perhaps cleaning time, alleen optie en definitief
// room.post_time >= room.prepost_time (always)
var this_post_time = Math.max(room.prepost_time, (ar[ci].act_post_time || 0));
var preclean = 0;
var postclean = 0;
if (this_post_time && (ar[ci].fo_status == 1 || ar[ci].fo_status == 2))
{
theClass += " res_cleaning";
// maximaal kwartier 'doorschieten' links/rechts
var preclean = Math.min(room.prepost_time, h_start - S("res_t1") + 0.25);
var postclean = Math.min(this_post_time, S("res_t2") - h_end + 0.25);
preclean = Math.min(room.prepost_time, h_start - S("res_t1") + 0.25);
postclean = Math.min(this_post_time, S("res_t2") - h_end + 0.25);
if ( Math.round(hour_px * postclean - 1) > 0 )
theStyleRight = "border-right-width:"+Math.round(hour_px * postclean - 1)+"px;"
@@ -224,6 +227,11 @@ function make_plan_regel(room, ar, params, nr_days, hour_px)
}
}
if (!preclean)
theClass += " res_nopre";
if (!postclean)
theClass += " res_nopost";
var res_flag = "";
if (ar[ci].flag_status > 0)
{
@@ -417,6 +425,16 @@ __Log("start make_plan_room");
<script>
$(function () {
$("div.res_nopre, div.res_nopost").each(function()
{
var MARGIN = 2;
var color = $(this).css("backgroundColor");
var pix = $(this).width() - MARGIN;
$(this).css("background", "linear-gradient(to right, transparent 0px, "+color+" "+MARGIN+"px, "+color+" "+pix+"px, transparent 100%)");
});
$("div.resIcon").each(function() {
var $parent = $(this).parents("div");