mbu-dev-shared-components 2.3.0__tar.gz → 2.4.2__tar.gz

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 2.3.0
+Version: 2.4.2
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
+License-Expression: MIT
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/mbu_dev_shared_components/solteqtand/application/appointment.py

@@ -276,6 +276,7 @@ class AppointmentHandler(HandlerBase):
         """
         try:
             self.open_tab("Stamkort")
+            self.open_sub_tab("Behandlingsstatus")
 
             create_booking_button = self.wait_for_control(
                 auto.PaneControl,
@@ -304,6 +305,14 @@ class AppointmentHandler(HandlerBase):
                         case "Stol":
                             child.GetPattern(auto.PatternId.ValuePattern).SetValue(booking_reminder_data["comboBoxChair"])
 
+            # Fill out text booking field
+            text_booking_field_group = manage_booking.GroupControl(AutomationId="GroupBox5")
+            for child in text_booking_field_group.GetChildren():
+                match child.AutomationId:
+                    case "TextBoxBookingText":
+                        if child.GetPattern(auto.PatternId.ValuePattern).Value != booking_reminder_data["textBoxBookingText"]:
+                            child.GetPattern(auto.PatternId.ValuePattern).SetValue(booking_reminder_data["textBoxBookingText"])
+
             # Fill out date and time
             date_and_time_group = manage_booking.GroupControl(AutomationId="GroupBox4")
 

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/mbu_dev_shared_components/solteqtand/application/base_ui.py

@@ -23,10 +23,12 @@ class BaseUI:
         children = control.GetChildren()
 
         for child in children:
-            if (control_type is None or child.ControlType == control_type) and \
-            (automation_id is None or child.AutomationId == automation_id) and \
-            (name is None or child.Name == name) and \
-            (class_name is None or child.ClassName == class_name):
+            if (
+                (control_type is None or child.ControlType == control_type) and
+                (automation_id is None or child.AutomationId == automation_id) and
+                (name is None or child.Name == name) and
+                (class_name is None or child.ClassName == class_name)
+            ):
                 return child
 
             found = self.find_element_by_property(child, control_type, automation_id, name, class_name)
@@ -96,5 +98,12 @@ class BaseUI:
         raise TimeoutError(f"Control with parameters {search_params} did not disappear within the timeout period.")
 
     def close_window(self, window_to_close: auto.WindowControl) -> None:
-        """Closes specified window by sending CTRL+F4 keystroke."""
-        window_to_close.SendKeys(text="^({F4})")
+        """Closes specified window."""
+        window_to_close.SetFocus()
+        window_to_close.GetWindowPattern().Close()
+
+        pop_up_window = window_to_close.WindowControl(Name="TMT - Afslut")
+        pop_up_window.SetFocus()
+        pop_up_window.ButtonControl(Name="Ja").Click(simulateMove=False, waitTime=0)
+
+        time.sleep(2)

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/mbu_dev_shared_components/solteqtand/application/document.py

@@ -5,6 +5,7 @@ import time
 import psutil
 from docx2pdf import convert
 import uiautomation as auto
+from datetime import datetime
 
 from .handler_base import HandlerBase
 

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/mbu_dev_shared_components/solteqtand/application/edi_portal.py

@@ -28,6 +28,8 @@ class EDIHandler(HandlerBase):
             )
             journalforsendelse_button.Click(simulateMove=False, waitTime=0)
 
+            time.sleep(5)
+
         except Exception as e:
             print(f"Error while opening EDI Portal: {e}")
 
@@ -70,7 +72,7 @@ class EDIHandler(HandlerBase):
             if not next_button:
                 try:
                     next_button = self.wait_for_control(
-                        auto.ButtonControl, {"Name": "patientInformationNextButton"},
+                        auto.ButtonControl, {"AutomationId": "patientInformationNextButton"},
                         search_depth=50,
                         timeout=5
                     )
@@ -97,6 +99,14 @@ class EDIHandler(HandlerBase):
             dict: A dictionary containing the row count and whether the phone number matches.
         """
         try:
+            # Handle Hasle Torv Clinic special case
+            if extern_clinic_data[0]["contractorId"] == "477052" or extern_clinic_data[0]["contractorId"] == "470678":
+                contractor_id = "485055"
+                clinic_phone_number = "86135240"
+            else:
+                contractor_id = extern_clinic_data[0]["contractorId"]
+                clinic_phone_number = extern_clinic_data[0]["phoneNumber"]
+
             self.edi_portal_click_next_button(sleep_time=2)
 
             class_options = [
@@ -120,7 +130,7 @@ class EDIHandler(HandlerBase):
                     raise RuntimeError("Search box not found")
             search_box.SetFocus()
             search_box_value_pattern = search_box.GetPattern(auto.PatternId.ValuePattern)
-            search_box_value_pattern.SetValue(extern_clinic_data[0]["contractorId"])
+            search_box_value_pattern.SetValue(contractor_id)
             search_box.SendKeys("{ENTER}")
 
             time.sleep(sleep_time)
@@ -134,10 +144,14 @@ class EDIHandler(HandlerBase):
             row_count = grid_pattern.RowCount
 
             is_phone_number_match = False
+
+            if grid_pattern.GetItem(1, 0).Name == "Ingen data i tabellen":
+                return {"rowCount": 0, "isPhoneNumberMatch": False}
+
             if row_count > 0:
                 for row in range(row_count):
                     phone_number = grid_pattern.GetItem(row, 4).Name
-                    if phone_number == extern_clinic_data[0]["phoneNumber"]:
+                    if phone_number == clinic_phone_number:
                         is_phone_number_match = True
                         break
             return {"rowCount": row_count, "isPhoneNumberMatch": is_phone_number_match}

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/mbu_dev_shared_components/solteqtand/application/patient.py

@@ -112,13 +112,14 @@ class PatientHandler(HandlerBase):
             TimeoutError: If the patient window does not close within the expected time.
         """
 
-        title_bar_window = self.app_window.TitleBarControl()
-        title_bar_window.ButtonControl(Name="Luk").Click(simulateMove=False, waitTime=0)
+        self.app_window.SetFocus()
+        self.app_window.GetWindowPattern().Close()
 
         self.app_window = self.wait_for_control_to_disappear(
             auto.WindowControl,
             {'AutomationId': 'FormPatient'},
-            search_depth=2
+            search_depth=2,
+            timeout=30
         )
 
         self.app_window = self.wait_for_control(
@@ -127,6 +128,7 @@ class PatientHandler(HandlerBase):
             search_depth=2,
             timeout=5
         )
+        self.app_window.SetFocus()
 
     def change_status(self, status: str) -> None:
         """

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/mbu_dev_shared_components.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 2.3.0
+Version: 2.4.2
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
+License-Expression: MIT
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown

{mbu_dev_shared_components-2.3.0 → mbu_dev_shared_components-2.4.2}/pyproject.toml

@@ -2,9 +2,13 @@
 requires = ["setuptools>=65.0"]
 build-backend = "setuptools.build_meta"
 
+#[tool.setuptools]
+#package-dir = { "" = "." }
+#packages = ["mbu_dev_shared_components"]
+
 [project]
 name = "mbu_dev_shared_components"
-version = "2.3.0"  # Specify the version manually here
+version = "2.4.2"  # Specify the version manually here
 authors = [
   { name="MBU", email="rpa@mbu.aarhus.dk" },
 ]
@@ -13,9 +17,9 @@ readme = "README.md"
 requires-python = ">=3.7"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: Microsoft :: Windows",
 ]
+license = "MIT"
 dependencies = [
   "openpyxl >= 3.1.2",
   "pyodbc >= 5.1.0",