|
|
|
@ -26,7 +26,7 @@ import Url |
|
|
|
-} |
|
|
|
-} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
main : Program () Model Msg |
|
|
|
main : Program Flags Model Msg |
|
|
|
main = |
|
|
|
main = |
|
|
|
Browser.application |
|
|
|
Browser.application |
|
|
|
{ init = init |
|
|
|
{ init = init |
|
|
|
@ -46,6 +46,8 @@ type alias Model = |
|
|
|
{ key : Nav.Key |
|
|
|
{ key : Nav.Key |
|
|
|
, url : Url.Url |
|
|
|
, url : Url.Url |
|
|
|
, page : Page |
|
|
|
, page : Page |
|
|
|
|
|
|
|
, largeur : Int |
|
|
|
|
|
|
|
, hauteur : Int |
|
|
|
, modeleGenerateurDeProblemes : GenerateurDeProblemes.Model |
|
|
|
, modeleGenerateurDeProblemes : GenerateurDeProblemes.Model |
|
|
|
, modeleCalculateurDeNotes : CalculateurDeNotes.Model |
|
|
|
, modeleCalculateurDeNotes : CalculateurDeNotes.Model |
|
|
|
} |
|
|
|
} |
|
|
|
@ -56,13 +58,21 @@ type Page |
|
|
|
| CalculateurDeNotes |
|
|
|
| CalculateurDeNotes |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
init : () -> Url.Url -> Nav.Key -> ( Model, Cmd Msg ) |
|
|
|
type alias Flags = |
|
|
|
|
|
|
|
{ l : Int |
|
|
|
|
|
|
|
, h : Int |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
init : Flags -> Url.Url -> Nav.Key -> ( Model, Cmd Msg ) |
|
|
|
init flags url key = |
|
|
|
init flags url key = |
|
|
|
case url.fragment of |
|
|
|
case url.fragment of |
|
|
|
Just "CalculateurDeNotes" -> |
|
|
|
Just "CalculateurDeNotes" -> |
|
|
|
( Model key |
|
|
|
( Model key |
|
|
|
url |
|
|
|
url |
|
|
|
CalculateurDeNotes |
|
|
|
CalculateurDeNotes |
|
|
|
|
|
|
|
flags.l |
|
|
|
|
|
|
|
flags.h |
|
|
|
GenerateurDeProblemes.init |
|
|
|
GenerateurDeProblemes.init |
|
|
|
CalculateurDeNotes.init |
|
|
|
CalculateurDeNotes.init |
|
|
|
, Cmd.none |
|
|
|
, Cmd.none |
|
|
|
@ -72,6 +82,8 @@ init flags url key = |
|
|
|
( Model key |
|
|
|
( Model key |
|
|
|
url |
|
|
|
url |
|
|
|
GenerateurDeProblemes |
|
|
|
GenerateurDeProblemes |
|
|
|
|
|
|
|
flags.l |
|
|
|
|
|
|
|
flags.h |
|
|
|
GenerateurDeProblemes.init |
|
|
|
GenerateurDeProblemes.init |
|
|
|
CalculateurDeNotes.init |
|
|
|
CalculateurDeNotes.init |
|
|
|
, Cmd.none |
|
|
|
, Cmd.none |
|
|
|
@ -81,6 +93,8 @@ init flags url key = |
|
|
|
( Model key |
|
|
|
( Model key |
|
|
|
{ url | fragment = Just "GenerateurDeProblemes" } |
|
|
|
{ url | fragment = Just "GenerateurDeProblemes" } |
|
|
|
GenerateurDeProblemes |
|
|
|
GenerateurDeProblemes |
|
|
|
|
|
|
|
flags.l |
|
|
|
|
|
|
|
flags.h |
|
|
|
GenerateurDeProblemes.init |
|
|
|
GenerateurDeProblemes.init |
|
|
|
CalculateurDeNotes.init |
|
|
|
CalculateurDeNotes.init |
|
|
|
, Nav.pushUrl key (Url.toString { url | fragment = Just "GenerateurDeProblemes" }) |
|
|
|
, Nav.pushUrl key (Url.toString { url | fragment = Just "GenerateurDeProblemes" }) |
|
|
|
@ -183,7 +197,9 @@ view model = |
|
|
|
, body = |
|
|
|
, body = |
|
|
|
[ CalculateurDeNotes.view model.modeleCalculateurDeNotes |
|
|
|
[ CalculateurDeNotes.view model.modeleCalculateurDeNotes |
|
|
|
|> Element.map CalculateurDeNotesMsg |
|
|
|
|> Element.map CalculateurDeNotesMsg |
|
|
|
|> designGeneral CalculateurDeNotes.titre |
|
|
|
|> designGeneral |
|
|
|
|
|
|
|
(model.largeur - 2 * (petitEspacement + grandEspacement)) |
|
|
|
|
|
|
|
CalculateurDeNotes.titre |
|
|
|
] |
|
|
|
] |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -192,12 +208,14 @@ view model = |
|
|
|
, body = |
|
|
|
, body = |
|
|
|
[ GenerateurDeProblemes.view model.modeleGenerateurDeProblemes |
|
|
|
[ GenerateurDeProblemes.view model.modeleGenerateurDeProblemes |
|
|
|
|> Element.map GenerateurDeProblemesMsg |
|
|
|
|> Element.map GenerateurDeProblemesMsg |
|
|
|
|> designGeneral GenerateurDeProblemes.titre |
|
|
|
|> designGeneral |
|
|
|
|
|
|
|
(model.largeur - 2 * (petitEspacement + grandEspacement)) |
|
|
|
|
|
|
|
GenerateurDeProblemes.titre |
|
|
|
] |
|
|
|
] |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
designGeneral titre elm = |
|
|
|
designGeneral largeur titre elmt = |
|
|
|
layout |
|
|
|
layout |
|
|
|
[ height fill |
|
|
|
[ height fill |
|
|
|
, width fill |
|
|
|
, width fill |
|
|
|
@ -212,7 +230,9 @@ designGeneral titre elm = |
|
|
|
, Border.rounded 13 |
|
|
|
, Border.rounded 13 |
|
|
|
] |
|
|
|
] |
|
|
|
[ row [] |
|
|
|
[ row [] |
|
|
|
[ echologo 135 |
|
|
|
[ entete 135 largeur titre |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{- |
|
|
|
, el |
|
|
|
, el |
|
|
|
[ Font.size 120 |
|
|
|
[ Font.size 120 |
|
|
|
, Font.color <| vert 0.2 |
|
|
|
, Font.color <| vert 0.2 |
|
|
|
@ -224,8 +244,9 @@ designGeneral titre elm = |
|
|
|
] |
|
|
|
] |
|
|
|
<| |
|
|
|
<| |
|
|
|
text titre |
|
|
|
text titre |
|
|
|
|
|
|
|
-} |
|
|
|
] |
|
|
|
] |
|
|
|
, elm |
|
|
|
, elmt |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|