Improve results and previous CGPA fields

Author: zefr0x

moadaly/ui/main.py

@@ -7,7 +7,7 @@
 
 from .. import database
 from . import result_box
-from . import previous_gpa_box
+from . import previous_cgpa_box
 from . import calculation_system_options_box
 from . import grades_panel
 from . import manage_profiles_dialogs
@@ -36,7 +36,7 @@ def __init__(self):
 
         # Create main window widgets.
         self.result_box = result_box.ResultBox()
-        self.previous_gpa_box = previous_gpa_box.PreviousGPABox()
+        self.previous_gpa_box = previous_cgpa_box.PreviousCGPABox()
         self.calculation_system_box = (
             calculation_system_options_box.CalculationSystemBox()
         )

moadaly/ui/previous_cgpa_box.py

@@ -0,0 +1,54 @@
+"""Where you can specify an old CGPA to be added to the calculation."""
+from gettext import gettext as _
+
+from PySide6 import QtCore, QtWidgets
+
+
+class PreviousCGPABox(QtWidgets.QWidget):
+    """A Group Box where you can specify a previous CGPA, to add it to the calculation."""
+
+    def __init__(self):
+        """Initialize components of the previous CGPA widget."""
+        super().__init__()
+
+        group_box = QtWidgets.QGroupBox(_("Previous CGPA"))
+        group_box.setParent(self)
+
+        group_box_layout = QtWidgets.QFormLayout()
+        group_box.setLayout(group_box_layout)
+
+        # Previous credit units.
+        self.previous_credit = QtWidgets.QSpinBox()
+        self.previous_credit.setMaximum(100000)
+        self.previous_credit.valueChanged.connect(self.update_previous_points)
+        group_box_layout.addRow(
+            QtWidgets.QLabel(_("Previous Credit Units")), self.previous_credit
+        )
+
+        # Previous CGPA.
+        self.previous_cgpa = QtWidgets.QDoubleSpinBox()
+        self.previous_cgpa.setDecimals(3)
+        self.previous_cgpa.setSingleStep(0.1)
+        # TODO Set the maximum value to 4 or 5 for the GPA depending on the used GPA system.
+        # TODO Set decimals count to three decimal values.
+        self.previous_cgpa.setMaximum(5.0)
+        self.previous_cgpa.valueChanged.connect(self.update_previous_points)
+        group_box_layout.addRow(
+            QtWidgets.QLabel(_("Previous CGPA")), self.previous_cgpa
+        )
+
+        # Previous points.
+        self.previous_points = QtWidgets.QDoubleSpinBox()
+        self.previous_points.setReadOnly(True)
+        self.previous_points.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.previous_points.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
+        self.previous_points.setDecimals(3)
+        group_box_layout.addRow(
+            QtWidgets.QLabel(_("Previous Points")), self.previous_points
+        )
+
+    def update_previous_points(self) -> None:
+        """Update previous points when CGPA or credit is changed."""
+        self.previous_points.setValue(
+            self.previous_cgpa.value() * self.previous_credit.value()
+        )

moadaly/ui/previous_gpa_box.py

@@ -1,7 +1,7 @@
 """The result box where the results are displayed."""
 from gettext import gettext as _
 
-from PySide6 import QtWidgets
+from PySide6 import QtCore, QtWidgets
 
 
 class ResultBox(QtWidgets.QWidget):
@@ -17,16 +17,23 @@ def __init__(self):
         group_box_layout = QtWidgets.QFormLayout()
 
         # Result GPA.
-        self.result_gpa = QtWidgets.QLabel(_("Undefined"))
+        self.result_gpa = QtWidgets.QDoubleSpinBox()
+        self.result_gpa.setReadOnly(True)
+        self.result_gpa.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.result_gpa.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
+        self.result_gpa.setDecimals(3)
         self.result_gpa.setStyleSheet(
             """
         font: bold;
         """
         )
-        group_box_layout.addRow(QtWidgets.QLabel(_("GPA:")), self.result_gpa)
+        group_box_layout.addRow(QtWidgets.QLabel(_("CGPA:")), self.result_gpa)
 
         # Result hours.
-        self.result_hours = QtWidgets.QLabel("0")
+        self.result_hours = QtWidgets.QSpinBox()
+        self.result_hours.setReadOnly(True)
+        self.result_hours.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.result_hours.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
         self.result_hours.setStyleSheet(
             """
         font: bold;
@@ -35,7 +42,10 @@ def __init__(self):
         group_box_layout.addRow(QtWidgets.QLabel(_("Hours:")), self.result_hours)
 
         # Result points.
-        self.result_points = QtWidgets.QLabel("0.00")
+        self.result_points = QtWidgets.QDoubleSpinBox()
+        self.result_points.setReadOnly(True)
+        self.result_points.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
+        self.result_points.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
         self.result_points.setStyleSheet(
             """
         font: bold;
@@ -45,6 +55,9 @@ def __init__(self):
 
         # Result grade.
         self.result_grade = QtWidgets.QLabel(_("Undefined"))
+        self.result_grade = QtWidgets.QLineEdit(_("Undefined"))
+        self.result_grade.setReadOnly(True)
+        self.result_grade.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
         self.result_grade.setStyleSheet(
             """
         font: bold;