segregate inactive groups into the end section

app/src/frontend/building/data-containers/planning.tsx

@@ -73,74 +73,6 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     allEntryCount={props.building.planning_data ? props.building.planning_data.length : 0}
                 />
             </DataEntryGroup>
-            <DataEntryGroup name="Active application info (crowdsourced) [inactive]" collapsed={true} >
-                {/* will be titled "Other active application info (crowdsourced data)" once active" */}
-                <InfoBox type='warning'>
-                    This category is not yet activated.
-                </InfoBox>
-                {/* that is placeholder display, will be replaced by actual code */}
-                <div className="data-title">
-                    <div className="data-title-text">
-                        <ul>
-                            <li>Year of completion if known</li>
-                            <li>If you know of a planning application that has been recently submitted for this site, and is not listed in the blue box above, please enter its planning application ID below:</li>
-                            <li>If any of the active planning applications are not mapped onto the correct site, please tick here</li>
-                        </ul>
-                    </div>
-                </div>
-                {
-                    /*
-                <NumericDataEntry
-                    title={dataFields.planning_crowdsourced_site_completion_year.title}
-                    slug="planning_crowdsourced_site_completion_year"
-                    value={props.building.planning_crowdsourced_site_completion_year}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    disabled={true}
-                    />
-                <Verification
-                    slug="planning_crowdsourced_site_completion_year"
-                    allow_verify={false}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("planning_crowdsourced_site_completion_year")}
-                    user_verified_as={props.user_verified.planning_crowdsourced_site_completion_year}
-                    verified_count={props.building.verified.planning_crowdsourced_site_completion_year}
-                    />
-
-                <DataEntry
-                    title={dataFields.planning_crowdsourced_planning_id.title}
-                    slug="planning_crowdsourced_planning_id"
-                    value={props.building.planning_crowdsourced_planning_id}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    disabled={true}
-                 />
-                <Verification
-                    slug="planning_crowdsourced_planning_id"
-                    allow_verify={false && props.user !== undefined && props.building.planning_crowdsourced_planning_id !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("planning_crowdsourced_planning_id")}
-                    user_verified_as={props.user_verified.planning_crowdsourced_planning_id}
-                    verified_count={props.building.verified.planning_crowdsourced_planning_id}
-                    />
-
-                <LogicalDataEntry
-                    slug='community_expected_planning_application_is_inaccurate'
-                    title={"If any of the active planning applications are not mapped onto the correct site, please tick here"}
-                    value={null}
-
-                    onChange={props.onSaveChange}
-                    mode={props.mode}
-                    copy={props.copy}
-                    disabled={true}
-                />
-                on enabling switch it to UserOpinionEntry, remove value and restore userValue
-                */
-                }
-
-            </DataEntryGroup>
             <DataEntryGroup name="Past applications (official data)" collapsed={true} >
                 <InfoBox>
                     This section provides data on past applications where available from the GLA, including those with no decision in over a year
@@ -429,7 +361,76 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 verified_count={props.building.verified.planning_in_apa_url}
                 />
         </DataEntryGroup>
-        <DataEntryGroup name="Land ownership type [inactive]" collapsed={true} >
+        <DataEntryGroup name="Forthcoming data (sections to be activated)" collapsed={true} >        
+        <DataEntryGroup name="Active application info (crowdsourced)" collapsed={true} >
+                {/* will be titled "Other active application info (crowdsourced data)" once active" */}
+                <InfoBox type='warning'>
+                    This category is not yet activated.
+                </InfoBox>
+                {/* that is placeholder display, will be replaced by actual code */}
+                <div className="data-title">
+                    <div className="data-title-text">
+                        <ul>
+                            <li>Year of completion if known</li>
+                            <li>If you know of a planning application that has been recently submitted for this site, and is not listed in the blue box above, please enter its planning application ID below:</li>
+                            <li>If any of the active planning applications are not mapped onto the correct site, please tick here</li>
+                        </ul>
+                    </div>
+                </div>
+                {
+                    /*
+                <NumericDataEntry
+                    title={dataFields.planning_crowdsourced_site_completion_year.title}
+                    slug="planning_crowdsourced_site_completion_year"
+                    value={props.building.planning_crowdsourced_site_completion_year}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    disabled={true}
+                    />
+                <Verification
+                    slug="planning_crowdsourced_site_completion_year"
+                    allow_verify={false}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("planning_crowdsourced_site_completion_year")}
+                    user_verified_as={props.user_verified.planning_crowdsourced_site_completion_year}
+                    verified_count={props.building.verified.planning_crowdsourced_site_completion_year}
+                    />
+
+                <DataEntry
+                    title={dataFields.planning_crowdsourced_planning_id.title}
+                    slug="planning_crowdsourced_planning_id"
+                    value={props.building.planning_crowdsourced_planning_id}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    disabled={true}
+                 />
+                <Verification
+                    slug="planning_crowdsourced_planning_id"
+                    allow_verify={false && props.user !== undefined && props.building.planning_crowdsourced_planning_id !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("planning_crowdsourced_planning_id")}
+                    user_verified_as={props.user_verified.planning_crowdsourced_planning_id}
+                    verified_count={props.building.verified.planning_crowdsourced_planning_id}
+                    />
+
+                <LogicalDataEntry
+                    slug='community_expected_planning_application_is_inaccurate'
+                    title={"If any of the active planning applications are not mapped onto the correct site, please tick here"}
+                    value={null}
+
+                    onChange={props.onSaveChange}
+                    mode={props.mode}
+                    copy={props.copy}
+                    disabled={true}
+                />
+                on enabling switch it to UserOpinionEntry, remove value and restore userValue
+                */
+                }
+
+            </DataEntryGroup>
+            <DataEntryGroup name="Land ownership type" collapsed={true} >
                     <InfoBox type='warning'>
                         This category is not yet activated.
                     </InfoBox>
@@ -475,6 +476,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     */
                     }
             </DataEntryGroup>
+        </DataEntryGroup>
     </Fragment>
 )};
 const PlanningContainer = withCopyEdit(PlanningView);