From 27f965136dc433866d23ee6db1efcba8536cc9db Mon Sep 17 00:00:00 2001 From: renanllisboa Date: Thu, 27 Jun 2024 09:49:07 -0300 Subject: [PATCH 01/22] added skip_environment in get_url condition. added set_log_info_config in teardown. --- tir/technologies/core/base.py | 4 ++++ tir/technologies/webapp_internal.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/tir/technologies/core/base.py b/tir/technologies/core/base.py index 3530324ad..6dc71fdf2 100644 --- a/tir/technologies/core/base.py +++ b/tir/technologies/core/base.py @@ -1186,6 +1186,10 @@ def get_url(self, url=None): num_of_trying = 1 while not get_url and num_of_trying <= 5: self.driver.get(url) + + if self.config.skip_environment: + return + try: if self.config.json_data['POUILogin'] and 'StartProg' in url: time.sleep(3) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 78cdc45f2..19c1c3e57 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -9233,6 +9233,9 @@ def TearDown(self): if self.config.smart_test: self.log.log_exec_file() + if self.config.log_info_config: + self.set_log_info_config() + webdriver_exception = None timeout = 1500 string = self.language.codecoverage #"Aguarde... Coletando informacoes de cobertura de codigo." From 0301ad9e54dc9aeb3b99fcf5bbe34dc03a73621d Mon Sep 17 00:00:00 2001 From: renanllisboa Date: Thu, 27 Jun 2024 10:07:08 -0300 Subject: [PATCH 02/22] Branch release v1.20.21rc1 --- scripts/install_package.cmd | 2 +- tir/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd index 9aedb1457..f384cad12 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-1.20.20.tar.gz +pip install -U dist/tir_framework-1.20.21rc1.tar.gz pause >nul | set/p = Press any key to exit ... diff --git a/tir/version.py b/tir/version.py index 0c3f5fdd1..c3c72de73 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.20' +__version__ = '1.20.21rc1' From a63a28c1c408074b6c8cc1d663f7024cb2e1a536 Mon Sep 17 00:00:00 2001 From: 98llm Date: Fri, 28 Jun 2024 16:17:58 -0300 Subject: [PATCH 03/22] fix setButton x --- tir/technologies/webapp_internal.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 78cdc45f2..8bae3e008 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -4451,9 +4451,10 @@ def set_button_x(self, position=1, check_error=True): element_soup = close_list.pop(position) element_selenium = self.soup_to_selenium(element_soup) if self.webapp_shadowroot(): - if element_selenium.get_attribute('title') == self.language.warning or ('fundodlg_mdi.png' in element_selenium.value_of_css_property('--wa-dialog-background-image') and element_selenium.tag_name == 'wa-dialog') : - script = "return arguments[0].shadowRoot.querySelector('wa-dialog-header').shadowRoot.querySelector('button')" - element_selenium = self.driver.execute_script(script, element_selenium) + header = self.find_shadow_element('wa-dialog-header', element_selenium, get_all=False) + x_button = self.find_shadow_element("button[class~=button-close]", header, get_all=False) + if x_button: + element_selenium = x_button self.scroll_to_element(element_selenium) self.wait_until_to(expected_condition="element_to_be_clickable", element=element_soup, locator=By.XPATH) @@ -10499,11 +10500,14 @@ def find_child_element(self, term, element): raise ValueError(message) - def find_shadow_element(self, term, objects): + def find_shadow_element(self, term, objects, get_all=True): elements = None + if get_all: + script = f"return arguments[0].shadowRoot.querySelectorAll('{term}')" + else: + script = f"return arguments[0].shadowRoot.querySelector('{term}')" - script = f"return arguments[0].shadowRoot.querySelectorAll('{term}')" try: elements = self.driver.execute_script(script, objects) except: From c20838d7718b42bd33f54c203224afdd6eb7c21c Mon Sep 17 00:00:00 2001 From: renanllisboa Date: Mon, 1 Jul 2024 16:50:02 -0300 Subject: [PATCH 04/22] added set_log_info_config in Program method and SetLateralMenu --- tir/technologies/webapp_internal.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 19c1c3e57..32c4aa7b1 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -1568,6 +1568,13 @@ def Program(self, program_name): self.routine = 'Program' self.config.routine = program_name + if self.config.log_info_config: + self.set_log_info_config() + + if self.config.new_log: + if not self.log.release: + self.log_error_newlog() + if not self.log.program: self.log.program = program_name self.set_program(program_name) @@ -3901,6 +3908,13 @@ def SetLateralMenu(self, menu_itens, save_input=True, click_menu_functional=Fals wait_screen = True if menu_itens != self.language.menu_about else False used_ids = [] + if self.config.log_info_config: + self.set_log_info_config() + + if self.config.new_log: + if not self.check_release_newlog() and wait_screen: + self.log_error_newlog() + if save_input: self.routine = 'SetLateralMenu' self.config.routine = menu_itens @@ -7899,7 +7913,7 @@ def log_error(self, message, new_log_line=True, skip_restart=False): if stack_item != "setUpClass": self.restart_counter = 0 - if proceed_action(): + if proceed_action() or not self.check_release_newlog(): if self.restart_counter >= 3: self.restart_counter = 0 self.assertTrue(False, log_message) @@ -10857,4 +10871,10 @@ def SetCalendar(self, day='', month='', year='', position=0): while not day_selected() and time.time() < click_try: self.click(filtered_day) if filtered_day and month_combo and year_interface(): - success = filtered_day.get_attribute('day') == day and month_combo.options.index(month_combo.first_selected_option) == month and year_interface() == year \ No newline at end of file + success = filtered_day.get_attribute('day') == day and month_combo.options.index(month_combo.first_selected_option) == month and year_interface() == year + + def check_release_newlog(self): + return self.log.release and self.config.new_log + + def log_error_newlog(self): + self.log_error('Please check config.json key "Release".It is necessary to generate the log on the dashboard. ex: "Release": "12.1.2310" ') \ No newline at end of file From 0cbbfc2bbdb94fb43edda930df6c7d662b8db660 Mon Sep 17 00:00:00 2001 From: 98llm Date: Wed, 3 Jul 2024 11:21:39 -0300 Subject: [PATCH 05/22] button error fix --- 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 caf346330..3b2e84d20 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -4253,8 +4253,8 @@ def SetButton(self, button, sub_item="", position=1, check_error=True): if self.webapp_shadowroot(): if not soup_objects: - script = "return arguments[0].shadowRoot.querySelector('footer').querySelectorAll('wa-button')" - buttons = self.driver.execute_script(script, self.soup_to_selenium(soup)) + footer = self.find_shadow_element('footer', self.soup_to_selenium(soup), get_all=False) + buttons = self.find_shadow_element("wa-button", footer) filtered_button = list(filter(lambda x: x.text.strip().replace('\n', '') == button.strip().replace(' \n ', ''), buttons)) if filtered_button and len(filtered_button) - 1 >= position: From 73b0f18b08ee513eeeba2178c3d744b7fa226e8c Mon Sep 17 00:00:00 2001 From: 98llm Date: Wed, 3 Jul 2024 11:24:21 -0300 Subject: [PATCH 06/22] remove unused --- tir/technologies/webapp_internal.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 3b2e84d20..9c6d95f55 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -10858,7 +10858,6 @@ def SetCalendar(self, day='', month='', year='', position=0): month = int(month) - 1 month_header = next(iter(self.find_shadow_element('wa-datepicker-month', elem_calendar))) month_select = next(iter(self.find_shadow_element('select', month_header))) - month_interface = lambda: self.return_selected_combo_value(month_select, locator=True) month_combo = self.return_combo_object(month_select, locator=True) month_combo.select_by_index(str(month)) else: From 992f02c7218655ea23f8d50f9c79213e5a3ca65e Mon Sep 17 00:00:00 2001 From: LEANDRO L MONTEIRO <60761500+98llm@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:31:20 -0300 Subject: [PATCH 07/22] 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 c3c72de73..00dec93ac 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.21rc1' +__version__ = '1.20.21rc2' From 4456192c344f4f0544ffe4cd2c88f1721b7018fb Mon Sep 17 00:00:00 2001 From: LEANDRO L MONTEIRO <60761500+98llm@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:31:31 -0300 Subject: [PATCH 08/22] 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 f384cad12..7734e0a49 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-1.20.21rc1.tar.gz +pip install -U dist/tir_framework-1.20.21rc2.tar.gz pause >nul | set/p = Press any key to exit ... From 41690fa96d87b88c15ed0dd1f07826e602a17979 Mon Sep 17 00:00:00 2001 From: 98llm Date: Thu, 4 Jul 2024 16:12:21 -0300 Subject: [PATCH 09/22] hotfix_setButton x term --- 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 caf346330..94d356e68 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -4436,7 +4436,7 @@ def SetButton(self, button, sub_item="", position=1, check_error=True): def set_button_x(self, position=1, check_error=True): endtime = self.config.time_out/2 if self.webapp_shadowroot(): - term_button = f"wa-dialog[title*={self.language.warning}], wa-button[icon*='fwskin_delete_ico'], wa-image[src*='fwskin_modal_close.png'], wa-dialog" + term_button = f"wa-dialog[title*={self.language.warning}], wa-button[icon*='fwskin_delete_ico'], wa-button[style*='fwskin_delete_ico'], wa-image[src*='fwskin_modal_close.png'], wa-dialog" else: term_button = ".ui-button.ui-dialog-titlebar-close[title='Close'], img[src*='fwskin_delete_ico.png'], img[src*='fwskin_modal_close.png']" From 07dbd1454307812d09cfb822cc2be6e41349c3cb Mon Sep 17 00:00:00 2001 From: 98llm Date: Thu, 4 Jul 2024 16:55:48 -0300 Subject: [PATCH 10/22] fix SetButton --- tir/technologies/webapp_internal.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 61fabd49e..e5c428878 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -4255,7 +4255,8 @@ def SetButton(self, button, sub_item="", position=1, check_error=True): if not soup_objects: footer = self.find_shadow_element('footer', self.soup_to_selenium(soup), get_all=False) buttons = self.find_shadow_element("wa-button", footer) - filtered_button = list(filter(lambda x: x.text.strip().replace('\n', '') == button.strip().replace(' \n ', ''), buttons)) + if buttons: + filtered_button = list(filter(lambda x: x.text.strip().replace('\n', '') == button.strip().replace(' \n ', ''), buttons)) if filtered_button and len(filtered_button) - 1 >= position: parents_actives = list(filter(lambda x: self.filter_active_tabs(x), filtered_button )) From d5d7a1b89964e441bd5de365c92f0883f0819e29 Mon Sep 17 00:00:00 2001 From: 98llm Date: Thu, 4 Jul 2024 17:46:52 -0300 Subject: [PATCH 11/22] hotfix/setfile_path --- tir/technologies/webapp_internal.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index e5c428878..40ee56580 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -7556,9 +7556,10 @@ def SetFilePath(self, value, button = ""): self.driver.execute_script("document.querySelector('wa-file-picker').shadowRoot.querySelector('#{}').value='';".format(element.get_attribute("id"))) self.send_keys(element, self.replace_slash(value)) - elements = self.driver.execute_script(f"return arguments[0].shadowRoot.querySelectorAll('button')", self.soup_to_selenium(containers_soup)) + elements = self.find_shadow_element('button, wa-button', self.soup_to_selenium(containers_soup)) possible_buttons = button.upper() + '_' + self.language.open.upper() + '_' + self.language.save.upper() - elements = list(filter(lambda x: x.text.strip().upper() in possible_buttons, elements )) + if elements: + elements = list(filter(lambda x: x.text.strip().upper() in possible_buttons, elements)) else: self.wait_element(self.language.file_name) element = self.driver.find_element(By.CSS_SELECTOR, ".filepath input") From 8edab164b0aac76554d301287662b0e38657130d Mon Sep 17 00:00:00 2001 From: 98llm Date: Thu, 4 Jul 2024 18:10:31 -0300 Subject: [PATCH 12/22] x3 variable correct --- tir/technologies/webapp_internal.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 40ee56580..ffd8db58b 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -3137,6 +3137,7 @@ def GetValue(self, field, grid=False, line=1, grid_number=1, grid_memo_field=Fal """ endtime = time.time() + self.config.time_out element = None + x3_dictionaries = None if grid_memo_field: self.grid_memo_field = True From 110d459b4c98cd45b3c0625d89a1083dbf50775a Mon Sep 17 00:00:00 2001 From: renanllisboa Date: Thu, 11 Jul 2024 17:10:03 -0300 Subject: [PATCH 13/22] remove strip check in password --- 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 ffd8db58b..d108c6c22 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -601,7 +601,7 @@ def user_screen(self, admin_user=False): try_counter = 0 password_value = '' endtime = time.time() + self.config.time_out - while (time.time() < endtime and not password_value.strip() and self.config.password != ''): + while (time.time() < endtime and not password_value and self.config.password != ''): if self.config.poui_login: soup = self.get_current_DOM(twebview=True) @@ -648,7 +648,7 @@ def user_screen(self, admin_user=False): self.wait_blocker() try_counter += 1 if (try_counter < 1) else -1 - if not password_value.strip() and self.config.password != '': + if not password_value and self.config.password != '': self.restart_counter += 1 message = "Couldn't fill User input element." self.log_error(message) From 61ee7655f303cd4937be0459a4d81236cceb9570 Mon Sep 17 00:00:00 2001 From: LEANDRO L MONTEIRO <60761500+98llm@users.noreply.github.com> Date: Thu, 11 Jul 2024 17:16:23 -0300 Subject: [PATCH 14/22] 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 00dec93ac..2cff8ef81 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.21rc2' +__version__ = '1.20.21rc3' From 177469e0d265249cbc500a7fe119d78df7ef5ed4 Mon Sep 17 00:00:00 2001 From: LEANDRO L MONTEIRO <60761500+98llm@users.noreply.github.com> Date: Thu, 11 Jul 2024 17:16:35 -0300 Subject: [PATCH 15/22] 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 7734e0a49..e10ef4c3b 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-1.20.21rc2.tar.gz +pip install -U dist/tir_framework-1.20.21rc3.tar.gz pause >nul | set/p = Press any key to exit ... From 22b225838054cc23476c2c5ca8937483b16b8366 Mon Sep 17 00:00:00 2001 From: 98llm Date: Fri, 12 Jul 2024 10:26:23 -0300 Subject: [PATCH 16/22] improve webscrap filter --- tir/technologies/webapp_internal.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index ffd8db58b..6b4706b85 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -3602,8 +3602,11 @@ def selenium_web_scrap(self, term, container, optional_term, second_term=None): if container.select('.dict-tfolder') and self.search_navigation_bar(container.select('.dict-tfolder')): labels_displayed = labels_not_none if labels_displayed: - element = next(iter(list(filter(lambda x: term.lower() in x.text.lower().replace('\n', ''), labels_displayed))), - None) + element = list(filter(lambda x: term.lower() in x.text.lower().replace('\n', ''), labels_displayed)) + if len(element) > 1: + element = next(iter(list(filter(lambda x: term.lower().strip() == x.text.lower().replace('\n', ''), element))),None) + else: + element = next(iter(element), None) if not element: element = next(iter(list(filter(lambda x: term.lower() in x.get_attribute('textContent').lower().replace('\n', '').replace('\t', ''), labels_displayed))), None) From f90a478cff8843b988f019f9919c5482fd69d16b Mon Sep 17 00:00:00 2001 From: 98llm Date: Fri, 12 Jul 2024 14:15:42 -0300 Subject: [PATCH 17/22] log to analyse --- tir/technologies/webapp_internal.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index ffd8db58b..c9cca2f18 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -7527,6 +7527,7 @@ def get_selected_row(self, rows): filtered_rows = list(filter(lambda x: "selected-row" == self.soup_to_selenium(x).get_attribute('class'), rows)) if filtered_rows: return next(iter(list(filter(lambda x: "selected-row" == self.soup_to_selenium(x).get_attribute('class'), rows))), None) + logger().debug(f'Get selected row- reversed rows {rows}') return next(reversed(rows), None) From d537d6ae680f72ff7e4d667c7e3c973b26b90fb6 Mon Sep 17 00:00:00 2001 From: "renan.lisboa" Date: Wed, 17 Jul 2024 16:52:12 -0300 Subject: [PATCH 18/22] branch release v1.20.21rc4 --- scripts/install_package.cmd | 2 +- tir/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd index e10ef4c3b..1c2c7eb1d 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-1.20.21rc3.tar.gz +pip install -U dist/tir_framework-1.20.21rc4.tar.gz pause >nul | set/p = Press any key to exit ... diff --git a/tir/version.py b/tir/version.py index 2cff8ef81..1083d942e 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.21rc3' +__version__ = '1.20.21rc4' From 95ac92f62d630f9a4fa2bb8dd40d49f2c5a894da Mon Sep 17 00:00:00 2001 From: "renan.lisboa" Date: Wed, 17 Jul 2024 16:55:25 -0300 Subject: [PATCH 19/22] update python version --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1562690a6..367dc81d9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7 +FROM python:3.7.9 ENV DEBIAN_FRONTEND=noninteractive From 355d5eb6cb5caddf28ba5b99dc0a4c23965fada8 Mon Sep 17 00:00:00 2001 From: 98llm Date: Wed, 17 Jul 2024 17:01:41 -0300 Subject: [PATCH 20/22] remove reversed rows --- tir/technologies/webapp_internal.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index 6fffb06bd..0080c6298 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -7530,8 +7530,6 @@ def get_selected_row(self, rows): filtered_rows = list(filter(lambda x: "selected-row" == self.soup_to_selenium(x).get_attribute('class'), rows)) if filtered_rows: return next(iter(list(filter(lambda x: "selected-row" == self.soup_to_selenium(x).get_attribute('class'), rows))), None) - logger().debug(f'Get selected row- reversed rows {rows}') - return next(reversed(rows), None) def SetFilePath(self, value, button = ""): From 5e1bc1a314468a3a20759c5d573a90e7818a3e97 Mon Sep 17 00:00:00 2001 From: "renan.lisboa" Date: Fri, 19 Jul 2024 14:39:28 -0300 Subject: [PATCH 21/22] Add lower() method check_pyodbc_drivers() method. --- tir/technologies/core/base_database.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tir/technologies/core/base_database.py b/tir/technologies/core/base_database.py index eb85dc5c3..cb7f87afc 100644 --- a/tir/technologies/core/base_database.py +++ b/tir/technologies/core/base_database.py @@ -76,7 +76,9 @@ def disconnect_database(self, connection): logger().info('DataBase connection already stopped') def check_pyodbc_drivers(self, driver_database): - if not next(iter(list(filter(lambda x: x == driver_database, pyodbc.drivers()))), None): + if not next(iter(list( + filter(lambda x: x == driver_database.lower(), list(map(lambda x: x.lower(), pyodbc.drivers()))))), + None): error_message = f"Driver: '{driver_database}' isn't a valid driver name!" self.webapp_internal.restart_counter = 3 self.webapp_internal.log_error(error_message) From 937ff5e555c5195361f70ec60159bb15258ef410 Mon Sep 17 00:00:00 2001 From: 98llm Date: Mon, 29 Jul 2024 14:55:56 -0300 Subject: [PATCH 22/22] release/v1.20.21 --- scripts/install_package.cmd | 2 +- tir/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd index 1c2c7eb1d..08b8fb31c 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-1.20.21rc4.tar.gz +pip install -U dist/tir_framework-1.20.21.tar.gz pause >nul | set/p = Press any key to exit ... diff --git a/tir/version.py b/tir/version.py index 1083d942e..8d8316842 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.21rc4' +__version__ = '1.20.21'