Afficher Ville, Code postal et Région avant confirmation d'un match (h…

…ostolab#662)

* Add city & zipcode columns

* Add city & zipcode display

app/models/vaccination_center.rb

@@ -113,6 +113,13 @@ def build_campaign_smart_defaults
     end
   end
 
+  def human_friendly_geo_area
+    if zipcode && city && geo_context
+      region = geo_context.split(",")[-1]
+      "#{city}, #{region} (#{zipcode})"
+    end
+  end
+
   private
 
   def approximated_lat_lon

app/views/matches/_match_details.html.erb

@@ -12,8 +12,10 @@
     <% else %>
       <strong> Distance du centre de vaccination </strong>
       <p>
-        <% distance = distance_delta({ lat: user.lat, lon: user.lon}, { lat: vaccination_center.lat, lon: vaccination_center.lon }) %>
-        <%= distance[:delta_in_words] %>
+        À
+        <% distance = distance_delta({lat: user.lat, lon: user.lon}, {lat: vaccination_center.lat, lon: vaccination_center.lon}) %>
+        <%= distance[:delta_in_words] %> de
+        vous<%= ", à #{vaccination_center.human_friendly_geo_area}" if vaccination_center.human_friendly_geo_area %>
       </p>
     <% end %>
   </div>

app/views/matches/show.html.erb

@@ -1,17 +1,19 @@
-<div class="row">
-  <div class="col-sm-12 col-md-8 col-lg-8">
-    <div class="text-left mt-4">
-      <% if @match.confirmed? %>
-        <%= render 'confirmed', match: @match %>
-      <% elsif @match.refused? %>
-        <%= render 'refused', match: @match %>
-      <% elsif @match.expired? %>
-        <%= render 'expired', match: @match %>
-      <% elsif !@match.confirmable? %>
-        <%= render 'overbooked', match: @match %>
-      <% elsif !@match.expired? %>
-        <%= render 'pending', match: @match %>
-      <% end %>
+<div class="container">
+  <div class="row">
+    <div class="col-sm-12 col-md-8 col-lg-8">
+      <div class="text-left mt-4">
+        <% if @match.confirmed? %>
+          <%= render 'confirmed', match: @match %>
+        <% elsif @match.refused? %>
+          <%= render 'refused', match: @match %>
+        <% elsif @match.expired? %>
+          <%= render 'expired', match: @match %>
+        <% elsif !@match.confirmable? %>
+          <%= render 'overbooked', match: @match %>
+        <% elsif !@match.expired? %>
+          <%= render 'pending', match: @match %>
+        <% end %>
+      </div>
     </div>
   </div>
 </div>

db/migrate/20210429122735_add_city_zipcode_to_vaccination_centers.rb

@@ -0,0 +1,13 @@
+class AddCityZipcodeToVaccinationCenters < ActiveRecord::Migration[6.1]
+  def change
+    add_column :vaccination_centers, :zipcode, :string
+    add_column :vaccination_centers, :city, :string
+    add_column :vaccination_centers, :geo_citycode, :string
+    add_column :vaccination_centers, :geo_context, :string
+
+    add_index :vaccination_centers, :zipcode
+    add_index :vaccination_centers, :city
+    add_index :vaccination_centers, :geo_citycode
+    add_index :vaccination_centers, :geo_context
+  end
+end