Changes in sample project for the documentation site

freon4dsl · Nov 15, 2024 · 1c4868b · 1c4868b
1 parent a8cb308
commit 1c4868b
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 7 deletions.
diff --git a/packages/samples/EduTutorialNew/src/defs/edu-flow.edit b/packages/samples/EduTutorialNew/src/defs/edu-flow.edit
@@ -11,8 +11,8 @@ Flow {[
 FlowRule {[
     -------------------------------------
     Name: ${self.name}
-        Description: ${self.description}
-        For page ${self.page}
+    Description: ${self.description}
+    From page ${self.page}
 
         ${self.transitions}
 ]}

diff --git a/packages/samples/EduTutorialNew/src/defs/edu-subjects.ast b/packages/samples/EduTutorialNew/src/defs/edu-subjects.ast
@@ -13,4 +13,5 @@ modelunit Subject {
     description: string; /* e.g. Mathematics, fractions for students age 10 */
     reference topics: Topic[];
     reference flows: Flow[];
+    reference tests: Test[];
 }
diff --git a/packages/samples/EduTutorialNew/src/defs/edu-tests.edit b/packages/samples/EduTutorialNew/src/defs/edu-tests.edit
@@ -8,9 +8,10 @@ Test {[
 ]}
 
 Scenario {[
+    ------------------------------------
     ${self.description}
 
-        ${self.testFlow vertical separator[=>]}
+        ${self.testFlow vertical}
 ]}
 
 TestFlow {[

diff --git a/...er/modelstore/Fractions/fractions101.json → ...er/modelstore/Fractions/Fractions101.json b/...er/modelstore/Fractions/fractions101.json → ...er/modelstore/Fractions/Fractions101.json
diff --git a/...elstore/Fractions/fractions101Public.json → ...elstore/Fractions/Fractions101Public.json b/...elstore/Fractions/fractions101Public.json → ...elstore/Fractions/Fractions101Public.json
diff --git a/...er/modelstore/Fractions/fractions102.json → ...er/modelstore/Fractions/Fractions102.json b/...er/modelstore/Fractions/fractions102.json → ...er/modelstore/Fractions/Fractions102.json
diff --git a/...elstore/Fractions/fractions102Public.json → ...elstore/Fractions/Fractions102Public.json b/...elstore/Fractions/fractions102Public.json → ...elstore/Fractions/Fractions102Public.json
diff --git a/packages/server/modelstore/Fractions/TestA.json b/packages/server/modelstore/Fractions/TestA.json
@@ -27,7 +27,8 @@
                   "key": "-default-key-Test-scenarios"
                },
                "children": [
-                  "ID-36"
+                  "ID-36",
+                  "ID-129"
                ]
             }
          ],
@@ -999,6 +1000,45 @@
          "references": [],
          "annotations": [],
          "parent": "ID-81"
+      },
+      {
+         "id": "ID-129",
+         "classifier": {
+            "language": "-default-key-Education",
+            "version": "2023.1",
+            "key": "-default-key-Scenario"
+         },
+         "properties": [
+            {
+               "property": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Scenario-description"
+               },
+               "value": ""
+            }
+         ],
+         "containments": [
+            {
+               "containment": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Scenario-testFlow"
+               },
+               "children": []
+            },
+            {
+               "containment": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Scenario-steps"
+               },
+               "children": []
+            }
+         ],
+         "references": [],
+         "annotations": [],
+         "parent": "ID-17"
       }
    ]
 }
diff --git a/packages/server/modelstore/Fractions/TestAPublic.json b/packages/server/modelstore/Fractions/TestAPublic.json
@@ -27,7 +27,8 @@
                   "key": "-default-key-Test-scenarios"
                },
                "children": [
-                  "ID-36"
+                  "ID-36",
+                  "ID-129"
                ]
             }
          ],
@@ -999,6 +1000,45 @@
          "references": [],
          "annotations": [],
          "parent": "ID-81"
+      },
+      {
+         "id": "ID-129",
+         "classifier": {
+            "language": "-default-key-Education",
+            "version": "2023.1",
+            "key": "-default-key-Scenario"
+         },
+         "properties": [
+            {
+               "property": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Scenario-description"
+               },
+               "value": ""
+            }
+         ],
+         "containments": [
+            {
+               "containment": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Scenario-testFlow"
+               },
+               "children": []
+            },
+            {
+               "containment": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Scenario-steps"
+               },
+               "children": []
+            }
+         ],
+         "references": [],
+         "annotations": [],
+         "parent": "ID-17"
       }
    ]
 }
diff --git a/packages/server/modelstore/Fractions/startFlow.json b/packages/server/modelstore/Fractions/startFlow.json
@@ -32,7 +32,21 @@
                ]
             }
          ],
-         "references": [],
+         "references": [
+            {
+               "reference": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Flow-subject"
+               },
+               "targets": [
+                  {
+                     "resolveInfo": "Fractions",
+                     "reference": "ID-18"
+                  }
+               ]
+            }
+         ],
          "annotations": [],
          "parent": null
       },

diff --git a/packages/server/modelstore/Fractions/startFlowPublic.json b/packages/server/modelstore/Fractions/startFlowPublic.json
@@ -32,7 +32,21 @@
                ]
             }
          ],
-         "references": [],
+         "references": [
+            {
+               "reference": {
+                  "language": "-default-key-Education",
+                  "version": "2023.1",
+                  "key": "-default-key-Flow-subject"
+               },
+               "targets": [
+                  {
+                     "resolveInfo": "Fractions",
+                     "reference": "ID-18"
+                  }
+               ]
+            }
+         ],
          "annotations": [],
          "parent": null
       },