Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

fix(PR #480 crashed GUI): added selenium code generation to GUI #486

Merged
merged 50 commits into from
Jun 16, 2021
Merged
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
fec582b
Draft for Code gen over GUI
IAmWebSA Jun 8, 2021
951d1d1
Update tools/gui/qtcodegen.py
IAmWebSA Jun 8, 2021
b2782b8
Update tools/gui/qtcodegen.py
IAmWebSA Jun 8, 2021
c7a1151
Update tools/gui/qtcodegen.py
IAmWebSA Jun 8, 2021
01c7a20
Update qtcodegen.py
IAmWebSA Jun 8, 2021
942fdf2
Merge branch 'ownBeta' of https://github.com/IAmWebSA/vaccipy into ow…
IAmWebSA Jun 8, 2021
fbee7a6
Thread cancel optimization
IAmWebSA Jun 8, 2021
40753bd
update now checking missing kontakt data
IAmWebSA Jun 9, 2021
d5b3faa
remove help icon
IAmWebSA Jun 9, 2021
3bf7b6f
added CodeGEn Checkbox to Kontaktdaten
IAmWebSA Jun 9, 2021
c81ca8d
Update qtcodegen.py
IAmWebSA Jun 9, 2021
b883a40
Update qtcodegen.py
IAmWebSA Jun 9, 2021
89b58c2
Revert "added CodeGEn Checkbox to Kontaktdaten"
IAmWebSA Jun 9, 2021
fa40b67
added QtCodeGen to SubProcess
IAmWebSA Jun 9, 2021
297d027
Merge branch 'beta' into ownBeta
IAmWebSA Jun 9, 2021
2d2a276
adapted to mainline beta and further improvements
IAmWebSA Jun 9, 2021
8f082c5
Update main.py
IAmWebSA Jun 9, 2021
a6b790a
Update utils.py
IAmWebSA Jun 9, 2021
53396a4
Update qtcodegen.py
IAmWebSA Jun 9, 2021
9571de7
Merge branch 'beta' into ownBeta
IAmWebSA Jun 9, 2021
a00b889
Revert "Update main.py"
IAmWebSA Jun 9, 2021
4dac118
file permission fix
IAmWebSA Jun 9, 2021
2d3e2b9
File permissin change revert
IAmWebSA Jun 9, 2021
f7a0fb7
Update gui.py
IAmWebSA Jun 9, 2021
21e5567
Merge branch 'beta' into ownBeta
IAmWebSA Jun 9, 2021
b01e5d5
Update tools/gui/qtcodegen.py
IAmWebSA Jun 10, 2021
3c32efc
Update tools/gui/qtcodegen.py
IAmWebSA Jun 10, 2021
a0a9932
Update tools/gui/qtcodegen.py
IAmWebSA Jun 10, 2021
2db27b8
Update tools/gui/qtcodegen.py
IAmWebSA Jun 10, 2021
17f02d1
Merge branch 'beta' into ownBeta
IAmWebSA Jun 10, 2021
f3d3985
keep all data kontaktdaten.json and just set a dummy code for code ge…
IAmWebSA Jun 10, 2021
6a5354a
Update gui.py
IAmWebSA Jun 10, 2021
aa9e29f
Update tools/gui/qtcodegen.py
IAmWebSA Jun 10, 2021
b84ca51
Update gui.py
IAmWebSA Jun 10, 2021
7e719ec
Update qtkontakt.py
IAmWebSA Jun 10, 2021
cb67518
Merge branch 'beta' into ownBeta
IAmWebSA Jun 10, 2021
fe4d9f5
Revert "Merge branch 'beta' into ownBeta"
IAmWebSA Jun 10, 2021
902cad6
Revert "Revert "Merge branch 'beta' into ownBeta""
IAmWebSA Jun 10, 2021
c2bee2b
logger conflicts with redirect of qtgui
IAmWebSA Jun 10, 2021
18d09ea
added fix from TIm Reibe
IAmWebSA Jun 10, 2021
4d09c5d
Merge branch 'beta' into ownBeta
IAmWebSA Jun 10, 2021
68fc0e0
Merge branch 'beta' into ownBeta
IAmWebSA Jun 11, 2021
ba52bb3
Added 3 Input Dlg retries if SMS PIN was wrong
IAmWebSA Jun 11, 2021
8a989a9
Merge branch 'beta' into ownBeta
IAmWebSA Jun 11, 2021
2dc37dd
Merge branch 'beta' into ownBeta
IAmWebSA Jun 15, 2021
e1bd571
Fix for keyerror in GUI (Kontaktdaten bearbeiten) with old file
IAmWebSA Jun 15, 2021
6ac930c
Merge branch 'beta' into ownBeta
IAmWebSA Jun 15, 2021
b8aa712
Merge branch 'beta' into ownBeta
IAmWebSA Jun 15, 2021
5149479
Merge branch 'beta' into ownBeta
IAmWebSA Jun 16, 2021
059b8b3
fix(PR #480 crahsed GUI)
IAmWebSA Jun 16, 2021
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
33 changes: 5 additions & 28 deletions tools/gui/qtcodegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def __init__(self, kontaktdaten: dict, ROOT_PATH: str):
self.plz_impfzentrum = ""
self.mail = ""
self.telefonnummer = ""
self.sms_pin = ""

# connect to signals
self.signalUpdateData.connect(self.updateData)
Expand Down Expand Up @@ -92,9 +91,6 @@ def updateData(self, strmode, txt):
if strmode == "GEBURTSDATUM":
print(txt)
self.geburtsdatum = txt
elif strmode == "SMSCODE":
print(txt)
self.sms_pin = txt

self.signalGot = True
return True
Expand Down Expand Up @@ -125,9 +121,11 @@ def code_gen(self):
if self.stopped is True:
return False

# code anfordern
# code anfordern via selenium
try:
token, cookies = its.code_anfordern(self.mail, self.telefonnummer, self.plz_impfzentrum, self.geburtsdatum)
if its.selenium_code_anfordern(self.mail, self.telefonnummer, self.plz_impfzentrum, self.geburtsdatum):
self.sendSignalAndWait("signalShowInput","SMSCODE_OK")
return True
except RuntimeError as exc:
print(
f"\nDie Code-Generierung war leider nicht erfolgreich:\n{str(exc)}")
Expand All @@ -136,18 +134,6 @@ def code_gen(self):
QtCore.QThread.msleep(100)
return False

# code bestätigen
# allow 3 retries
for _ in range(3):
if self.stopped is False:
self.sendSignalAndWait("signalShowInput","SMSCODE")
if its.code_bestaetigen(token, cookies, self.sms_pin, self.plz_impfzentrum):
self.sendSignalAndWait("signalShowInput","SMSCODE_OK")
return True
else:
return False

print("\nSMS-Code ungültig")
print("Die Code-Generierung war leider nicht erfolgreich.")

self.signalShowDlg.emit("CRITICAL_CLOSE",f"SMS-Code ungültig.\n\nDie Code-Generierung war leider nicht erfolgreich")
Expand Down Expand Up @@ -257,16 +243,7 @@ def showInputDlg(self, dlgType):
break
except ValidationError as exc:
QtWidgets.QMessageBox.critical(self, "Geburtsdatum ungültiges Format", "Das Datum entspricht nicht dem richtigen Format (DD.MM.YYYY).")
elif dlgType == "SMSCODE":
text, ok = QtWidgets.QInputDialog.getText(self, 'SMS Code',
'Du erhältst gleich eine SMS mit einem Code zur Bestätigung deiner Telefonnummer\n'
'Bitte trage nachfolgend den SMS-Code ein.\n'
'Beispiel: 551-550\n')
if ok:
sms_pin = str(text).replace("-", "")
self.worker.signalUpdateData.emit("SMSCODE",sms_pin)
else:
self.hardClose()

elif dlgType == "SMSCODE_OK":
ret = QtWidgets.QMessageBox.information(self, "Erfolgreich", "Code erfolgreich generiert. Du kannst jetzt mit der Terminsuche fortfahren.",QMessageBox.StandardButton.Ok)
if ret == QMessageBox.StandardButton.Ok:
Expand Down