Merge pull request #168 from DigiKlausur/dev

Dev

docs/source/conf.py

@@ -9,7 +9,7 @@
 project = "e2xgrader"
 copyright = "2023, Tim Metzler"
 author = "Tim Metzler"
-release = "0.1.1"
+release = "0.2.0-dev1"
 github_project_url = "https://github.com/Digiklausur/e2xgrader"
 
 # -- General configuration ---------------------------------------------------

docs/source/extensions/apps.rst

@@ -69,10 +69,15 @@ Let's start by looking at the file `app.py`.
             },
         ).tag(config=True)
 
+        def __init__(self, **kwargs):
+            NbGrader.__init__(self, **kwargs)
+            BaseApp.__init__(self, **kwargs)
+
         template_path = os.path.join(os.path.dirname(__file__), "templates")
 
         def load_app(self):
             self.log.info("Loading the convert grades app")
+            self.initialize([])
             # Add the grading scheme to the tornado settings
             self.update_tornado_settings(dict(e2x_grading_scheme=self.grading_scheme))
             self.add_handlers(default_handlers)

docs/source/user_docs/cells/cells.rst

@@ -99,6 +99,24 @@ In student mode the `Edit Cell` button is deactivated and students can not unren
 
 .. _diagrams.net: https://diagrams.net
 
+Configuring the Diagram Cells
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can configure the following options for the diagram cells in your ``nbgrader_config.py``:
+
+* ``drawDomain``: The domain of the diagram instance to use
+* ``drawOrigin``: The url of the origin of the diagram instance. This is the url from which the diagram instance sends messages
+* ``libraries``: A list of libraries which should be active by default (e.g. *uml*, *general*, *kubernetes*, etc)
+
+.. code-block:: python
+    :caption: Example of configuring the diagram editor
+
+    # nbgrader_config.py
+
+    c.DiagramEditor.drawDomain = "https://embed.diagrams.net/"
+    c.DiagramEditor.drawOrigin = "https://embed.diagrams.net/"
+    c.DiagramEditor.libraries = ["uml", "general", "arrows2"]
+
 
 Upload Cells
 ------------

e2xgrader/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.2.0-dev1"

e2xgrader/server_extensions/apps/diagram_editor/__init__.py

@@ -0,0 +1,3 @@
+from .diagrameditor import DiagramEditor
+
+__all__ = ["DiagramEditor"]

e2xgrader/server_extensions/apps/diagram_editor/diagrameditor.py

@@ -0,0 +1,52 @@
+import json
+
+from e2xcore import BaseApp
+from e2xcore.handlers import E2xApiHandler
+from nbgrader.apps.baseapp import NbGrader
+from nbgrader.server_extensions.formgrader.base import check_xsrf
+from tornado import web
+from traitlets import List, Unicode
+
+
+class DiagramConfigHandler(E2xApiHandler):
+    @web.authenticated
+    @check_xsrf
+    def get(self):
+        self.finish(json.dumps(self.settings.get("diagram_config", dict())))
+
+
+class DiagramEditor(NbGrader, BaseApp):
+    drawDomain = Unicode(
+        default_value=None, allow_none=True, help="The url to drawio"
+    ).tag(config=True)
+    drawOrigin = Unicode(
+        default_value=None, allow_none=True, help="The drawio origin"
+    ).tag(config=True)
+    libraries = List(default_value=[], help="A list of activated libraries").tag(
+        config=True
+    )
+
+    def __init__(self, **kwargs):
+        NbGrader.__init__(self, **kwargs)
+        BaseApp.__init__(self, **kwargs)
+
+    def get_diagram_config(self):
+        # self.log.info("My drawDomain is", self.drawDomain)
+        config = dict()
+        if self.drawDomain:
+            config["drawDomain"] = self.drawDomain
+        if self.drawOrigin:
+            config["drawOrigin"] = self.drawOrigin
+        if len(self.libraries) > 0:
+            config["libs"] = self.libraries
+        return config
+
+    def load_app(self):
+        self.log.info("Loading the diagrameditor app")
+        self.initialize([])
+        self.update_tornado_settings(dict(diagram_config=self.get_diagram_config()))
+        self.add_handlers(
+            [
+                (r"/e2x/diagrams/api", DiagramConfigHandler),
+            ]
+        )

e2xgrader/server_extensions/apps/formgrader/handlers.py

@@ -214,7 +214,6 @@ def get(self, submission_id):
             "index": ix,
             "total": len(indices),
             "base_url": self.base_url,
-            "my_mathjax_url": self.base_url + "/" + self.mathjax_url,
             "student": student_id,
             "last_name": submission.student.last_name,
             "first_name": submission.student.first_name,

e2xgrader/server_extensions/apps/formgrader/static/js/formgrade_models.js

@@ -175,6 +175,12 @@ let Comments = Backbone.Collection.extend({
 
 let AnnotationUI = Backbone.View.extend({
   initialize: function () {
+    if (this.$el.length == 0) {
+      console.log(
+        "Failed to create AnnotationUI. Cell is not present in the notebook"
+      );
+      return;
+    }
     this.$switch = this.$el.find('input[name="annotate"]');
     this.$switch.prop("checked", "checked");
 

e2xgrader/server_extensions/apps/formgrader/templates/formgrade/index.html.j2

@@ -15,7 +15,7 @@
 
 
 <!-- Loading mathjax macro -->
-{{ mathjax( resources.my_mathjax_url + '?config=TeX-AMS-MML_HTMLorMML-full') }}
+{{ mathjax( ) }}
 
 <link rel="stylesheet" href="{{ resources.base_url }}/formgrader/static/css/formgrade.css" />
 <style type="text/css">

e2xgrader/server_extensions/student/student.py

@@ -1,6 +1,7 @@
 from traitlets import Any, List
 
 from ..apps.assignment_list import AssignmentList
+from ..apps.diagram_editor import DiagramEditor
 from ..apps.help import Help
 from ..apps.validate_assignment import ValidateAssignment
 from ..base import BaseExtension
@@ -9,7 +10,7 @@
 class StudentExtension(BaseExtension):
     apps = List(
         trait=Any(),
-        default_value=[AssignmentList, ValidateAssignment, Help],
+        default_value=[AssignmentList, ValidateAssignment, Help, DiagramEditor],
     ).tag(config=True)
 
 

e2xgrader/server_extensions/teacher/teacher.py

@@ -2,6 +2,7 @@
 from traitlets import Any, List
 
 from ..apps.assignment_list import AssignmentList
+from ..apps.diagram_editor import DiagramEditor
 from ..apps.e2xgraderapi import E2xGraderApi
 from ..apps.formgrader import FormgradeApp
 from ..apps.help import Help
@@ -21,6 +22,7 @@ class TeacherExtension(BaseExtension):
             ValidateAssignment,
             AssignmentList,
             Help,
+            DiagramEditor,
         ],
     ).tag(config=True)
 

e2xgrader/tests/server_extensions/apps/diagram_editor/test_diagrameditor.py

@@ -0,0 +1,48 @@
+import unittest
+
+from traitlets.config import LoggingConfigurable
+
+from e2xgrader.server_extensions.apps.diagram_editor import DiagramEditor
+
+
+class DummyWebApp:
+    @property
+    def settings(self):
+        return dict()
+
+
+class DummyApp(LoggingConfigurable):
+    root_dir = "dummy"
+    name = "dummy"
+
+    @property
+    def web_app(self):
+        return DummyWebApp()
+
+
+class TestDiagramEditor(unittest.TestCase):
+    def setUp(self) -> None:
+        self.editor = DiagramEditor(parent=DummyApp())
+
+    def test_empty_config(self):
+        self.assertDictEqual(self.editor.get_diagram_config(), dict())
+
+    def test_configure_draw_domain(self):
+        domain = "myDomain"
+        self.editor.drawDomain = domain
+        self.assertDictEqual(self.editor.get_diagram_config(), dict(drawDomain=domain))
+
+    def test_configure_draw_origin(self):
+        domain = "myDomain"
+        self.editor.drawOrigin = domain
+        self.assertDictEqual(self.editor.get_diagram_config(), dict(drawOrigin=domain))
+
+    def test_configure_libraries(self):
+        libraries = ["lib1", "lib2", "lib3"]
+        self.editor.libraries = libraries
+        self.assertDictEqual(self.editor.get_diagram_config(), dict(libs=libraries))
+
+    def tearDown(self) -> None:
+        self.editor.drawDomain = None
+        self.editor.drawOrigin = None
+        self.editor.libraries = []

lerna.json

@@ -2,5 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": true,
-  "version": "0.1.1"
+  "version": "0.2.0-dev1"
 }