Merge pull request #73 from itk-dev-rpa/release/2.6.0

Release/2.6.0

Author: bakspace-itk

.github/workflows/Linting.yml

@@ -1,6 +1,6 @@
 name: Linting
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   build:

changelog.md

@@ -5,9 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-
 ## [Unreleased]
 
+## [2.6.0] - 2024-09-04
+
+### Added
+
+- Added fields to the eflyt Case dataclass for status, cpr, name, case_worker
+
+### Changed
+
+- eflyt.eflyt_case.change_tab now checks if the tab needs to be changed before doing it.
+
 ## [2.5.0] - 2024-08-14
 
 ### Added
@@ -145,7 +154,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/compare/2.5.0...HEAD
+[Unreleased]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/compare/2.6.0...HEAD
+[2.6.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.6.0
 [2.5.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.5.0
 [2.4.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.4.0
 [2.3.0]: https://github.com/itk-dev-rpa/ITK-dev-shared-components/releases/tag/2.3.0

itk_dev_shared_components/eflyt/eflyt_case.py

@@ -12,6 +12,10 @@ class Case:
     case_number: str
     deadline: date | None
     case_types: list[str]
+    status: str
+    cpr: str
+    name: str
+    case_worker: str
 
 
 @dataclass
@@ -115,4 +119,10 @@ def change_tab(browser: webdriver.Chrome, tab_index: int):
         browser: The webdriver browser object.
         tab_index: The zero-based index of the tab to select.
     """
-    browser.execute_script(f"__doPostBack('ctl00$ContentPlaceHolder2$ptFanePerson$ImgJournalMap','{tab_index}')")
+    # Use the src of the tab image to determine if the tab needs to be changed
+    tab_image = browser.find_element(By.ID, "ctl00_ContentPlaceHolder2_ptFanePerson_ImgJournalMap")
+    image_src = tab_image.get_attribute("src")
+    current_index = int(image_src[-5]) - 1
+
+    if current_index != tab_index:
+        browser.execute_script(f"__doPostBack('ctl00$ContentPlaceHolder2$ptFanePerson$ImgJournalMap','{tab_index}')")

itk_dev_shared_components/eflyt/eflyt_search.py

@@ -76,9 +76,14 @@ def extract_cases(browser: webdriver.Chrome) -> list[Case]:
         # If the case types ends with '...' we need to get the title instead
         if case_types_text.endswith("..."):
             case_types_text = row.find_element(By.XPATH, "td[5]").get_attribute("Title")
-
         case_types = case_types_text.split(", ")
-        case = Case(case_number, deadline, case_types)
+
+        status = row.find_element(By.XPATH, "td[6]").text
+        cpr = row.find_element(By.XPATH, "td[7]/a").text
+        name = row.find_element(By.XPATH, "td[8]").text
+        case_worker = row.find_element(By.XPATH, "td[9]").text
+
+        case = Case(case_number, deadline, case_types, status, cpr, name, case_worker)
         cases.append(case)
 
     return cases

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itk_dev_shared_components"
-version = "2.5.0"
+version = "2.6.0"
 authors = [
   { name="ITK Development", email="itk-rpa@mkb.aarhus.dk" },
 ]

tests/test_eflyt/test_search.py

@@ -33,6 +33,10 @@ def test_extract_cases(self):
         self.assertIsInstance(case.case_number, str)
         self.assertIsInstance(case.case_types, list)
         self.assertIsInstance(case.deadline, (date, type(None)))
+        self.assertIsInstance(case.status, str)
+        self.assertIsInstance(case.cpr, str)
+        self.assertIsInstance(case.name, str)
+        self.assertIsInstance(case.case_worker, str)
 
     def test_open_case(self):
         """Open a case and check the browser opened the case view"""