Merge branch 'develop' · mgabarda.com/upvcarshare@e97fb54

+2 -1

README.rst

··· 38 38 39 39 cd /usr/local/lib/ 40 40 ln -s $ORACLE_HOME/libclntsh.dylib.12.1 libclntsh.dylib.12.1 41 + ln -s $ORACLE_HOME/libclntsh.dylib.12.1 libclntsh.dylib 41 42 ln -s $ORACLE_HOME/libocci.dylib.12.1 libocci.dylib.12.1 42 43 ln -s $ORACLE_HOME/libnnz12.dylib libnnz12.dylib 43 44 44 45 Install ``cx_Oracle`` from PIP:: 45 46 46 - env ARCHFLAGS="-arch $ARCH" pip install cx_Oracle 47 + env ARCHFLAGS="-arch $ARCH" pip install cx-Oracle==5.2.1 47 48 48 49 Environment Variables 49 50 ---------------------

+5 -1

package.json

··· 7 7 "dependencies": { 8 8 "underscore": "^1.8.3" 9 9 }, 10 + "scripts": { 11 + "watch": "gulp", 12 + "build": "gulp build" 13 + }, 10 14 "devDependencies": { 11 15 "angular": "^1.5.5", 12 16 "angular-cookies": "^1.5.7", ··· 20 24 "babel-preset-es2015": "^6.6.0", 21 25 "babel-preset-react": "^6.5.0", 22 26 "babelify": "^7.3.0", 23 - "bootstrap": "^4.0.0-alpha.4", 27 + "bootstrap": "4.0.0-alpha.5", 24 28 "bootstrap-ui-datetime-picker": "^2.4.1", 25 29 "browserify": "^13.0.1", 26 30 "browserify-shim": "^3.8.12",

+1 -1

requirements/base.txt

··· 1 - django==1.10.2 1 + workon django==1.10.2 2 2 django-environ==0.4.0 3 3 django-braces==1.8.1 4 4 django-floppyforms==1.6.2

+12 -6

upvcarshare/config/settings/base.py

··· 1 1 # -*- coding: utf-8 -*- 2 - from os.path import basename 2 + from os.path import basename, join 3 3 from sys import path 4 4 5 5 import environ 6 6 from django.core.urlresolvers import reverse_lazy 7 7 8 - env = environ.Env() 9 - env.DB_SCHEMES.update({ 10 - 'oracle': 'django.db.backends.oracle', 11 - 'oraclegis': 'django.contrib.gis.db.backends.oracle', 12 - }) # Add support for Oracle and Oracle GIS to Django Environ 13 8 14 9 # PATH CONFIGURATION 15 10 # ------------------------------------------------------------------------------ ··· 40 35 # Add our project to our pythonpath, this way we don't need to type our project 41 36 # name in our dotted import paths: 42 37 path.append(CONFIG_ROOT) 38 + 39 + # ENV CONFIGURATION 40 + # ------------------------------------------------------------------------------ 41 + # See: http://django-environ.readthedocs.io/en/latest/ 42 + env = environ.Env() 43 + env.read_env(join(DJANGO_ROOT, '.env')) 44 + env.DB_SCHEMES.update({ 45 + 'oracle': 'django.db.backends.oracle', 46 + 'oraclegis': 'django.contrib.gis.db.backends.oracle', 47 + }) # Add support for Oracle and Oracle GIS to Django Environ 43 48 44 49 # DEBUG CONFIGURATION 45 50 # ------------------------------------------------------------------------------ ··· 360 365 361 366 # UPV CREDENTIALS 362 367 # ------------------------------------------------------------------------------ 368 + UPV_LOGIN_IGNORE = False 363 369 UPV_LOGIN_DATA_USERNAME = env("UPV_LOGIN_DATA_USERNAME") 364 370 UPV_LOGIN_DATA_PASSWORD = env("UPV_LOGIN_DATA_PASSWORD")

+6

upvcarshare/config/settings/local.py

··· 38 38 NOTEBOOK_ARGUMENTS = [ 39 39 '--port=8000', 40 40 ] 41 + 42 + # UPV CREDENTIALS 43 + # ------------------------------------------------------------------------------ 44 + UPV_LOGIN_IGNORE = True 45 + UPV_LOGIN_DATA_USERNAME = env("UPV_LOGIN_DATA_USERNAME") 46 + UPV_LOGIN_DATA_PASSWORD = env("UPV_LOGIN_DATA_PASSWORD")

+3 -3

upvcarshare/journeys/__init__.py

··· 18 18 # Uses projected coordinate system for Spain. 19 19 # See: https://epsg.io/2062 20 20 DEFAULT_PROJECTED_SRID = 2062 21 - DEFAULT_WGS84_SRID = 4326 22 - DEFAULT_GOOGLE_MAPS_SRID = 3857 21 + # DEFAULT_WGS84_SRID = 4326 22 + DEFAULT_WGS84_SRID = DEFAULT_GOOGLE_MAPS_SRID = 4326 23 23 # Distance in meters 24 24 DEFAULT_DISTANCE = 500 25 - # Time window in minutes 25 + # Time window in minutesg 26 26 DEFAULT_TIME_WINDOW = 30

+14 -5

upvcarshare/journeys/admin.py

··· 5 5 from django import forms 6 6 from django.contrib.gis import admin 7 7 8 - from core.widgets import GMapsPointWidget 9 - from journeys.helpers import make_point_projected 10 - from journeys.models import Residence, Journey, Campus, Message, Transport,\ 8 + from core.widgets import OsmPointWidget 9 + from journeys import DEFAULT_GOOGLE_MAPS_SRID, DEFAULT_PROJECTED_SRID, DEFAULT_WGS84_SRID 10 + from journeys.helpers import make_point_projected, make_point 11 + from journeys.models import Residence, Journey, Campus, Message, Transport, \ 11 12 Passenger 12 13 13 14 14 15 class PlaceAdminForm(forms.ModelForm): 15 16 16 - position = floppyforms.gis.PointField(widget=GMapsPointWidget(), srid=3857) 17 + position = floppyforms.gis.PointField(widget=OsmPointWidget(), srid=DEFAULT_WGS84_SRID) 17 18 18 19 class Meta: 19 20 model = Residence 20 21 fields = "__all__" 21 22 23 + def __init__(self, *args, **kwargs): 24 + super(PlaceAdminForm, self).__init__(*args, **kwargs) 25 + self.initial["position"] = make_point( 26 + self.initial["position"], 27 + origin_coord_srid=DEFAULT_PROJECTED_SRID, 28 + destiny_coord_srid=DEFAULT_WGS84_SRID 29 + ) 30 + 22 31 def clean_position(self): 23 32 position = self.cleaned_data["position"] 24 - position = make_point_projected(position, origin_coord_srid=3857) 33 + position = make_point_projected(position, origin_coord_srid=DEFAULT_WGS84_SRID) 25 34 return position 26 35 27 36 def save(self, commit=True):

+3 -3

upvcarshare/journeys/forms.py

··· 11 11 from django.utils import timezone 12 12 13 13 from journeys import JOURNEY_KINDS, GOING, RETURN, DEFAULT_GOOGLE_MAPS_SRID, \ 14 - DEFAULT_PROJECTED_SRID 14 + DEFAULT_PROJECTED_SRID, DEFAULT_WGS84_SRID 15 15 from journeys.helpers import expand, make_point 16 16 from journeys.models import Residence, Journey, Campus, Transport 17 17 from users.models import User ··· 37 37 38 38 def clean_position(self): 39 39 position = self.cleaned_data["position"] 40 - position_point = GEOSGeometry(position, srid=DEFAULT_GOOGLE_MAPS_SRID) 40 + position_point = GEOSGeometry(position, srid=DEFAULT_WGS84_SRID) 41 41 position_projected_point = make_point( 42 - position_point, origin_coord_srid=DEFAULT_GOOGLE_MAPS_SRID, destiny_coord_srid=DEFAULT_PROJECTED_SRID 42 + position_point, origin_coord_srid=DEFAULT_WGS84_SRID, destiny_coord_srid=DEFAULT_PROJECTED_SRID 43 43 ) 44 44 return position_projected_point 45 45

+1 -1

upvcarshare/journeys/models.py

··· 63 63 def google_maps_link(self): 64 64 """Gets a link to Google Maps position""" 65 65 point = make_point( 66 - self.position, origin_coord_srid=DEFAULT_PROJECTED_SRID, destiny_coord_srid=DEFAULT_GOOGLE_MAPS_SRID 66 + self.position, origin_coord_srid=DEFAULT_PROJECTED_SRID, destiny_coord_srid=DEFAULT_WGS84_SRID 67 67 ) 68 68 return "http://www.google.com/maps/place/{},{}".format( 69 69 point.coords[1], point.coords[0]

+1 -2

upvcarshare/journeys/views/journeys.py

··· 332 332 333 333 def get(self, request): 334 334 journeys = Journey.objects.none() 335 - initial_departure = make_naive(timezone.now().replace(second=0, minute=0) + \ 336 - datetime.timedelta(hours=1)) 335 + initial_departure = make_naive(timezone.now().replace(second=0, minute=0) + datetime.timedelta(hours=1)) 337 336 madrid_tz = pytz.timezone("Europe/Madrid") 338 337 initial_departure = madrid_tz.localize(initial_departure) 339 338 form = SearchJourneyForm(initial={

+3

upvcarshare/users/models.py

··· 1 1 # -*- coding: utf-8 -*- 2 2 from __future__ import unicode_literals, print_function, absolute_import 3 3 4 + from django.conf import settings 4 5 from django.contrib.auth.base_user import AbstractBaseUser 5 6 from django.contrib.auth.models import PermissionsMixin, AbstractUser, UserManager 6 7 from django.contrib.gis.db import models ··· 90 91 91 92 def update_groups(self): 92 93 """Updates the groups using the UPV service.""" 94 + if settings.UPV_LOGIN_IGNORE: 95 + return 93 96 username = self.email.split("@")[0] 94 97 user_data = UPVLoginDataService.user_data(username=username) 95 98 roles = user_data.get("roles")

Configure Feed

Configure Feed