Mercurial > gemma
changeset 5051:72bf187cefc9 time-sliding
toolbar: use localized date
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Mon, 02 Mar 2020 14:40:50 +0100 |
parents | a970a1678b17 |
children | 89cd8937cc4b |
files | client/src/components/TimeSlider.vue client/src/components/toolbar/TimeSlider.vue |
diffstat | 2 files changed, 4 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/TimeSlider.vue Mon Mar 02 14:34:15 2020 +0100 +++ b/client/src/components/TimeSlider.vue Mon Mar 02 14:40:50 2020 +0100 @@ -141,17 +141,12 @@ .attr("width", svgWidth) .attr("height", svgHeight); - const wheelDelta = () => { - return (-d3.event.deltaY * (d3.event.deltaMode ? 120 : 1)) / 15; - }; - // zoom event zoom = d3 .zoom() .scaleExtent([0.8, 102000]) .translateExtent([[0, 0], [svgWidth, svgHeight]]) .extent([[0, 0], [(svgWidth, svgHeight)]]) .on("zoom", this.zoomed); - zoom.wheelDelta(wheelDelta); svg .append("g")
--- a/client/src/components/toolbar/TimeSlider.vue Mon Mar 02 14:34:15 2020 +0100 +++ b/client/src/components/toolbar/TimeSlider.vue Mon Mar 02 14:40:50 2020 +0100 @@ -34,18 +34,15 @@ import locale2 from "locale2"; import { format } from "date-fns"; -const formatDate = date => {}; - export default { computed: { ...mapState("application", ["showTimeSlider", "selectedTime"]), label() { - const date = this.selectedTime; - const result = date.toLocaleDateString(locale2, { + return `<b>${this.selectedTime.toLocaleDateString(locale2, { day: "2-digit", - month: "2-digit" - }); - return `<b>${result}${date.getFullYear()} ${format(date, "HH:MM")}</b>`; + month: "2-digit", + year: "numeric" + })} ${format(this.selectedTime, "HH:MM")}</b>`; }, currentTimeSelection() { const date = this.selectedTime;