Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scenario card arrows added #149

Merged
merged 9 commits into from
Oct 26, 2022
Merged

scenario card arrows added #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe2fe7d
scenario card arrows added
Jul 27, 2022
8032e54
updated scenariocard arrows
Aug 16, 2022
48556a9
stagnation condition <=3 && >=0
Sep 2, 2022
11805ef
little change from 2.9 to 3
Sep 2, 2022
84fde54
stash added
Sep 2, 2022
f5141a9
Applied stagnation rule + Arrows for N/A values
Sep 12, 2022
71d8587
format done
Sep 12, 2022
291382b
Merge branch 'develop' into feature/scenarioCardArrows
Pawandeep-Kaur-Betz Oct 7, 2022
791e32c
pr conflict resolved
Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions frontend/src/components/ScenarioCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import {Dictionary} from '../util/util';
import {useTranslation} from 'react-i18next';
import {NumberFormatter} from '../util/hooks';
import {CheckBoxOutlineBlank, CheckBox} from '@mui/icons-material';
import ArrowDropUpIcon from '@mui/icons-material/ArrowDropUp';
import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
import ArrowRightIcon from '@mui/icons-material/ArrowRight';

/**
* React Component to render individual Scenario Card
Expand Down Expand Up @@ -207,6 +210,7 @@ export default function ScenarioCard(props: ScenarioCardProps): JSX.Element {
{compartments.map((compartment, i) => (
// hide compartment if expandProperties false and index > 4
// highlight compartment if selectedProperty === compartment

<ListItem
key={compartment}
sx={{
Expand Down Expand Up @@ -239,6 +243,37 @@ export default function ScenarioCard(props: ScenarioCardProps): JSX.Element {
flexBasis: '45%',
}}
/>
<ArrowDropDownIcon
color={'success'}
fontSize={'medium'}
// shows downwards green arrows if getCompartmentRate < 0%
sx={{display: parseFloat(getCompartmentRate(compartment)) < 0 ? 'block' : 'none'}}
></ArrowDropDownIcon>
<ArrowDropUpIcon
color={'error'}
fontSize={'medium'}
sx={{
display:
// shows upwards red arrows if getCompartmentRate > 3%. If there is no RKI value for that compartment i.e., getCompartmentRate is Null, then it will check the getCompartmentValue (scenario values only) which will always me positive.
parseFloat(getCompartmentRate(compartment)) > 3 ||
(parseFloat(getCompartmentValue(compartment)) > 0 && getCompartmentRate(compartment) === 'N/A')
? 'block'
: 'none',
}}
></ArrowDropUpIcon>
<ArrowRightIcon
color={'action'}
fontSize={'medium'}
// shows grey arrows (stagnation) if getCompartmentRate is between 0 and 3 %. If there is no RKI value and then it checks for getCompartmentValue.
sx={{
display:
(parseFloat(getCompartmentRate(compartment)) >= 0 &&
parseFloat(getCompartmentRate(compartment)) <= 3) ||
parseFloat(getCompartmentValue(compartment)) === 0
? 'block'
: 'none',
}}
></ArrowRightIcon>
</ListItem>
))}
</List>
Expand Down
41 changes: 9 additions & 32 deletions frontend/src/components/Sidebar/DistrictMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import HeatLegendEdit from './HeatLegendEdit';
import {HeatmapLegend} from '../../types/heatmapLegend';
import {LockOpen} from '@mui/icons-material';
import LoadingContainer from '../shared/LoadingContainer';
import * as am5plugins_exporting from '@amcharts/amcharts5/plugins/exporting';

const {useRef} = React;

interface IRegionPolygon {
Expand All @@ -35,7 +33,7 @@ export default function DistrictMap(): JSX.Element {
const [geodata, setGeodata] = useState<GeoJSON.GeoJSON | null>(null);
const [longLoad, setLongLoad] = useState(false);
const [longLoadTimeout, setLongLoadTimeout] = useState<number>();
const selectedDistrict = useAppSelector((state) => state.dataSelection.district);
//const selectedDistrict = useAppSelector((state) => state.dataSelection.district);
const selectedScenario = useAppSelector((state) => state.dataSelection.scenario);
const selectedCompartment = useAppSelector((state) => state.dataSelection.compartment);
const selectedDate = useAppSelector((state) => state.dataSelection.date);
Expand All @@ -55,12 +53,11 @@ export default function DistrictMap(): JSX.Element {
const chartRef = useRef<am5map.MapChart | null>(null);
const rootRef = useRef<am5.Root | null>(null);
const legendRef = useRef<am5.HeatLegend | null>(null);

const {t, i18n} = useTranslation();
const {formatNumber} = NumberFormatter(i18n.language, 3, 8);
const theme = useTheme();
const dispatch = useAppDispatch();
const lastSelectedPolygon = useRef<am5map.MapPolygon | null>(null);
//const lastSelectedPolygon = useRef<am5map.MapPolygon | null>(null);
const [fixedLegendMaxValue, setFixedLegendMaxValue] = useState<number | null>(null);

// use Memoized to store aggregated max and only recalculate if parameters change
Expand Down Expand Up @@ -116,13 +113,6 @@ export default function DistrictMap(): JSX.Element {
);
}, []);

//select germany as district if no district is selcted
useEffect(() => {
if (!selectedDistrict || selectedDistrict.name == 'germany') {
dispatch(selectDistrict({ags: '00000', name: t('germany'), type: ''}));
}
}, [dispatch, t, selectedDistrict]);

// Setup Map
useEffect(() => {
// Create map instance
Expand Down Expand Up @@ -188,25 +178,9 @@ export default function DistrictMap(): JSX.Element {
};
}, [geodata, theme, t, formatNumber, dispatch]);

useEffect(() => {
// To export map
if (legendRef.current && rootRef.current) {
am5plugins_exporting.Exporting.new(rootRef.current, {
menu: am5plugins_exporting.ExportingMenu.new(rootRef.current, {}),
extraImages: [
{
source: legendRef.current.root,
marginTop: 20,
marginLeft: 20,
},
],
});
}
});

const polygonSeriesLength = (chartRef.current?.series.getIndex(0) as am5map.MapPolygonSeries)?.mapPolygons.length; //needed as trigger for the following effect
//const polygonSeriesLength = (chartRef.current?.series.getIndex(0) as am5map.MapPolygonSeries)?.mapPolygons.length; //needed as trigger for the following effect

useEffect(() => {
/* useEffect(() => {
// unselect previous
if (chartRef.current && lastSelectedPolygon.current) {
// reset style
Expand Down Expand Up @@ -236,7 +210,7 @@ export default function DistrictMap(): JSX.Element {
});
}
}, [selectedDistrict, theme, polygonSeriesLength]);

*/
// set Data
useEffect(() => {
if (chartRef.current && chartRef.current.series.length > 0) {
Expand Down Expand Up @@ -303,7 +277,10 @@ export default function DistrictMap(): JSX.Element {
legend,
longLoad,
]);

/* useEffect(() => {
// search polygon list for selected district
// apply hover effect or highlight hovering effect.
}, [selectedDistrict]); */
return (
<LoadingContainer show={isFetching && longLoad} overlayColor={theme.palette.background.default}>
<Box id='mapdiv' height={'650px'} />
Expand Down