From f63ff98268312054cabf9f31f585fe83cf7a8f8b Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Mon, 7 Nov 2022 17:25:24 +0100
Subject: [PATCH] changing layour of planning data display

---
 .../building/data-containers/planning.tsx     | 24 ++++++++++---------
 .../frontend/config/category-maps-config.ts   |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index aacb860f..c7057265 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -50,20 +50,22 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const communityLinkUrl = `/${props.mode}/${Category.Community}/${props.building.building_id}`;
     return (
     <Fragment>
-        <DataEntryGroup name="Official planning data" collapsed={false} >
         <InfoBox type='warning'>
             This section is under development as part of the project CLPV Tool. For more details and progress <a href="https://github.com/colouring-cities/manual/wiki/G.-Data-capture-methods">read here</a>.
         </InfoBox>
-        <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="Older official planning data" collapsed={true} >
-        <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 name="Official planning data" collapsed={false} >
+        <DataEntryGroup name="Active planning applications" collapsed={true} >
+            <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="No activity in the last year" collapsed={true} >
+            <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>
         <DataEntryGroup name="Crowdsourced planning application data" collapsed={false} >
         <CheckboxDataEntry
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 5662fba1..540aac4d 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -185,7 +185,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
         {
             mapStyle: 'planning_applications_status_recent',
             legend: {
-                title: 'Recent planning applications',
+                title: 'Active planning applications in the last year',
                 elements: [
                     { color: '#53f5dd', text: 'Submitted, awaiting decision' },
                     { color: '#fff200', text: 'Appeal In Progress' },
@@ -199,7 +199,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
         {
             mapStyle: 'planning_applications_status_very_recent',
             legend: {
-                title: 'Very recent planning applications',
+                title: 'Submissions/decisions in last 7 days',
                 elements: [
                     { color: '#53f5dd', text: 'Submitted, awaiting decision' },
                     { color: '#fff200', text: 'Appeal In Progress' },