Round aggregator time range
This commit is contained in:
+1
-1
@@ -10,7 +10,7 @@ console.log("api host:", import.meta.env.VITE_API_HOST);
|
|||||||
type Section = "aggregator" | "fileManager";
|
type Section = "aggregator" | "fileManager";
|
||||||
|
|
||||||
const App: Component = () => {
|
const App: Component = () => {
|
||||||
const [getSection, setSection] = createSignal<Section>("fileManager");
|
const [getSection, setSection] = createSignal<Section>("aggregator");
|
||||||
|
|
||||||
const section = () => getSection() === "aggregator" ? <Aggregator /> : <FileManager />;
|
const section = () => getSection() === "aggregator" ? <Aggregator /> : <FileManager />;
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,18 @@
|
|||||||
|
import moment from "moment";
|
||||||
import { createSignal } from "solid-js";
|
import { createSignal } from "solid-js";
|
||||||
|
|
||||||
import { Result } from "./Result";
|
import { Result } from "./Result";
|
||||||
import { SelectAggregator } from "./SelectAggregator";
|
import { SelectAggregator } from "./SelectAggregator";
|
||||||
import { SelectCity } from "./SelectCity";
|
import { SelectCity } from "./SelectCity";
|
||||||
import { SelectTimeRange } from "./SelectTimeRange";
|
import { SelectTimeRange } from "./SelectTimeRange";
|
||||||
|
|
||||||
const dayAgoMs = Date.now() - 24 * 60 * 60 * 1000;
|
const nowRounded = new Date(new Date().setMinutes(30));
|
||||||
|
const dayAgo = moment(nowRounded).subtract(1, "days").subtract(30, "minutes").toDate();
|
||||||
|
|
||||||
export function Aggregator() {
|
export function Aggregator() {
|
||||||
const [getCities, setCities] = createSignal<Set<string>>(new Set([]));
|
const [getCities, setCities] = createSignal<Set<string>>(new Set([]));
|
||||||
const [getStart, setStart] = createSignal(new Date(dayAgoMs));
|
const [getStart, setStart] = createSignal(dayAgo);
|
||||||
const [getEnd, setEnd] = createSignal(new Date());
|
const [getEnd, setEnd] = createSignal(nowRounded);
|
||||||
const [getField, setField] = createSignal("tempMax");
|
const [getField, setField] = createSignal("tempMax");
|
||||||
const [getKey, setKey] = createSignal("max");
|
const [getKey, setKey] = createSignal("max");
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ export const Result: Component<{
|
|||||||
const [getTimestamp, setTimestamp] = createSignal<number>(0);
|
const [getTimestamp, setTimestamp] = createSignal<number>(0);
|
||||||
|
|
||||||
const fetchQuery = async (timestamp: number) => {
|
const fetchQuery = async (timestamp: number) => {
|
||||||
console.log("query:", new Date(timestamp));
|
|
||||||
if (cities() === "") return "ERROR: Select cities!";
|
if (cities() === "") return "ERROR: Select cities!";
|
||||||
await new Promise(resolve => setTimeout(resolve, 500))
|
await new Promise(resolve => setTimeout(resolve, 500))
|
||||||
const response = await fetch(`${apiHost}/api/query/${queryStart()}-${queryEnd()}/${cities()}/${props.getField()}/${props.getKey()}`);
|
const response = await fetch(`${apiHost}/api/query/${queryStart()}-${queryEnd()}/${cities()}/${props.getField()}/${props.getKey()}`);
|
||||||
|
|||||||
Reference in New Issue
Block a user