nerf/choirMail
1
0
Fork 0
mirror of https://git.nerfingen.de/nerf/choirMail.git synced 2025-06-08 09:41:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed table layout and seperator

Browse source
This commit is contained in:
Dennis Frieberg 2023-12-10 19:35:58 +01:00
parent 93a09e8402
commit 4f2a6bffda
Signed by: nerf
GPG key ID: 42DED0E2D8F04FB6
3 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/TableParser.hs
View file

@ -14,15 +14,14 @@ import Control.Monad(void)
data MailRecord = MailRecord {
date :: D.Day,
voice1 :: LT.Text,
voice2 :: LT.Text,
song1 :: LT.Text,
song2 :: LT.Text,
voices :: LT.Text,
songs :: LT.Text,
notes :: LT.Text,
announcement :: LT.Text
} deriving (Show)
seperator :: Char
seperator = '\t'
seperator = ';'
sepParser :: P.Parser ()
sepParser = void $ P.char seperator
@ -52,19 +51,17 @@ parseRow :: P.Parser MailRecord
parseRow = do
date <- dateCellParser
sepParser
voice1 <- textCellParser
voices <- textCellParser
sepParser
voice2 <- textCellParser
songs <- textCellParser
sepParser
song1 <- textCellParser
sepParser
song2 <- textCellParser
notes <- textCellParser
sepParser
announcement <- textCellParser
return $ MailRecord{..}
parseFirstRow :: P.Parser ()
parseFirstRow = void (P.string "Datum\tStimmprobe 1\tStimmprobe 2\tLied 1\tLied 2\tWeitere Ansagen" >> P.endOfLine)
parseFirstRow = void (P.string "Datum;Stimmproben;Lieder;Noten;Weitere Ansagen" >> P.endOfLine)
parseTable :: P.Parser [MailRecord]
parseTable = do