Commit 77824798 authored by Peter Achten's avatar Peter Achten
Browse files

*** empty log message ***

parent 57d44e48
...@@ -6,7 +6,7 @@ import StdEnv, StdMaybe, htmlRefFormlib ...@@ -6,7 +6,7 @@ import StdEnv, StdMaybe, htmlRefFormlib
, state :: s // state , state :: s // state
} }
:: Login = { loginName :: String // Should be unique :: Login = { loginName :: String // Should be unique
, password :: PasswordBox // Should remain secret , password :: PasswordBox // Should remain secret
} }
:: Accounts s :== [Account s] :: Accounts s :== [Account s]
......
...@@ -271,13 +271,9 @@ where ...@@ -271,13 +271,9 @@ where
, PaperInfo.paper = RefPaper(Ref2 (uniquePaper paperInfo.nr uniquename))}} , PaperInfo.paper = RefPaper(Ref2 (uniquePaper paperInfo.nr uniquename))}}
_ -> account _ -> account
where where
uniquename = uniquePerson account.login.loginName uniquename = uniquePerson account.login.loginName
setInvariantReports (Reports reports) = Reports (map setInvariantReport reports)
setInvariantReports (Reports reports) = Reports (setInvariantReport reports)
setInvariantReport :: [(PaperNr, RefReport)] -> [(PaperNr, RefReport)] setInvariantReport :: (PaperNr, RefReport) -> (PaperNr, RefReport)
setInvariantReport [] = [] setInvariantReport (nr, (RefReport (Ref2 _)))
setInvariantReport [(nr, (RefReport (Ref2 _))):reports] = (nr, (RefReport (Ref2 (uniqueReport nr uniquename))))
= [(nr, (RefReport (Ref2 (uniqueReport nr uniquename)))):setInvariantReport reports] \ No newline at end of file
setInvariantReport [report:reports]
= [report:setInvariantReport reports]
...@@ -14,7 +14,7 @@ where ...@@ -14,7 +14,7 @@ where
loginHandlingPage :: !ConfAccounts !*HSt -> (Maybe ConfAccount,[BodyTag],!*HSt) loginHandlingPage :: !ConfAccounts !*HSt -> (Maybe ConfAccount,[BodyTag],!*HSt)
loginHandlingPage accounts hst loginHandlingPage accounts hst
# (mbaccount,login,hst) = loginPage accounts hst // has account ? # (mbaccount,login,hst) = loginPage accounts hst // has account ?
| isJust mbaccount = (mbaccount,[],hst) // ok, goto memeber area | isJust mbaccount = (mbaccount,[],hst) // ok, goto member area
# (forgotf,hst) = passwordForgotten accounts hst # (forgotf,hst) = passwordForgotten accounts hst
# (yes,addauthorf,hst) = addAuthorPage accounts hst # (yes,addauthorf,hst) = addAuthorPage accounts hst
# (guest,hst) = guestAccountStore (if yes (\(_,guest) -> (True,guest)) id) hst # (guest,hst) = guestAccountStore (if yes (\(_,guest) -> (True,guest)) id) hst
......
...@@ -636,4 +636,3 @@ MailApplicationLink mailaddress subject txtbody = ...@@ -636,4 +636,3 @@ MailApplicationLink mailaddress subject txtbody =
A [Lnk_Href ("mailto:" +++ mailaddress +++ A [Lnk_Href ("mailto:" +++ mailaddress +++
"?subject=" +++ subject +++ "?subject=" +++ subject +++
"&body=" +++ txtbody)] [Txt mailaddress] "&body=" +++ txtbody)] [Txt mailaddress]
\ No newline at end of file
...@@ -9,7 +9,7 @@ import StdEnv, htmlHandler, htmlButtons ...@@ -9,7 +9,7 @@ import StdEnv, htmlHandler, htmlButtons
:: Ref2 a = Ref2 String :: Ref2 a = Ref2 String
instance == (Ref2 a) instance == (Ref2 a)
ref2EditForm :: !(InIDataId a) !(InIDataId (Ref2 a)) !*HSt -> (Form a,!*HSt) | gForm{|*|}, gUpd{|*|}, gPrint{|*|}, gParse{|*|}, TC a //ref2EditForm :: !(InIDataId a) !(InIDataId (Ref2 a)) !*HSt -> (Form a,!*HSt) | gForm{|*|}, gUpd{|*|}, gPrint{|*|}, gParse{|*|}, TC a
invokeRefEditor :: (!(InIDataId b) !*HSt -> (Form d,!*HSt)) (InIDataId b) !*HSt -> (Form b,!*HSt) invokeRefEditor :: (!(InIDataId b) !*HSt -> (Form d,!*HSt)) (InIDataId b) !*HSt -> (Form b,!*HSt)
universalRefEditor :: !(InIDataId (Ref2 a)) !(a -> Judgement) !*HSt -> (Form a,!*HSt) | gForm{|*|}, gUpd{|*|}, gPrint{|*|}, gParse{|*|}, TC a universalRefEditor :: !(InIDataId (Ref2 a)) !(a -> Judgement) !*HSt -> (Form a,!*HSt) | gForm{|*|}, gUpd{|*|}, gPrint{|*|}, gParse{|*|}, TC a
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment