diff options
author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-08-26 10:32:12 +0100 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-08-26 10:34:28 +0100 |
commit | 287f8d486917b888f614c8c9252005f3838daf91 (patch) | |
tree | cfcbdbc9c9913c2599e5a50f062162f9150eff48 | |
parent | e97bb084b7b113bd4465945d397f4ac35c58f25c (diff) |
The end of ongoing open cards is now calculated and equal to end of the
timeline.
Change-Id: I5275a7097b8e3d87ae6c7102dfd4ef376d566c3d
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
-rw-r--r-- | roadmap/templates/roadmap/roadmap.html | 24 | ||||
-rw-r--r-- | roadmap/templates/roadmap/timeline.html | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/roadmap/templates/roadmap/roadmap.html b/roadmap/templates/roadmap/roadmap.html index 9355503..1493652 100644 --- a/roadmap/templates/roadmap/roadmap.html +++ b/roadmap/templates/roadmap/roadmap.html @@ -51,7 +51,7 @@ options["showMajorLabels"] = false; options["showMinorLabels"] = false; {% endif %} - + // Instantiate our timeline object. vis{{ forloop.counter0 }} = new links.Timeline(document.getElementById('{{ epic.key }}')); {% for card in epic.implementedby.all %} @@ -73,11 +73,11 @@ {% endfor %} google.visualization.events.addListener(vis{{ forloop.counter0 }}, 'rangechange', onrangechange{{ forloop.counter0 }}); google.visualization.events.addListener(vis{{ forloop.counter0 }}, 'ready', onready{{ forloop.counter0 }}); - + // Draw our timeline with the created data and options vis{{ forloop.counter0 }}.draw(data, options); } - + function onrangechange{{ forloop.counter0 }}() { var range = vis{{ forloop.counter0 }}.getVisibleChartRange(); {% for e in epics %} @@ -124,7 +124,7 @@ "max": endDate, "selectable": false }; - + // Instantiate our timeline object. vis{{ forloop.counter }} = new links.Timeline(document.getElementById('other-cards')); {% for card in other_cards %} @@ -132,7 +132,7 @@ data.push({ "start": new Date("{{ card.start_date|date:'c' }}"), {% if card.event_type == 'ONGOING' %} - "end": new Date(2015, 1, 1), + "end": endDate, {% endif %} "content": "<a class=\"confirm\" href=\"{{ card.url }}\">{{ card.summary }}</a>", "editable": false, @@ -142,11 +142,11 @@ {% endfor %} google.visualization.events.addListener(vis{{ forloop.counter }}, 'rangechange', onrangechange{{ forloop.counter }}); google.visualization.events.addListener(vis{{ forloop.counter }}, 'ready', onready{{ forloop.counter }}); - + // Draw our timeline with the created data and options vis{{ forloop.counter }}.draw(data, options); } - + function onrangechange{{ forloop.counter }}() { var range = vis{{ forloop.counter }}.getVisibleChartRange(); {% for e in epics %} @@ -175,7 +175,7 @@ {% endif %} {% endif %} {% endfor %} // endfor epic - + function drawVisualization() { {% for epic in epics %} {% if epic.is_valid_swimlane %} @@ -207,11 +207,11 @@ "animate": false, "animateZoom": false, "zoomMin": 33*2629740000, // 33* month in miliseconds - "min": new Date(2011, 1, 1), - "max": new Date(2015, 1, 1), + "min": startDate, + "max": endDate, "selectable": false }; - + // Instantiate our timeline object. timeline = new links.Timeline(document.getElementById('other-cards')); {% for card in other_cards %} @@ -219,7 +219,7 @@ data.push({ "start": new Date("{{ card.start_date|date:'c' }}"), {% if card.event_type == 'ONGOING' %} - "end": new Date(2015, 1, 1), + "end": endDate, {% endif %} "content": "<a class=\"confirm\" ref=\"{{ card.url }}\">{{ card.summary }}</a>", "editable": false, diff --git a/roadmap/templates/roadmap/timeline.html b/roadmap/templates/roadmap/timeline.html index 04e96d5..4830e4c 100644 --- a/roadmap/templates/roadmap/timeline.html +++ b/roadmap/templates/roadmap/timeline.html @@ -46,7 +46,7 @@ "max": endDate, "selectable": false }; - + // Instantiate our timeline object. vis{{ forloop.counter0 }} = new links.Timeline(document.getElementById('component_{{ component.pk }}')); {% for card in component.card_set.all %} @@ -71,11 +71,11 @@ {% endfor %} google.visualization.events.addListener(vis{{ forloop.counter0 }}, 'rangechange', onrangechange{{ forloop.counter0 }}); google.visualization.events.addListener(vis{{ forloop.counter0 }}, 'ready', onready{{ forloop.counter0 }}); - + // Draw our timeline with the created data and options vis{{ forloop.counter0 }}.draw(data, options); } - + function onrangechange{{ forloop.counter0 }}() { var range = vis{{ forloop.counter0 }}.getVisibleChartRange(); {% for e in components %} @@ -101,7 +101,7 @@ } {% endfor %} // endfor epic - + function drawVisualization() { {% for component in components %} createTimeline{{ forloop.counter0 }}(); |