From 92f0fe4b9ed93a680c90fe21297c42c50a1229c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Optimal=20Sup-Sp=C3=A9?= <contact@optimalsupspe.fr>
Date: Fri, 16 Sep 2022 18:20:04 +0200
Subject: [PATCH] =?UTF-8?q?On=20avance=20=C3=A0=20petits=20pas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GenerateurH5P.elm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/GenerateurH5P.elm b/src/GenerateurH5P.elm
index b8e4113..d27ac78 100644
--- a/src/GenerateurH5P.elm
+++ b/src/GenerateurH5P.elm
@@ -1465,7 +1465,7 @@ h5pParser depth =
                                         |> with contentField content
                                         |> BranchingScenarioH5P
                             in
-                            succeed (R.map build << .content)
+                            succeed (R.map build << R.map L.reverse << .content)
                                 |= branchingScenarioParser (depth + 1)
                                     { content = R.constant []
                                     , lastIdUsed = -1
@@ -1548,13 +1548,13 @@ branchingScenarioParser depth state =
                             BranchingQuestionBranchingScenarioSubContext ->
                                 inContext BranchingQuestionContext <|
                                     (succeed
-                                        (\newState ->
+                                        (\subState ->
                                             { state
                                                 | content =
-                                                    R.map2 L.append
-                                                        newState.content
+                                                    R.map2 (++)
+                                                        subState.content
                                                         state.content
-                                                , lastIdUsed = state.lastIdUsed + 1
+                                                , lastIdUsed = subState.lastIdUsed
                                             }
                                         )
                                         |= branchingQuestionParser (depth + 1)
@@ -1593,7 +1593,10 @@ branchingScenarioParser depth state =
 
                             InteractiveVideoBranchingScenarioSubContext ->
                                 inContext InteractiveVideoContext <|
-                                    succeed state
+                                    succeed
+                                        { state
+                                            | lastIdUsed = state.lastIdUsed + 1
+                                        }
                     )
             )
         , let
@@ -1612,7 +1615,6 @@ branchingScenarioParser depth state =
                 | content =
                     state.content
                         |> R.map changeLastId
-                        |> R.map L.reverse
             }
         ]
 
@@ -1663,12 +1665,14 @@ branchingQuestionParser depth state =
                 R.map branchingQuestionHelp UUID.generator
 
             branchingQuestionHelp uuid =
-                new contentField
-                    |> with3 typeField metadataField titleField ""
-                    |> with3 typeField metadataField contentTypeField "Branching Question"
-                    |> with2 typeField libraryField "H5P.BranchingQuestion 1.0"
-                    |> with2 typeField paramsField params
-                    |> with2 typeField subContentIdField (UUID.toString uuid)
+                L.singleton
+                    (new contentField
+                        |> with3 typeField metadataField titleField ""
+                        |> with3 typeField metadataField contentTypeField "Branching Question"
+                        |> with2 typeField libraryField "H5P.BranchingQuestion 1.0"
+                        |> with2 typeField paramsField params
+                        |> with2 typeField subContentIdField (UUID.toString uuid)
+                    )
 
             params =
                 BranchingQuestionBranchingScenarioContentTypeParams
@@ -1677,12 +1681,11 @@ branchingQuestionParser depth state =
                     }
 
             content =
-                state.content
-                    |> R.map2 (::) branchingQuestion
+                R.map2 (++) state.content branchingQuestion
           in
           succeed
             { content = content
-            , lastIdUsed = state.lastIdUsed
+            , lastIdUsed = state.lastIdUsed + 1
             }
         ]