From 34c48ee9b6f3893f1f9584cb0f58a19114bd6fb1 Mon Sep 17 00:00:00 2001 From: Francois Voisard Date: Wed, 15 Jul 2020 14:34:08 +0200 Subject: [PATCH 1/3] test redirect layer source --- crdppf/models/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crdppf/models/models.py b/crdppf/models/models.py index 36d7012..39e7a13 100644 --- a/crdppf/models/models.py +++ b/crdppf/models/models.py @@ -363,8 +363,8 @@ class CHPollutedSitesPublicTransportsPDF(): if 'road_noise' in db_config['restrictions']: class RoadNoise(GeoInterface, Base): - __tablename__ = 'r145_sens_bruit' - __table_args__ = {'schema': db_config['schema'], 'autoload': True} + __tablename__ = 'v_r145_sens_bruit' + __table_args__ = {'schema': 'noise_sensitivity_levels', 'autoload': True} idobj = Column(Integer, primary_key=True) geom = Column(Geometry("GEOMETRY", srid=srid_)) else: From 7c89313e24751ce9f1dbc24c548895a941ff632f Mon Sep 17 00:00:00 2001 From: Francois Voisard Date: Thu, 16 Jul 2020 16:44:31 +0200 Subject: [PATCH 2/3] added a spinner while UI is loading --- crdppf/static/js/Crdppf/main.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crdppf/static/js/Crdppf/main.js b/crdppf/static/js/Crdppf/main.js index 6ba0211..52e0f45 100644 --- a/crdppf/static/js/Crdppf/main.js +++ b/crdppf/static/js/Crdppf/main.js @@ -49,9 +49,16 @@ Ext.onReady(function() { }; Crdppf.triggerFunction = function(counter) { + + var loadMask = new Ext.LoadMask(Ext.getBody(), {msg: 'Chargement en cours... Merci de patienter.'}); + if (counter == 3) { + loadMask.hide(); synchronize(sync); } + else { + loadMask.show(); + } }; var redirectAfterDisclaimer = function(userChoice){ From 029db4da286a988048f4d09cda0eb71f0c5c167d Mon Sep 17 00:00:00 2001 From: Francois Voisard Date: Thu, 23 Jul 2020 16:21:46 +0200 Subject: [PATCH 3/3] configuration for pyramid_oereb v1.7.6 --- CONST_versions.txt | 16 +++++++--------- setup.py | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CONST_versions.txt b/CONST_versions.txt index a069705..2b22737 100644 --- a/CONST_versions.txt +++ b/CONST_versions.txt @@ -6,16 +6,15 @@ dicttoxml==1.7.4 dogpile.cache==0.6.6 future==0.16.0 generateDS==2.29.24 -GeoAlchemy2==0.7.0 +GeoAlchemy2==0.8.4 geojson==2.4.0 -geolink-formatter==1.5.1 httplib2==0.14 hupper==1.5 idna==2.6 Jinja2==2.10 jsonschema==3.2.0 JSTools==1.0 -lxml==4.5.0 +lxml==4.5.1 Mako==1.0.7 MarkupSafe==1.0 netifaces==0.10.7 @@ -24,7 +23,6 @@ PasteDeploy==1.5.2 plaster==1.0 plaster-pastedeploy==0.5 psycopg2==2.8.5 -pyconizer==0.1.4 Pygments==2.2.0 pyproj==1.9.6 pyramid==1.10.4 @@ -34,16 +32,16 @@ pyramid-tm==2.4 pyreproj==1.0.1 PyYAML==5.3.1 repoze.lru==0.7 -requests==2.23.0 +requests==2.24.0 simplejson==3.17.0 six==1.11.0 -SQLAlchemy==1.3.16 -SQLAlchemy-Utils==0.36.5 +SQLAlchemy==1.3.18 +SQLAlchemy-Utils==0.36.6 transaction==3.0.0 translationstring==1.3 -urllib3==1.25.9 +urllib3[secure]==1.25.9 venusian==1.1.0 -waitress==1.4.3 +waitress==1.4.4 WebOb==1.8.3 zope.deprecation==4.3.0 zope.interface==4.5.0 diff --git a/setup.py b/setup.py index 46a89ae..338da83 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='crdppf', - version='3.1.1', + version='3.2.1', description='SITN, public law restriction portal core', author='sitn', author_email='sitn@ne.ch',