Merge release 4.3.1

cityofasheville · Jun 27, 2019 · 2cfd101 · 2cfd101
2 parents 3d2d477 + 7068047
commit 2cfd101
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simplicity2",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "Version 2 of SimpliCity",
   "main": "index.js",
   "scripts": {

diff --git a/src/app/development/permits/Permit.js b/src/app/development/permits/Permit.js
@@ -61,6 +61,7 @@ const Permit = props => (
       const thisPermit = data.permits[0];
       const trcType = getTRCTypeFromPermit(thisPermit);
       const formattedPermit = Object.assign({ contact: trcType ? '[email protected]' : null }, thisPermit, { trcType });
+
       // These are all the "misc" info fields that may or may not be filled out for any permit
       thisPermit.custom_fields.forEach((customField) => {
         formattedPermit[customField.name] = customField.value;
@@ -92,13 +93,13 @@ const Permit = props => (
       // The popup is what you see when you click on the pin
       const mapData = [Object.assign(
         {},
-        thisPermit,
+        formattedPermit,
         {
-          popup: `<b>${thisPermit.address}</b>`,
+          popup: `<b>${formattedPermit.address}</b>`,
         },
       )];
       // Don't show map if there are no coordinates
-      const showMap = thisPermit.y && thisPermit.x;
+      const showMap = formattedPermit.y && formattedPermit.x;
 
       const currentStatusItem = statusTranslation.find(item =>
         item.accelaSpeak === formattedPermit.status_current);
@@ -117,7 +118,6 @@ const Permit = props => (
             // Format functions return null if it should not show
             return;
           }
-
           if (!byDetailArea[d.displayGroup]) {
             byDetailArea[d.displayGroup] = [];
           }

diff --git a/src/app/development/permits/permitFieldFormats.js b/src/app/development/permits/permitFieldFormats.js
@@ -68,7 +68,7 @@ export const permitFieldFormats = [
     ),
   },
   {
-    accelaLabel: 'Address',
+    accelaLabel: 'address',
     displayGroup: 'project details',
     displayLabel: 'Address',
     formatFunc: (d, permit) => (permit.civic_address_id ?
@@ -77,7 +77,7 @@ export const permitFieldFormats = [
     ),
   },
   {
-    accelaLabel: 'Permit Subtype',
+    accelaLabel: 'permit_subtype',
     displayGroup: 'project details',
     displayLabel: 'Type of permit review',
     formatFunc: (d, permit) => {
@@ -106,7 +106,7 @@ export const permitFieldFormats = [
     description: 'Google Drive folder link to view documents',
   },
   {
-    accelaLabel: 'Subdivision Number',
+    accelaLabel: 'Subdivision Number of Lots',
     displayGroup: 'project details',
     displayLabel: 'Number of lots to be created',
     formatFunc: d => (+d > 0 ? `${d} lots` : null),
@@ -134,7 +134,7 @@ export const permitFieldFormats = [
     formatFunc: d => (+d > 0 ? `${d} units` : null),
   },
   {
-    accelaLabel: 'Permit Number',
+    accelaLabel: 'permit_number',
     displayGroup: 'project details',
     displayLabel: 'Application Number',
     formatFunc: (d, permit) => {
@@ -150,7 +150,7 @@ export const permitFieldFormats = [
     )},
   },
   {
-    accelaLabel: 'Contact',
+    accelaLabel: 'contact',
     displayGroup: 'project details',
     displayLabel: 'Contact',
   },
@@ -171,7 +171,7 @@ export const permitFieldFormats = [
   },
   {
     // This is a combined field from corner, side, and rear-- see formatted permit transoformations in render func
-    accelaLabel: 'Setbacks',
+    accelaLabel: 'setbacks',
     displayGroup: 'zoning details',
     displayLabel: 'Setbacks',
     formatFunc: d => (d.length > 0 ? d.join(', ') : null),

diff --git a/src/app/development/trc/TRCDataTable.js b/src/app/development/trc/TRCDataTable.js
@@ -29,7 +29,7 @@ class TRCDataTable extends React.Component {
             timeSpan: newExtent,
           })}
           defaultBrushExtent={this.initialBrushExtent}
-          xSpan={2}
+          xSpan={3}
         />
         <PermitsTableWrapper
           after={this.state.timeSpan[0]}

diff --git a/src/app/development/utils.js b/src/app/development/utils.js
@@ -294,7 +294,6 @@ export const trcProjectTypes = {};
     permit_type: 'Development',
     permit_subtype: 'Conditional Zoning',
     short: 'CZ',
-    description: 'Any development project that seeks to change the zoning of a site and develop the site simultaneously.',
     descriptors: {
       whyLevel: (<ul>
         <li>Requires a change in zoning</li>
@@ -327,7 +326,7 @@ export const trcProjectTypes = {};
         <li>Government buildings</li>
         <li>Group homes</li>
       </ul>),
-      recentAppsLink: <a href="/development/major?permit_subtype=level%20II%20#data">Recently submitted Conditional Use projects</a>,
+      recentAppsLink: <a href="/development/major?permit_subtype=conditional%20use%20#data">Recently submitted Conditional Use projects</a>,
     },
     color: '#073d49',
   };

diff --git a/src/app/development/volume/TimeSlider.js b/src/app/development/volume/TimeSlider.js
@@ -216,7 +216,7 @@ TimeSlider.defaultProps = {
     timeDay.floor(new Date()).getTime(),
   ], // today and today minus thirty-one days
   onBrushEnd: newExtent => console.log(newExtent),
-  xSpan: 1, // in years
+  xSpan: 2, // in years
 };
 
 export default TimeSlider;