chore(firm): filter associates by valid qualficiations

towards #157

messages/uniworx/categories/firm/de-de-formal.msg

@@ -49,6 +49,7 @@ FilterSupervisorForeign fsh@CompanyShorthand: Hat aktiven Ansprechpartner, der s
 FilterForeignSupervisor: Hat firmenfremde Ansprechpartner
 FilterFirmExtern: Externe Firma
 FilterFirmPrimary: Ist primäre Firma in FRADrive
+FilterHasQualification: Hat Firmenangehörige mit aktuell gültiger Qualifikation
 FirmSupervisorOf fsh@CompanyShorthand: Ansprechpartner #{fsh} angehörig
 FirmSupervisorIndependent: Ansprechpartner ohne jegliche Firmenzugehörigkeit
 FirmEmployeeOf fsh@CompanyShorthand: Firmenangehörige #{fsh}

messages/uniworx/categories/firm/en-eu.msg

@@ -49,6 +49,7 @@ FilterSupervisorForeign fsh: Has active supervisor not belonging to #{fsh}
 FilterForeignSupervisor: Has company-external supervisors
 FilterFirmExtern: External company
 FilterFirmPrimary: Is primary company in FRADrive
+FilterHasQualification: Has company associates with currently valid qualification
 FirmSupervisorOf fsh@CompanyShorthand: Supervisors belonging to #{fsh}
 FirmSupervisorIndependent: Independent supervisors
 FirmEmployeeOf fsh@CompanyShorthand: #{fsh} associated users

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

@@ -73,6 +73,7 @@ TableDiffDaysTooltip: Zeitspanne nach ISO 8601. Beispiel: "P2Y3M4D" ist eine Zei
 TableExamOfficeLabel: Label-Name
 TableExamOfficeLabelStatus: Label-Farbe
 TableExamOfficeLabelPriority: Label-Priorität
+TableQualification: Qualifikation
 TableQualifications: Qualifikationen
 TableCompany: Firma
 TableCompanyFilter: Firma oder Nummer

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

@@ -73,6 +73,7 @@ TableDiffDaysTooltip: Duration given according to ISO 8601. Example: "P2Y3M4D" i
 TableExamOfficeLabel: Label name
 TableExamOfficeLabelStatus: Label colour
 TableExamOfficeLabelPriority: Label priority
+TableQualification: Qualification
 TableQualifications: Qualifications
 TableCompany: Company
 TableCompanyFilter: Company/Nr

src/Handler/Firm.hs

@@ -464,7 +464,7 @@ resultAllCompanyDefaultReroutes   = _dbrOutput . _4 . _unValue
 
 mkFirmAllTable :: Bool -> UserId -> DB (FormResult (FirmActionData, Set CompanyId), Widget)
 mkFirmAllTable isAdmin uid = do
-  -- now <- liftIO getCurrentTime
+  now <- liftIO getCurrentTime
   mr <- getMessageRender
   let
     resultDBTable = DBTable{..}
@@ -701,6 +701,16 @@ mkFirmAllTable isAdmin uid = do
                 Just False -> E.notExists checkSuper
             )
           , single ("company-postal", FilterColumn $ E.mkExactFilterLast $ views (to queryAllCompany) (E.isJust . (E.^. CompanyPostAddress)))
+          , single ("qualification" , FilterColumn . E.mkExistsFilter $ \row (CI.mk -> criterion :: CI Text) -> do
+              (usrCmp :& usrQual :& qual) <- E.from $ E.table @UserCompany
+                `E.innerJoin` E.table @QualificationUser
+                `E.on` (\(usrCmp :& usrQual) -> usrCmp E.^. UserCompanyUser E.==. usrQual E.^. QualificationUserUser)
+                `E.innerJoin` E.table @Qualification
+                `E.on` (\(_ :& usrQual :& qual) -> qual E.^. QualificationId E.==. usrQual E.^. QualificationUserQualification)
+              E.where_ $ usrCmp E.^. UserCompanyCompany E.==. queryAllCompany row E.^. CompanyId
+                E.&&. qual E.^. QualificationShorthand E.==. E.val criterion
+                E.&&. validQualification now usrQual
+            )
           ]
         dbtFilterUI mPrev = mconcat
           [ fltrCompanyNameUI mPrev
@@ -711,6 +721,7 @@ mkFirmAllTable isAdmin uid = do
           , prismAForm (singletonFilter "is-default-supervisor")                      mPrev $ aopt textField (fslI MsgFirmSuperDefault)
           , prismAForm (singletonFilter "foreign-supervisor" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterForeignSupervisor)
           , prismAForm (singletonFilter "company-postal"     . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterFirmExtern)
+          , fltrQualificationHdrUI MsgFilterHasQualification mPrev
           ]
         dbtStyle =  def { dbsFilterLayout = defaultDBSFilterLayout }
         dbtParams = DBParamsForm

src/Handler/Utils/Form.hs

@@ -594,6 +594,12 @@ degreeField = selectField $ optionsPersistKey [] [Asc StudyDegreeName, Asc Study
 degreeFieldEnt :: Field Handler (Entity StudyDegree)
 degreeFieldEnt = selectField $ optionsPersist [] [Asc StudyDegreeName, Asc StudyDegreeShorthand, Asc StudyDegreeKey] id
 
+qualificationField :: Field Handler QualificationId
+qualificationField = selectField $ optionsPersistKey [] [Asc QualificationName] qualificationName
+
+qualificationFieldShort :: Field Handler QualificationShorthand
+qualificationFieldShort = selectField $ (qualificationShorthand . entityVal) <<$>> optionsPersist [] [Asc QualificationName] qualificationName
+
 qualificationFieldEnt :: Field Handler (Entity Qualification)
 qualificationFieldEnt = selectField $ optionsPersist [] [Asc QualificationName] qualificationName
 

src/Handler/Utils/Table/Columns.hs

@@ -470,6 +470,8 @@ fltrUserMatriclenrUI mPrev =
 
 ----------------
 -- User E-Mail
+----------------
+
 colUserEmail ::  (IsDBTable m c, HasUser a) => Colonnade Sortable a (DBCell m c)
 colUserEmail = sortable (Just "user-email") (i18nCell MsgTableEmail) cellHasEMail
 
@@ -719,6 +721,19 @@ fltrRelevantStudyFeaturesSemesterUI :: DBFilterUI
 fltrRelevantStudyFeaturesSemesterUI = fltrFeaturesSemesterUI
 
 
+--------------------
+-- Qualifications
+--------------------
+
+fltrQualification :: OpticFilterColumn t QualificationShorthand
+fltrQualification queryQual = singletonMap "qualification" . FilterColumn $ mkExactFilter (view queryQual)
+
+fltrQualificationUI :: DBFilterUI
+fltrQualificationUI = fltrQualificationHdrUI MsgTableQualification
+
+fltrQualificationHdrUI :: (RenderMessage UniWorX msg) => msg -> DBFilterUI
+fltrQualificationHdrUI msg mPrev = prismAForm (singletonFilter "qualification" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift qualificationFieldShort) (fslI msg)
+
 
 ---------------
 -- Companies --