Merge branch 'master' into refactor_tpl

assets/form.js

@@ -8,7 +8,7 @@ $( document ).ready(function() {
     }
 
     // Create map
-    var map = L.map('map').setView([defaults.lat,defaults.lng], defaults.zoom);
+    var map = L.map('map', {scrollWheelZoom: false}).setView([defaults.lat,defaults.lng], defaults.zoom);
     L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
         attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
         maxZoom: 18
@@ -89,4 +89,9 @@ $( document ).ready(function() {
         else { $('#contrib-type-share').slideUp(); }
     });
 
-});
+    // select/deselect all checkbox
+    $('#orientation-all').change(function(e){
+        $('input[name="orientation"]').prop('checked', $(e.target).is(':checked') );
+    });
+
+});

backend.py

@@ -39,6 +39,7 @@ DB_COLS = (
 ('bandwidth', 'REAL'),
 ('share_part', 'REAL'),
 ('floor', 'INTEGER'),
+('floor_total', 'INTEGER'),
 ('orientations', 'TEXT'),
 ('roof', 'INTEGER'),
 ('comment', 'TEXT'),
@@ -68,9 +69,9 @@ def save_to_db(db, dic):
     tosave['date'] = utils.formatdate()
     return db.execute("""
 INSERT INTO {}
-(name, contrib_type, latitude, longitude, phone, email, access_type, bandwidth, share_part, floor, orientations, roof, comment,
+(name, contrib_type, latitude, longitude, phone, email, access_type, bandwidth, share_part, floor, floor_total, orientations, roof, comment,
 privacy_name, privacy_email, privacy_place_details, privacy_coordinates, privacy_comment, date)
-VALUES (:name, :contrib_type, :latitude, :longitude, :phone, :email, :access_type, :bandwidth, :share_part, :floor, :orientations, :roof, :comment,
+VALUES (:name, :contrib_type, :latitude, :longitude, :phone, :email, :access_type, :bandwidth, :share_part, :floor, :floor_total, :orientations, :roof, :comment,
         :privacy_name, :privacy_email, :privacy_place_details, :privacy_coordinates, :privacy_comment, :date)
 """.format(TABLE_NAME), tosave)
 
@@ -94,6 +95,8 @@ def submit_wifi_form():
         'access-type' : 'Type de connexion',
         'bandwidth'   : 'Bande passante',
         'share-part'  : 'Débit partagé',
+        'floor' : 'Étage',
+        'floor_total' : 'Nombre d\'étages total'
     }
 
     errors = []
@@ -114,6 +117,14 @@ def submit_wifi_form():
                 if not request.forms.get(name):
                     errors.append(
                         (field_names[name], 'ce champ est requis'))
+
+    if request.forms.get('floor') and not request.forms.get('floor_total'):
+        errors.append((field_names['floor_total'], "ce champ est requis"))
+    elif not request.forms.get('floor') and request.forms.get('floor_total'):
+        errors.append((field_names['floor'], "ce champ est requis"))
+    elif request.forms.get('floor') and request.forms.get('floor_total') and (request.forms.get('floor') > request.forms.get('floor_total')):
+        errors.append((field_names['floor'], "Étage supérieur au nombre total"))
+
     if errors:
         return template('wifi-form', errors=errors, data=request.forms,
                         orientations=ORIENTATIONS)
@@ -131,6 +142,7 @@ def submit_wifi_form():
                 'bandwidth'            : d.get('bandwidth'),
                 'share_part'           : d.get('share-part'),
                 'floor'                : d.get('floor'),
+                'floor_total'                : d.get('floor_total'),
                 'orientations'         : ','.join(d.getall('orientation')),
                 'roof'         : d.get('roof'),
                 'comment'              : d.get('comment'),
@@ -217,6 +229,7 @@ def build_geojson():
                 "name" : row['name'],
                 "place" : {
                     'floor' : row['floor'],
+                    'floor_total' : row['floor_total'],
                     'orientations' : row['orientations'].split(','),
                     'roof' : row['roof'],
                 },
@@ -249,6 +262,7 @@ def build_geojson():
         if not row['privacy_place_details']:
             public_feature['properties']['place'] = {
                 'floor' : row['floor'],
+                'floor_total' : row['floor_total'],
                 'orientations' : row['orientations'].split(','),
                 'roof' : row['roof'],
             }

views/wifi-form.tpl

@@ -149,7 +149,9 @@ Un moyen de contact au moins est nécessaire
     <p class="help-block">Les antennes peuvent être positionées soit sur le toit soit aux fenêtres</p>
 
     <div class="form-group">
-    <label for="orientation" />Orientation(s) de mes fenêtres</label><br />
+    <label for="orientation" />Orientation(s) de mes fenêtres</label>
+    (<label class="ceckbox-inline"><input type="checkbox" name="orientation-all" id="orientation-all" value="" />Vue à 360°</label>)
+    <br>
 %for val, label in orientations:
     <label class="checkbox-inline">
       <input type="checkbox" name="orientation" value="{{val}}"
@@ -166,10 +168,13 @@ Un moyen de contact au moins est nécessaire
         </label>
     </div>
 
-    <p>
+    <p class="form-inline">
       <label for="floor">Étage</label>
       <input name="floor" value="{{data.get('floor', '')}}"
-             id="floor" type="number" class="form-control" placeholder="Indiquer  « 0 » pour le Rez-de-chaussée"/>
+             id="floor" type="number" class="form-control" placeholder="«0» pour le RDC"/>
+      <span>/</span>
+      <input name="floor_total" value="{{data.get('floor_total', '')}}"
+             id="floor_total" type="number" class="form-control" placeholder="Nombre d'étages"/>
     </p>
 
     <h2>Remarque/commentaire</h2>