Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.20.28 #1609

Merged
merged 77 commits into from
Dec 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
8ec9ad1
Bump opencv-python from 4.6.0.66 to 4.8.1.78
dependabot[bot] Aug 31, 2024
3810e99
Merge pull request #1568 from totvs/master
98llm Oct 28, 2024
54a9f10
Update version.py
98llm Oct 30, 2024
40a2280
Update install_package.cmd
98llm Oct 30, 2024
21075cd
refactor logging to added buffer memory handle.
renanllisboa Nov 1, 2024
e774de1
ConfigLoader class changed to load .json one time.
renanllisboa Nov 1, 2024
63858c1
Merge pull request #1573 from totvs/hotfix/config_class
renanllisboa Nov 1, 2024
bc6e0fa
Merge pull request #1574 from totvs/feature/user_logger_file_handler
renanllisboa Nov 1, 2024
46db927
Merge branch 'develop' into feature/logging
renanllisboa Nov 1, 2024
9231f3c
added check path from config_path Webapp
renanllisboa Nov 1, 2024
6be30f8
add error handling in create_file
renanllisboa Nov 1, 2024
92178cd
add log_folder key
renanllisboa Nov 4, 2024
cd75360
added new zindex check to click_tree right_click
renanllisboa Nov 6, 2024
0627f66
handling create folder errors
renanllisboa Nov 6, 2024
672a87a
Merge pull request #1575 from totvs/feature/logging
renanllisboa Nov 6, 2024
34eafda
Merge pull request #1577 from totvs/hotfix/clicktree_rightclick
renanllisboa Nov 6, 2024
9cf882b
Merge pull request #1578 from totvs/release/v1.20.28rc1
renanllisboa Nov 6, 2024
4fdadb3
change def names
98llm Nov 6, 2024
a6f4f33
Merge pull request #1580 from totvs/change_names
renanllisboa Nov 6, 2024
7ff0d66
Merge pull request #1581 from totvs/release/v1.20.28rc1
renanllisboa Nov 6, 2024
fac3f39
refactor the program_screen method to gain more stability
renanllisboa Nov 7, 2024
5bf01e5
branch release v1.20.28rc2
renanllisboa Nov 7, 2024
feb44bf
add server environment parameter
renanllisboa Nov 7, 2024
7efa138
fix log_error messages
renanllisboa Nov 7, 2024
19b8740
Merge pull request #1582 from totvs/hotfix/program_screen_module
renanllisboa Nov 8, 2024
d171e9e
Merge pull request #1583 from totvs/release/v1.20.28rc2
renanllisboa Nov 8, 2024
d403102
fix po-tabs search
98llm Nov 11, 2024
f0caa69
Update version.py
98llm Nov 11, 2024
983c59a
Update install_package.cmd
98llm Nov 11, 2024
0fc20ca
feature to checkListBox
98llm Nov 12, 2024
7a619c8
added set_button_character method
renanllisboa Nov 13, 2024
9f42ebd
Merge pull request #1585 from totvs/hotfix/poTabs
renanllisboa Nov 13, 2024
d6ced34
Merge pull request #1586 from totvs/feature/ClickListBox
renanllisboa Nov 13, 2024
376bed4
fix get_web_value in fill_select_element
renanllisboa Nov 13, 2024
64fe78d
Merge pull request #1587 from totvs/feature/click_quastionmark_button
renanllisboa Nov 13, 2024
e9fe30d
Merge pull request #1588 from totvs/hotfix/fill_select_element
renanllisboa Nov 13, 2024
ac92040
Merge pull request #1589 from totvs/release/v1.20.28rc3
renanllisboa Nov 14, 2024
4d61fea
add server environment in restart method and default value in program…
renanllisboa Nov 18, 2024
29ff9be
branch release v1.20.28rc4
renanllisboa Nov 18, 2024
6337a40
Merge pull request #1590 from totvs/hotfix/program_screen_environment
renanllisboa Nov 18, 2024
a432868
Merge pull request #1591 from totvs/release/v1.20.28rc4
renanllisboa Nov 18, 2024
9c0d061
Update version.py
98llm Nov 25, 2024
bfa608b
Update install_package.cmd
98llm Nov 25, 2024
eae536f
feature to click combo
98llm Nov 25, 2024
64a06a2
Merge pull request #1593 from totvs/hotfix/clickCombo
renanllisboa Nov 25, 2024
45002d3
Merge pull request #1594 from totvs/release/v1.20.28rc5
renanllisboa Nov 25, 2024
d7a801e
add configloader loading check and some changes to restructured resta…
renanllisboa Nov 25, 2024
373736d
Update version.py
98llm Nov 27, 2024
c88b9cf
Update install_package.cmd
98llm Nov 27, 2024
521ef93
fix combo input
98llm Nov 27, 2024
b632222
Merge pull request #1595 from totvs/hotfix/ClickCombo
renanllisboa Nov 27, 2024
809cdd3
Merge pull request #1596 from totvs/release/v1.20.28rc6
renanllisboa Nov 27, 2024
c8f216e
fix poSearch
98llm Nov 27, 2024
d0e79ec
refactor base_database log_error
renanllisboa Nov 27, 2024
5c5029f
Merge pull request #1597 from totvs/hotfix/poSearch
renanllisboa Nov 27, 2024
f0ce3e6
Merge pull request #1598 from totvs/hotfix/ConfigLoader
renanllisboa Nov 27, 2024
4c8fd19
Merge branch 'release/v1.20.28rc6' into hotfix/base_database
renanllisboa Nov 27, 2024
b3b1d68
Merge pull request #1599 from totvs/hotfix/base_database
renanllisboa Nov 27, 2024
183d34d
Merge pull request #1600 from totvs/release/v1.20.28rc6
renanllisboa Nov 27, 2024
bfcf665
fix POUI database call
98llm Nov 28, 2024
e3c87ab
Merge pull request #1601 from totvs/hotfix/dataBase
98llm Nov 28, 2024
fa84111
Merge pull request #1602 from totvs/release/v1.20.28rc6
98llm Nov 28, 2024
0692bee
fix a selector to icon input
98llm Nov 28, 2024
258e105
change coverage to check by layer instead of string
renanllisboa Nov 28, 2024
23475fd
fix posearch on active containers
98llm Nov 29, 2024
cdcf95e
adding get_coverage method and more time
renanllisboa Nov 29, 2024
6e77644
Merge pull request #1603 from totvs/hotfix/poSearch
renanllisboa Nov 29, 2024
92d1413
Merge pull request #1604 from totvs/hotfix/webapp_internal_coverage
renanllisboa Nov 29, 2024
012de7d
Merge pull request #1605 from totvs/release/v1.20.28rc6
renanllisboa Nov 29, 2024
a9e366f
update release
renanllisboa Nov 29, 2024
0b8989d
change post_exec ConfigLoader call
renanllisboa Dec 2, 2024
a14d12b
create branch release v1.20.28rc8
renanllisboa Dec 2, 2024
6696098
Merge pull request #1606 from totvs/hotfix/num_exec
renanllisboa Dec 2, 2024
63816b8
Merge pull request #1607 from totvs/release/v1.20.28rc8
renanllisboa Dec 2, 2024
f6e4aca
Merge pull request #1499 from totvs/dependabot/pip/opencv-python-4.8.…
renanllisboa Dec 2, 2024
2d65695
Update version.py
98llm Dec 5, 2024
cf32222
Update install_package.cmd
98llm Dec 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add server environment in restart method and default value in program…
…_screen
renanllisboa committed Nov 18, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 4d61fea866005b81fbcabd7f19e1bd07e75361dd
11 changes: 9 additions & 2 deletions tir/technologies/webapp_internal.py
Original file line number Diff line number Diff line change
@@ -390,6 +390,9 @@ def program_screen(self, initial_program="", environment="", poui=False):
>>> self.program_screen("SIGAADV", "MYENVIRONMENT")
"""

if not environment:
environment = self.config.environment


self.config.poui_login = poui

@@ -669,13 +672,15 @@ def reload_user_screen(self):

logger().debug('Reloading user screen')

server_environment = self.config.environment

self.restart_browser()

if self.config.coverage:
self.driver.get(f"{self.config.url}/?StartProg=CASIGAADV&A={self.config.initial_program}&Env={self.config.environment}")

if not self.config.skip_environment and not self.config.coverage:
self.program_screen(self.config.initial_program)
self.program_screen(self.config.initial_program, environment=server_environment)

self.wait_element_timeout(term="[name='cGetUser']",
scrap_type=enum.ScrapType.CSS_SELECTOR, timeout = self.config.time_out , main_container='body')
@@ -3212,6 +3217,8 @@ def restart(self):
"""
webdriver_exception = None

server_environment = self.config.environment

if self.config.appserver_service:
try:
self.sc_query(self.config.appserver_service)
@@ -3240,7 +3247,7 @@ def restart(self):
if self.config.initial_program != '' and self.restart_counter < 3:

if not self.config.skip_environment and not self.config.coverage:
self.program_screen(self.config.initial_program)
self.program_screen(self.config.initial_program, environment=server_environment)

self.wait_user_screen()
if 'POUILogin' in self.config.json_data and self.config.json_data['POUILogin'] == True: