Examtracker 1.2.2__tar.gz → 1.2.3__tar.gz

{examtracker-1.2.2/src/Examtracker.egg-info → examtracker-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Examtracker
-Version: 1.2.2
+Version: 1.2.3
 Summary: A Python exam tracker for the Lernphase .It allows you to keep track of all exams you have completed and the scores you achieved.
 Author-email: Samuel Huwiler <samuel.huwiler@gmx.ch>
 License: MIT License
@@ -36,6 +36,8 @@ Requires-Dist: pydantic-settings
 Requires-Dist: pathlib
 Requires-Dist: pyyaml
 Requires-Dist: rich
+Requires-Dist: pymysql
+Requires-Dist: cryptography
 Dynamic: license-file
 
 ![test](https://github.com/Samhuw8a/Examtracker/actions/workflows/test.yml/badge.svg) 
@@ -94,6 +96,7 @@ By default, the program searches for:
 
 ```yaml
 database_path: "~/.config/examtracker/examtracker.db"
+database_uri: "sqllite:///~/.config/examtracker/examtracker.db"
 ```
 
 </details>
@@ -144,6 +147,7 @@ Environment variables override values defined in `config.yml`.
 
 # TODO
 
+- [x] Allow for floating point values for the points scored
 - [x] Handle SQL errors  
 - [x] Initialize database  
 - [x] Configuration file support  
@@ -153,5 +157,8 @@ Environment variables override values defined in `config.yml`.
 - [x] enable Editing Exams and Semester
 - [x] Feature where you can add the grade you got in the exams
 - [ ] Enable externaly hosted database in config
+- [x] Add a Notes section to the Exams for adding notes
+- [  ] Fix sizing issue when removing a large note from an exam
+- [x] Save the collumn when entering a submenu to set the cursor to the same place as before instead of to the top
 - [x] write Tests
 - [x] automagicly push new pypi versions and make release upon github tag push tag push

{examtracker-1.2.2 → examtracker-1.2.3}/README.md

@@ -54,6 +54,7 @@ By default, the program searches for:
 
 ```yaml
 database_path: "~/.config/examtracker/examtracker.db"
+database_uri: "sqllite:///~/.config/examtracker/examtracker.db"
 ```
 
 </details>
@@ -104,6 +105,7 @@ Environment variables override values defined in `config.yml`.
 
 # TODO
 
+- [x] Allow for floating point values for the points scored
 - [x] Handle SQL errors  
 - [x] Initialize database  
 - [x] Configuration file support  
@@ -113,5 +115,8 @@ Environment variables override values defined in `config.yml`.
 - [x] enable Editing Exams and Semester
 - [x] Feature where you can add the grade you got in the exams
 - [ ] Enable externaly hosted database in config
+- [x] Add a Notes section to the Exams for adding notes
+- [  ] Fix sizing issue when removing a large note from an exam
+- [x] Save the collumn when entering a submenu to set the cursor to the same place as before instead of to the top
 - [x] write Tests
 - [x] automagicly push new pypi versions and make release upon github tag push tag push

{examtracker-1.2.2 → examtracker-1.2.3}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" # If not defined, then legacy behavior c
 
 [project]
 name = "Examtracker" # REQUIRED, is the only field that cannot be marked as dynamic.
-version = "1.2.2" # REQUIRED, although can be dynamic
+version = "1.2.3" # REQUIRED, although can be dynamic
 description = "A Python exam tracker for the Lernphase .It allows you to keep track of all exams you have completed and the scores you achieved."
 
 readme = "README.md"

{examtracker-1.2.2 → examtracker-1.2.3}/requirements.txt

@@ -6,3 +6,5 @@ pydantic-settings
 pathlib
 pyyaml
 rich
+pymysql
+cryptography

{examtracker-1.2.2 → examtracker-1.2.3/src/Examtracker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Examtracker
-Version: 1.2.2
+Version: 1.2.3
 Summary: A Python exam tracker for the Lernphase .It allows you to keep track of all exams you have completed and the scores you achieved.
 Author-email: Samuel Huwiler <samuel.huwiler@gmx.ch>
 License: MIT License
@@ -36,6 +36,8 @@ Requires-Dist: pydantic-settings
 Requires-Dist: pathlib
 Requires-Dist: pyyaml
 Requires-Dist: rich
+Requires-Dist: pymysql
+Requires-Dist: cryptography
 Dynamic: license-file
 
 ![test](https://github.com/Samhuw8a/Examtracker/actions/workflows/test.yml/badge.svg) 
@@ -94,6 +96,7 @@ By default, the program searches for:
 
 ```yaml
 database_path: "~/.config/examtracker/examtracker.db"
+database_uri: "sqllite:///~/.config/examtracker/examtracker.db"
 ```
 
 </details>
@@ -144,6 +147,7 @@ Environment variables override values defined in `config.yml`.
 
 # TODO
 
+- [x] Allow for floating point values for the points scored
 - [x] Handle SQL errors  
 - [x] Initialize database  
 - [x] Configuration file support  
@@ -153,5 +157,8 @@ Environment variables override values defined in `config.yml`.
 - [x] enable Editing Exams and Semester
 - [x] Feature where you can add the grade you got in the exams
 - [ ] Enable externaly hosted database in config
+- [x] Add a Notes section to the Exams for adding notes
+- [  ] Fix sizing issue when removing a large note from an exam
+- [x] Save the collumn when entering a submenu to set the cursor to the same place as before instead of to the top
 - [x] write Tests
 - [x] automagicly push new pypi versions and make release upon github tag push tag push

{examtracker-1.2.2 → examtracker-1.2.3}/src/Examtracker.egg-info/requires.txt

@@ -6,3 +6,5 @@ pydantic-settings
 pathlib
 pyyaml
 rich
+pymysql
+cryptography

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/database.py

@@ -2,20 +2,19 @@
 Database related functions for getting and adding entries
 """
 
-from typing import List, Optional
+from typing import Optional
 
-from sqlalchemy import Engine, create_engine, inspect  # type:ignore
+from sqlalchemy import Engine  # type:ignore
 from sqlalchemy.orm import Session
 
 from examtracker.database_scheme import Base, Class, Exam, Semester
 
 
-def create_database_engine(path: str) -> Engine:
-    engine = create_engine("sqlite:///" + path, echo=False)
-    inspector = inspect(engine)
+def create_database_engine(uri: str) -> Engine:
+    from sqlalchemy import create_engine
 
-    if not inspector.get_table_names():
-        create_tables(engine)
+    engine = create_engine(uri, echo=False)
+    create_tables(engine)
 
     return engine
 
@@ -31,7 +30,7 @@ def get_semester_by_name(session: Session, name: str) -> Semester:
 def add_semester(session: Session, name: str) -> None:
     semester_obj = Semester(name=name)
     session.add(semester_obj)
-    session.flush
+    session.flush()
 
 
 def get_class_by_id(session: Session, class_id: int) -> Class:
@@ -56,29 +55,35 @@ def add_class_to_semester(
 
 
 def add_exam_to_class(
-    session: Session, name: str, max_points: int, scored_points: int, class_obj: Class
+    session: Session,
+    name: str,
+    max_points: float,
+    scored_points: float,
+    notes: str,
+    class_obj: Class,
 ) -> None:
     exam_obj = Exam(
         name=name,
         max_points=max_points,
         scored_points=scored_points,
+        notes=notes,
         class_id=class_obj.class_id,
     )
     session.add(exam_obj)
     session.flush()
 
 
-def get_all_exams_for_class(session: Session, class_obj: Class) -> List[Exam]:
+def get_all_exams_for_class(session: Session, class_obj: Class) -> list[Exam]:
     return session.query(Exam).filter_by(class_id=class_obj.class_id).all()
 
 
-def get_all_semester(session: Session) -> List[Semester]:
-    return session.query(Semester).all()
+def get_all_semester(session: Session) -> list[Semester]:
+    return session.query(Semester).all()[::-1]
 
 
 def get_all_classes_for_semester(
     session: Session, semster_obj: Semester
-) -> List[Class]:
+) -> list[Class]:
     return session.query(Class).filter_by(semester_id=semster_obj.semester_id).all()
 
 
@@ -98,7 +103,7 @@ def remove_exam_by_id(session: Session, exam_id: int) -> None:
 
 
 def main() -> int:
-    engine: Engine = create_database_engine("test.db")
+    engine: Engine = create_database_engine("sqlite:///test.db")
     create_tables(engine)
     session = Session(engine)
     add_semester(session, "FS25")

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/database_scheme.py

@@ -2,8 +2,6 @@
 Defining the database tables and entries
 """
 
-from typing import List, Optional
-
 from sqlalchemy import ForeignKey, String
 from sqlalchemy.orm import (  # type: ignore
     DeclarativeBase,
@@ -21,8 +19,9 @@ class Exam(Base):
     __tablename__ = "exams"
     exam_id: Mapped[int] = mapped_column(primary_key=True)
     name: Mapped[str] = mapped_column(String(30))
-    max_points: Mapped[int]
-    scored_points: Mapped[int]
+    max_points: Mapped[float]
+    scored_points: Mapped[float]
+    notes: Mapped[str] = mapped_column(String(100))
     class_id: Mapped[int] = mapped_column(ForeignKey("classes.class_id"))
     class_: Mapped["Class"] = relationship(back_populates="exams")  # type:ignore
 
@@ -34,11 +33,11 @@ class Class(Base):
     __tablename__ = "classes"
     class_id: Mapped[int] = mapped_column(primary_key=True)
     name: Mapped[str] = mapped_column(String(30))
-    exam_grade: Mapped[Optional[float]]
+    exam_grade: Mapped[float | None]
     semester_id: Mapped[int] = mapped_column(ForeignKey("semester.semester_id"))
     semester: Mapped["Semester"] = relationship(back_populates="classes")  # type:ignore
 
-    exams: Mapped[List["Exam"]] = relationship(
+    exams: Mapped[list["Exam"]] = relationship(
         back_populates="class_",
         cascade="all, delete-orphan",
     )  # type: ignore
@@ -51,7 +50,7 @@ class Semester(Base):
     __tablename__ = "semester"
     semester_id: Mapped[int] = mapped_column(primary_key=True)
     name: Mapped[str] = mapped_column(String(30), unique=True)
-    classes: Mapped[List["Class"]] = relationship(
+    classes: Mapped[list["Class"]] = relationship(
         back_populates="semester",
         cascade="all, delete-orphan",
     )  # type: ignore

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/main.py

@@ -7,7 +7,7 @@ from examtracker.settings import Settings
 
 def main() -> int:
     config: Settings = Settings()
-    db_engine = create_database_engine(config.database_path)
+    db_engine = create_database_engine(config.database_uri)
     app = ExamTracker(db_engine, config)
     app.run()
     return 0

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/screens/classscreen.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import math
+
 from sqlalchemy.orm import Session
 from textual import on
 from textual.app import ComposeResult, Screen
@@ -13,27 +15,27 @@ from examtracker.database import (
     remove_class_by_id,
 )
 from examtracker.screens.examscreen import ExamScreen
-from examtracker.screens.inputscreens import DoubleInputScreen
+from examtracker.screens.inputscreens import MultiInputScreen
 from examtracker.textual_utils.vimtable import VimTable
 
 
-class AddClassScreen(DoubleInputScreen):
+class AddClassScreen(MultiInputScreen):
     def __init__(self, semester_name: str, **kwargs) -> None:
-        super().__init__(**kwargs)
+        super().__init__(2, **kwargs)
         self.semester_name = semester_name
         self.label_text = f"Add class to: {self.semester_name}"
 
     def on_mount(self) -> None:
-        self.input_button1.placeholder = "class name"
-        self.input_button1.value = ""
-        self.input_button2.placeholder = "exam_score"
-        self.input_button2.value = ""
-        self.input_button1.focus()
+        self.buttons[0].placeholder = "class name"
+        self.buttons[0].value = ""
+        self.buttons[1].placeholder = "exam_score"
+        self.buttons[1].value = ""
+        self.buttons[0].focus()
 
     # Submit on Enter from any Input
     def submit(self) -> None:
-        name = self.input_button1.value.strip()
-        exam_score = self.input_button2.value.strip()
+        name = self.buttons[0].value.strip()
+        exam_score = self.buttons[1].value.strip()
         try:
             score = float(exam_score)
         except ValueError:
@@ -49,29 +51,32 @@ class AddClassScreen(DoubleInputScreen):
         self.app.pop_screen()
 
 
-class EditClassScreen(DoubleInputScreen):
+class EditClassScreen(MultiInputScreen):
     def __init__(self, class_id: int, **kwargs) -> None:
-        super().__init__(**kwargs)
+        super().__init__(2, **kwargs)
         self.class_id = class_id
         self.label_text = "Edit class"
 
     def on_mount(self) -> None:
         class_obj = get_class_by_id(self.db_session, self.class_id)
-        self.input_button1.value = class_obj.name
+        self.buttons[0].value = class_obj.name
         if class_obj.exam_grade is not None:
-            self.input_button2.value = str(class_obj.exam_grade)
+            self.buttons[1].value = str(class_obj.exam_grade)
         else:
-            self.input_button2.value = ""
-        self.input_button1.focus()
+            self.buttons[1].value = ""
+        self.buttons[0].focus()
 
     # Submit on Enter from any Input
     def submit(self) -> None:
-        name = self.input_button1.value.strip()
-        exam_score = self.input_button2.value.strip()
+        name = self.buttons[0].value.strip()
+        exam_score = self.buttons[1].value.strip()
         try:
             score = float(exam_score)
         except ValueError:
             score = None
+
+        if isinstance(score, float) and not math.isfinite(score):
+            score = None
         if not name:
             return  # Require class name
 
@@ -101,6 +106,7 @@ class ClassScreen(Screen):
         super().__init__()
         self.db_session: Session = self.app.db_session  # type: ignore
         self.semester_name = semester_name
+        self.latest_row = 0
 
     def compose(self) -> ComposeResult:
         yield Header()
@@ -147,9 +153,11 @@ class ClassScreen(Screen):
             score = cls.exam_grade
             str_score = ""
             if score is not None:
-                str_score = cls.exam_grade
+                str_score = str(cls.exam_grade)
             self.class_table.add_row(cls.class_id, cls.name, str_score)
 
+        self.class_table.move_cursor(row=self.latest_row, column=0)
+
     def on_screen_resume(self) -> None:
         self.refresh_table()
 
@@ -158,6 +166,7 @@ class ClassScreen(Screen):
         row_index = self.class_table.cursor_row
         if row_index is None:
             return
+        self.latest_row = row_index
 
         class_id = self.class_table.get_row_at(row_index)[0]
         self.app.push_screen(ExamScreen(class_id))

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/screens/examscreen.py

@@ -1,4 +1,5 @@
-from rich.text import Text
+import math
+
 from textual import on
 from textual.app import ComposeResult, Screen
 from textual.widgets import Footer, Header
@@ -10,7 +11,7 @@ from examtracker.database import (
     get_exam_by_id,
     remove_exam_by_id,
 )
-from examtracker.screens.inputscreens import TrippleInputScreen
+from examtracker.screens.inputscreens import MultiInputScreen
 from examtracker.textual_utils.vimtable import VimTable
 
 
@@ -23,93 +24,108 @@ def proc_color(value: float) -> str:
         return "#fc1c03"
 
 
-class EditExamScreen(TrippleInputScreen):
+class EditExamScreen(MultiInputScreen):
     def __init__(self, exam_id: int, **kwargs):
-        super().__init__(**kwargs)
+        super().__init__(4, **kwargs)
         self.label_text = "Edit exam"
         self.exam_id = exam_id
-        self.db_session = self.app.db_session  # type:ignore
+        self.db_session = self.app.db_session  # type: ignore
 
     def on_mount(self) -> None:
         exam = get_exam_by_id(self.db_session, self.exam_id)
 
-        self.input_button1.value = exam.name
-        self.input_button2.value = str(exam.max_points)
-        self.input_button3.value = str(exam.scored_points)
+        self.buttons[0].value = exam.name
+        self.buttons[1].value = str(exam.max_points)
+        self.buttons[2].value = str(exam.scored_points)
+        self.buttons[3].value = str(exam.notes)
 
-        self.input_button1.focus()
+        self.buttons[0].focus()
 
     def submit(self) -> None:
-        name = self.input_button1.value.strip()
+        name = self.buttons[0].value.strip()
         if not name:
             return  # Require class name
 
         # Optional exam points
         try:
-            max_points = int(self.input_button2.value.strip())
+            max_points = float(self.buttons[1].value.strip())
         except ValueError:
             # Ignore invalid numbers for now
             max_points = 0
 
         try:
-            scored_points = int(self.input_button3.value.strip())
+            scored_points = float(self.buttons[2].value.strip())
         except ValueError:
             # Ignore invalid numbers for now
             scored_points = 0
+        if not math.isfinite(scored_points):
+            scored_points = 0
+
+        notes = self.buttons[3].value.strip()
 
         exam = get_exam_by_id(self.db_session, self.exam_id)
         exam.name = name
         exam.max_points = max_points
         exam.scored_points = scored_points
+        exam.notes = notes
 
         self.db_session.commit()
 
         self.app.pop_screen()
 
 
-class AddExamScreen(TrippleInputScreen):
+class AddExamScreen(MultiInputScreen):
     BINDINGS = [
         ("escape", "app.pop_screen", "Cancel"),
     ]
 
     def __init__(self, class_id: int, **kwargs):
-        super().__init__(**kwargs)
+        super().__init__(4, **kwargs)
         self.db_session = self.app.db_session  # type: ignore
         self.class_id = class_id
         self.class_name = get_class_by_id(self.db_session, self.class_id).name
         self.label_text = f"Add exam to: {self.class_name}"
 
     def on_mount(self) -> None:
-        self.input_button1.focus()
-        self.input_button1.placeholder = "Exam Name"
-        self.input_button2.placeholder = "Max Points"
-        self.input_button3.placeholder = "Scored Points"
+        self.buttons[0].focus()
+        self.buttons[0].placeholder = "Exam Name"
+        self.buttons[1].placeholder = "Max Points"
+        self.buttons[2].placeholder = "Scored Points"
+        self.buttons[3].placeholder = "Additional Notes"
 
-        self.input_button1.value = ""
-        self.input_button2.value = ""
-        self.input_button3.value = ""
+        self.buttons[0].value = ""
+        self.buttons[1].value = ""
+        self.buttons[2].value = ""
+        self.buttons[3].value = ""
 
     def submit(self) -> None:
-        name = self.input_button1.value.strip()
+        name = self.buttons[0].value.strip()
         if not name:
             return  # Require class name
 
         try:
-            max_points = int(self.input_button2.value.strip())
+            max_points = float(self.buttons[1].value.strip())
         except ValueError:
             # Ignore invalid numbers for now
             max_points = 0
 
         try:
-            scored_points = int(self.input_button3.value.strip())
+            scored_points = float(self.buttons[2].value.strip())
         except ValueError:
             # Ignore invalid numbers for now
             scored_points = 0
 
+        if not math.isfinite(scored_points):
+            scored_points = 0
+
+        notes = self.buttons[3].value.strip()
+
         class_obj = get_class_by_id(self.db_session, self.class_id)
 
         # Add the class
-        add_exam_to_class(self.db_session, name, max_points, scored_points, class_obj)
+        add_exam_to_class(
+            self.db_session, name, max_points, scored_points, notes, class_obj
+        )
         self.db_session.commit()
 
         # Pop the screen and return
@@ -134,7 +150,9 @@ class ExamScreen(Screen):
         yield Header()
 
         self.exam_table: VimTable = VimTable()
-        self.exam_table.add_columns("ID", "Name", "Max_points", "Scored_points", "%")
+        self.exam_table.add_columns(
+            "ID", "Name", "Max_points", "Scored_points", "%", "Additional Notes"
+        )
         self.exam_table.cursor_type = "cell"
         self.exam_table.border_title = f"Exams completed for: {self.class_name}"
         yield self.exam_table
@@ -161,18 +179,25 @@ class ExamScreen(Screen):
         self.refresh_table()
 
     def refresh_table(self) -> None:
+        from rich.text import Text
+
         class_obj = get_class_by_id(self.db_session, self.class_id)
 
         self.exam_table.clear()
-        for cls in get_all_exams_for_class(self.db_session, class_obj):
-            if cls.max_points == 0:
+        for exm in get_all_exams_for_class(self.db_session, class_obj):
+            if exm.max_points == 0:
                 proc = 0.0
             else:
-                proc = round((cls.scored_points / cls.max_points) * 100, 2)
+                proc = round((exm.scored_points / exm.max_points) * 100, 2)
 
             proc_text = Text(str(proc), style=proc_color(proc))
             self.exam_table.add_row(
-                cls.exam_id, cls.name, cls.max_points, cls.scored_points, proc_text
+                exm.exam_id,
+                exm.name,
+                exm.max_points,
+                exm.scored_points,
+                proc_text,
+                exm.notes,
             )
 
     def on_screen_resume(self) -> None:

examtracker-1.2.3/src/examtracker/screens/inputscreens.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+from textual import on
+from textual.app import ComposeResult, Screen
+from textual.containers import Vertical
+from textual.widgets import Footer, Header, Input, Label
+
+
+class MultiInputScreen(Screen):
+    BINDINGS = [
+        ("escape", "app.pop_screen", "Cancel"),
+    ]
+    label_text: str = ""
+
+    def __init__(self, n: int, **kwargs) -> None:
+        super().__init__(**kwargs)
+        self.buttons: list[Input] = []
+        self.db_session = self.app.db_session  # type: ignore
+        for i in range(n):
+            self.buttons.append(Input())
+
+    def compose(self) -> ComposeResult:
+        yield Header()
+        with Vertical():
+            yield Label(self.label_text)
+            for i in range(len(self.buttons)):
+                yield self.buttons[i]
+        yield Footer()
+
+    @on(Input.Submitted)
+    def input_submitted(self, event: Input.Submitted) -> None:
+        self.submit()  # type: ignore

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/screens/semesterscreen.py

@@ -12,23 +12,23 @@ from examtracker.database import (
     remove_semester_by_name,
 )
 from examtracker.screens.classscreen import ClassScreen
-from examtracker.screens.inputscreens import SingleInputScreen
+from examtracker.screens.inputscreens import MultiInputScreen
 from examtracker.textual_utils.vimtable import VimTable
 
 
-class AddSemesterScreen(SingleInputScreen):
+class AddSemesterScreen(MultiInputScreen):
 
     def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+        super().__init__(1, *args, **kwargs)
         self.label_text = "Add new semester"
 
     def on_mount(self) -> None:
-        self.input_button.focus()
-        self.input_button.placeholder = "semester name"
-        self.input_button.value = ""
+        self.buttons[0].focus()
+        self.buttons[0].placeholder = "semester name"
+        self.buttons[0].value = ""
 
     def submit(self) -> None:
-        name = self.input_button.value.strip()
+        name = self.buttons[0].value.strip()
         if not name:
             return
         try:
@@ -42,20 +42,20 @@ class AddSemesterScreen(SingleInputScreen):
         self.app.pop_screen()
 
 
-class EditSemesterScreen(SingleInputScreen):
+class EditSemesterScreen(MultiInputScreen):
 
     def __init__(self, semester_name: str, **kwargs) -> None:
-        super().__init__(**kwargs)
+        super().__init__(1, **kwargs)
         self.semester_name = semester_name
         self.label_text = "Edit semester"
 
     def on_mount(self) -> None:
         semester = get_semester_by_name(self.db_session, self.semester_name)
-        self.input_button.value = semester.name
-        self.input_button.focus()
+        self.buttons[0].value = semester.name
+        self.buttons[0].focus()
 
     def submit(self) -> None:
-        name = self.input_button.value.strip()
+        name = self.buttons[0].value.strip()
         if not name:
             return
         semester = get_semester_by_name(self.db_session, self.semester_name)
@@ -79,6 +79,7 @@ class SemesterScreen(Screen):
 
     def __init__(self) -> None:
         super().__init__()
+        self.latest_row = 0
 
     def compose(self) -> ComposeResult:
         yield Header()
@@ -98,6 +99,7 @@ class SemesterScreen(Screen):
         self.semester_table.clear()
         for sem in get_all_semester(self.db_session):
             self.semester_table.add_row(sem.name)
+        self.semester_table.move_cursor(row=self.latest_row, column=0)
 
     def action_edit(self) -> None:
         row_index = self.semester_table.cursor_row
@@ -133,6 +135,7 @@ class SemesterScreen(Screen):
         row_index = self.semester_table.cursor_row
         if row_index is None:
             return
+        self.latest_row = row_index
 
         semester_name = self.semester_table.get_row_at(row_index)[0]
         self.app.push_screen(ClassScreen(semester_name))

{examtracker-1.2.2 → examtracker-1.2.3}/src/examtracker/settings.py

@@ -4,9 +4,8 @@ import os
 import sys
 from importlib.resources import files
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any
 
-import yaml  # type: ignore
 from platformdirs import PlatformDirs
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -26,12 +25,12 @@ def get_config_dir() -> Path:
         return Path(dirs.user_config_dir)
 
 
-def get_default_database_path() -> Path:
+def get_default_database_uri() -> str:
     """Return a writable database path in the user data directory."""
 
     db_dir = get_config_dir()
     db_dir.mkdir(parents=True, exist_ok=True)
-    return db_dir / "examtracker.db"
+    return "sqlite:///" + str(db_dir / "examtracker.db")
 
 
 def get_default_css_path() -> Path:
@@ -39,7 +38,9 @@ def get_default_css_path() -> Path:
     return Path(files("examtracker").joinpath("data/style.css"))  # type:ignore
 
 
-def yaml_config_settings_source(settings_cls) -> Dict[str, Any]:
+def yaml_config_settings_source(settings_cls) -> dict[str, Any]:
+    import yaml  # type: ignore
+
     config_path = os.getenv("EXAMTRACKER_CONFIG")
 
     if config_path:
@@ -58,7 +59,7 @@ def yaml_config_settings_source(settings_cls) -> Dict[str, Any]:
 
 
 class Settings(BaseSettings):
-    database_path: str = Field(default_factory=lambda: str(get_default_database_path()))
+    database_uri: str = Field(default_factory=lambda: str(get_default_database_uri()))
     css_path: str = Field(default_factory=lambda: str(get_default_css_path()))
     model_config = SettingsConfigDict(
         env_prefix="EXAMTRACKER_",

{examtracker-1.2.2 → examtracker-1.2.3}/test/test_database.py

@@ -87,10 +87,8 @@ def test_semester_name_uniqueness(name: str) -> None:
         session.commit()
 
         # Second insertion of the exact same name
-        add_semester(session, name)
-
         with pytest.raises(IntegrityError):
-            session.commit()
+            add_semester(session, name)
 
 
 # ------------- Class tests -------------
@@ -139,11 +137,18 @@ def test_get_nonexistant_class() -> None:
 
 @given(
     name=valid_text,
-    max_points=integers(min_value=0, max_value=10000),
-    scored_points=integers(min_value=0, max_value=10000),
+    max_points=floats(
+        min_value=0, max_value=10000, allow_infinity=False, allow_nan=False
+    ),
+    scored_points=floats(
+        min_value=0, max_value=10000, allow_infinity=False, allow_nan=False
+    ),
+    notes=text(),
 )
 @settings(deadline=None)
-def test_add_get_exam(name: str, max_points: int, scored_points: int) -> None:
+def test_add_get_exam(
+    name: str, max_points: float, scored_points: float, notes: str
+) -> None:
     with temp_db() as session:
         # Setup Hierarchy: Semester -> Class
         add_semester(session, "S1")
@@ -151,7 +156,7 @@ def test_add_get_exam(name: str, max_points: int, scored_points: int) -> None:
         add_class_to_semester(session, "C1", sem)
         cls = sem.classes[0]
 
-        add_exam_to_class(session, name, max_points, scored_points, cls)
+        add_exam_to_class(session, name, max_points, scored_points, notes, cls)
         session.commit()
 
         # Verify exam data
@@ -160,6 +165,7 @@ def test_add_get_exam(name: str, max_points: int, scored_points: int) -> None:
         assert exams[0].name == name
         assert exams[0].max_points == max_points
         assert exams[0].scored_points == scored_points
+        assert exams[0].notes == notes
 
 
 def test_get_nonexistant_exam() -> None:
@@ -181,7 +187,7 @@ def test_remove_semester_cascades_to_classes_and_exams() -> None:
         add_class_to_semester(session, "Nested Class", sem)
         cls = sem.classes[0]
 
-        add_exam_to_class(session, "Nested Exam", 100, 90, cls)
+        add_exam_to_class(session, "Nested Exam", 100, 90, "notes", cls)
         session.commit()
 
         # Capture IDs to verify deletion later
@@ -229,7 +235,7 @@ def test_remove_exam_by_id_logic() -> None:
         sem = get_semester_by_name(session, "S1")
         add_class_to_semester(session, "C1", sem)
         cls = sem.classes[0]
-        add_exam_to_class(session, "Final", 100, 100, cls)
+        add_exam_to_class(session, "Final", 100, 100, "notes", cls)
         session.commit()
 
         exam_id = cls.exams[0].exam_id
@@ -259,7 +265,7 @@ def test_empty_relationships_return_empty_list() -> None:
         assert get_all_exams_for_class(session, cls) == []
 
 
-@given(pts=integers(min_value=0, max_value=2147483647))  # Max 32-bit signed int
+@given(pts=floats(allow_infinity=False, allow_nan=False))  # Max 32-bit signed int
 def test_exam_score_boundaries(pts: int) -> None:
     """Tests that the database handles large point values correctly."""
     with temp_db() as session:
@@ -268,7 +274,7 @@ def test_exam_score_boundaries(pts: int) -> None:
         add_class_to_semester(session, "Math", sem)
         cls = sem.classes[0]
 
-        add_exam_to_class(session, "Big Score", pts, pts, cls)
+        add_exam_to_class(session, "Big Score", pts, pts, "notes", cls)
         session.commit()
 
         exam = get_all_exams_for_class(session, cls)[0]

examtracker-1.2.2/src/examtracker/screens/inputscreens.py

@@ -1,81 +0,0 @@
-from __future__ import annotations
-
-from textual import on
-from textual.app import ComposeResult, Screen
-from textual.containers import Vertical
-from textual.widgets import Footer, Header, Input, Label
-
-
-class SingleInputScreen(Screen):
-    BINDINGS = [
-        ("escape", "app.pop_screen", "Cancel"),
-    ]
-    input_button: Input = Input()
-    label_text: str = ""
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.db_session = self.app.db_session  # type: ignore
-
-    def compose(self) -> ComposeResult:
-        yield Header()
-        with Vertical():
-            yield Label(self.label_text)
-            yield self.input_button
-        yield Footer()
-
-    @on(Input.Submitted)
-    def input_submitted(self, event: Input.Submitted) -> None:
-        self.submit()  # type: ignore
-
-
-class TrippleInputScreen(Screen):
-    BINDINGS = [
-        ("escape", "app.pop_screen", "Cancel"),
-    ]
-    input_button1: Input = Input()
-    input_button2: Input = Input()
-    input_button3: Input = Input()
-    label_text: str = ""
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.db_session = self.app.db_session  # type: ignore
-
-    def compose(self) -> ComposeResult:
-        yield Header()
-        with Vertical():
-            yield Label(self.label_text)
-            yield self.input_button1
-            yield self.input_button2
-            yield self.input_button3
-        yield Footer()
-
-    @on(Input.Submitted)
-    def input_submitted(self, event: Input.Submitted) -> None:
-        self.submit()  # type: ignore
-
-
-class DoubleInputScreen(Screen):
-    BINDINGS = [
-        ("escape", "app.pop_screen", "Cancel"),
-    ]
-    input_button1: Input = Input()
-    input_button2: Input = Input()
-    label_text: str = ""
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.db_session = self.app.db_session  # type: ignore
-
-    def compose(self) -> ComposeResult:
-        yield Header()
-        with Vertical():
-            yield Label(self.label_text)
-            yield self.input_button1
-            yield self.input_button2
-        yield Footer()
-
-    @on(Input.Submitted)
-    def input_submitted(self, event: Input.Submitted) -> None:
-        self.submit()  # type: ignore