Merge branch 'master' of gitlab.uniworx.de:fradrive/fradrive

.gitignore

@@ -50,4 +50,5 @@ tunnel.log
 .develop.env
 **/result
 **/result-*
-.develop.cmd
+.develop.cmd
+/.vscode

src/Foundation/Yesod/Auth.hs

@@ -263,8 +263,8 @@ decodeUser now UserDefaultConf{..} upsertMode ldapData = do
     userEmail <- if -- TODO: refactor! NOTE: LDAP doesnt know email for all users; we use userPrincialName instead; however validEmail refutes `E<number@fraport.de` here, too strong! Make Email-Field optional!
       | userEmail : _ <- mapMaybe (assertM (elem '@') . either (const Nothing) Just . Text.decodeUtf8') (lookupSome ldapMap $ toList ldapUserEmail)
          -> return $ CI.mk userEmail
-      -- | userEmail : _ <- mapMaybe (assertM validEmail . either (const Nothing) Just . Text.decodeUtf8') (lookupSome ldapMap $ toList ldapUserEmail) -- TOO STRONG, see above!
+      --   | userEmail : _ <- mapMaybe (assertM validEmail . either (const Nothing) Just . Text.decodeUtf8') (lookupSome ldapMap $ toList ldapUserEmail) -- TOO STRONG, see above!
-      --    -> return $ CI.mk userEmail
+      --      -> return $ CI.mk userEmail
       | otherwise
         -> throwM CampusUserInvalidEmail
         

src/Handler/Admin/Avs.hs

@@ -44,7 +44,7 @@ single = uncurry Map.singleton
 
 
 -- Button only needed in AVS TEST; further buttons see below
-data ButtonAvsTest = BtnCheckLicences -- | BtnSynchLicences
+data ButtonAvsTest = BtnCheckLicences   --  | BtnSynchLicences
   deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic)
 instance Universe ButtonAvsTest
 instance Finite ButtonAvsTest

src/Model/Types/Avs.hs

@@ -254,7 +254,7 @@ instance FromJSON AvsLicence where
   parseJSON (Number n)  | n == 1 = pure AvsLicenceVorfeld   -- ordered by occurrence, n==1 is most common case
                         | n == 2 = pure AvsLicenceRollfeld
                         | n == 0 = pure AvsNoLicence
-                        -- | n ==(-1) = pure AvsNoLicenceGuest -- InfoContact may send -1 for Guest unable to obtain a licence
+                    {-  | n ==(-1) = pure AvsNoLicenceGuest -- InfoContact may send -1 for Guest unable to obtain a licence -}
 #ifdef DEVELOPMENT
   parseJSON invalid = prependFailure "parsing AvsLicence failed, " $ fail $ "expected Int value being 0, 1 or 2. Found " ++ show invalid
 #else

src/Utils/Avs.hs

@@ -101,7 +101,7 @@ splitQuery :: (Wrapped a, Wrapped c, Unwrapped a ~ Set b, Semigroup (Unwrapped c
 splitQuery rawQuery q
     | avsMaxQueryAtOnce >= Set.size s = rawQuery q
     | otherwise = do
-        -- $logInfoS "AVS" $ "Splitting large query for input Set " <> tshow (Set.size s) -- would require MonadLogger ClientM 
+        --  logInfoS "AVS" $ "Splitting large query for input Set " <> tshow (Set.size s) -- would require MonadLogger ClientM
         let (avsid1, avsid2) = Set.splitAt avsMaxQueryAtOnce s
         res1 <-            rawQuery $ view _Unwrapped' avsid1
         res2 <- splitQuery rawQuery $ view _Unwrapped' avsid2

src/Utils/Csv/Mail.hs

@@ -56,11 +56,11 @@ recodeCsv encOpts toUser act = fromMaybe act $ do
         inp <- C.sinkLazy
         inp' <- recode inp
         sourceLazy inp' .| act
-    -- -- | FormatXlsx <- fmt -> do
+    --     | FormatXlsx <- fmt -> do
-    -- --     inp <- C.sinkLazy
+    --         inp <- C.sinkLazy
-    -- --     archive <- throwLeft $ Zip.toArchiveOrFail inp
+    --         archive <- throwLeft $ Zip.toArchiveOrFail inp
-    -- --     archive' <- traverseOf (_zEntries . traverse . _Entrty . _3) recode archive
+    --         archive' <- traverseOf (_zEntries . traverse . _Entrty . _3) recode archive
-    -- --     sourceLazy (Zip.fromArchive inp') .| act
+    --         sourceLazy (Zip.fromArchive inp') .| act
     | otherwise -> act
   where