From 8c134968a9de77aa11a57cc53502c3ba32ef7914 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Mon, 28 Nov 2022 11:26:57 +0100
Subject: [PATCH] rewrite organisation of planning menu

---
 .../building/data-containers/planning.tsx     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index ced8dee0..81f5336b 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -51,29 +51,14 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
     <Fragment>
         <DataEntryGroup name="Planning application information" collapsed={false} >
-            <DataEntryGroup name="Active applications (official data)" collapsed={false} >
+            <DataEntryGroup name="Current/active applications (official data)" collapsed={false} >
                 <PlanningDataOfficialDataEntry  
                     shownData={props.building.planning_data ? props.building.planning_data.filter(item => isArchived(item) == false) : []}
                     allEntryCount={props.building.planning_data ? props.building.planning_data.length : 0}
                 />
             </DataEntryGroup>
-            <DataEntryGroup name="Past applications (official data)" collapsed={true} >
-                <InfoBox type='warning'>
-                    Past applications, including those with no decision in over a year
-                </InfoBox>
-                <PlanningDataOfficialDataEntry  
-                    shownData={props.building.planning_data ? props.building.planning_data.filter(item => isArchived(item)) : []}
-                    allEntryCount={props.building.planning_data ? props.building.planning_data.length : 0}
-            />
-            </DataEntryGroup>
-            <DataEntryGroup name="Crowdsourced info on planning applications" collapsed={true} >
-                <CheckboxDataEntry
-                        title="Has the work on this site been completed?"
-                        slug="planning_live_application"
-                        value={null}
-                        disabled={false}
-                        />
-                    <NumericDataEntry
+            <DataEntryGroup name="Other active application info (crowdsourced data)" collapsed={true} >
+                <NumericDataEntry
                         title={"Year of completion"}
                         slug="date_year"
                         value={2019}
@@ -85,6 +70,17 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         // "type": "year_estimator"
                         />
             </DataEntryGroup>
+            <DataEntryGroup name="Past applications (official data)" collapsed={true} >
+                <InfoBox type='warning'>
+                    Past applications, including those with no decision in over a year
+                </InfoBox>
+                <PlanningDataOfficialDataEntry
+                    shownData={props.building.planning_data ? props.building.planning_data.filter(item => isArchived(item)) : []}
+                    allEntryCount={props.building.planning_data ? props.building.planning_data.length : 0}
+                />
+            </DataEntryGroup>
+            <DataEntryGroup name="Possible future applications (crowdsourced data)" collapsed={true} >
+            </DataEntryGroup>
         </DataEntryGroup>
         <DataEntryGroup name="Planning contraints and building protection" collapsed={true} >
             <DataEntryGroup name="Building protection" collapsed={false} >