mbu-dev-shared-components 2.0.1__tar.gz → 2.2.0__tar.gz

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 2.0.1
+Version: 2.2.0
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
 Classifier: Programming Language :: Python :: 3

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/mbu_dev_shared_components/solteqtand/application/app_handler.py

@@ -1,45 +1,53 @@
-"""This module contains the PatientHandler class, which manages patient-related actions in the Solteq Tand application."""
+"""This module provides the main application handler for Solteq Tand, integrating various components."""
 import os
 import uiautomation as auto
 
 from .base_ui import BaseUI
-
-
-class SolteqTandApp(BaseUI):
+from .patient import PatientHandler
+from .document import DocumentHandler
+from .appointment import AppointmentHandler
+from .edi_portal import EDIHandler
+from .clinic import ClinicHandler
+from .event import EventHandler
+from .journal_note import JournalNoteHandler
+
+
+class SolteqTandApp(
+    BaseUI,
+    PatientHandler,
+    DocumentHandler,
+    AppointmentHandler,
+    EDIHandler,
+    ClinicHandler,
+    EventHandler,
+    JournalNoteHandler
+):
     """
     Main application handler for Solteq Tand, integrating various components.
-    Inherits from BaseUI for core UI methods, and composes all feature handlers.
+
+    Inherits from:
+        BaseUI: Provides basic UI interaction methods.
+        PatientHandler: Handles patient-related operations.
+        DocumentHandler: Manages document operations.
+        AppointmentHandler: Manages appointment operations.
+        EDIHandler: Handles EDI portal interactions.
+        ClinicHandler: Manages clinic-related operations.
+        EventHandler: Processes events in the application.
+        JournalNoteHandler: Handles journal note operations.
     """
 
     def __init__(self, app_path: str, username: str = None, password: str = None):
         """
         Initializes the Solteq Tand application handler.
+
         Args:
             app_path (str): Path to the Solteq Tand application executable.
-            username (str): Username for login.
-            password (str): Password for login.
         """
-        super().__init__()
         self.app_path = app_path
         self.username = username
         self.password = password
         self.app_window = None
 
-        # Compose feature handlers, passing this App as parent
-        from .patient import PatientHandler
-        from .appointment import AppointmentHandler
-        from .document import DocumentHandler
-        from .edi_portal import EDIHandler
-        from .clinic import ClinicHandler
-        from .event import EventHandler
-
-        self.patient = PatientHandler(self)
-        self.appointment = AppointmentHandler(self)
-        self.document = DocumentHandler(self)
-        self.edi = EDIHandler(self)
-        self.clinic = ClinicHandler(self)
-        self.event = EventHandler(self)
-
     def start_application(self):
         """
         Starts the application using the specified path.
@@ -121,3 +129,12 @@ class SolteqTandApp(BaseUI):
         if not is_tab_selected:
             tab_button.SetFocus()
             tab_button.SendKeys('{ENTER}')
+
+    def close_solteq_tand(self):
+        """Closes the Solteq Tand application gracefully."""
+        try:
+            if self.app_window:
+                self.close_window(self.app_window)
+                self.app_window = None
+        except Exception as error:
+            print(f"Error closing Solteq Tand application window: {error}")

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/mbu_dev_shared_components/solteqtand/application/document.py

@@ -355,7 +355,7 @@ class DocumentHandler(HandlerBase):
             print(f"Error while sending discharge document via DigitalPost: {e}")
             raise
 
-    def create_digital_printet_journal(self, document_type: str) -> None:
+    def create_digital_printet_journal(self) -> None:
         """
         Creates a digital printet journal for the patient
         and stores it in the documentsilo.

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/mbu_dev_shared_components/solteqtand/application/edi_portal.py

@@ -56,15 +56,29 @@ class EDIHandler(HandlerBase):
                 auto.WindowControl, {"ClassName": "Chrome_WidgetWin_1"}, search_depth=3
             )
 
-            root_web_area = self.wait_for_control(
-                edge_window.DocumentControl, {"AutomationId": "RootWebArea"}, search_depth=14
-            )
+            edge_window.SetFocus()
 
-            next_button = self.wait_for_control(
-                auto.ButtonControl, {"Name": "Næste"}, search_depth=50
-            )
+            try:
+                next_button = self.wait_for_control(
+                    auto.ButtonControl, {"Name": "Næste"},
+                    search_depth=50,
+                    timeout=5
+                )
+            except TimeoutError:
+                next_button = None
+
+            if not next_button:
+                try:
+                    next_button = self.wait_for_control(
+                        auto.ButtonControl, {"Name": "patientInformationNextButton"},
+                        search_depth=50,
+                        timeout=5
+                    )
+                except TimeoutError:
+                    next_button = None
 
-            # edge_window.SetFocus()
+            if not next_button:
+                raise RuntimeError("Next button not found in EDI Portal")
             next_button.Click(simulateMove=False, waitTime=0)
             time.sleep(sleep_time)
         except Exception as e:

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/mbu_dev_shared_components/solteqtand/application/handler_base.py

@@ -10,4 +10,8 @@ class HandlerBase:
         self._parent = parent
 
     def __getattr__(self, name):
-        return getattr(self._parent, name)
+        parent = object.__getattribute__(self, "_parent")
+        try:
+            return object.__getattribute__(parent, name)
+        except AttributeError as exc:
+            raise AttributeError(f"'{type(self).__name__}' object has no attribute '{name}'") from exc

mbu_dev_shared_components-2.2.0/mbu_dev_shared_components/solteqtand/application/journal_note.py

@@ -0,0 +1,38 @@
+import uiautomation as auto
+
+from .handler_base import HandlerBase
+
+
+class JournalNoteHandler(HandlerBase):
+    """
+    Handles the processing of journal notes in the Solteq Tand application.
+    """
+
+    def create_journal_note(self, note_message: str, checkmark_in_complete: bool):
+        """
+        Creates a journal note for the given patient.
+
+        Args:
+            note_message (str): The note message.
+            checkmark_in_complete (bool): Checks the checkmark in 'Afslut'.
+        """
+        self.open_tab("Journal")
+
+        self.wait_for_control(
+            auto.DocumentControl,
+            {"AutomationId": "RichTextBoxInput"},
+            search_depth=21
+            )
+
+        input_box = self.app_window.DocumentControl(AutomationId="RichTextBoxInput")
+        input_box_value_pattern = input_box.GetValuePattern()
+        input_box_value_pattern.SetValue(value=note_message, waitTime=0)
+
+        if checkmark_in_complete:
+            checkbox = self.app_window.CheckBoxControl(AutomationId="CheckBoxAssignCompletionStatus")
+            checkbox.SetFocus()
+            checkbox.Click(simulateMove=False, waitTime=0)
+
+        save_button = self.app_window.PaneControl(AutomationId="buttonSave")
+        save_button.SetFocus()
+        save_button.Click(simulateMove=False, waitTime=0)

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/mbu_dev_shared_components.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 2.0.1
+Version: 2.2.0
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
 Classifier: Programming Language :: Python :: 3

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/mbu_dev_shared_components.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ mbu_dev_shared_components/solteqtand/application/edi_portal.py
 mbu_dev_shared_components/solteqtand/application/event.py
 mbu_dev_shared_components/solteqtand/application/exceptions.py
 mbu_dev_shared_components/solteqtand/application/handler_base.py
+mbu_dev_shared_components/solteqtand/application/journal_note.py
 mbu_dev_shared_components/solteqtand/application/patient.py
 mbu_dev_shared_components/solteqtand/database/__init__.py
 mbu_dev_shared_components/solteqtand/database/db_handler.py

{mbu_dev_shared_components-2.0.1 → mbu_dev_shared_components-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mbu_dev_shared_components"
-version = "2.0.1"  # Specify the version manually here
+version = "2.2.0"  # Specify the version manually here
 authors = [
   { name="MBU", email="rpa@mbu.aarhus.dk" },
 ]