From cfda180be569243a070c4dcb25fee244110c9cc2 Mon Sep 17 00:00:00 2001
From: _earthtospace
Date: Thu, 24 Aug 2023 11:57:14 +0800
Subject: [PATCH 1/2] default selections
---
src/pages/SearchOutputs.js | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/pages/SearchOutputs.js b/src/pages/SearchOutputs.js
index 6ed57c1..3cc6797 100644
--- a/src/pages/SearchOutputs.js
+++ b/src/pages/SearchOutputs.js
@@ -19,8 +19,8 @@ const SearchOutputs = () => {
const [selectedName, setSelectedName] = useState(null);
const [selectedStartDate, setSelectedStartDate] = useState(null);
const [selectedEndDate, setSelectedEndDate] = useState(null);
- const [selectedWater, setSelectedWater] = useState(false);
- const [selectedElectricity, setSelectedElectricity] = useState(false);
+ const [selectedWater, setSelectedWater] = useState(true);
+ const [selectedElectricity, setSelectedElectricity] = useState(true);
let [color, setColor] = useState("#39FF14");
// Selected data outputs vars:
@@ -31,7 +31,7 @@ const SearchOutputs = () => {
const [traceableCIDData, setTraceableCIDData] = useState(null);
// Handle selections:
- const handleWaterClicked = () => setSelectedWater(!selectedWater)
+ const handleWaterClicked = () => setSelectedWater(!selectedWater);
const handleElectricityClicked = () => setSelectedElectricity(!selectedElectricity)
const handleNameSelected = (event) => setSelectedName(event.target.value)
const handleTraceableCIDModalOnClose = () => setShowTraceableCIDModal(false);
@@ -170,21 +170,23 @@ const SearchOutputs = () => {
From b1043494c6138a20acb6615ee66105d160cab9a0 Mon Sep 17 00:00:00 2001
From: _earthtospace
Date: Thu, 24 Aug 2023 13:58:02 +0800
Subject: [PATCH 2/2] date configurations
---
src/pages/SearchOutputs.js | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/pages/SearchOutputs.js b/src/pages/SearchOutputs.js
index 3cc6797..5c3162c 100644
--- a/src/pages/SearchOutputs.js
+++ b/src/pages/SearchOutputs.js
@@ -17,10 +17,10 @@ const SearchOutputs = () => {
// Selected data vars:
const [selectedName, setSelectedName] = useState(null);
- const [selectedStartDate, setSelectedStartDate] = useState(null);
- const [selectedEndDate, setSelectedEndDate] = useState(null);
const [selectedWater, setSelectedWater] = useState(true);
const [selectedElectricity, setSelectedElectricity] = useState(true);
+ let [selectedStartDate, setSelectedStartDate] = useState("");
+ let [selectedEndDate, setSelectedEndDate] = useState("");
let [color, setColor] = useState("#39FF14");
// Selected data outputs vars:
@@ -38,10 +38,16 @@ const SearchOutputs = () => {
// Handle Search:
const handleSearch = (event) => {
+ if(selectedStartDate === ""){
+ selectedStartDate = "2000-01-01";
+ }
+
+ if(selectedEndDate === ""){
+ selectedEndDate = new Date().getUTCFullYear() + "-" + (new Date().getUTCMonth() + 1) + "-" + new Date().getUTCDate();
+ }
let startDateFormatted = selectedStartDate.toString().replace(/\//g,'-');
let endDateFormatted = selectedEndDate.toString().replace(/\//g,'-');
-
loadStorageProviderOutputs(selectedName, startDateFormatted, endDateFormatted, selectedWater, selectedElectricity);
if (!dataLoaded.current) {
@@ -52,9 +58,7 @@ const SearchOutputs = () => {
// Load storage provider data:
const loadStorageProviderOutputs = (spName, spStartDate, spEndDate, spWaterRecord, spElectricityRecord) => {
-
let searchURL = getURL(spName, spStartDate, spEndDate, spWaterRecord, spElectricityRecord);
-
console.log(searchURL);
fetch(searchURL)
@@ -69,10 +73,10 @@ const SearchOutputs = () => {
// Creates URL search endpoint:
const getURL = (spName, spStartDate, spEndDate, spWaterRecord, spElectricityRecord) => {
-
let water, electricity, allSelection, url = null;
-
+
if(spWaterRecord && !spElectricityRecord){
+
water = "Water Audit Data";
url = `https://sp-outputs-api.vercel.app/api/search/?sp_name=${spName}&record_type=${water}&start_date=${spStartDate}&end_date=${spEndDate}`;
}
@@ -127,7 +131,7 @@ const SearchOutputs = () => {
Enter Start Date:
-