hackforla · sellnat77 · Feb 21, 2020 · Feb 5, 2020 · Feb 9, 2020 · Feb 9, 2020
diff --git a/package.json b/package.json
@@ -15,9 +15,11 @@
     "html-webpack-plugin": "^3.2.0",
     "jest": "^24.9.0",
     "leaflet": "^1.5.1",
+    "moment": "^2.24.0",
     "proptypes": "^1.1.0",
     "react": "^16.8.6",
     "react-burger-menu": "^2.6.13",
+    "react-datepicker": "^2.12.1",
     "react-dom": "^16.8.6",
     "react-leaflet": "^2.4.0",
     "react-leaflet-choropleth": "^2.0.0",
@@ -39,10 +41,10 @@
     "deploy": "gh-pages -d dist"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.2",
+    "@babel/core": "^7.8.4",
     "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/preset-env": "^7.7.1",
-    "@babel/preset-react": "^7.7.0",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/preset-react": "^7.8.3",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "css-loader": "^3.2.0",
@@ -54,12 +56,14 @@
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.17.0",
     "eslint-plugin-react-hooks": "^1.7.0",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^4.2.0",
+    "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.12.0",
     "sass-loader": "^8.0.0",
     "style-loader": "^1.0.0",
     "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10",
+    "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.9.0"
   }
 }
diff --git a/public/index.html b/public/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
     <link rel="stylesheet" href="https://unpkg.com/react-vis/dist/style.css">
     <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
           integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="

diff --git a/server/src/app.py b/server/src/app.py
@@ -1,15 +1,16 @@
 import os
 from sanic import Sanic
 from sanic.response import json
-from services.time_to_close import time_to_close
-from services.frequency import frequency
-from services.ingress_service import ingress_service
 from configparser import ConfigParser
 from threading import Timer
-from multiprocessing import cpu_count
-from services.sqlIngest import DataHandler
 from datetime import datetime
+from multiprocessing import cpu_count
 
+from services.time_to_close import time_to_close
+from services.frequency import frequency
+from services.pinService import PinService
+from services.ingress_service import ingress_service
+from services.sqlIngest import DataHandler
 
 app = Sanic(__name__)
 
@@ -77,7 +78,8 @@ async def ingest(request):
         return json({"error": "'years' parameter is required."})
     years = set([int(year) for year in request.args.get("years").split(",")])
     if not all(year in ALLOWED_YEARS for year in years):
-        return json({"error": f"'years' parameter values must be one of {ALLOWED_YEARS}"})
+        return json({"error":
+                    f"'years' param values must be one of {ALLOWED_YEARS}"})
     loader = DataHandler()
     loader.loadConfig(configFilePath='./settings.cfg')
     loader.populateFullDatabase(yearRange=years)
@@ -99,6 +101,22 @@ async def delete(request):
     return json(return_data)
 
 
+@app.route('/pins', methods=["POST"])
+async def pinMap(request):
+    pin_worker = PinService(app.config['Settings'])
+    postArgs = request.json
+    start = postArgs.get('startDate', '2015-01-01')
+    end = postArgs.get('endDate', '2015-12-31 01:01:01')
+    ncs = postArgs.get('ncList', ['SHERMAN OAKS NC'])
+    requests = postArgs.get('requestTypes', ['Bulky Items'])
+
+    return_data = await pin_worker.get_base_pins(startDate=start,
+                                                 endDate=end,
+                                                 ncList=ncs,
+                                                 requestTypes=requests)
+    return json(return_data)
+
+
 @app.route('/test_multiple_workers')
 async def test_multiple_workers(request):
     Timer(10.0, print, ["Timer Test."]).start()

diff --git a/server/src/services/dataService.py b/server/src/services/dataService.py
@@ -0,0 +1,39 @@
+import sqlalchemy as db
+import pandas as pd
+
+
+class DataService(object):
+    def includeMeta(func):
+        def inner1(*args, **kwargs):
+            dataResponse = func(*args, **kwargs)
+
+            withMeta = {'lastPulled': 'NOW', 'data': dataResponse}
+            print(withMeta)
+            return withMeta
+
+        return inner1
+
+    def __init__(self, config=None, tableName="ingest_staging_table"):
+        self.config = config
+        self.dbString = None if not self.config  \
+            else self.config['Database']['DB_CONNECTION_STRING']
+
+        self.table = tableName
+        self.data = None
+        self.engine = db.create_engine(self.dbString)
+
+    @includeMeta
+    def query(self, queryItems=[], queryfilters=[], limit=None):
+        items = ', '.join(queryItems)
+        query = 'SELECT {} FROM {}'.format(items, self.table)
+        if queryfilters:
+            filters = ' AND '.join(queryfilters)
+            query += ' WHERE {}'.format(filters)
+        if limit:
+            query += ' LIMIT {}'.format(limit)
+
+        df = pd.read_sql_query(query, con=self.engine)
+        return df.to_dict(orient='records')
+
+    def storedProc(self):
+        pass
diff --git a/server/src/services/pinService.py b/server/src/services/pinService.py
@@ -0,0 +1,48 @@
+from .dataService import DataService
+
+
+class PinService(object):
+    def __init__(self, config=None, tableName="ingest_staging_table"):
+        self.dataAccess = DataService(config, tableName)
+
+    async def get_base_pins(self,
+                            startDate='',
+                            endDate='',
+                            ncList=[],
+                            requestTypes=[]):
+        """
+        Returns the base pin data given times, ncs, and request filters
+        {
+          'LastPulled': 'Timestamp',
+          'data': [
+            {
+              'ncname':'String',
+              'requesttype':'String',
+              'srnumber':'String',
+              'latitude': 'String',
+              'longitude': 'String',
+              'address': 'String',
+              'createddate': 'Timestamp'
+            }
+          ]
+        }
+        """
+
+        items = ['ncname',
+                 'requesttype',
+                 'srnumber',
+                 'latitude',
+                 'longitude',
+                 'address',
+                 'createddate']
+
+        ncs = '\'' + '\', \''.join(ncList) + '\''
+        requests = '\'' + '\', \''.join(requestTypes) + '\''
+
+        filters = ['createddate > \'{}\''.format(startDate),
+                   'createddate < \'{}\''.format(endDate),
+                   'ncname IN ({})'.format(ncs),
+                   'requesttype IN ({})'.format(requests)]
+        result = self.dataAccess.query(items, filters)
+
+        return result
diff --git a/server/src/services/sqlIngest.py b/server/src/services/sqlIngest.py
@@ -1,11 +1,11 @@
 import os
-import sqlalchemy as db
-import pandas as pd
-from configparser import ConfigParser
+import time
 import numpy as np
+import pandas as pd
+import sqlalchemy as db
 from sodapy import Socrata
-import time
-import databaseOrm  # Contains database specs and field definitions
+from .databaseOrm import tableFields, insertFields, readFields  # Contains db specs and field definitions
+from configparser import ConfigParser
 
 
 class DataHandler:
@@ -17,9 +17,9 @@ def __init__(self, config=None, configFilePath=None, separator=','):
         self.filePath = None
         self.configFilePath = configFilePath
         self.separator = separator
-        self.fields = databaseOrm.tableFields
-        self.insertParams = databaseOrm.insertFields
-        self.readParams = databaseOrm.readFields
+        self.fields = tableFields
+        self.insertParams = insertFields
+        self.readParams = readFields
         self.dialect = None
 
     def loadConfig(self, configFilePath):
@@ -177,7 +177,7 @@ def populateFullDatabase(self, yearRange=range(2015, 2021)):
            Default operation is to fetch data from 2015-2020
            !!! Be aware that each fresh import will wipe the
            existing staging table'''
-        print('Performing fresh ' + self.dialect + ' population from Socrata data sources')
+        print('Performing {} population from data source'.format(self.dialect))
         tableInit = False
         globalTimer = time.time()
         for y in yearRange:

diff --git a/src/components/common/Button.jsx b/src/components/common/Button.jsx
@@ -24,6 +24,8 @@ const Button = ({
   isStatic,
   disabled,
   style,
+  icon,
+  iconStyle,
 }) => {
   // Dynamically generates button className from props to comply with Bulma styling modifiers.
   const buttonClassName = classNames('button', {
@@ -53,7 +55,14 @@ const Button = ({
       className={buttonClassName}
       style={style}
     >
-      {label}
+      {icon && (
+        <span className="icon is-small" style={iconStyle}>
+          <i className={`fas fa-${icon}`} />
+        </span>
+      )}
+      <span>
+        {label}
+      </span>
     </button>
   );
 };
@@ -78,6 +87,8 @@ Button.propTypes = {
   isStatic: PropTypes.bool,
   disabled: PropTypes.bool,
   style: PropTypes.shape({}),
+  iconStyle: PropTypes.shape({}),
+  icon: PropTypes.string,
 };
 
 Button.defaultProps = {
@@ -97,4 +108,6 @@ Button.defaultProps = {
   isStatic: false,
   disabled: false,
   style: undefined,
+  iconStyle: undefined,
+  icon: undefined,
 };
diff --git a/src/components/common/CONSTANTS.js b/src/components/common/CONSTANTS.js
@@ -23,6 +23,69 @@ export const MONTHS = [
   'December',
 ];
 
+export const REQUEST_TYPES = [
+  {
+    type: 'Dead Animal',
+    abbrev: 'DAN',
+    color: '#4FEFEF',
+  },
+  {
+    type: 'Homeless Encampment',
+    abbrev: 'HLE',
+    color: '#ECB800',
+  },
+  {
+    type: 'Single Streetlight',
+    abbrev: 'SSL',
+    color: '#AD7B56',
+  },
+  {
+    type: 'Multiple Streetlight',
+    abbrev: 'MSL',
+    color: '#F7ADAD',
+  },
+  {
+    type: 'Feedback',
+    abbrev: 'FBK',
+    color: '#FFE6B7',
+  },
+  {
+    type: 'Bulky Items',
+    abbrev: 'BLK',
+    color: '#FF0000',
+  },
+  {
+    type: 'E-Waste',
+    abbrev: 'EWT',
+    color: '#DDEC9F',
+  },
+  {
+    type: 'Metal/Household Appliances',
+    abbrev: 'MHA',
+    color: '#B8D0FF',
+  },
+  {
+    type: 'Graffiti',
+    abbrev: 'GFT',
+    color: '#2368D0',
+  },
+  {
+    type: 'Illegal Dumping',
+    abbrev: 'ILD',
+    color: '#6A8011',
+  },
+  {
+    type: 'Other',
+    abbrev: 'OTH',
+    color: '#6D7C93',
+  },
+
+  /*
+   * Is 'Report Water Waste' still a valid request type?
+   * If so, we're missing it on the front end mockups.
+   */
+];
+
 export const REQUESTS = [
   'Bulky Items',
   'Dead Animal Removal',

diff --git a/src/components/common/Checkbox.jsx b/src/components/common/Checkbox.jsx
@@ -10,6 +10,7 @@ const Checkbox = ({
   name,
   value,
   checked,
+  style,
   /*
    *  Props below correspond with Bulma modifiers.
    *  wikiki.github.io/form/checkradio/
@@ -48,7 +49,7 @@ const Checkbox = ({
         checked={checked}
         disabled={disabled}
       />
-      <label htmlFor={checkboxId}>
+      <label htmlFor={checkboxId} style={style}>
         {label}
       </label>
     </>
@@ -64,6 +65,8 @@ Checkbox.propTypes = {
   label: PropTypes.string,
   name: PropTypes.string,
   value: PropTypes.string,
+  checked: PropTypes.bool,
+  style: PropTypes.shape({}),
   rightToLeft: PropTypes.bool,
   color: PropTypes.string,
   size: PropTypes.oneOf(['small', '', 'medium', 'large']),
@@ -80,6 +83,8 @@ Checkbox.defaultProps = {
   label: null,
   name: null,
   value: undefined,
+  checked: false,
+  style: undefined,
   rightToLeft: false,
   color: 'primary',
   size: '',