Anlegen einer Subsite mit dem Titel des entsprechenden Gruppennamens (#17)

THS-LMIS · Thomas Schley · web-flow · commit 9e40701844e6 · 2024-12-20T08:13:39.000+01:00
Co-authored-by: Thomas Schley &lt;thomas.schley@lmis.de&gt;
diff --git a/app/components/Breadcrumbs.module.css b/app/components/Breadcrumbs.module.css
@@ -2,9 +2,16 @@
     background-color: #41485A;
     display: flex;
     padding: 10px min(4vh, 2vw);
+    @media only screen and (max-height: 767px) {
+        padding-bottom: 5px;
+        padding-top: 5px;
+    }
     a {
         color: white;
         font-size: large;
+        @media only screen and (max-height: 767px) {
+            font-size: medium;
+        }
         text-decoration: none;
     }
     a + a:before {
@@ -15,4 +22,7 @@
     a.active {
         font-weight: bold;
     }
+    a.disabled {
+        pointer-events: none;
+    }
 }
diff --git a/app/components/Breadcrumbs.tsx b/app/components/Breadcrumbs.tsx
@@ -2,9 +2,25 @@ import {NavLink, useLocation} from 'react-router';
 import styles from './Breadcrumbs.module.css';
 
 const routeLabels: { [key: string]: string } = {
+    group: 'Gruppe',
     impressum: 'Impressum'
 };
 
+const routeWithoutLink: string[] = [
+    'group'
+];
+
+function calculateNavLinkClassNames(isActive: boolean, disabled: boolean) {
+    const classNames: string[] = [];
+    if (isActive) {
+        classNames.push(styles.active);
+    }
+    if (disabled) {
+        classNames.push(styles.disabled);
+    }
+    return classNames.join(' ');
+}
+
 function Breadcrumbs() {
     const location = useLocation();
     const pathnames = location.pathname.split('/').filter((x) => x);
@@ -20,9 +36,10 @@ function Breadcrumbs() {
             {pathnames.map((pathname, index) => {
                 const to = `/${pathnames.slice(0, index + 1).join('/')}`;
                 const label: string = routeLabels[pathname] || pathname;
+                const disabled = routeWithoutLink.includes(pathname);
                 return <NavLink
-                    to={to}
-                    className={({ isActive }) => (isActive ? styles.active : undefined)}
+                    to={disabled ? '#' : to}
+                    className={({ isActive }) => calculateNavLinkClassNames(isActive, disabled)}
                     key={pathname}
                 >
                     {decodeURIComponent(label)}
diff --git a/app/components/Footer.module.css b/app/components/Footer.module.css
@@ -5,6 +5,10 @@
     gap: 40px;
     list-style: none;
     padding: 20px min(4vh, 2vw);
+    @media only screen and (max-height: 767px) {
+        padding-bottom: 10px;
+        padding-top: 10px;
+    }
     a {
         color: white;
         font-size: x-large;
diff --git a/app/components/Header.module.css b/app/components/Header.module.css
@@ -5,4 +5,9 @@
     padding: 20px min(4vh, 2vw);
     text-align: center;
     text-decoration: none;
+    @media only screen and (max-height: 767px) {
+        font-size: xx-large;
+        padding-bottom: 10px;
+        padding-top: 10px;
+    }
 }
diff --git a/app/components/OpenLayers.tsx b/app/components/OpenLayers.tsx
@@ -2,14 +2,15 @@ import React, {useEffect, useRef} from 'react';
 
 import {Feature, Map, View} from 'ol';
 import {Coordinate} from 'ol/coordinate';
-import {Extent} from "ol/extent";
+import {Extent} from 'ol/extent';
 import {Point, Polygon} from 'ol/geom';
 import TileLayer from 'ol/layer/Tile';
 import VectorLayer from "ol/layer/Vector";
 import {fromLonLat} from 'ol/proj';
 import {OSM} from 'ol/source';
 import VectorSource from 'ol/source/Vector';
 import {Fill, Stroke, Style} from 'ol/style';
+import CircleStyle from 'ol/style/Circle';
 
 import 'ol/ol.css';
 import styles from './OpenLayers.module.css';
@@ -36,7 +37,9 @@ function createPointVectorLayer(name: string, source: VectorSource<Feature<Point
 interface Props {
     id: string,
     agriCrops: AgriCrop[],
+    selectedAgriCrop?: AgriCrop|undefined,
     selectedGroup: TenantGroup|undefined,
+    selectedSensor?: Sensor|undefined,
     sensors: Sensor[]
 }
 
@@ -52,7 +55,7 @@ function fitMap(mapView: View | undefined, extent: Extent | undefined) {
     }
 }
 
-function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
+function OpenLayers({ agriCrops, id, selectedAgriCrop, selectedGroup, selectedSensor, sensors }: Props) {
 
     const mapRef = useRef<Map | undefined>(undefined);
 
@@ -70,7 +73,7 @@ function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
     let pointVectorLayer = createPointVectorLayer(pointVectorLayerName, pointVectorSource);
     let polygonVectorLayer = createPolygonVectorLayer(polygonVectorLayerName, polygonVectorSource);
 
-    const style = new Style({
+    const normalPolygonStyle = new Style({
         fill: new Fill({
             color: 'rgba(0, 128, 255, 0.4)',
         }),
@@ -80,6 +83,29 @@ function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
         }),
     });
 
+    const highlightPolygonStyle = new Style({
+        fill: new Fill({
+            color: 'rgba(255, 0, 0, 0.4)',
+        }),
+        stroke: new Stroke({
+            color: 'red',
+            width: 2,
+        }),
+    });
+
+    const highlightPointStyle = new Style({
+        image: new CircleStyle({
+            fill: new Fill({
+                color: 'rgba(255, 0, 0, 0.4)'
+            }),
+            stroke: new Stroke({
+                color: 'red',
+                width: 1
+            }),
+            radius: 5
+        })
+    });
+
     function updateAgriCrops () {
         const map = mapRef.current;
         if (!map || agriCrops.length === 0) return;
@@ -93,7 +119,7 @@ function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
                 lonLatCoordinates.push(fromLonLat(coordinate));
             });
             const polygonFeature = new Feature({ geometry: new Polygon([lonLatCoordinates]) });
-            polygonFeature.setStyle(style);
+            polygonFeature.setStyle(agriCrop.id === selectedAgriCrop?.id ? highlightPolygonStyle : normalPolygonStyle);
             features.push(polygonFeature);
         });
         polygonVectorSource.clear();
@@ -105,7 +131,9 @@ function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
         }
         polygonVectorLayer = createPolygonVectorLayer(polygonVectorLayerName, polygonVectorSource);
         map.addLayer(polygonVectorLayer);
-        fitMap(map.getView(), polygonVectorSource.getExtent());
+        if (!selectedAgriCrop && !selectedSensor) {
+            fitMap(map.getView(), polygonVectorSource.getExtent());
+        }
     }
 
     function updateSensors() {
@@ -116,7 +144,11 @@ function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
             return !selectedGroup || sensor.customGroup === selectedGroup.groupId;
         });
         _sensors.forEach((sensor: Sensor) => {
-            features.push(new Feature({ geometry: new Point(fromLonLat(sensor.coordinates)) }));
+            const pointFeature = new Feature({ geometry: new Point(fromLonLat(sensor.coordinates)) });
+            if (sensor.id === selectedSensor?.id) {
+                pointFeature.setStyle(highlightPointStyle);
+            }
+            features.push(pointFeature);
         });
         pointVectorSource.clear();
         pointVectorSource.addFeatures(features);
@@ -148,13 +180,13 @@ function OpenLayers({ agriCrops, id, selectedGroup, sensors }: Props) {
         if (mapRef.current && agriCrops.length > 0) {
             updateAgriCrops();
         }
-    }, [agriCrops, selectedGroup]);
+    }, [agriCrops, selectedGroup, selectedAgriCrop]);
 
     useEffect(() => {
         if (mapRef.current && sensors.length > 0) {
             updateSensors();
         }
-    }, [sensors, selectedGroup]);
+    }, [sensors, selectedGroup, selectedSensor]);
 
     return <div id={id} className={styles.map}></div>;
 }
diff --git a/app/components/SingleSelectionGroupContents.tsx b/app/components/SingleSelectionGroupContents.tsx
@@ -0,0 +1,57 @@
+import React, {ChangeEventHandler, MouseEventHandler} from 'react';
+import {Button, Form} from 'react-bootstrap';
+import {NavLink} from 'react-router';
+
+import AgriCrop from '../models/AgriCrop';
+import Sensor from '../models/Sensor';
+
+import styles from './SingleSelectionGroups.module.css';
+
+interface Props {
+    agriCrops: AgriCrop[],
+    handleChange: ChangeEventHandler,
+    handleReset: MouseEventHandler,
+    selectedAgriCrop: AgriCrop | undefined,
+    selectedSensor: Sensor | undefined,
+    sensors: Sensor[]
+}
+
+function SingleSelectionGroupContents({ agriCrops, handleChange, handleReset, selectedAgriCrop, selectedSensor, sensors }: Props) {
+    return <>
+        <h4>Übersicht der Gruppeninhalte:</h4>
+        <Form id="group_contents">
+            {sensors.map((sensor) => (
+                <Form.Check
+                    className={styles.groups}
+                    type="radio"
+                    id={sensor.id}
+                    key={sensor.id}
+                    label={sensor.id}
+                    value={sensor.id}
+                    name="group_contents"
+                    checked={selectedSensor?.id === sensor.id}
+                    onChange={handleChange}
+                />
+            ))}
+            {agriCrops.map((agriCrops) => (
+                <Form.Check
+                    className={styles.groups}
+                    type="radio"
+                    id={agriCrops.id}
+                    key={agriCrops.id}
+                    label={agriCrops.id}
+                    value={agriCrops.id}
+                    name="group_contents"
+                    checked={selectedAgriCrop?.id === agriCrops.id}
+                    onChange={handleChange}
+                />
+            ))}
+            <NavLink className="btn btn-secondary mt-5" to="/">Zurück</NavLink>
+            <Button className="ms-5 mt-5" variant="secondary" onClick={handleReset} disabled={!selectedSensor && !selectedAgriCrop}>
+                Auswahl aufheben
+            </Button>
+        </Form>
+    </>;
+}
+
+export default SingleSelectionGroupContents;
diff --git a/app/components/SingleSelectionGroups.tsx b/app/components/SingleSelectionGroups.tsx
@@ -1,14 +1,15 @@
 import styles from './SingleSelectionGroups.module.css';
 
-import React from 'react';
+import React, {ChangeEventHandler, MouseEventHandler} from 'react';
 import {Button, Form} from 'react-bootstrap';
+import {NavLink} from 'react-router';
 
 import TenantGroup from '../models/TenantGroup';
 
 interface Props {
     groups: TenantGroup[],
-    handleChange: any,
-    handleReset: any,
+    handleChange: ChangeEventHandler,
+    handleReset: MouseEventHandler,
     selectedGroup: TenantGroup|undefined
 }
 
@@ -31,9 +32,13 @@ function SingleSelectionGroups({ handleChange, handleReset, groups, selectedGrou
                         onChange={handleChange}
                     />
                 ))}
-                <Button className="mt-5" variant="secondary" onClick={handleReset}>
+                <Button className="mt-5" variant="secondary" onClick={handleReset} disabled={!selectedGroup}>
                     Auswahl aufheben
                 </Button>
+                <NavLink className={`btn btn-secondary ms-5 mt-5 ${selectedGroup ? '' : 'disabled'}`}
+                         to={selectedGroup ? '/group/' + selectedGroup.name : '#'}>
+                    Weiter
+                </NavLink>
             </Form>
         </>
     );
diff --git a/app/models/Sensor.tsx b/app/models/Sensor.tsx
@@ -3,6 +3,7 @@ import {Coordinate} from 'ol/coordinate';
 export default interface Sensor {
     id: string,
     type: string,
+    name: string,
     customGroup: string,
     coordinates: Coordinate
 }
diff --git a/app/models/SensorResponse.tsx b/app/models/SensorResponse.tsx
@@ -4,5 +4,6 @@ export default interface SensorResponse {
     id: string,
     type: string,
     customGroup: string,
-    location: SingleLocationResponse | null
+    location: SingleLocationResponse | null,
+    name: string
 }
diff --git a/app/routes.ts b/app/routes.ts
@@ -2,5 +2,6 @@ import {index, route, RouteConfig} from '@react-router/dev/routes';
 
 export default [
     index('./routes/Home.tsx'),
-    route('impressum', './routes/Impressum.tsx')
+    route('impressum', './routes/Impressum.tsx'),
+    route('group/:groupName', './routes/Group.tsx')
 ] satisfies RouteConfig;
diff --git a/app/routes/Group.tsx b/app/routes/Group.tsx
diff --git a/app/routes/Home.module.css b/app/routes/Home.module.css
diff --git a/app/routes/Home.tsx b/app/routes/Home.tsx
diff --git a/app/services/fiwareService.tsx b/app/services/fiwareService.tsx

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import {Coordinate} from 'ol/coordinate';`
`3`	`3`	`export default interface Sensor {`
`4`	`4`	`id: string,`
`5`	`5`	`type: string,`
	`6`	`+ name: string,`
`6`	`7`	`customGroup: string,`
`7`	`8`	`coordinates: Coordinate`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ export default interface SensorResponse {`
`4`	`4`	`id: string,`
`5`	`5`	`type: string,`
`6`	`6`	`customGroup: string,`
`7`		`- location: SingleLocationResponse \| null`
	`7`	`+ location: SingleLocationResponse \| null,`
	`8`	`+ name: string`
`8`	`9`	`}`