Merge pull request #1653 from totvs/release/v2.0.0rc31

Release/v2.0.0rc31
totvs · Jan 28, 2025 · c413cd1 · c413cd1
2 parents 1ab1fca + 0184188
commit c413cd1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd
@@ -13,5 +13,5 @@ taskkill /f /im chromedriver.exe
 echo -------------------------
 echo Installing project...
 echo -------------------------
-pip install -U dist/tir_framework-2.0.0rc30.tar.gz
+pip install -U dist/tir_framework-2.0.0rc31.tar.gz
 pause >nul | set/p = Press any key to exit ...
diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py
@@ -825,6 +825,7 @@ def filling_date(self, shadow_root=None, container=None):
         click_type = 1
         send_type = 1
         base_date_value = ''
+        is_active_element = None
         endtime = time.time() + self.config.time_out / 2
         while (time.time() < endtime and (base_date_value.strip() != self.config.date.strip())):
 
@@ -861,26 +862,32 @@ def filling_date(self, shadow_root=None, container=None):
                     logger().info(f'Filling Date: "{self.config.date}"')
 
                     self.wait_blocker()
-                    self.click(date(), click_type=enum.ClickType(click_type))
-                    ActionChains(self.driver).key_down(Keys.CONTROL).send_keys(Keys.HOME).key_up(Keys.CONTROL).perform()
-                    ActionChains(self.driver).key_down(Keys.CONTROL).key_down(Keys.SHIFT).send_keys(
-                        Keys.END).key_up(Keys.CONTROL).key_up(Keys.SHIFT).perform()
+                    for i in range(3):
+                        self.click(date(), click_type=enum.ClickType(click_type))
+                        ActionChains(self.driver).key_down(Keys.CONTROL).send_keys(Keys.HOME).key_up(Keys.CONTROL).perform()
+                        ActionChains(self.driver).key_down(Keys.CONTROL).key_down(Keys.SHIFT).send_keys(
+                            Keys.END).key_up(Keys.CONTROL).key_up(Keys.SHIFT).perform()
 
+                        self.try_send_keys(date, self.config.date, try_counter=send_type)
 
-                    self.try_send_keys(date, self.config.date, try_counter=send_type)
+                        base_date_value = self.merge_date_mask(self.config.date, self.get_web_value(date()))
+                        if self.config.poui_login:
+                            ActionChains(self.driver).send_keys(Keys.TAB * 2).perform()
 
+                        time.sleep(1)
+                        send_type += 1
+                        if send_type > 3:
+                            send_type = 1
 
-                    base_date_value = self.merge_date_mask(self.config.date, self.get_web_value(date()))
-                    if self.config.poui_login:
-                        ActionChains(self.driver).send_keys(Keys.TAB * 2).perform()
+                        if base_date_value.strip() == self.config.date.strip():
+                            break
 
-                    time.sleep(1)
-                    click_type += 1
-                    send_type += 1
-                    if click_type > 3:
-                        click_type = 1
-                    if send_type > 3:
-                        send_type = 1
+                        if not self.is_active_element(date()) and click_type == 3:
+                            self.filling_group(shadow_root, container)
+
+                click_type += 1
+                if click_type > 3:
+                    click_type = 1
 
     def filling_group(self, shadow_root=None, container=None):
         """

diff --git a/tir/version.py b/tir/version.py
@@ -1 +1 @@
-__version__ = '2.0.0rc30'
+__version__ = '2.0.0rc31'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '2.0.0rc30'
		__version__ = '2.0.0rc31'