chore(firm): separate firm name nr filters

messages/uniworx/utils/table_column/de-de-formal.msg

@@ -103,4 +103,5 @@ ActJobDelete: Job entfernen
 TableJobActDeleteFeedback n@Int m@Int: #{n}/#{m} Jobs entfernt
 TableFilterComma: Es können mehrere alternative Suchkriterien mit Komma getrennt angegeben werden, wovon mindestens eines erfüllt werden muss.
 TableFilterCommaPlus: Mehrere alternative Suchkriterien mit Komma trennen. Mindestens ein Suchkriterium muss erfüllt werden, zusätzlich zu allen Suchkriterien mit vorangestelltem Plus-Symbol.
+TableFilterCommaName: Mehrere Namen mit Komma trennen.
 TableFilterCommaNameNr: Mehrere Namen oder Nummern mit Komma trennen. Nummern werden nur exakt gesucht.

messages/uniworx/utils/table_column/en-eu.msg

@@ -103,4 +103,5 @@ ActJobDelete: Delete job
 TableJobActDeleteFeedback n@Int m@Int: #{n}/#{m} queued jobs deleted
 TableFilterComma: Separate multiple alternative filter criteria by comma, at least one of which must be fulfilled.
 TableFilterCommaPlus: Separate multiple alternative filter criteria by comma, at least one of which must be fulfilled in addition to all criteria preceded by a plus symbol.
+TableFilterCommaName: Separate names by comma.
 TableFilterCommaNameNr: Separate names and numbers by comma. Numbers have to match exact.

src/Database/Esqueleto/Utils.hs

@@ -287,14 +287,14 @@ mkExactFilterWith cast lenslike row criterias
 
 -- | like `mkExactFilterWith` but splits comma separared Texts into multiple criteria
 mkExactFilterWithComma :: (PersistField b)
-  => (Text -> b)                   -- ^ type conversion
+  => (Text -> Maybe b)                   -- ^ type conversion
   -> (t -> E.SqlExpr (E.Value b))  -- ^ getter from query to searched element
   -> t                             -- ^ query row
   -> Set.Set Text                  -- ^ needle collection
   -> E.SqlExpr (E.Value Bool)
 mkExactFilterWithComma cast lenslike row (foldMap commaSeparatedText -> criterias)
   | Set.null criterias = true
-  | otherwise = lenslike row `E.in_` E.valList (cast <$> Set.toList criterias)
+  | otherwise = lenslike row `E.in_` E.valList (mapMaybe cast $ Set.toList criterias)
 
 -- | generic filter creation for dbTable
 --   Given a lens-like function, make filter for exact matches against last element of a collection

src/Handler/Firm.hs

@@ -293,7 +293,8 @@ mkFirmAllTable isAdmin uid = do
           ]
         dbtFilter = mconcat
           [ single $ fltrCompanyNameNr queryAllCompany
-          , single ("is-supervisor", FilterColumn . E.mkExistsFilter $ \row (criterion :: Text) -> do              
+          , single ("company-number", FilterColumn $ E.mkExactFilterWithComma readMay (queryAllCompany >>> (E.^. CompanyAvsId)))
+          , single ("is-supervisor" , FilterColumn . E.mkExistsFilter $ \row (criterion :: Text) -> do
               (usr :& usrCmp) <- E.from $ E.table @User
                 `E.innerJoin` E.table @UserCompany
                 `E.on` (\(usr :& usrCmp) -> usr E.^. UserId E.==. usrCmp E.^. UserCompanyUser)              
@@ -305,8 +306,9 @@ mkFirmAllTable isAdmin uid = do
             )
           ]
         dbtFilterUI mPrev = mconcat        
-          [ fltrCompanyNameNrUI mPrev
+          [ fltrCompanyNameUI mPrev
-          , prismAForm (singletonFilter "is-supervisor") mPrev $ aopt textField (fslI MsgTableSupervisor)
+          , prismAForm (singletonFilter "company-number") mPrev $ aopt textField (fslI MsgTableCompanyNo)
+          , prismAForm (singletonFilter "is-supervisor")  mPrev $ aopt textField (fslI MsgTableSupervisor)
           ]
         dbtStyle =  def { dbsFilterLayout = defaultDBSFilterLayout }
         acts :: Map FirmAllAction (AForm Handler FirmAllActionData)

src/Handler/Utils/Table/Columns.hs

@@ -753,16 +753,25 @@ sortUserCompany queryUser = ( "user-company"
                 return (comp E.^. CompanyName)
             ))
 
--- | Search companies by name, shorthand oder AVS nr
+-- | Search companies by name or shorthand
--- fltrCompanyNameNr :: (IsFilterColumn t (a -> Set Text -> E.SqlExpr (E.Value Bool)), IsString d)
+fltrCompanyName :: (IsFilterColumn t (a -> Set Text -> E.SqlExpr (E.Value Bool)), IsString d)
---    => (a -> E.SqlExpr (Entity Company))
+   => (a -> E.SqlExpr (Entity Company))
---    -> (d, FilterColumn t fs)
+   -> (d, FilterColumn t fs)
--- fltrCompanyNameNr query = ( "company-name-number", FilterColumn $ anyFilter
+fltrCompanyName query = ( "company-name", FilterColumn $ anyFilter
---     [ mkContainsFilterWithComma CI.mk $ query >>> (E.^. CompanyName)
+    [ mkContainsFilterWithComma CI.mk $ query >>> (E.^. CompanyName)
---     , mkContainsFilterWithComma CI.mk $ query >>> (E.^. CompanyShorthand)
+    , mkContainsFilterWithComma CI.mk $ query >>> (E.^. CompanyShorthand)
---     , mkExactFilterWithComma    id    $ query >>> (E.num2text . (E.^. CompanyAvsId))
+    -- , mkExactFilterWithComma    id    $ query >>> (E.num2text . (E.^. CompanyAvsId))
---     ]
+    ]
---   )
+  )
+
+fltrCompanyNameUI :: Maybe (Map FilterKey [Text]) -> AForm (YesodDB UniWorX) (Map FilterKey [Text])
+fltrCompanyNameUI = fltrCompanyNameNrHdrUI MsgTableCompany
+
+fltrCompanyNameHdrUI :: (RenderMessage UniWorX msg) => msg -> Maybe (Map FilterKey [Text]) -> AForm (YesodDB UniWorX) (Map FilterKey [Text])
+fltrCompanyNameHdrUI msg mPrev =
+  prismAForm (singletonFilter "company-name") mPrev $ aopt textField (fslI msg & setTooltip MsgTableFilterCommaNameNr)
+
+
 
 fltrCompanyNameNr :: (IsFilterColumn t (a -> Set Text -> E.SqlExpr (E.Value Bool)), IsString d)
    => (a -> E.SqlExpr (Entity Company))

templates/i18n/firm-all/de-de-formal.hamlet

@@ -8,8 +8,8 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
 
 
   <p>
-    Die Daten der Firmen wurden aus dem Ausweisverwaltungssystem (AVS) der Fraport AG
+    Die Daten der Firmen wurden aus dem Ausweisverwaltungssystem (AVS) der Fraport AG #
-    importiert und werden regelmäßig aktualisiert, 
+    importiert und werden regelmäßig aktualisiert, #
     wenn Fahrlizenzinhaber oder deren Verwalter über das AVS einer Firma zugeordnet wurden.
   <p>
     ^{firmTable}