qcanvas 1.0.11__py3-none-any.whl → 2026.1.19__py3-none-any.whl

qcanvas/ui/course_viewer/course_viewer.py

@@ -1,36 +1,46 @@
 import logging
+from dataclasses import dataclass
 
-import qcanvas_backend.database.types as db
-from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtCore import Slot
-from qtpy.QtWidgets import *
+from libqcanvas import db
+from libqcanvas.net.resources.download.resource_manager import ResourceManager
+from libqcanvas.net.sync.sync_receipt import SyncReceipt
+from PySide6.QtCore import Slot
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QTabWidget, QVBoxLayout, QWidget
 
+from qcanvas import icons
 from qcanvas.ui.course_viewer.tabs.assignment_tab import AssignmentTab
 from qcanvas.ui.course_viewer.tabs.mail_tab import MailTab
 from qcanvas.ui.course_viewer.tabs.page_tab import PageTab
-from qcanvas.util.basic_fonts import bold_font
 from qcanvas.util.layouts import layout
-from qcanvas.util.ui_tools import make_truncatable
+import qcanvas.util.ui_tools as ui
 
 _logger = logging.getLogger(__name__)
 
 
+@dataclass
+class _Tab:
+    icon: QIcon
+    highlighted_icon: QIcon
+    update_type: type
+
+
 class CourseViewer(QWidget):
     def __init__(
         self,
         course: db.Course,
         downloader: ResourceManager,
         *,
-        sync_receipt: SyncReceipt
+        sync_receipt: SyncReceipt,
     ):
         super().__init__()
         # todo this is a mess. there are several other messes like this too, do they all have to be a mess?
         self._course_id = course.id
+        self._previous_tab_index = 0
 
-        self._course_label = QLabel(course.name)
-        self._course_label.setFont(bold_font)
-        make_truncatable(self._course_label)
+        self._course_label = ui.label(
+            course.name, font=ui.font(point_size=13, bold=True), allow_truncation=True
+        )
 
         self._pages_tab = PageTab.create_from_receipt(
             course=course,
@@ -53,57 +63,80 @@ class CourseViewer(QWidget):
         #     sync_receipt=sync_receipt,
         # )
 
-        self._tabs = QTabWidget()
-        self._tabs.addTab(self._pages_tab, "Pages")
-        self._tabs.addTab(self._assignments_tab, "Assignments")
-        self._tabs.addTab(self._mail_tab, "Mail")
-        self._tabs.addTab(QLabel("Not implemented"), "Files")
-        # self._tabs.addTab(self._files_tab, "Files")
-        # self._tabs.addTab(QLabel("Not implemented"), "Panopto")  # The meme lives on!
-
-        self.setLayout(layout(QVBoxLayout, self._course_label, self._tabs))
+        self._tab_widget = QTabWidget()
+        self._tabs: dict[int, _Tab] = {}
 
-        self._tabs.currentChanged.connect(self._tab_changed)
+        # self._setup_tab(
+        #     name="Files",
+        #     widget=self._files_tab,
+        #     icon=icons.tabs.pages,
+        #     highlighted_icon=icons.tabs.pages_new_content,
+        # )
+        self._PAGES_TAB = self._set_up_tab(
+            name="Pages",
+            widget=self._pages_tab,
+            icon=icons.tabs.pages,
+            highlighted_icon=icons.tabs.pages_new_content,
+            content_update_key=db.Page,
+        )
+        self._ASSIGNMENTS_TAB = self._set_up_tab(
+            name="Assignments",
+            widget=self._assignments_tab,
+            icon=icons.tabs.assignments,
+            highlighted_icon=icons.tabs.assignments_new_content,
+            content_update_key=db.Assignment,
+        )
+        self._MAIL_TAB = self._set_up_tab(
+            name="Mail",
+            widget=self._mail_tab,
+            icon=icons.tabs.mail,
+            highlighted_icon=icons.tabs.mail_new_content,
+            content_update_key=db.Message,
+        )
+        # self._tabs.addTab(QLabel("Not implemented"), "Panopto")  # The meme lives on!
 
+        self.setLayout(layout(QVBoxLayout, self._course_label, self._tab_widget))
+        self._tab_widget.currentChanged.connect(self._tab_changed)
         self._highlight_tabs(sync_receipt)
-        self._unhighlight_tab(0)  # Because the first tab always gets auto-selected
+
+    def _set_up_tab(
+        self,
+        *,
+        widget: QWidget,
+        icon: QIcon,
+        highlighted_icon: QIcon,
+        name: str,
+        content_update_key: type,
+    ) -> int:
+        index = self._tab_widget.addTab(widget, icon, name)
+        self._tabs[index] = _Tab(icon, highlighted_icon, update_type=content_update_key)
+        return index
 
     def reload(self, course: db.Course, *, sync_receipt: SyncReceipt) -> None:
+        # self._files_tab.reload(course, sync_receipt=sync_receipt)
         self._pages_tab.reload(course, sync_receipt=sync_receipt)
         self._assignments_tab.reload(course, sync_receipt=sync_receipt)
         self._mail_tab.reload(course, sync_receipt=sync_receipt)
-
         self._highlight_tabs(sync_receipt)
 
     @Slot(int)
     def _tab_changed(self, index: int) -> None:
+        _logger.debug(f"Index = {index}")
         if index != -1:
-            self._unhighlight_tab(index)
+            _logger.debug(f"Previous tab = {self._previous_tab_index}")
+            self._set_tab_highlight(self._previous_tab_index, False)
+            self._previous_tab_index = index
 
     def _highlight_tabs(self, sync_receipt: SyncReceipt) -> None:
         updates = sync_receipt.updates_by_course.get(self._course_id, None)
 
-        if updates is not None:
-            # if len(updates.updated_resources) > 0:
-            #     raise Exception("Looks like you forgot to update the other numbers??????"")
-            #     self._highlight_tab(0)
-
-            if len(updates.updated_pages) > 0:
-                self._highlight_tab(0)
-
-            if len(updates.updated_assignments) > 0:
-                self._highlight_tab(1)
-
-            if len(updates.updated_messages) > 0:
-                self._highlight_tab(2)
-        else:
-            for index in range(0, 4):
-                self._unhighlight_tab(index)
-
-    def _highlight_tab(self, tab_index: int) -> None:
-        self._tabs.setTabText(tab_index, "* " + self._tabs.tabText(tab_index))
+        for tab_index, tab in enumerate(self._tabs.values()):
+            self._set_tab_highlight(
+                tab_index, updates is not None and updates[tab.update_type] is not None
+            )
 
-    def _unhighlight_tab(self, tab_index: int) -> None:
-        self._tabs.setTabText(
-            tab_index, self._tabs.tabText(tab_index).replace("* ", "")
+    def _set_tab_highlight(self, tab_index: int, highlighted: bool) -> None:
+        tab = self._tabs[tab_index]
+        self._tab_widget.setTabIcon(
+            tab_index, tab.highlighted_icon if highlighted else tab.icon
         )

qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tab.py

@@ -1,28 +1,40 @@
 import logging
 
-import qcanvas_backend.database.types as db
-from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtWidgets import *
+from PySide6.QtCore import Qt
+from libqcanvas import db
+from libqcanvas.net.sync.sync_receipt import SyncReceipt
+from libqcanvas.util import as_local
+from PySide6.QtWidgets import (
+    QLabel,
+    QLayout,
+    QDockWidget,
+    QMainWindow,
+)
+from typing_extensions import override
 
-from qcanvas.ui.course_viewer.tabs.assignment_tab.assignment_tree import AssignmentTree
+import qcanvas.util.ui_tools as ui
+from qcanvas.backend_connectors import FrontendResourceManager
+from .assignment_tree import AssignmentTree
+from qcanvas.ui.qml_components import CommentsPane, AttachmentsPane
 from qcanvas.ui.course_viewer.tabs.content_tab import ContentTab
-from qcanvas.ui.course_viewer.tabs.util import date_strftime_format
-from qcanvas.util.basic_fonts import bold_label
-from qcanvas.util.layouts import grid_layout
+from qcanvas.ui.course_viewer.tabs.constants import (
+    date_strftime_format,
+)
 
 _logger = logging.getLogger(__name__)
 
 
 class AssignmentTab(ContentTab):
-
     def __init__(
         self,
         *,
         course: db.Course,
         sync_receipt: SyncReceipt,
-        downloader: ResourceManager,
+        downloader: FrontendResourceManager,
     ):
+        # must be before super init, otherwise _setup_layout will be called before it is initialised
+        self._main_container = QMainWindow()
+
         super().__init__(
             explorer=AssignmentTree.create_from_receipt(
                 course, sync_receipt=sync_receipt
@@ -31,38 +43,104 @@ class AssignmentTab(ContentTab):
             downloader=downloader,
         )
 
+        # fixme: can't figure out how to get the panes to have the right size without showing them when nothing is selected
+        self._comments_pane = CommentsPane(downloader)
+        self._comments_dock = ui.dock_widget(
+            title="Comments",
+            name="comments_dock",
+            widget=self._comments_pane,
+            min_size=ui.size(150, 150),
+            features=QDockWidget.DockWidgetFeature.DockWidgetMovable,
+            hide=False,
+        )
+
+        self._submission_files_pane = AttachmentsPane(downloader)
+        self._submission_files_dock = ui.dock_widget(
+            title="Submitted Files",
+            name="sub_files_dock",
+            widget=self._submission_files_pane,
+            min_size=ui.size(150, 150),
+            features=QDockWidget.DockWidgetFeature.DockWidgetMovable,
+            hide=False,
+        )
+
+        self._main_container.setCentralWidget(self._viewer)
+        self._main_container.addDockWidget(
+            Qt.DockWidgetArea.RightDockWidgetArea, self._submission_files_dock
+        )
+        self._main_container.addDockWidget(
+            Qt.DockWidgetArea.RightDockWidgetArea, self._comments_dock
+        )
+
+        self._main_container.resizeDocks(
+            [self._submission_files_dock, self._comments_dock],
+            [350, 350],
+            Qt.Orientation.Horizontal,
+        )
+        self._main_container.resizeDocks(
+            [self._submission_files_dock],
+            [200],
+            Qt.Orientation.Vertical,
+        )
+
         self._due_date_label = QLabel("")
         self._score_label = QLabel("")
-
         self.enable_info_grid()
 
-    def setup_info_grid(self) -> QGridLayout:
-        grid = grid_layout(
-            [
-                [
-                    bold_label("Due:"),
-                    self._due_date_label,
-                ],
-                [
-                    bold_label("Score:"),
-                    self._score_label,
-                ],
-            ]
+    @override
+    def _setup_layout(self) -> None:
+        super()._setup_layout()
+        self.content_grid.replaceWidget(
+            self._viewer,
+            self._main_container,
         )
 
-        grid.setColumnStretch(0, 0)
-        grid.setColumnStretch(1, 1)
+        self.content_grid.setColumnStretch(0, 1)
+        self.content_grid.setColumnStretch(1, 3)
 
-        return grid
+    @override
+    def setup_info_grid(self) -> QLayout:
+        return ui.form_layout(
+            {"Due": self._due_date_label, "Score": self._score_label},
+        )
 
+    # fixme: kind of a misleading name? it's not just updating the info "grid" anymore
+    @override
     def update_info_grid(self, assignment: db.Assignment) -> None:
         if assignment.due_date is not None:
-            due_text = assignment.due_date.strftime(date_strftime_format)
+            due_text = as_local(assignment.due_date).strftime(date_strftime_format)
         else:
-            due_text = "?"
+            due_text = "No due date"
 
         self._due_date_label.setText(due_text)
 
+        last_submission = assignment.submissions[-1] if assignment.submissions else None
+        submission_score = "-"
+
+        if last_submission and last_submission.score:
+            submission_score = last_submission.score
+
         self._score_label.setText(
-            f"{assignment.mark or '?'}/{assignment.max_mark_possible or '?'}"
+            f"<b>{submission_score}</b>/{assignment.max_score or '?'}"
         )
+
+        if last_submission and last_submission.attachments:
+            self._submission_files_pane.load_files(last_submission.attachments)
+            self._submission_files_dock.show()
+        else:
+            self._submission_files_pane.clear_files()
+            self._submission_files_dock.hide()
+
+        if last_submission and last_submission.comments:
+            self._comments_pane.load_comments(last_submission.comments)
+            self._comments_dock.show()
+        else:
+            self._comments_pane.clear_comments()
+            self._comments_dock.hide()
+
+    @override
+    def _show_blank(self) -> None:
+        super()._show_blank()
+
+        self._comments_dock.hide()
+        self._submission_files_dock.hide()

qcanvas/ui/course_viewer/tabs/assignment_tab/assignment_tree.py

@@ -1,12 +1,14 @@
 import logging
 from typing import Sequence
 
-import qcanvas_backend.database.types as db
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QHeaderView
+from libqcanvas import db
+from libqcanvas.net.sync.sync_receipt import SyncReceipt
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QHeaderView
 
+from qcanvas import icons
 from qcanvas.ui.course_viewer.content_tree import ContentTree
+from qcanvas.ui.course_viewer.tree_widget_data_item import TreeWidgetDataItem
 from qcanvas.ui.memory_tree import MemoryTreeWidgetItem
 
 _logger = logging.getLogger(__name__)
@@ -18,6 +20,7 @@ class AssignmentTree(ContentTree[db.Course]):
             tree_name=f"course.{course_id}.assignment_groups",
             emit_selection_signal_for_type=db.Assignment,
         )
+
         self.ui_setup(
             header_text=["Assignments", "Weight"],
             indentation=15,
@@ -25,13 +28,9 @@ class AssignmentTree(ContentTree[db.Course]):
             min_width=150,
         )
 
-        self._adjust_header()
-
-    def _adjust_header(self) -> None:
-        header = self.header()
-        header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch)
-        header.setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
-        header.setStretchLastSection(False)
+        self.set_columns_resize_mode(
+            [QHeaderView.ResizeMode.Stretch, QHeaderView.ResizeMode.ResizeToContents]
+        )
 
     def create_tree_items(
         self, course: db.Course, sync_receipt: SyncReceipt
@@ -39,8 +38,11 @@ class AssignmentTree(ContentTree[db.Course]):
         widgets = []
 
         for assignment_group in course.assignment_groups:  # type: db.AssignmentGroup
+            if len(assignment_group.assignments) == 0:
+                continue
+
             assignment_group_widget = self._create_assignment_group_widget(
-                assignment_group, sync_receipt
+                assignment_group
             )
 
             widgets.append(assignment_group_widget)
@@ -54,7 +56,7 @@ class AssignmentTree(ContentTree[db.Course]):
         return widgets
 
     def _create_assignment_group_widget(
-        self, assignment_group: db.AssignmentGroup, sync_receipt: SyncReceipt
+        self, assignment_group: db.AssignmentGroup
     ) -> MemoryTreeWidgetItem:
         assignment_group_widget = MemoryTreeWidgetItem(
             id=assignment_group.id,
@@ -63,22 +65,21 @@ class AssignmentTree(ContentTree[db.Course]):
         )
 
         assignment_group_widget.setFlags(Qt.ItemFlag.ItemIsEnabled)
-
-        if sync_receipt.was_updated(assignment_group):
-            self.mark_as_unseen(assignment_group_widget)
+        assignment_group_widget.setIcon(0, icons.tree_items.module)
 
         return assignment_group_widget
 
     def _create_assignment_widget(
         self, assignment: db.Assignment, sync_receipt: SyncReceipt
-    ) -> MemoryTreeWidgetItem:
-        assignment_widget = MemoryTreeWidgetItem(
+    ) -> TreeWidgetDataItem:
+        assignment_widget = TreeWidgetDataItem(
             id=assignment.id, data=assignment, strings=[assignment.name]
         )
 
         assignment_widget.setFlags(
             Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
         )
+        assignment_widget.setIcon(0, icons.tree_items.assignment)
 
         if sync_receipt.was_updated(assignment):
             self.mark_as_unseen(assignment_widget)

qcanvas/ui/course_viewer/tabs/content_tab.py

@@ -1,31 +1,33 @@
 import logging
-from typing import *
 
-import qcanvas_backend.database.types as db
-from qcanvas_backend.net.resources.download.resource_manager import ResourceManager
-from qcanvas_backend.net.sync.sync_receipt import SyncReceipt
-from qtpy.QtCore import Slot
-from qtpy.QtWidgets import *
+from libqcanvas import db
+from libqcanvas.net.resources.download.resource_manager import ResourceManager
+from libqcanvas.net.sync.sync_receipt import SyncReceipt
+from PySide6.QtCore import Slot
+from PySide6.QtWidgets import (
+    QGridLayout,
+    QLabel,
+    QWidget,
+    QLayout,
+)
 
 from qcanvas.ui.course_viewer.content_tree import ContentTree
 from qcanvas.ui.course_viewer.tabs.resource_rich_browser import ResourceRichBrowser
-from qcanvas.util.basic_fonts import bold_font
-from qcanvas.util.ui_tools import make_truncatable
 
-_logger = logging.getLogger(__name__)
+import qcanvas.util.ui_tools as ui
 
-T = TypeVar("T", bound=Type["ContentTab"])
+_logger = logging.getLogger(__name__)
 
 
 class ContentTab(QWidget):
     @classmethod
-    def create_from_receipt(
+    def create_from_receipt[T: ContentTab](
         cls: T,
         *,
         course: db.Course,
         sync_receipt: SyncReceipt,
         downloader: ResourceManager,
-    ) -> Type[T]:
+    ) -> type[T]:
         return cls(course=course, sync_receipt=sync_receipt, downloader=downloader)
 
     def __init__(
@@ -36,49 +38,41 @@ class ContentTab(QWidget):
         downloader: ResourceManager,
     ):
         super().__init__()
-        self._content_vbox = QVBoxLayout()
+        self.content_grid = QGridLayout()
         self._placeholder_text = title_placeholder_text
         self._title_label = self._create_title_label()
-        self._info_grid: Optional[QWidget] = None
+        self._use_info_grid = False
+        self._info_grid = QWidget()
+        self._info_grid.hide()
         self._viewer = ResourceRichBrowser(downloader=downloader)
         self._explorer = explorer
 
+        self.setLayout(self.content_grid)
         self._setup_layout()
         self._explorer.item_selected.connect(self._item_selected)
 
     def enable_info_grid(self) -> None:
-        # Info grid needs to be a widget, so it can be hidden/shown
-        grid_layout = self.setup_info_grid()
-
-        grid_widget = QWidget()
-        grid_widget.setLayout(grid_layout)
-        grid_widget.hide()
-
-        self._info_grid = grid_widget
-        self._content_vbox.insertWidget(1, grid_widget)
+        self._info_grid.setLayout(self.setup_info_grid())
+        self._use_info_grid = True
 
     def _create_title_label(self) -> QLabel:
-        title_label = QLabel(self._placeholder_text)
-        title_label.setFont(bold_font)
-        make_truncatable(title_label)
-        return title_label
+        return ui.label(
+            self._placeholder_text,
+            font=ui.font(point_size=12, bold=True),
+            allow_truncation=True,
+        )
 
-    def setup_info_grid(self) -> QGridLayout:
+    def setup_info_grid(self) -> QLayout:
         """
         Override this if you need an info grid
         """
         raise NotImplementedError()
 
     def _setup_layout(self) -> None:
-        parent_layout = QHBoxLayout()
-        parent_layout.addWidget(self._explorer)
-
-        self._content_vbox.addWidget(self._title_label)
-        self._content_vbox.addWidget(self._viewer)
-
-        parent_layout.addLayout(self._content_vbox)
-
-        self.setLayout(parent_layout)
+        self.content_grid.addWidget(self._explorer, 0, 0, 4, 1)
+        self.content_grid.addWidget(self._title_label, 0, 1)
+        self.content_grid.addWidget(self._info_grid, 1, 1)
+        self.content_grid.addWidget(self._viewer, 2, 1)
 
     def reload(self, course: db.Course, *, sync_receipt: SyncReceipt) -> None:
         self._explorer.reload(course, sync_receipt=sync_receipt)
@@ -95,7 +89,7 @@ class ContentTab(QWidget):
         self._title_label.setText(item.name)
         self._viewer.show_content(item)
 
-        if self._info_grid is not None:
+        if self._use_info_grid:
             self._info_grid.show()
             self.update_info_grid(item)
 
@@ -106,5 +100,5 @@ class ContentTab(QWidget):
         self._title_label.setText(self._placeholder_text)
         self._viewer.show_blank(completely_blank=True)
 
-        if self._info_grid is not None:
+        if self._use_info_grid:
             self._info_grid.hide()

qcanvas/ui/course_viewer/tabs/file_tab/__init__.py

@@ -0,0 +1 @@
+from .file_tab import FileTab

qcanvas/ui/course_viewer/tabs/file_tab/file_tab.py

@@ -0,0 +1,46 @@
+import logging
+
+from libqcanvas import db
+from libqcanvas.net.resources.download.resource_manager import ResourceManager
+from libqcanvas.net.sync.sync_receipt import SyncReceipt
+from PySide6.QtWidgets import QHBoxLayout, QWidget
+
+from qcanvas.ui.course_viewer.tabs.file_tab.pages_file_tree import PagesFileTree
+from qcanvas.util.layouts import layout
+
+_logger = logging.getLogger(__name__)
+
+
+class FileTab(QWidget):
+    @staticmethod
+    def create_from_receipt(
+        *,
+        course: db.Course,
+        sync_receipt: SyncReceipt,
+        downloader: ResourceManager,
+    ) -> "FileTab":
+        return FileTab(course=course, sync_receipt=sync_receipt, downloader=downloader)
+
+    def __init__(
+        self,
+        course: db.Course,
+        downloader: ResourceManager,
+        *,
+        sync_receipt: SyncReceipt = None,
+    ):
+        super().__init__()
+
+        self._page_file_tree = PagesFileTree.create_from_receipt(
+            course, sync_receipt=sync_receipt, resource_manager=downloader
+        )
+        # self._assignment_file_tree = FileTree.create_from_receipt(
+        #     course,
+        #     sync_receipt=sync_receipt,
+        #     mode="assignments",
+        #     resource_manager=downloader,
+        # )
+
+        self.setLayout(layout(QHBoxLayout, self._page_file_tree))
+
+    def reload(self, course: db.Course, *, sync_receipt: SyncReceipt) -> None:
+        pass