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

feat(search): Wenn angebracht, pausiere Vermittlungscodes #431

Merged
merged 1 commit into from
Jun 11, 2021
Merged

feat(search): Wenn angebracht, pausiere Vermittlungscodes #431

merged 1 commit into from
Jun 11, 2021

Conversation

haslersn
Copy link
Contributor

Ein "Codepoint" ist ein dict, das einen Vermittlungscode ("code") und den Zeitpunkt ("next_use") enthält, zu dem der Code frühestens verwendet werden soll. So kann man die Verwendung eines Codes z. B. für 10 Minuten unterbinden.

@JuliusJacobitz
Copy link
Collaborator

JuliusJacobitz commented Jun 11, 2021 •
edited
Loading

@haslersn tested ? gute idee btw

@JuliusJacobitz JuliusJacobitz self-requested a review June 11, 2021 13:05
@haslersn
Copy link
Contributor Author

Ich konnte die Änderung zumindest seit gestern ohne Probleme verwenden. Ich habe noch nicht verifiziert, dass Codes tatsächlich für 10 Minuten pausiert und danach wieder verwendet werden.

@haslersn
Copy link
Contributor Author

Update: Mir ist gerade noch ein Bug aufgefallen, der wahrscheinlich auch von der Assertion, die ich gerade hinzugefügt habe, gecatcht wird. Aber das heißt, dass wir das noch nicht mergen können.

@haslersn haslersn marked this pull request as draft June 11, 2021 13:10
@haslersn
Copy link
Contributor Author

haslersn commented Jun 11, 2021 •
edited
Loading

Fix ist gepusht, muss aber noch getestet werden. Der Zweig wird nur bei der Buchung genommen.

@haslersn haslersn force-pushed the delay-code-usage branch 2 times, most recently from 44c9244 to 4ec4bfa Compare June 11, 2021 13:17
@haslersn haslersn marked this pull request as ready for review June 11, 2021 15:07
@haslersn
Copy link
Contributor Author

Ich hab damit erfolgreich einen Termin gebucht, d. h. es geht zumindest nicht komplett kaputt. Kann somit in die Beta gemerged werden, finde ich.

@haslersn
Copy link
Contributor Author

haslersn commented Jun 11, 2021 •
edited
Loading

Hab das hier noch zu einem deepcopy geändert, damit die Pausierung nicht dazu führt, dass auch die Aussortierung des Codes bei anderen URLs verzögert wird. Die Änderung sollte ohne Testen ok sein.

@timreibe timreibe merged commit e0ee4d1 into timreibe:beta Jun 11, 2021
@haslersn haslersn deleted the delay-code-usage branch June 12, 2021 10:09
timreibe added a commit that referenced this pull request Jun 16, 2021
@timreibe @haslersn
@IAmWebSA @andreaswachowski @Genmutant @TRojaner2013 @jonasmock @pancakeDevelopment @marcorombach @Floskinner @JuliusJacobitz @thecodingdad
fix(code-gen): code generation with selenium, GUI fixes (#491)
5b79c7e 
* feat(search): Wenn angebracht, pausiere Vermittlungscodes (#431)

* fix(Kontaktdaten GUI): fix for pressing Cancel Btn in Kontaktdaten GUI raised error (#436)

* Fix for pressing Cancel Btn in Kontaktdaten GUI raised error

Hier wie man es replizieren kann:
Kontaktdaten.json ist nicht vorhanden
Termin suchen drücken
Kontakdaten ausfüllen kommt
"Abbrechen"
Falsche/Unnötige Fehlermeldung da ja abgebrochen kommtHier wie man es replizieren kann:
Kontaktdaten.json ist nicht vorhanden
Termin suchen drücken
Kontakdaten ausfüllen kommt
"Abbrechen"
Falsche/Unnötige Fehlermeldung da ja abgebrochen kommt

@Floskinner  passt das so?

* Docstring added

* syntax change

* Revert "syntax change"

This reverts commit a6d16c9.

* syntax fix

* Fix for reject() / accept()

Buttons  wurden nicht korrekt zurück gemeldet.

@Floskinner

* fix(gender): added Kind and Divers as gender options (#442)

* Added Kind and Divers (#448)

* feat(code gen GUI): Added 3 retries of SMS PIN (if attempt failed) (#432)

* fix(log): Ensure tools/log paths are constructed portably (#454)

On Linux, the backslash in "tools\log\" was not interpreted as path
separator, so screenshots etc. ended up in the project's root directory,
named "tools\log\<filename>". Now they are named "<filename>" and stored
in the log-directory under tools.

* Don't throw and show error if loading of data was cancelled by the user (#456)

Co-authored-by: Juri <[email protected]>

* feat(GUI): Sprachsupport, Usability (#455)

* Update .gitignore

Added venv

* Documentation

* added language support and minor improvements

* documentation

* Updated .gitignore

* Update .gitignore

Added venv

Documentation

added language support and minor improvements

documentation

Updated .gitignore

* typos

* Adapt postition zip-code hometown

* fix(cookie-gen): Improve cookie generation / enter v-code with updated mouse simulation (#453)

* Improve mouse simulation for cookies / enter code

* Add requirements for mouse simulation

* Remove unecessary import

* Fix imports

* Remove imports which doesnt work on M1

* Generate coordinates without numpy/scipy

* Update move mouse by offsets func

* Add func to move from source x,y to target x,y

* Improve enter vermittlungscode

* Add mouse movements to driver_enter_code()

* Add second try if "Es ist ein unerwarteter Fehler aufgetreten" occurs

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Fix ugly if

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

* Update tools/its.py

Co-authored-by: Tim Reibe <[email protected]>

Co-authored-by: Jonas Mock <[email protected]>
Co-authored-by: Tim Reibe <[email protected]>

* Added a minimum of 30 seconds for retry-sec/check-delay (#452)

* refactor(search): Rotiere durch PLZs, anstatt Zufallswahl (#444)

* feat(notify): added notification configuration to GUI (#463)

* added notifications to GUI

* added tabstops

* Update tools/gui/qtkontakt.py

Co-authored-by: Florian Glaser <[email protected]>

Co-authored-by: Florian Glaser <[email protected]>

* Workaround für Generierung von Vermittlungscodes (#459)

* Update requirements

* Replace code_anfordern()

* Fix wait for server response before continue

* Accept cookies

* Add queue bypass

* Add retry counter for fetching server response

* Revert from HEAD to 7efe793.

* Add selenium_code_anfordern()

* Replace its.code_anfordern()

* Add logging

* Add specific error messages

* Add mouse simulation

* Enter char by char

* Fix random v-code

Co-authored-by: Jonas Mock <[email protected]>

* fix(bugs): small bugfixes, added selenium debugging port (#466)

* fix(notifications GUI): Fix for KeyError "notifications" after click Kontaktdaten bearbeiten over GUI (#468)

* Draft for Code gen over GUI

first draft for running Code Gen over GUI

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update qtcodegen.py

* Thread cancel optimization

break while loops if stop called

* update now checking missing kontakt data

showing dialog to generate kontaktdaten if not present

* remove help icon

* added  CodeGEn Checkbox to Kontaktdaten

for now it just simply adds a XXXX dummy code to prevent code validation error (since it is not yet known )

* Update qtcodegen.py

* Update qtcodegen.py

* Revert "added  CodeGEn Checkbox to Kontaktdaten"

This reverts commit 3bf7b6f.

* added QtCodeGen to SubProcess

added QtCodeGen to SubProcess  because Impfterminservice is blocking  the Thread for termination

* adapted to mainline beta and further improvements

READY to TEST

* Update main.py

* Update utils.py

* Update qtcodegen.py

hard exit if cancelled

* Revert "Update main.py"

This reverts commit 8f082c5.

* file permission fix

git update-index --chmod=+x main.py under windows

* File permissin change revert

* Update gui.py

small rearrangment

* Update tools/gui/qtcodegen.py

THX

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* keep all data kontaktdaten.json and just set a dummy code for code gen task

Rework to keep all data in kontaktdaten.json and just set a dummy code for code gen task if not file is present.

Also added checks if kontaktdaten edit fenster was cancelled to not run processes.

Also do a full validation check on input also if mode CODE_GENERIEREN, to have a valid config file

* Update gui.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update gui.py

Co-authored-by: Florian Glaser <[email protected]>

* Update qtkontakt.py

changes from @Floskinner  added

* Revert "Merge branch 'beta' into ownBeta"

This reverts commit cb67518, reversing
changes made to 7e719ec.

* Revert "Revert "Merge branch 'beta' into ownBeta""

This reverts commit fe4d9f5.

* logger conflicts with redirect of qtgui

* added fix from TIm Reibe

* Added 3 Input Dlg retries if SMS PIN  was wrong

Change allows a wrong input of smspin and if code failed to accept the pin will be asked again

* Fix for keyerror in GUI (Kontaktdaten bearbeiten) with old file

tools\gui\qtkontakt.py", line 362, in __lade_alle_werte
    if kontaktdaten['notifications']:
KeyError: 'notifications'

Co-authored-by: Florian Glaser <[email protected]>

* fix missing add-data in create spec for version.txt

* selenium-wire hooks for pyinstaller

* feat(notifications): Fire notification as soon as an appointment was found (#474)

* Added title to telegram notification message

* Fire notification as soon as an appointment was found

* Added possibility to move the mouse negative values (#458)

* Added possibility to move the mouse negative values

* - Refactored, moved mouse movement and path generation to own file mousemover.py

* - Reordered imports

* - Fix calls to move_mouse_to_coordinates

Co-authored-by: Juri <[email protected]>

* feat(GUI): Verbesserte Oberfläche im Modus CODE_GENERIEREN  (#471)

* Update .gitignore

Added venv

* Improved Kontaktdateneingabe (CodeGen))

Verbesserung der UX.
Felder wurden deaktiviert,
Ladefunktion unterstüzt nun CodeGen

* select correct tab

* typo

* added default arguments

* Improve selenium vcode generation (#480)

* Add second try if "Es ist ein unerwarteter Fehler aufgetreten"

* Improve selenium_code_anfordern

* Close browser if error occurs

* Fixed unable to locate element

* Fix unable to locate element #2

* Fix 'CLogger' object has no attribute 'warning'

* Prevent unable locate sms_verifizierung_h1 after successful request

* Cleaned up main

Co-authored-by: Jonas Mock <[email protected]>

* fix(seleniumwire): added chrome_options to selenium-wire, added selenium-wire certificates (#485)

* added chrome_options to seleniumwire, pep8 changes

* added seleniumwire certificates

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

* Draft for Code gen over GUI

first draft for running Code Gen over GUI

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update qtcodegen.py

* Thread cancel optimization

break while loops if stop called

* update now checking missing kontakt data

showing dialog to generate kontaktdaten if not present

* remove help icon

* added  CodeGEn Checkbox to Kontaktdaten

for now it just simply adds a XXXX dummy code to prevent code validation error (since it is not yet known )

* Update qtcodegen.py

* Update qtcodegen.py

* Revert "added  CodeGEn Checkbox to Kontaktdaten"

This reverts commit 3bf7b6f.

* added QtCodeGen to SubProcess

added QtCodeGen to SubProcess  because Impfterminservice is blocking  the Thread for termination

* adapted to mainline beta and further improvements

READY to TEST

* Update main.py

* Update utils.py

* Update qtcodegen.py

hard exit if cancelled

* Revert "Update main.py"

This reverts commit 8f082c5.

* file permission fix

git update-index --chmod=+x main.py under windows

* File permissin change revert

* Update gui.py

small rearrangment

* Update tools/gui/qtcodegen.py

THX

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* keep all data kontaktdaten.json and just set a dummy code for code gen task

Rework to keep all data in kontaktdaten.json and just set a dummy code for code gen task if not file is present.

Also added checks if kontaktdaten edit fenster was cancelled to not run processes.

Also do a full validation check on input also if mode CODE_GENERIEREN, to have a valid config file

* Update gui.py

Co-authored-by: Florian Glaser <[email protected]>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <[email protected]>

* Update gui.py

Co-authored-by: Florian Glaser <[email protected]>

* Update qtkontakt.py

changes from @Floskinner  added

* Revert "Merge branch 'beta' into ownBeta"

This reverts commit cb67518, reversing
changes made to 7e719ec.

* Revert "Revert "Merge branch 'beta' into ownBeta""

This reverts commit fe4d9f5.

* logger conflicts with redirect of qtgui

* added fix from TIm Reibe

* Added 3 Input Dlg retries if SMS PIN  was wrong

Change allows a wrong input of smspin and if code failed to accept the pin will be asked again

* Fix for keyerror in GUI (Kontaktdaten bearbeiten) with old file

tools\gui\qtkontakt.py", line 362, in __lade_alle_werte
    if kontaktdaten['notifications']:
KeyError: 'notifications'

* fix(PR #480 crahsed GUI)

Merged changes to GUI from : #480

Co-authored-by: Florian Glaser <[email protected]>

* bugfix notifications not working in GUI (#487)

* fix(master): merge master into beta (#490)

* Update README.md

* Update README.md

* Create CONTRIBUTING.md

* Update README.md

* Update CONTRIBUTING.md

* Added Kind and Divers (#437)

Kind and Divers are now also selectable ,)

* Revert "Added Kind and Divers (#437)" (#443)

This reverts commit 996878c.

* Update README.md

Co-authored-by: Julius Jacobitz <[email protected]>
Co-authored-by: IAmWebSA <[email protected]>

Co-authored-by: haslersn <[email protected]>
Co-authored-by: IAmWebSA <[email protected]>
Co-authored-by: Andreas Wachowski <[email protected]>
Co-authored-by: Genmutant <[email protected]>
Co-authored-by: Juri <[email protected]>
Co-authored-by: Alex <[email protected]>
Co-authored-by: Jonas Mock <[email protected]>
Co-authored-by: Jonas Mock <[email protected]>
Co-authored-by: Timo <[email protected]>
Co-authored-by: Marco Rombach <[email protected]>
Co-authored-by: Florian Glaser <[email protected]>
Co-authored-by: JuliusJacobitz <[email protected]>
Co-authored-by: Julius Jacobitz <[email protected]>
Co-authored-by: Sebastian Nagel <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@JuliusJacobitz JuliusJacobitz Awaiting requested review from JuliusJacobitz

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@haslersn @JuliusJacobitz @timreibe