Add SIG filter w/ SOTA and POTA

-Also at FT4 to mode filters

Author: cwhelchel

src/@types/ContextTypes.d.ts

@@ -21,6 +21,7 @@ export interface ContextData {
     errorSeverity: string;
     themeMode: string;
     onlyNewFilter: boolean;
+    sigFilter: string;
     otherOperators: string;
 }
 

src/api.py

@@ -343,6 +343,15 @@ def set_only_new_filter(self, filter_only_new: bool):
         logging.debug(f"api setting ATNO filter to: {filter_only_new}")
         self.db.set_only_new_filter(filter_only_new)
 
+    def set_sig_filter(self, sig_filter: str):
+        '''
+        Set the Special Interest Group (sig) filter.
+
+        :param string sig_filter: only POTA or SOTA
+        '''
+        logging.debug(f"api setting SIG filter to: {sig_filter}")
+        self.db.set_sig_filter(sig_filter)
+
     def update_activator_stats(self, callsign: str) -> int:
         j = self.pota.get_activator_stats(callsign)
 

src/components/AppContext.tsx

@@ -24,7 +24,8 @@ const defData: ContextData = {
     themeMode: 'dark',
     onlyNewFilter: false,
     otherOperators: '',
-    summit: null
+    summit: null,
+    sigFilter: ''
 };
 
 export const AppContext = React.createContext<AppContextType | null>(null);
@@ -50,7 +51,8 @@ export const AppContextProvider = ( {children}: any ) => {
             themeMode: ctx.themeMode,
             onlyNewFilter: ctx.onlyNewFilter,
             otherOperators: ctx.otherOperators,
-            summit: ctx.summit
+            summit: ctx.summit,
+            sigFilter: ctx.sigFilter
         }
         setContextData(newContext);
     };

src/components/FilterBar/FilterBar.tsx

@@ -23,6 +23,7 @@ export const FilterBar = (props: IFilterBarPros) => {
     const [band, setBand] = React.useState('');
     const [region, setRegion] = React.useState('');
     const [location, setLocation] = React.useState('');
+    const [sig, setSig] = React.useState('');
     const [qrt, setQrt] = React.useState(true);
     const [hunted, setHunted] = React.useState(false);
     const [onlyNew, setOnlyNew] = React.useState(false);
@@ -53,6 +54,9 @@ export const FilterBar = (props: IFilterBarPros) => {
             setHuntedFilter((hf === "true"));
             let on = window.localStorage.getItem("ATNO_FILTER");
             setOnlyNewFilter((on === "true"));
+
+            let sf = window.localStorage.getItem("SIG_FILTER") || '';
+            setSigFilter(sf);
         };
     }, []);
 
@@ -81,6 +85,12 @@ export const FilterBar = (props: IFilterBarPros) => {
         window.localStorage.setItem("LOCATION_FILTER", l);
     }
 
+    const handleSigChange = (event: SelectChangeEvent) => {
+        let sig = event.target.value as string;
+        setSigFilter(sig);
+        window.localStorage.setItem("SIG_FILTER", sig);
+    }
+
     const handleClear = () => {
         setMode("");
         setBand("0");
@@ -93,11 +103,13 @@ export const FilterBar = (props: IFilterBarPros) => {
         window.pywebview.api.set_qrt_filter(true);
         window.pywebview.api.set_hunted_filter(false);
         window.pywebview.api.set_only_new_filter(false);
+        window.pywebview.api.set_sig_filter("");
         setRegion("");
         setLocation("");
         setQrt(true);
         setHunted(false);
         setOnlyNew(false);
+        setSig("");
 
         window.localStorage.setItem("BAND_FILTER", '0');
         window.localStorage.setItem("REGION_FILTER", '');
@@ -106,7 +118,7 @@ export const FilterBar = (props: IFilterBarPros) => {
         window.localStorage.setItem("QRT_FILTER", 'true');
         window.localStorage.setItem("HUNTED_FILTER", 'false');
         window.localStorage.setItem("ATNO_FILTER", 'false');
-        
+
         const next = {
             ...contextData,
             bandFilter: 0,
@@ -200,6 +212,16 @@ export const FilterBar = (props: IFilterBarPros) => {
         setLocation(l);
     }
 
+    function setSigFilter(sig: string) {
+        console.log("changing sig filt to: " + sig);
+        window.pywebview.api.set_sig_filter(sig);
+
+        let next = { ...contextData, locationFilter: sig };
+        setData(next);
+        setSig(sig);
+    }
+
+
     const StyledTypoGraphy = styled(Typography)(({ theme }) =>
         theme.unstable_sx({
             fontSize: {
@@ -277,6 +299,7 @@ export const FilterBar = (props: IFilterBarPros) => {
                         <MenuItem value='CW'>CW</MenuItem>
                         <MenuItem value='SSB'>SSB</MenuItem>
                         <MenuItem value='FT8'>FT8</MenuItem>
+                        <MenuItem value='FT4'>FT4</MenuItem>
                     </Select>
                 </FormControl>
                 <FormControl size='small'>
@@ -315,6 +338,21 @@ export const FilterBar = (props: IFilterBarPros) => {
                         ))}
                     </Select>
                 </FormControl>
+                <FormControl size='small'>
+                    <StyledInputLabel id="sig-lbl">SIG</StyledInputLabel>
+                    <Select
+                        labelId="sig-lbl"
+                        id="sig"
+                        value={sig}
+                        variant='standard'
+                        sx={{ minWidth: 100 }}
+                        onChange={handleSigChange}
+                    >
+                        <MenuItem value=""><em>None</em></MenuItem>
+                        <MenuItem value='POTA'>POTA</MenuItem>
+                        <MenuItem value='SOTA'>SOTA</MenuItem>
+                    </Select>
+                </FormControl>
                 <Button onClick={handleClear} variant="outlined"
                     sx={{ maxWidth: 100 }}>
                     Clear

src/db/db.py

@@ -193,8 +193,8 @@ def update_all_spots(self, spots_json, sota_spots):
                     to_add.is_qrt = True
 
         for sota in sota_spots:
-            # the sota spots are returned in a descending spot time order. where
-            # the first spot is the newest. 
+            # the sota spots are returned in a descending spot time order.
+            # where the first spot is the newest.
             sota_to_add = Spot()
             sota_to_add.init_from_sota(sota)
 
@@ -314,7 +314,7 @@ def build_qso_from_spot(self, spot_id: int) -> Qso:
         if (s.spot_source == 'POTA'):
             a = self.get_activator(s.activator)
             name = a.name if a is not None else ""
-        elif s.spot_source == 'SOTA' :
+        elif s.spot_source == 'SOTA':
             name = s.name
             if s.grid4 == '':
                 sota_api = SotaApi()
@@ -353,13 +353,17 @@ def set_only_new_filter(self, is_on: bool):
         logging.debug(f"db setting ATNO filter to {is_on}")
         self.only_new_on = is_on
 
+    def set_sig_filter(self, sig: str):
+        self.sig_filter = sig
+
     def _get_all_filters(self) -> list[sa.ColumnElement[bool]]:
         return self._get_band_filters() + \
             self._get_region_filters() + \
             self._get_location_filters() + \
             self._get_qrt_filter() + \
             self._get_hunted_filter() + \
-            self._get_only_new_filter()
+            self._get_only_new_filter() + \
+            self._get_sig_filter()
 
     def _get_band_filters(self) -> list[sa.ColumnElement[bool]]:
         band = Bands(self.band_filter)  # not sure why cast is needed
@@ -403,3 +407,10 @@ def _get_only_new_filter(self) -> list[sa.ColumnElement[bool]]:
             return [Spot.park_hunts == 0]  # noqa E712
         terms = []
         return terms
+
+    def _get_sig_filter(self) -> list[sa.ColumnElement[bool]]:
+        sig = self.sig_filter
+        if (sig is None or sig == ''):
+            return []
+        terms = [Spot.spot_source == sig]
+        return terms