Merge branch 'issue-166-360Page' of https://github.com/CodeForPhilly/paws-data-pipeline into issue-166-360Page

Author: urirot

src/client/src/pages/DataView360/DataView360.js

@@ -197,7 +197,7 @@ class DataView360 extends Component {
                         <Donations donations={_.get(this.state, 'participantData.donations')}/>
                         <Adoptions adoptions={_.get(this.state, 'participantData.adoptions')}/>
                         <Volunteer volunteer={_.get(this.state, 'participantData.shifts')}
-                                   volunteerShifts={_.get(this.state, 'participantData.volgistics_shifts_results')}/>
+                                   volunteerShifts={_.get(this.state, 'participantData.shifts')}/>
 
                     </Paper>)}
                 {this.state.isDataBusy === true && (

src/client/src/pages/DataView360/components/Adoptions.js

@@ -52,7 +52,7 @@ class Adoptions extends Component {
                             </TableHead>
                             <TableBody>
                                 <StyledTableRow>
-                                    <TableCell align="center"> {_.size(this.getAnimalIds())}</TableCell>
+                                    <TableCell align="center"> {_.size(this.props.adoptions)}</TableCell>
                                 </StyledTableRow>
                             </TableBody>
                         </Table>

src/server/api/common_api.py

@@ -4,6 +4,7 @@
 from sqlalchemy.sql import text
 import requests
 import json
+import dateutil.parser
 from secrets import SHELTERLUV_SECRET_TOKEN
 
 
@@ -52,7 +53,15 @@ def get_360(matching_id):
             if row["source_type"] == "volgistics":
                 shifts_query = text("select * from volgisticsshifts where number = :volgistics_id")
                 volgistics_shifts_query_result = connection.execute(shifts_query, volgistics_id=row["source_id"])
-                volgisticsshifts_results = [dict(row) for row in volgistics_shifts_query_result]
+                volgisticsshifts_results = []
+                for r in volgistics_shifts_query_result:
+                    shifts = dict(r)
+                    # normalize date string
+                    parsed_date_from = dateutil.parser.parse(shifts["from"], ignoretz=True)
+                    normalized_date_from = parsed_date_from.strftime("%Y-%m-%d")
+                    shifts["from"] = normalized_date_from
+                    volgisticsshifts_results.append(shifts)
+                
                 result['shifts'] = volgisticsshifts_results
 
             if row["source_type"] == "shelterluvpeople":