Browse Source

Added gradient on TimeTable

master
tr4ck3ur des JM2L 9 years ago
parent
commit
f0f228f173
2 changed files with 18 additions and 12 deletions
  1. +11
    -7
      jm2l/static/img/shadow.svg
  2. +7
    -5
      jm2l/static/js/programme.js

+ 11
- 7
jm2l/static/img/shadow.svg View File

@@ -12,13 +12,17 @@
<feMergeNode in="SourceGraphic"/>
</feMerge>
</filter>
<linearGradient id="BoxGradient"
x1="0%" y1="0%"
x2="0%" y2="100%"
spreadMethod="pad">
<stop offset="0%" fill-opacity="1" stop-opacity="1"/>
<stop offset="100%" stop-opacity="1"/>
<linearGradient id="BoxGradient-Conference" spreadMethod="pad" x1="100%" y1="0%" x2="50%" y2="100%">
<stop offset="0%" stop-color="#EEE" stop-opacity="0"/>
<stop offset="15%" stop-color="#f9fde8" stop-opacity="1"/>
</linearGradient>
<linearGradient id="BoxGradient-Atelier" spreadMethod="pad" x1="100%" y1="0%" x2="50%" y2="100%">
<stop offset="0%" stop-color="#EEE" stop-opacity="0"/>
<stop offset="15%" stop-color="#faebeb" stop-opacity="1"/>
</linearGradient>
<linearGradient id="BoxGradient-Table-ronde" spreadMethod="pad" x1="100%" y1="0%" x2="50%" y2="100%">
<stop offset="0%" stop-color="#EEE" stop-opacity="0"/>
<stop offset="15%" stop-color="#fff4e5" stop-opacity="1"/>
</linearGradient>
</defs>
</svg>

+ 7
- 5
jm2l/static/js/programme.js View File

@@ -119,14 +119,14 @@ function HandleEvents(Ctrl) {

function displayit(Set_of_Task, Set_of_Area, key) {
// Try to compute time range
Set_of_Task.sort(function(a, b) {
return a.endDate - b.endDate;
});
timeDomainEnd = Set_of_Task[Set_of_Task.length - 1].endDate;
Set_of_Task.sort(function(a, b) {
return a.startDate - b.startDate;
});
timeDomainStart = Set_of_Task[0].startDate;
Set_of_Task.sort(function(a, b) {
return a.endDate - b.endDate;
});
timeDomainEnd = Set_of_Task[Set_of_Task.length - 1].endDate;

// Prepare scales
xScale = d3.scale.ordinal()
@@ -197,7 +197,9 @@ function displayit(Set_of_Task, Set_of_Area, key) {
.attr("rx", 5)
.attr("ry", 5)
.attr("filter", "url(/img/shadow.svg#dropshadow)")
//.attr("style", "fill:url(/img/shadow.svg#BoxGradient)")
.attr("style", function(d){
return "fill:url(/img/shadow.svg#BoxGradient-"+ taskStatus[d.status] +")"
})
.attr("class", function(d){
if(taskStatus[d.status] == null)
{ return "bar";}


Loading…
Cancel
Save