Add year filter (#39)

Author: JanisV

backend/app.py

@@ -59,8 +59,8 @@ def filelist():
 
 
 @app.get("/api/coins", dependencies=[Depends(get_api_key)])
-def coins(f, search=None, sort=None, reverse: bool = False, status_filter=None, country_filter=None, series_filter=None, type_filter=None,
-          period_filter=None, mint_filter=None):
+def coins(f, search=None, sort=None, reverse: bool = False, status_filter=None, country_filter=None, year_filter=None,
+          series_filter=None, type_filter=None, period_filter=None, mint_filter=None):
     file = f
     con = sqlite_connect(file)
     cur = con.cursor()
@@ -81,6 +81,9 @@ def coins(f, search=None, sort=None, reverse: bool = False, status_filter=None,
     if country_filter:
         sql_filters.append("country = ?")
         params.append(country_filter)
+    if year_filter:
+        sql_filters.append("year = ?")
+        params.append(year_filter)
     if series_filter:
         sql_filters.append("series = ?")
         params.append(series_filter)
@@ -144,7 +147,7 @@ def filters(f):
 
     result = {}
 
-    for field in ('status', 'country', 'series', 'type', 'period', 'mint',):
+    for field in ('status', 'country', 'year', 'series', 'type', 'period', 'mint',):
         res = cur.execute(f"SELECT DISTINCT IFNULL({field},'') FROM coins ORDER BY {field}")
         data = res.fetchall()
 

frontend/package-lock.json

@@ -76,7 +76,7 @@ const openFile = async (file, connection_type) => {
 
   await router.replace('/')
   collectionSettings.value = {};
-  collectionFilters.value = {'status': [], 'country': [], 'series': [], 'type': [], 'period': [], 'mint': []}
+  collectionFilters.value = {'status': [], 'country': [], 'year': [], 'series': [], 'type': [], 'period': [], 'mint': []}
   isOpened = true;
 
   let ret = null

frontend/src/App.vue

@@ -20,6 +20,7 @@ const sortedBy = ref(null)
 const reverseSort = ref(false)
 const selectedStatus = ref(null)
 const selectedCountry = ref(null)
+const selectedYear = ref(null)
 const selectedSeries = ref(null)
 const selectedType = ref(null)
 const selectedPeriod = ref(null)
@@ -61,11 +62,13 @@ const onOpenFile = async () => {
     });
   }
 
-  fields.value = ['title', 'year']
+  fields.value = ['title',]
   if (props.filters['status'].length > 1)
     fields.value.push('status')
   if (props.filters['country'].length > 1)
     fields.value.push('country')
+  if (props.filters['year'].length > 1)
+    fields.value.push('year')
   if (props.filters['series'].length > 1)
     fields.value.push('series')
   if (props.filters['type'].length > 1)
@@ -80,6 +83,7 @@ const clear = async () => {
   reverseSort.value = false
   selectedStatus.value = null
   selectedCountry.value = null
+  selectedYear.value = null
   selectedSeries.value = null
   selectedType.value = null
   selectedPeriod.value = null
@@ -119,6 +123,7 @@ const onChanged = async () => {
       reverseSort.value,
       selectedStatus.value,
       selectedCountry.value,
+      selectedYear.value,
       selectedSeries.value,
       selectedType.value,
       selectedPeriod.value,
@@ -142,6 +147,7 @@ const loadImage = async (coinId) => {
   <v-container>
     <FilterItem :filters="filters['status']" field="status" :settings="settings" @filter-changed="onChanged" v-model="selectedStatus" />
     <FilterItem :filters="filters['country']" field="country" :settings="settings" @filter-changed="onChanged" v-model="selectedCountry" />
+    <FilterItem :filters="filters['year']" field="year" :settings="settings" @filter-changed="onChanged" v-model="selectedYear" />
     <FilterItem :filters="filters['series']" field="series" :settings="settings" @filter-changed="onChanged" v-model="selectedSeries" />
     <FilterItem :filters="filters['type']" field="type" :settings="settings" @filter-changed="onChanged" v-model="selectedType" />
     <FilterItem :filters="filters['period']" field="period" :settings="settings" @filter-changed="onChanged" v-model="selectedPeriod" />

frontend/src/components/CoinListView.vue

@@ -255,6 +255,8 @@ export function useService(passwordDialogRef) {
     collectionFilters['status'] = (await executeQuery(sql_statuses)).flat()
     const sql_countries = "SELECT DISTINCT IFNULL(country,'') FROM coins ORDER BY country";
     collectionFilters['country'] = (await executeQuery(sql_countries)).flat()
+    const sql_years = "SELECT DISTINCT IFNULL(year,'') FROM coins ORDER BY year";
+    collectionFilters['year'] = (await executeQuery(sql_years)).flat()
     const sql_series = "SELECT DISTINCT IFNULL(series,'') FROM coins ORDER BY series";
     collectionFilters['series'] = (await executeQuery(sql_series)).flat()
     const sql_types = "SELECT DISTINCT IFNULL(type,'') FROM coins ORDER BY type";
@@ -268,14 +270,14 @@ export function useService(passwordDialogRef) {
   }
 
   const loadCoins = async (search=null, sortBy=null, reverse=false, statusFilter=null, countryFilter=null,
-                           seriesFilter=null, typeFilter=null, periodFilter=null, mintFilter=null) => {
+                           yearFilter=null, seriesFilter=null, typeFilter=null, periodFilter=null, mintFilter=null) => {
     if (connection_type === 'local')
-      return loadCoinsLocal(search, sortBy, reverse, statusFilter, countryFilter, seriesFilter, typeFilter, periodFilter, mintFilter);
+      return loadCoinsLocal(search, sortBy, reverse, statusFilter, countryFilter, yearFilter, seriesFilter, typeFilter, periodFilter, mintFilter);
     else if (connection_type === 'remote')
-      return loadCoinsRemote(search, sortBy, reverse, statusFilter, countryFilter, seriesFilter, typeFilter, periodFilter, mintFilter, connected_file);
+      return loadCoinsRemote(search, sortBy, reverse, statusFilter, countryFilter, yearFilter, seriesFilter, typeFilter, periodFilter, mintFilter, connected_file);
   }
 
-  const loadCoinsRemote = async (search, sortBy, reverse, statusFilter, countryFilter, seriesFilter, typeFilter, periodFilter, mintFilter, file) => {
+  const loadCoinsRemote = async (search, sortBy, reverse, statusFilter, countryFilter, yearFilter, seriesFilter, typeFilter, periodFilter, mintFilter, file) => {
     let coinsList = [];
 
     await globalStatus.startLoading(i18n.global.t('Load coins'));
@@ -288,6 +290,7 @@ export function useService(passwordDialogRef) {
           reverse: reverse,
           status_filter: statusFilter,
           country_filter: countryFilter,
+          year_filter: yearFilter,
           series_filter: seriesFilter,
           type_filter: typeFilter,
           period_filter: periodFilter,
@@ -305,7 +308,7 @@ export function useService(passwordDialogRef) {
     return coinsList;
   }
 
-  const loadCoinsLocal = async (search, sortBy, reverse, statusFilter, countryFilter, seriesFilter, typeFilter, periodFilter, mintFilter) => {
+  const loadCoinsLocal = async (search, sortBy, reverse, statusFilter, countryFilter, yearFilter, seriesFilter, typeFilter, periodFilter, mintFilter) => {
     let sql = `
         SELECT coins.id, title, status, subjectshort, value, unit, year, mintmark, series, country
         FROM coins
@@ -324,6 +327,10 @@ export function useService(passwordDialogRef) {
       sql_filters.push('country = ?')
       params.push(countryFilter);
     }
+    if (yearFilter) {
+      sql_filters.push('year = ?')
+      params.push(yearFilter);
+    }
     if (seriesFilter) {
       sql_filters.push('series = ?')
       params.push(seriesFilter);