From d6571337ece645e4746c8bab8990ba015071fc23 Mon Sep 17 00:00:00 2001 From: 98llm Date: Tue, 21 Jan 2025 15:29:29 -0300 Subject: [PATCH 1/7] fix data fill --- tir/technologies/webapp_internal.py | 34 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index d84f2cc4..00067514 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -861,26 +861,28 @@ 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() - 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) - click_type += 1 - send_type += 1 - if click_type > 3: - click_type = 1 - if send_type > 3: - send_type = 1 + time.sleep(1) + click_type += 1 + if click_type > 3: + click_type = 1 + if base_date_value.strip() == self.config.date.strip(): + break + send_type += 1 + if send_type > 3: + send_type = 1 def filling_group(self, shadow_root=None, container=None): """ From 59d33a7206ec471955857e89f22373a4db873ea3 Mon Sep 17 00:00:00 2001 From: 98llm Date: Tue, 21 Jan 2025 16:37:26 -0300 Subject: [PATCH 2/7] date screenshot --- tir/technologies/webapp_internal.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 00067514..5f4b0f7d 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -862,13 +862,17 @@ def filling_date(self, shadow_root=None, container=None): self.wait_blocker() for i in range(3): + self.take_screenshot(f'fill_data_before_click{click_type}_{time.time()}') self.click(date(), click_type=enum.ClickType(click_type)) + self.take_screenshot(f'fill_data_after_click{click_type}_{time.time()}') 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.take_screenshot(f'fill_data_before_send{click_type}_{time.time()}') self.try_send_keys(date, self.config.date, try_counter=send_type) + self.take_screenshot(f'fill_data_after_send{click_type}_{time.time()}') base_date_value = self.merge_date_mask(self.config.date, self.get_web_value(date())) if self.config.poui_login: From 487f3e890e27d352cce3d260219b73228200499a Mon Sep 17 00:00:00 2001 From: 98llm Date: Tue, 21 Jan 2025 16:58:41 -0300 Subject: [PATCH 3/7] take --- tir/technologies/webapp_internal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 5f4b0f7d..be4503a4 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -870,9 +870,9 @@ def filling_date(self, shadow_root=None, container=None): 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.take_screenshot(f'fill_data_before_send{click_type}_{time.time()}') + self.take_screenshot(f'fill_data_before_send{send_type}_{time.time()}') self.try_send_keys(date, self.config.date, try_counter=send_type) - self.take_screenshot(f'fill_data_after_send{click_type}_{time.time()}') + self.take_screenshot(f'fill_data_after_send{send_type}_{time.time()}') base_date_value = self.merge_date_mask(self.config.date, self.get_web_value(date())) if self.config.poui_login: From 0e9a5be0c11f00c03b2d8a4647881200fc1edcdf Mon Sep 17 00:00:00 2001 From: 98llm Date: Fri, 24 Jan 2025 11:49:42 -0300 Subject: [PATCH 4/7] fix date filling --- tir/technologies/webapp_internal.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index be4503a4..3977b8dc 100644 --- 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())): @@ -862,31 +863,31 @@ def filling_date(self, shadow_root=None, container=None): self.wait_blocker() for i in range(3): - self.take_screenshot(f'fill_data_before_click{click_type}_{time.time()}') + time.sleep(1) self.click(date(), click_type=enum.ClickType(click_type)) - self.take_screenshot(f'fill_data_after_click{click_type}_{time.time()}') - 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.take_screenshot(f'fill_data_before_send{send_type}_{time.time()}') self.try_send_keys(date, self.config.date, try_counter=send_type) - self.take_screenshot(f'fill_data_after_send{send_type}_{time.time()}') 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) - click_type += 1 - if click_type > 3: - click_type = 1 + send_type += 1 + if send_type > 3: + send_type = 1 + if base_date_value.strip() == self.config.date.strip(): break - send_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): """ From 131ccdac4c891e8d882bccb154a3f95678c3f81f Mon Sep 17 00:00:00 2001 From: LEANDRO L MONTEIRO <60761500+98llm@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:14:57 -0300 Subject: [PATCH 5/7] Update version.py --- tir/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tir/version.py b/tir/version.py index bad4e905..b4a1368f 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '2.0.0rc30' +__version__ = '2.0.0rc31' From 8e712e3539a2dde0324f5d77f42851dfc4e6d3c6 Mon Sep 17 00:00:00 2001 From: LEANDRO L MONTEIRO <60761500+98llm@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:15:51 -0300 Subject: [PATCH 6/7] Update install_package.cmd --- scripts/install_package.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd index 7af7f185..8754305e 100644 --- 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 ... From a568f1e5b22627c88f2cf50f13082a99788cbc8f Mon Sep 17 00:00:00 2001 From: 98llm Date: Fri, 24 Jan 2025 15:32:58 -0300 Subject: [PATCH 7/7] fix --- tir/technologies/webapp_internal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 3977b8dc..9b2682f4 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -863,7 +863,6 @@ def filling_date(self, shadow_root=None, container=None): self.wait_blocker() for i in range(3): - time.sleep(1) 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( @@ -875,6 +874,7 @@ def filling_date(self, shadow_root=None, container=None): 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