Merge branch 'master' of git.wmi.amu.edu.pl:s470611/Systemy-rozmyte-sql

backend/cars/fuzzy_logic.py

@@ -79,5 +79,5 @@ def get_fuzzy_response(request_params, objects_list):
             )
         if comparator and min(comparator) > settings.COMPARATOR:
             end_object_list.append(car)
-
+            
     return end_object_list

frontend/src/components/Settings.vue

@@ -22,8 +22,8 @@ export default {
       production_year: {
         label: "Rok produkcji",
         items: [
-          { label: "Dawno", value: "1960,1960,2001" },
+          { label: "Dawno", value: "2000,2000,2009" },
-          { label: "Średnio", value: "1960,2001,2022" },
+          { label: "Średnio", value: "2009,2012,2022" },
           { label: "Niedawno", value: "2017,2022,2022" },
         ],
       },

frontend/src/components/Table.vue

@@ -1,54 +1,58 @@
 <template>
-    <v-container>
+  <v-container>
-        <v-row>
+    <v-row>
-            <v-col md="12">
+      <v-col md="12">
-                <v-data-table :headers="headers" :items="getCars" class="elevation-1"></v-data-table>
+        <v-data-table
-            </v-col>
+          :headers="headers"
-        </v-row>
+          :items="getCars"
-    </v-container>
+          class="elevation-1"
+        ></v-data-table>
+      </v-col>
+    </v-row>
+  </v-container>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 export default {
-    name: "Table",
+  name: "Table",
 
-    data: () => ({
+  data: () => ({
-        headers: [
+    headers: [
-            { text: "Marka", value: "mark" },
+      { text: "Marka", value: "mark" },
-            { text: "Model", value: "model" },
+      { text: "Model", value: "model" },
-            { text: "Przebieg (km)", value: "mileage" },
+      { text: "Przebieg (km)", value: "mileage" },
-            { text: "Rok produkcji", value: "production_year" },
+      { text: "Rok produkcji", value: "production_year" },
-            { text: "Pojemnośc silnika (cm^3)", value: "engine_capacity" },
+      { text: "Pojemnośc silnika (cm^3)", value: "engine_capacity" },
-            { text: "Spalanie (L/100km)", value: "combustion" },
+      { text: "Spalanie (L/100km)", value: "combustion" },
-            { text: "Cena (zł)", value: "price" },
+      { text: "Cena (USD)", value: "price" },
-        ],
+    ],
-        items: [{
+    items: [
-                brand: "Ford",
+      {
-                model: "Focus",
+        brand: "Ford",
-                mileage: 230000,
+        model: "Focus",
-                production_year: 2008,
+        mileage: 230000,
-                engine_capacity: 2.0,
+        production_year: 2008,
-                combustion: 7.6,
+        engine_capacity: 2.0,
-                price: 12200,
+        combustion: 7.6,
-            },
+        price: 12200,
-            {
+      },
-                brand: "Fiat",
+      {
-                model: "Punto",
+        brand: "Fiat",
-                mileage: 430000,
+        model: "Punto",
-                production_year: 2003,
+        mileage: 430000,
-                engine_capacity: 1.3,
+        production_year: 2003,
-                combustion: 5.5,
+        engine_capacity: 1.3,
-                price: 3500,
+        combustion: 5.5,
-            },
+        price: 3500,
-        ],
+      },
-    }),
+    ],
-    computed: {
+  }),
-        ...mapGetters(['getCars'])
+  computed: {
-    }
+    ...mapGetters(["getCars"]),
+  },
 };
 </script>
 
 <style scoped>
-
 </style>