Merge pull request #312 from FranckKe/tp-shore_length_meters

Shore length in meters
FranckKe · Feb 22, 2020 · 3341db0 · 3341db0
2 parents 1abe484 + 7aaab28
commit 3341db0
Show file tree

Hide file tree

Showing 18 changed files with 162 additions and 96 deletions.
diff --git a/app/models/report.rb b/app/models/report.rb
@@ -36,10 +36,10 @@ class Report < ApplicationRecord
   belongs_to :tracer
   belongs_to :user, optional: true
 
-  validates :tracer_id, :name, :latitude, :longitude, :reported_at, :quantity, :shore_length, presence: true
+  validates :tracer_id, :name, :latitude, :longitude, :reported_at, :quantity, presence: true
   validates :photo, attached: true,
                     content_type: ['image/png', 'image/jpeg', 'image/tiff', 'image/webp'],
                     if: -> { !self.user&.senior && self.status != 'accepted' }
-  validates :shore_length, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 10 }
-  validates :quantity, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 500 }
+  validates :quantity, numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 1000 }
+  validates :shore_length, numericality: { greater_than_or_equal_to: 100, less_than_or_equal_to: 15000 }
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -37,7 +37,7 @@ en:
         reported_at: Reported at
         tracer: Tracer
         quantity: Quantity
-        shore_length: Shore kilometers
+        shore_length: Shore meters
         date: Date of report
         status: Status
       user:

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -37,7 +37,7 @@ es:
         reported_at: Informado a
         tracer: Localizador
         quantity: Cantidad
-        shore_length: kilómetro costero
+        shore_length: Metro costero
         date: Fecha del informe
         status: Status
       user:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -37,7 +37,7 @@ fr:
         reported_at: Signalé le
         tracer: Traceur
         quantity: Quantité
-        shore_length: Kilomètre de rivages
+        shore_length: Mètre de rivages
         date: Date du signalement
         status: Statut
       user:

diff --git a/frontend/src/components/TracerCard.vue b/frontend/src/components/TracerCard.vue
@@ -20,17 +20,17 @@
         </p>
         <p>
           <strong>{{ $t('created_at') }}:</strong>
-          <time datetime="tracer.created_at | formatDate">
-            {{ tracer.created_at | formatDate }}</time
-          >
+          <time datetime="tracer.created_at | formatDate">{{
+            tracer.created_at | formatDate
+          }}</time>
         </p>
         <p>
           <strong>{{ $t('quantity') }}:</strong>
           {{ getReportCount()(tracer.id) }}
         </p>
         <p>
-          <strong>{{ $t('quantity_by_km') }}:</strong>
-          {{ $n(getQuantitybyShoreLength()(tracer.id)) }}/km
+          <strong>{{ $t('distance_between_tracers') }}:</strong>
+          {{ $n(getReportsEveryKilometers()(tracer.id)) }} km
         </p>
       </div>
     </div>
@@ -51,7 +51,7 @@ export default {
   },
   computed: {},
   methods: {
-    ...reportsModule.mapGetters(['getReportCount', 'getQuantitybyShoreLength'])
+    ...reportsModule.mapGetters(['getReportCount', 'getReportsEveryKilometers'])
   }
 }
 </script>
@@ -79,23 +79,23 @@ export default {
     "created_at": "Created at",
     "origin": "Origin",
     "quantity": "Reported quantity",
-    "quantity_by_km": "Quantity by km",
+    "distance_between_tracers": "Distance between tracers",
     "name": "Name",
     "kind": "Type"
   },
   "fr": {
     "created_at": "Créé le",
     "origin": "Origine",
     "quantity": "Quantité signalée",
-    "quantity_by_km": "Quantité par km",
+    "distance_between_tracers": "Distance entre traceurs",
     "name": "Nom",
     "kind": "Type"
   },
   "es": {
     "created_at": "Creado en",
     "origin": "Origen",
     "quantity": "Cantidad testificada",
-    "quantity_by_km": "Cantidad por km",
+    "distance_between_tracers": "Distancia entre trazadores",
     "name": "Apellido",
     "kind": "Tipo"
   }

diff --git a/frontend/src/components/TracersGrid.vue b/frontend/src/components/TracersGrid.vue
@@ -14,7 +14,11 @@
         }})
       </button>
     </div>
-    <div v-for="(category, idt) in getCategories()" :key="idt" class="tracers-grid-wrapper">
+    <div
+      v-for="(category, idt) in getCategories()"
+      :key="idt"
+      class="tracers-grid-wrapper"
+    >
       <h2 class="category-title title is-2">{{ $t(category) }}</h2>
       <div class="tracers-grid columns is-multiline is-mobile">
         <div
@@ -72,7 +76,7 @@ export default {
           type: 'num',
           order: 'asc'
         },
-        shore_length: {
+        distance_between_tracers: {
           active: false,
           type: 'num',
           order: 'asc'
@@ -97,7 +101,10 @@ export default {
   },
   methods: {
     ...mapGetters(['getTracers', 'getCategories']),
-    ...reportsModule.mapGetters(['getReportCount', 'getQuantitybyShoreLength']),
+    ...reportsModule.mapGetters([
+      'getReportCount',
+      'getReportsEveryKilometers'
+    ]),
     sortTracersBy: function(field, order) {
       if (order == null) {
         order = this.sortFields[field].order
@@ -127,16 +134,16 @@ export default {
         })
       }
 
-      if (field === 'shore_length') {
+      if (field === 'distance_between_tracers') {
         this.sortedTracers.sort((a, b) => {
           if (
-            this.getQuantitybyShoreLength()(a.id) <
-            this.getQuantitybyShoreLength()(b.id)
+            this.getReportsEveryKilometers()(a.id) <
+            this.getReportsEveryKilometers()(b.id)
           ) {
             return 0 - modifier
           } else if (
-            this.getQuantitybyShoreLength()(a.id) >
-            this.getQuantitybyShoreLength()(b.id)
+            this.getReportsEveryKilometers()(a.id) >
+            this.getReportsEveryKilometers()(b.id)
           ) {
             return modifier
           } else {
@@ -189,7 +196,7 @@ export default {
     "created_at": "Created at",
     "origin": "Origin",
     "quantity": "Reported quantity",
-    "shore_length": "Quantity by km",
+    "distance_between_tracers": "Distance between tracers",
     "name": "Name",
     "research": "Research",
     "drift": "Drift",
@@ -204,7 +211,7 @@ export default {
     "created_at": "Créé le",
     "origin": "Origine",
     "quantity": "Quantité signalée",
-    "shore_length": "Quantité par km",
+    "distance_between_tracers": "Distance entre traceurs",
     "name": "Nom",
     "research": "Recherche",
     "drift": "Dérive",
@@ -219,7 +226,7 @@ export default {
     "created_at": "Creado en",
     "origin": "Origen",
     "quantity": "Cantidad testificada",
-    "shore_length": "Cantidad por km",
+    "distance_between_tracers": "Distancia entre trazadores",
     "name": "Apellido",
     "research": "Búsqueda",
     "drift": "Dériva",

diff --git a/frontend/src/components/TracersList.vue b/frontend/src/components/TracersList.vue
@@ -53,13 +53,16 @@
           >{{ getReportCount()(props.row.id) }}</b-table-column
         >
         <b-table-column
-          field="quantity_by_km"
-          v-bind:label="$t('quantity_by_km')"
+          field="distance_between_tracers"
+          v-bind:label="$t('distance_between_tracers')"
           sortable
           width="100"
           centered
           :custom-sort="sortByQuantityPerKm"
-          >{{ $n(getQuantitybyShoreLength()(props.row.id)) }}</b-table-column
+          >{{
+            $n(getReportsEveryKilometers()(props.row.id))
+          }}
+          km</b-table-column
         >
       </template>
       <template slot="detail" slot-scope="props">
@@ -111,16 +114,19 @@ export default {
   methods: {
     ...mapMutations(['setPerPage']),
     ...mapGetters(['getPerPage']),
-    ...reportsModule.mapGetters(['getReportCount', 'getQuantitybyShoreLength']),
+    ...reportsModule.mapGetters([
+      'getReportCount',
+      'getReportsEveryKilometers'
+    ]),
     sortByReportedQuantity: function(tracerA, tracerB, isAsc) {
       const reportCountA = this.getReportCount()(tracerA.id)
       const reportCountB = this.getReportCount()(tracerB.id)
 
       return isAsc ? reportCountA - reportCountB : reportCountB - reportCountA
     },
     sortByQuantityPerKm: function(tracerA, tracerB, isAsc) {
-      const reportCountPerKmA = this.getQuantitybyShoreLength()(tracerA.id)
-      const reportCountPerKmB = this.getQuantitybyShoreLength()(tracerB.id)
+      const reportCountPerKmA = this.getReportsEveryKilometers()(tracerA.id)
+      const reportCountPerKmB = this.getReportsEveryKilometers()(tracerB.id)
 
       return isAsc
         ? reportCountPerKmA - reportCountPerKmB
@@ -168,7 +174,7 @@ export default {
     "origin": "Origin",
     "per_page": "per page",
     "reported_quantity": "Reported quantity",
-    "quantity_by_km": "Quantity by km",
+    "distance_between_tracers": "Distance between tracers",
     "research": "Research",
     "drift": "Drift",
     "container": "Container",
@@ -183,7 +189,7 @@ export default {
     "origin": "Origine",
     "per_page": "par page",
     "reported_quantity": "Quantité signalée",
-    "quantity_by_km": "Quantité par km",
+    "distance_between_tracers": "Distance entre traceurs",
     "research": "Recherche",
     "drift": "Dérive",
     "container": "Conteneur",
@@ -198,7 +204,7 @@ export default {
     "origin": "Origen",
     "per_page": "por página",
     "reported_quantity": "Cantidad testificada",
-    "quantity_by_km": "Cantidad por km",
+    "distance_between_tracers": "Distancia entre trazadores",
     "research": "Búsqueda",
     "drift": "Dériva",
     "container": "Envase",

diff --git a/frontend/src/components/tools/AddReport.vue b/frontend/src/components/tools/AddReport.vue
@@ -268,11 +268,11 @@
                           v-model="shoreLengths[index]"
                           name="shoreLength"
                           type="number"
-                          step="1"
-                          min="1"
-                          max="10"
+                          step="0.1"
+                          min="0.1"
+                          max="15"
                           :data-vv-as="$t('shore_length')"
-                          v-validate="'required|min_value:1|max_value:10'"
+                          v-validate="'required|min_value:0.1|max_value:15'"
                         ></b-input>
                         <p class="shore-length-unit">km</p>
                       </div>
@@ -319,7 +319,7 @@
                       areSomeReportsSubmitted
                   "
                 >
-                  {{ $t('add') }}
+                  <font-awesome-icon icon="plus" /> {{ $t('add_tracer') }}
                 </a>
               </b-field>
               <b-message
@@ -551,6 +551,7 @@ export default {
           console.warn(e)
         }
       }
+
       const postDataJson = {
         name: this.$auth.check() ? this.$auth.user().name : this.username,
         address: this.address,
@@ -559,9 +560,10 @@ export default {
         reported_at: String(moment(this.reportDate).format('YYYY-MM-DD')),
         tracer_id: (this.selectedTracers[index] || {}).id,
         quantity: this.quantities[index],
-        shore_length: this.shoreLengths[index],
+        shore_length: this.shoreLengths[index] * 1000,
         description: this.description
       }
+
       if (file64 != null) postDataJson.photo = file64
 
       return this.$http({
@@ -783,6 +785,10 @@ export default {
   margin-top: 0;
 }
 
+.add-tracer-input svg {
+  margin-right: 10px;
+}
+
 .close-icon {
   align-self: flex-end;
 }
@@ -835,19 +841,19 @@ export default {
 }
 
 .quantity-field {
-  width: 66px;
+  width: 60px;
 }
 
 .shore-length-field {
-  width: 100px;
+  width: auto;
 
   .label {
     height: 1.5rem;
   }
 
   .control,
   input {
-    width: 50px;
+    width: 66px;
   }
 
   .shore-length-unit-wrapper {
@@ -960,7 +966,7 @@ export default {
 {
   "en": {
     "report_verb": "Report",
-    "add": "Add a tracer",
+    "add_tracer": "Add a tracer",
     "add_report": "Report a waste",
     "address": "Address",
     "cancel_report": "Close reporting",
@@ -976,9 +982,9 @@ export default {
     "optional": "optional",
     "previous": "Previous",
     "quantity": "Quantity",
-    "shore_length": "Shore kilometers",
+    "shore_length": "Shore meters",
     "shore_length_on": "on",
-    "shore_length_tooltip": "Collection's kilometers of shore",
+    "shore_length_tooltip": "Collection's meters of shore",
     "report_date": "Date of report",
     "report_review": "Thank you for your report. It will soon be reviewed by an administrator",
     "report": "Report",
@@ -995,7 +1001,7 @@ export default {
   },
   "fr": {
     "report_verb": "Signaler",
-    "add": "Ajouter un traceur",
+    "add_tracer": "Ajouter un traceur",
     "add_report": "Signaler un déchet",
     "address": "Adresse",
     "cancel_report": "Fermer l'ajout de signalement",
@@ -1011,9 +1017,9 @@ export default {
     "optional": "optionnel",
     "previous": "Précédent",
     "quantity": "Quantité",
-    "shore_length": "Kilomètres de rivage",
+    "shore_length": "mètres de rivage",
     "shore_length_on": "sur",
-    "shore_length_tooltip": "Kilomètre de rivage du ramassage",
+    "shore_length_tooltip": "Mètre de rivage du ramassage",
     "report_date": "Date de signalement",
     "report_review": "Merci pour votre signalement. Une validation va bientôt être effectuée.",
     "report": "Signalement",
@@ -1030,7 +1036,7 @@ export default {
   },
   "es": {
     "report_verb": "Informe",
-    "add": "Añadir un trazador",
+    "add_tracer": "Añadir un trazador",
     "add_report": "Reportar un desperdicio",
     "address": "Dirección",
     "cancel_report": "Cerrar agrega testimonio",
@@ -1048,7 +1054,7 @@ export default {
     "quantity": "Cantidad",
     "shore_length": "Kilómetros de la costa",
     "shore_length_on": "en",
-    "shore_length_tooltip": "Recogida en la costa kilómetro",
+    "shore_length_tooltip": "Recogida en la costa metro",
     "report_date": "Fecha de reporte",
     "report_review": "Gracias por su testimonio. Uno administrador revisado soon",
     "report": "Testimonio",