Commit 91b9dc0d authored by Pithon Kabiro's avatar Pithon Kabiro
Browse files

Edit function: chart type selection callback

parent 6db57cbe
No related merge requests found
Showing with 28 additions and 11 deletions
+28 -11
...@@ -173,6 +173,13 @@ const getSelectedOptionsFromDropDownLists = function () { ...@@ -173,6 +173,13 @@ const getSelectedOptionsFromDropDownLists = function () {
"#drop-down--sampling-rate" "#drop-down--sampling-rate"
).value; ).value;
if (
selectedBuilding === "--Select--" ||
selectedSensor === "" ||
selectedSamplingRate === ""
)
return;
return [selectedBuilding, selectedSensor, selectedSamplingRate]; return [selectedBuilding, selectedSensor, selectedSamplingRate];
}; };
...@@ -223,10 +230,12 @@ const getBuildingSensorSamplingRateAbbreviation = function ( ...@@ -223,10 +230,12 @@ const getBuildingSensorSamplingRateAbbreviation = function (
return [buildingAbbrev, phenomenonAbbrev, samplingRateAbbrev]; return [buildingAbbrev, phenomenonAbbrev, samplingRateAbbrev];
}; };
const runFromOptionThree = async function () { const selectChartTypeFromDropDown = async function () {
try { try {
const selectedOptions = getSelectedOptionsFromDropDownLists(); const selectedOptions = getSelectedOptionsFromDropDownLists();
if (selectedOptions === undefined) return;
const abbreviationsArr = getBuildingSensorSamplingRateAbbreviation( const abbreviationsArr = getBuildingSensorSamplingRateAbbreviation(
...selectedOptions ...selectedOptions
); );
...@@ -235,6 +244,12 @@ const runFromOptionThree = async function () { ...@@ -235,6 +244,12 @@ const runFromOptionThree = async function () {
...abbreviationsArr ...abbreviationsArr
); );
const selectedChartType = document.querySelector(
"#drop-down--chart-type"
).value;
if (selectedChartType === "--Select--") return;
const URL_DATASTREAM = getDatastreamUrl(BASE_URL, selectedDatastream); const URL_DATASTREAM = getDatastreamUrl(BASE_URL, selectedDatastream);
const URL_OBSERVATIONS = getObservationsUrl(BASE_URL, selectedDatastream); const URL_OBSERVATIONS = getObservationsUrl(BASE_URL, selectedDatastream);
...@@ -255,15 +270,17 @@ const runFromOptionThree = async function () { ...@@ -255,15 +270,17 @@ const runFromOptionThree = async function () {
const combinedObs = metadataPlusObservations[0]; const combinedObs = metadataPlusObservations[0];
const datastreamMetadata = metadataPlusObservations[1]; const datastreamMetadata = metadataPlusObservations[1];
drawLineChartHC( if (selectedChartType === "Line") {
formatSTAResponseForLineChart(combinedObs), drawLineChartHC(
formatDatastreamMetadataForChart(datastreamMetadata) formatSTAResponseForLineChart(combinedObs),
); formatDatastreamMetadataForChart(datastreamMetadata)
);
drawHeatMapHC( } else if (selectedChartType === "Heatmap") {
formatSTAResponseForHeatMap(combinedObs), drawHeatMapHC(
formatDatastreamMetadataForChart(datastreamMetadata) formatSTAResponseForHeatMap(combinedObs),
); formatDatastreamMetadataForChart(datastreamMetadata)
);
}
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
...@@ -271,4 +288,4 @@ const runFromOptionThree = async function () { ...@@ -271,4 +288,4 @@ const runFromOptionThree = async function () {
document document
.querySelector("#drop-down--chart-type") .querySelector("#drop-down--chart-type")
.addEventListener("change", runFromOptionThree); .addEventListener("change", selectChartTypeFromDropDown);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment