From add6c2ab1f282157c6a276a5cf14f7580ad782b4 Mon Sep 17 00:00:00 2001 From: Milan Date: Fri, 14 Dec 2018 21:11:00 +0100 Subject: [PATCH] simplify detailed playout view in calendar --- website/agenda/planung/css/calendar.css | 7 +-- website/agenda/planung/js/calendar.js | 68 +++++++++++-------------- 2 files changed, 33 insertions(+), 42 deletions(-) diff --git a/website/agenda/planung/css/calendar.css b/website/agenda/planung/css/calendar.css index 8577ed6..eef7b7a 100644 --- a/website/agenda/planung/css/calendar.css +++ b/website/agenda/planung/css/calendar.css @@ -422,11 +422,12 @@ div#toolbar input.search{ } #calendar td div.play:hover { - min-height: 180px!important; + min-height: 250px!important; min-width: 420px!important; z-index:99; box-shadow:0 2px 5px 0 rgba(0,0,0,.12),0 2px 10px 0 rgba(0,0,0,.09); border-radius:3px; + cursor:pointer; } #calendar td div.play:hover img{ @@ -442,10 +443,6 @@ div#toolbar input.search{ display:none; } -#calendar td div.play img:hover{ - cursor:pointer; -} - #calendar div.ui-draggable-dragging{ z-index:99; cursor:move; diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js index ab7f1eb..b4dee3b 100644 --- a/website/agenda/planung/js/calendar.js +++ b/website/agenda/planung/js/calendar.js @@ -566,10 +566,11 @@ function createId(prefix) { return prefix+'_'+s4() + s4(); } -function showRmsPlot(id){ +function showRmsPlot(id, project_id, studio_id, start){ + console.log(id+" "+project_id+" "+studio_id+" "+start) $('#'+id).dialog({ width:940, - height:400, + height:560, open: function () { $(this).scrollTop(0); } @@ -584,14 +585,8 @@ function deleteFromPlayout(id, projectId, studioId, start){ url+='&studio_id='+escape(studioId); url+='&start_date='+escape(start); //console.log(url); - $('#'+id).dialog({ - width:940, - height:440, - open: function () { - $(this).scrollTop(0); - $(this).load(url); - } - }); + //console.log(id) + $('#'+id).load(url); return false; } @@ -602,44 +597,43 @@ function quoteAttr(attr){ function initRmsPlot(){ $( "#calendar div.play" ).hover( function() { - var plot=$(this).attr("rms"); - - var id=$(this).attr("id"); - var field=id.split('_'); - var classname =field.shift(); - var project_id =field.shift(); - var studio_id =field.shift(); - var start=$(this).attr("start") - var html=''; + var plot = $(this).attr("rms"); + var id = $(this).attr("id"); + var field = id.split('_'); + var classname = field.shift(); + var project_id = field.shift(); + var studio_id = field.shift(); + var start = $(this).attr("start") if (project_id==null) return; if (studio_id==null) return; if (start==null) return; + if ( !$(this).hasClass("clickHandler") ){ + $(this).addClass("clickHandler"); + $(this).click( function(event){ + event.stopImmediatePropagation(); + showRmsPlot( id , project_id , studio_id , start ); + }); + } + if ( (!$(this).hasClass("rms_image")) && (plot!=null)){ $(this).addClass("rms_image"); - var id=createId("rms_img"); + var content = $(this).html(); + var id = createId("rms_img"); var url = '/agenda_files/playout/'+plot; - var handler = 'onclick="showRmsPlot('+quoteAttr(id)+')"'; - var img = ''; - - html += ''; - html += img; - html += '"; - } - - if (!$(this).hasClass("deleteHandler")){ - $(this).addClass("deleteHandler"); + var img = ''; var deleteHandler = 'onclick="deleteFromPlayout(' + quoteAttr(id) + ", " + quoteAttr(project_id) + ", " + quoteAttr(studio_id) + ", "+ quoteAttr(start) + ')"'; - if (start!=null) html += ''; - } - $(this).append(html); - + var details=''; + details += '"; + $(this).append(img + details); + } $(this).find('img').each(function(){ $(this).show();