Merge pull request #199 from Rafalkufel/198-new-look-support-center-settings

198 - Popraw zakładkę ustawienia poradnii

Author: Rafalkufel

alinka/db/queries.py

@@ -97,14 +97,16 @@ def delete_school(school_id: int) -> None:
         db.commit()
 
 
-def upsert_support_center(support_center_data: dict) -> SupportCenterDbSchema:
+def upsert_support_center(support_center_data: SupportCenterDbSchema) -> SupportCenterDbSchema:
     with db_session() as db:
         if db.query(SupportCenter).where(SupportCenter.id == 1).one_or_none():
-            db.query(SupportCenter).where(SupportCenter.id == 1).update(support_center_data, synchronize_session="auto")
+            db.query(SupportCenter).where(SupportCenter.id == 1).update(
+                support_center_data.model_dump(), synchronize_session="auto"
+            )
             db.commit()
             support_center = db.query(SupportCenter).where(SupportCenter.id == 1).one()
         else:
-            support_center = SupportCenter(**support_center_data)
+            support_center = SupportCenter(**support_center_data.model_dump())
             db.add(support_center)
             db.commit()
 

alinka/widget/containers/main_body/content/__init__.py

@@ -70,10 +70,12 @@ def validate_basic_settings(self) -> bool:
                 self.window(), error_message, tab_names=invalid_tab_names if invalid_tab_names else None
             )
             self.sidebar_menu_container.create_documents_btn.setEnabled(False)
+            self.sidebar_menu_container.search_child_btn.setEnabled(False)
             self.show_settings_container()
             return False
         else:
             self.sidebar_menu_container.create_documents_btn.setEnabled(True)
+            self.sidebar_menu_container.search_child_btn.setEnabled(True)
             return True
 
     def showEvent(self, event):

alinka/widget/containers/main_body/content/application/application_tabs/meeting_tab/__init__.py

@@ -377,7 +377,9 @@ def meeting_data(self) -> MeetingData:
             member = self.meeting_member_group.model.item(row_index)
             if member.checkState() == Qt.CheckState.Unchecked:
                 continue
-            meeting_member_data = get_meeting_member_by_id(member.data())
+            mm_data = get_meeting_member_by_id(member.data())
+            meeting_member_data = MeetingMemberData(**mm_data.model_dump())
+
             if meeting_member_data.name == self.meeting_leader.combobox.currentText():
                 meeting_members.insert(0, meeting_member_data)
             else:

alinka/widget/containers/main_body/content/settings/__init__.py

@@ -30,7 +30,6 @@ def __init__(self, parent: QWidget, content_container, visible: bool = False):
         self.addTab(self.support_center_tab_container, "Dane poradni")
         self.addTab(self.app_settings_tab_container, "Ustawienia aplikacji")
         self.addTab(self.creators_tab_container, "O aplikacji")
-        self.currentChanged.connect(self.handle_footer_visibility)
         self.currentChanged.connect(self.update_breadcrumb)
 
     @property
@@ -48,18 +47,6 @@ def error_message(self) -> str | None:
     def support_center_data(self):
         return self.support_center_tab_container.support_center_data
 
-    def handle_footer_visibility(self, index):
-        footer_container = self.content_container.main_body_container.footer_container
-        setting_footer_container = footer_container.settings_footer_container
-        match index:
-            case 0:
-                setting_footer_container.setVisible(True)  # Ensure visible
-                setting_footer_container.show_footer_support_center_data_container()
-            case 1:  # App settings tab - no footer needed
-                setting_footer_container.hide()
-            case 2:  # Creators tab - no footer needed
-                setting_footer_container.hide()
-
     def update_breadcrumb(self, index: int):
         """Update breadcrumb when tab changes"""
         header_container = self.content_container.main_body_container.header_container

alinka/widget/containers/main_body/content/settings/settings_tabs/schools_tab/__init__.py

@@ -1,11 +1,44 @@
-from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QVBoxLayout, QWidget
+from PySide6.QtCore import Qt, Signal
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
 
 from alinka.db.queries import get_support_center_data
 from alinka.widget.components import ValidationMixin
 
-from .select_support_center_group import SelectSupportCenterGroup
-from .support_center_data_group import SupportCenterDataGroup
+from .support_center_dialog import SupportCenterDialog
+
+
+class HandleSupportCenterFrame(ValidationMixin, QWidget):
+    support_center_changed = Signal()
+
+    def __init__(self, parent: QWidget):
+        super().__init__(parent)
+        layout = QHBoxLayout(self)
+
+        self.add_support_center_btn = QPushButton("Dodaj", self)
+        self.add_support_center_btn.setFixedSize(200, 30)
+        self.add_support_center_btn.clicked.connect(self.add_support_center)
+        layout.addWidget(self.add_support_center_btn)
+
+        self.update_support_center_btn = QPushButton("Edytuj", self)
+        self.update_support_center_btn.setFixedSize(200, 30)
+        self.update_support_center_btn.clicked.connect(self.update_support_center)
+        layout.addWidget(self.update_support_center_btn)
+
+        self.setLayout(layout)
+
+    def add_support_center(self):
+        dialog = SupportCenterDialog(self, edit=False)
+        if dialog.exec():
+            self.support_center_changed.emit()
+
+    def update_support_center(self):
+        dialog = SupportCenterDialog(self)
+        if dialog.exec():
+            self.support_center_changed.emit()
+
+    def toggle_buttons(self, support_center_exists: bool):
+        self.add_support_center_btn.setVisible(not support_center_exists)
+        self.update_support_center_btn.setVisible(support_center_exists)
 
 
 class SupportCenterTabContainer(ValidationMixin, QWidget):
@@ -17,15 +50,77 @@ def __init__(self, parent: QWidget):
         layout.setContentsMargins(0, 0, 0, 0)
         layout.setAlignment(Qt.AlignTop)
 
-        self.select_support_center_group = SelectSupportCenterGroup(self)
-        self.support_center_data_group = SupportCenterDataGroup(self)
-        layout.addWidget(self.select_support_center_group, 0)
-        layout.addWidget(self.support_center_data_group, 0)
+        self.support_center_description = QLabel(self)
+        self.support_center_description.setWordWrap(True)
+        self.support_center_description.setTextFormat(Qt.RichText)
+        self.support_center_description.setAlignment(Qt.AlignCenter)
+        self.support_center_description.setText(self.support_center_description_text)
+        self.handle_support_center_frame = HandleSupportCenterFrame(self)
+        self.handle_support_center_frame.support_center_changed.connect(self.support_center_description_updated)
+        self.handle_support_center_frame.toggle_buttons(self.is_valid)
+
+        layout.addWidget(self.support_center_description, 0)
+        layout.addWidget(self.handle_support_center_frame, 0)
         layout.addStretch()
 
+    def support_center_description_updated(self):
+        support_center_exists = self.is_valid
+        self.handle_support_center_frame.toggle_buttons(support_center_exists)
+
+        self.support_center_description.setText(self.support_center_description_text)
+        self.settings_container.content_container.validate_basic_settings()
+
+    @property
+    def support_center_description_text(self) -> str:
+        support_center_data = get_support_center_data()
+        if not support_center_data:
+            return self.no_support_center_selected_message
+
+        return f"""
+        <div align="center">
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">NAZWA PORADNI</span><br/>
+                <span style="font-size:14pt;">{support_center_data.name_nominative}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">NAZWA PORADNI (DOPEŁNIACZ)</span><br/>
+                <span style="font-size:14pt;">{support_center_data.name_genitive}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">ZESPÓŁ ORZEKAJĄCY</span><br/>
+                <span style="font-size:14pt;">{support_center_data.institute_name}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">KURATOR</span><br/>
+                <span style="font-size:14pt;">{support_center_data.kurator}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">ADRES</span><br/>
+                <span style="font-size:14pt;">{support_center_data.address}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">MIEJSCOWOŚĆ</span><br/>
+                <span style="font-size:14pt;">{support_center_data.town}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">KOD POCZTOWY</span><br/>
+                <span style="font-size:14pt;">{support_center_data.postal_code}</span></p>
+            </div>
+            <div>
+                <p><span style="font-weight:bold; font-size:10pt;">POCZTA</span><br/>
+                <span style="font-size:14pt;">{support_center_data.post}</span></p>
+            </div>
+        </div>
+        """
+
     @property
-    def support_center_data(self):
-        return self.support_center_data_group.support_center_data
+    def no_support_center_selected_message(self) -> str:
+        return """
+        <div align="center">
+            <p><span style="font-weight:bold; font-size:18pt; color:#856404;">⚠️ BRAK WYBRANEJ PORADNI</span></p>
+            <p><span style="font-size:16pt; color:#856404;">Proszę wybrać właściwą poradnię.</span></p>
+        </div>
+        """
 
     @property
     def is_valid(self) -> bool:

alinka/widget/containers/main_body/content/settings/settings_tabs/support_center_tab/__init__.py

@@ -0,0 +1,63 @@
+from PySide6.QtWidgets import QDialog, QHBoxLayout, QPushButton, QVBoxLayout, QWidget
+
+from alinka.db.queries import get_support_center_data, upsert_support_center
+from alinka.widget.components import ValidationMixin
+
+from .select_support_center_group import SelectSupportCenterGroup
+from .support_center_data_group import SupportCenterDataGroup
+
+
+class SupportCenterDialog(ValidationMixin, QDialog):
+    def __init__(self, parent: QWidget, edit: bool = True):
+        super().__init__(parent)
+        self.setWindowTitle("Edytuj poradnię" if edit else "Dodaj poradnię")
+        self.resize(600, 300)
+
+        layout = QVBoxLayout(self)
+
+        if not edit:
+            self.select_support_center_group = SelectSupportCenterGroup(self)
+            self.select_support_center_group.support_center_selected.connect(self.populate_support_center_data)
+            layout.addWidget(self.select_support_center_group)
+
+        self.support_center_data_group = SupportCenterDataGroup(self)
+        layout.addWidget(self.support_center_data_group)
+        if edit:
+            support_center_data = get_support_center_data()
+            if support_center_data:
+                self.support_center_data_group.populate_fields(support_center_data.model_dump())
+
+                # Buttons
+        buttons_frame = QHBoxLayout()
+        self.save_btn = QPushButton("Zapisz", self)
+        self.cancel_btn = QPushButton("Anuluj", self)
+
+        self.save_btn.clicked.connect(self.accept)
+        self.cancel_btn.clicked.connect(self.reject)
+
+        buttons_frame.addWidget(self.save_btn)
+        buttons_frame.addWidget(self.cancel_btn)
+
+        layout.addSpacing(20)
+        layout.addLayout(buttons_frame)
+
+    def populate_support_center_data(self):
+        selected_support_center = self.select_support_center_group.selected_support_center_data()
+        if not selected_support_center:
+            return
+        self.support_center_data_group.populate_fields(selected_support_center)
+
+    def save_support_center_data(self):
+        support_center_data = self.support_center_data_group.support_center_data
+        if not support_center_data:
+            return
+        upsert_support_center(support_center_data)
+
+    def validate(self) -> bool:
+        return self.support_center_data_group.validate()
+
+    def accept(self) -> None:
+        if not self.validate():
+            return
+        self.save_support_center_data()
+        super().accept()

alinka/widget/containers/main_body/content/settings/settings_tabs/support_center_tab/support_center_dialog/__init__.py

@@ -1,4 +1,4 @@
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, Signal
 from PySide6.QtWidgets import QGroupBox, QSizePolicy, QVBoxLayout, QWidget
 
 from alinka import rspo_client
@@ -12,9 +12,10 @@
 
 
 class SelectSupportCenterGroup(ValidationMixin, QGroupBox):
+    support_center_selected = Signal()
+
     def __init__(self, parent: QWidget):
         super().__init__(title="Wybierz poradnię z RPSO", parent=parent)
-        self.support_center_tab = parent
         layout = QVBoxLayout(self)
         layout.setAlignment(Qt.AlignTop)
         layout.setSpacing(2)
@@ -25,14 +26,13 @@ def __init__(self, parent: QWidget):
 
         self.support_center_combobox = LabeledComboBoxComponent("Poradnia", self)
         self.support_center_combobox.combobox.setPlaceholderText("Wybierz z listy...")
-        self.support_center_combobox.combobox.currentTextChanged.connect(self.populate_support_center_data)
+        self.support_center_combobox.combobox.currentTextChanged.connect(self.selected)
         layout.addWidget(self.province_district_group)
         layout.addWidget(self.support_center_combobox)
 
         self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Minimum)
 
     def populate_support_centers_combobox(self):
-        self.clear_support_center_data()
         selected_province_id = self.province_district_group.province_id
         selected_district_id = self.province_district_group.district_id
         if not all([selected_province_id, selected_district_id]):
@@ -57,21 +57,21 @@ def populate_support_centers_combobox(self):
             self.support_center_combobox.combobox.setEnabled(True)
             print(f"Error loading support centers: {e}")
 
-    def populate_support_center_data(self):
+    def selected(self):
+        self.support_center_selected.emit()
+
+    def selected_support_center_data(self) -> dict[str, str] | None:
         selected_support_center_rspo = self.support_center_combobox.combobox.currentData()
         if not selected_support_center_rspo:
-            return
+            return None
         support_center = [sc for sc in self.support_centers.items if sc.rspo_id == selected_support_center_rspo][0]
-        self.support_center_tab.support_center_data_group.populate_fields(
-            province_id=self.province_district_group.province_id,
-            district_id=self.province_district_group.district_id,
-            rspo=support_center.rspo_id,
-            name_nominative=support_center.name,
-            address=support_center.address,
-            town=support_center.town,
-            postal_code=support_center.postal_code,
-            post=support_center.post,
-        )
-
-    def clear_support_center_data(self):
-        self.support_center_tab.support_center_data_group.clear()
+        return {
+            "rspo": support_center.rspo_id,
+            "province_id": self.province_district_group.province_id,
+            "district_id": self.province_district_group.district_id,
+            "name_nominative": support_center.name,
+            "address": support_center.address,
+            "town": support_center.town,
+            "postal_code": support_center.postal_code,
+            "post": support_center.post,
+        }