diff --git a/.pnp.cjs b/.pnp.cjs index c9016f895..1f149a157 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -45,7 +45,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["cypress-real-events", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.7.0"],\ ["d3", "npm:7.4.4"],\ ["eslint", "npm:8.16.0"],\ - ["flot", "npm:4.2.2"],\ ["highcharts", "npm:10.1.0"],\ ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.1.1"],\ ["jquery", "npm:3.6.0"],\ @@ -3283,15 +3282,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["flot", [\ - ["npm:4.2.2", {\ - "packageLocation": "./.yarn/cache/flot-npm-4.2.2-77eb146093-81910f7bc2.zip/node_modules/flot/",\ - "packageDependencies": [\ - ["flot", "npm:4.2.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["forever-agent", [\ ["npm:0.6.1", {\ "packageLocation": "./.yarn/cache/forever-agent-npm-0.6.1-01dae53bf9-766ae6e220.zip/node_modules/forever-agent/",\ @@ -5188,7 +5178,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["cypress-real-events", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:1.7.0"],\ ["d3", "npm:7.4.4"],\ ["eslint", "npm:8.16.0"],\ - ["flot", "npm:4.2.2"],\ ["highcharts", "npm:10.1.0"],\ ["html-validate", "virtual:dc3fc578bfa5e06182a4d2be39ede0bc5b74940b1ffe0d70c26892ab140a4699787750fba175dc306292e80b4aa2c8c5f68c2a821e69b2c37e360c0dff36ff66#npm:7.1.1"],\ ["jquery", "npm:3.6.0"],\ diff --git a/.yarn/cache/flot-npm-4.2.2-77eb146093-81910f7bc2.zip b/.yarn/cache/flot-npm-4.2.2-77eb146093-81910f7bc2.zip deleted file mode 100644 index 5badafddd..000000000 Binary files a/.yarn/cache/flot-npm-4.2.2-77eb146093-81910f7bc2.zip and /dev/null differ diff --git a/ietf/static/js/flot.js b/ietf/static/js/flot.js deleted file mode 100644 index 545503c25..000000000 --- a/ietf/static/js/flot.js +++ /dev/null @@ -1 +0,0 @@ -import "flot"; \ No newline at end of file diff --git a/ietf/static/js/highcharts-export-data.js b/ietf/static/js/highcharts-export-data.js deleted file mode 100644 index 804a40c14..000000000 --- a/ietf/static/js/highcharts-export-data.js +++ /dev/null @@ -1 +0,0 @@ -import "highcharts/modules/export-data"; \ No newline at end of file diff --git a/ietf/static/js/highcharts-exporting.js b/ietf/static/js/highcharts-exporting.js deleted file mode 100644 index 85e069513..000000000 --- a/ietf/static/js/highcharts-exporting.js +++ /dev/null @@ -1 +0,0 @@ -import "highcharts/modules/exporting"; \ No newline at end of file diff --git a/ietf/static/js/highcharts-highcharts.js b/ietf/static/js/highcharts-highcharts.js deleted file mode 100644 index 27255bd00..000000000 --- a/ietf/static/js/highcharts-highcharts.js +++ /dev/null @@ -1,3 +0,0 @@ -import * as Highcharts from "highcharts"; - -window.Highcharts = Highcharts; \ No newline at end of file diff --git a/ietf/static/js/highcharts-highstock.js b/ietf/static/js/highcharts-highstock.js deleted file mode 100644 index 140b587e0..000000000 --- a/ietf/static/js/highcharts-highstock.js +++ /dev/null @@ -1,3 +0,0 @@ -import * as Highcharts from "highcharts/highstock"; - -window.Highcharts = Highcharts; \ No newline at end of file diff --git a/ietf/static/js/highcharts-offline-exporting.js b/ietf/static/js/highcharts-offline-exporting.js deleted file mode 100644 index e38ee045d..000000000 --- a/ietf/static/js/highcharts-offline-exporting.js +++ /dev/null @@ -1 +0,0 @@ -import "highcharts/modules/offline-exporting"; \ No newline at end of file diff --git a/ietf/static/js/highcharts.js b/ietf/static/js/highcharts.js new file mode 100644 index 000000000..f9b7aa615 --- /dev/null +++ b/ietf/static/js/highcharts.js @@ -0,0 +1,13 @@ +import Highcharts from "highcharts"; + +import Highcharts_Exporting from "highcharts/modules/exporting"; +import Highcharts_Offline_Exporting from "highcharts/modules/offline-exporting"; +import Highcharts_Export_Data from "highcharts/modules/export-data"; +import Highcharts_Accessibility from"highcharts/modules/accessibility"; + +Highcharts_Exporting(Highcharts); +Highcharts_Offline_Exporting(Highcharts); +Highcharts_Export_Data(Highcharts); +Highcharts_Accessibility(Highcharts); + +window.Highcharts = Highcharts; diff --git a/ietf/static/js/highstock.js b/ietf/static/js/highstock.js new file mode 100644 index 000000000..e1965acb6 --- /dev/null +++ b/ietf/static/js/highstock.js @@ -0,0 +1,13 @@ +import Highcharts from "highcharts/highstock"; + +import Highcharts_Exporting from "highcharts/modules/exporting"; +import Highcharts_Offline_Exporting from "highcharts/modules/offline-exporting"; +import Highcharts_Export_Data from "highcharts/modules/export-data"; +import Highcharts_Accessibility from"highcharts/modules/accessibility"; + +Highcharts_Exporting(Highcharts); +Highcharts_Offline_Exporting(Highcharts); +Highcharts_Export_Data(Highcharts); +Highcharts_Accessibility(Highcharts); + +window.Highcharts = Highcharts; diff --git a/ietf/static/js/review-stats.js b/ietf/static/js/review-stats.js deleted file mode 100644 index 83168a7db..000000000 --- a/ietf/static/js/review-stats.js +++ /dev/null @@ -1,9 +0,0 @@ -$(document) - .ready(function () { - if (window.timeSeriesData && window.timeSeriesOptions) { - var placeholder = $(".stats-time-graph"); - placeholder.height(Math.round(placeholder.width() * 1 / 3)); - - $.plot(placeholder, window.timeSeriesData, window.timeSeriesOptions); - } - }); \ No newline at end of file diff --git a/ietf/static/js/upload_bofreq.js b/ietf/static/js/upload_bofreq.js index dbedc75d3..b2d8fd64e 100644 --- a/ietf/static/js/upload_bofreq.js +++ b/ietf/static/js/upload_bofreq.js @@ -18,7 +18,6 @@ $(document) var row = form.find(selector); if (!row.is(".row")) row = row.closest(".row"); - console.log("!"); if ($.inArray(selector, shouldBeVisible[val]) != -1) row.show(); else @@ -27,4 +26,4 @@ $(document) } }) .trigger("change"); - }); \ No newline at end of file + }); diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py index b44022284..798cc8ba6 100644 --- a/ietf/stats/tests.py +++ b/ietf/stats/tests.py @@ -209,7 +209,7 @@ class StatisticsTests(TestCase): {"label": "late", "color": "#b42222", "data": [[expected_js_timestamp, 0]]} ]) q = PyQuery(r.content) - self.assertTrue(q('.stats-time-graph')) + self.assertTrue(q('#stats-time-graph')) # check non-stacked chart url = urlreverse(ietf.stats.views.review_stats, kwargs={ "stats_type": "time" }) @@ -219,7 +219,7 @@ class StatisticsTests(TestCase): self.assertEqual(r.status_code, 200) self.assertEqual(json.loads(r.context['data']), [{"color": "#3d22b3", "data": [[expected_js_timestamp, 0]]}]) q = PyQuery(r.content) - self.assertTrue(q('.stats-time-graph')) + self.assertTrue(q('#stats-time-graph')) # check reviewer level url = urlreverse(ietf.stats.views.review_stats, kwargs={ "stats_type": "completion", "acronym": review_req.team.acronym }) diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html index dd9cbedfc..ff48f730e 100644 --- a/ietf/templates/doc/charter/change_state.html +++ b/ietf/templates/doc/charter/change_state.html @@ -61,7 +61,6 @@ $(document).ready(function () { function stateChanged() { var v = $(this).val(); - console.log(v); $("#id_message").val(info_msg[v] || ""); if ($.inArray(+v, statesForBallotWoExtern) != -1) diff --git a/ietf/templates/doc/stats/highstock.html b/ietf/templates/doc/stats/highstock.html index e65f5684d..d6a36f58e 100644 --- a/ietf/templates/doc/stats/highstock.html +++ b/ietf/templates/doc/stats/highstock.html @@ -4,9 +4,7 @@ {% load static %} {% load ietf_filters %} {% block js %} - - - + - - + -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/ietf/templates/stats/document_stats.html b/ietf/templates/stats/document_stats.html index 655bcc4ca..8a4458172 100644 --- a/ietf/templates/stats/document_stats.html +++ b/ietf/templates/stats/document_stats.html @@ -79,9 +79,7 @@ {% include content_template %} {% endblock %} {% block js %} - - - + {% endblock %} \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_format.html b/ietf/templates/stats/document_stats_format.html index ba73f1e41..32c25fe37 100644 --- a/ietf/templates/stats/document_stats_format.html +++ b/ietf/templates/stats/document_stats_format.html @@ -27,7 +27,6 @@ }, tooltip: { formatter: function () { - console.log(this); var s = '' + this.points[0].key + ''; $.each(this.points, function () { @@ -61,4 +60,4 @@ {% endfor %} {% endif %} - + \ No newline at end of file diff --git a/ietf/templates/stats/document_stats_formlang.html b/ietf/templates/stats/document_stats_formlang.html index 07da7ce17..217d79e3e 100644 --- a/ietf/templates/stats/document_stats_formlang.html +++ b/ietf/templates/stats/document_stats_formlang.html @@ -27,7 +27,6 @@ }, tooltip: { formatter: function () { - console.log(this); var s = '' + this.points[0].key + ''; $.each(this.points, function () { @@ -61,4 +60,4 @@ {% endfor %} {% endif %} - + \ No newline at end of file diff --git a/ietf/templates/stats/meeting_stats.html b/ietf/templates/stats/meeting_stats.html index e64f4b4cc..520615992 100644 --- a/ietf/templates/stats/meeting_stats.html +++ b/ietf/templates/stats/meeting_stats.html @@ -28,10 +28,7 @@