Merge branch 'connect_reason'

assets/form.js

@@ -83,10 +83,14 @@ $( document ).ready(function() {
     // Contrib share dynamic form
     if ($('[name="contrib-type"]:checked').val() == 'share') { $('#contrib-type-share').show(); }
     else { $('#contrib-type-share').hide(); }
+    if ($('[name="contrib-type"]:checked').val() == 'connect') { $('#contrib-type-connect').show(); }
+    else { $('#contrib-type-connect').hide(); }
     // On change
     $('[name="contrib-type"]').change(function(e){
+        $('#contrib-type-share').slideUp();
+        $('#contrib-type-connect').slideUp();
         if ($(this).val() == 'share') { $('#contrib-type-share').slideDown(); }
-        else { $('#contrib-type-share').slideUp(); }
+        if ($(this).val() == 'connect') { $('#contrib-type-connect').slideDown(); }
     });
 
     // select/deselect all checkbox

backend.py

@@ -48,6 +48,8 @@ DB_COLS = (
 ('phone', 'TEXT'),
 ('email', 'TEXT'),
 ('access_type', 'TEXT'),
+('connect_local', 'INTEGER'),
+('connect_internet', 'INTEGER'),
 ('bandwidth', 'REAL'),
 ('share_part', 'REAL'),
 ('floor', 'INTEGER'),
@@ -82,9 +84,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, floor_total, orientations, roof, comment,
+(name, contrib_type, latitude, longitude, phone, email, access_type, connect_local, connect_internet, 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, :floor_total, :orientations, :roof, :comment,
+VALUES (:name, :contrib_type, :latitude, :longitude, :phone, :email, :access_type, :connect_local, :connect_internet, :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)
 
@@ -155,6 +157,8 @@ def submit_wifi_form():
                 'email'        : d.get('email'),
                 'phone'        : d.get('phone'),
                 'access_type'          : d.get('access-type'),
+                'connect_local'        : 'local' in d.getall('connect-type'),
+                'connect_internet'     : 'internet' in d.getall('connect-type'),
                 'bandwidth'            : d.get('bandwidth'),
                 'share_part'           : d.get('share-part'),
                 'floor'                : d.get('floor'),

views/wifi-form.tpl

@@ -124,6 +124,21 @@ pourraient-être intéressantes.
     </p>
     </div>
 
+    <div id="contrib-type-connect">
+    <h2>Me raccorder au réseau</h2>
+    <h3>J'aimerais pouvoir</h3>
+    <p class="checkbox"><label>
+      <input {{'checked' if data.get('connect-type') == 'local' else ''}}
+      type="checkbox" name="connect-type" value="local"/>
+      Proposer et utiliser des services en local avec les autres utilisateurs du réseau
+    </label></p>
+    <p class="checkbox"><label>
+      <input {{'checked' if data.get('connect-type') == 'internet' else ''}}
+         type="checkbox" name="connect-type" value="internet"/>
+      Avoir un accès à Internet
+    </label></p>
+    </div>
+
     <h2>Ma localisation</h2>
 
     <div class="row">