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

Beta -> master #434

Merged
merged 51 commits into from
Jun 11, 2021
Merged

Beta -> master #434

merged 51 commits into from
Jun 11, 2021

Conversation

JuliusJacobitz
Copy link
Collaborator

beta -> master

IAmWebSA and others added 30 commits June 2, 2021 18:46
Python 3.8 on Ubuntu fix
GUI needs complete spawn of Interpreter. Since  GUI Thread is ot handling UI for date search in main thread
wenn keine version.txt vorhanden ist, startet das GUI nicht
fix(gui version): Absturz wenn version.txt nicht vorhanden
fix(GUI Pfadauswahl): GUI stürz beim "x" drücken während der Pfadauswahl ab
Fixed NameError exception due to quit() call. Replaced with sys.exit().
reference: https://docs.python.org/3.8/library/constants.html#quit
Tested in Linux-Ubuntu-20.04 build.
fix(Falsche PLZ): Fixed NameError exception #367
Gmail allows a + character to organize your email (see https://support.google.com/a/users/answer/9308648?hl=en), but impfterminservice rejects these
feat(code): Allow to specify multiple codes
* Create version.txt

* Update utils - removed empty lines/comments

* Added output if source files are used.

* Update gui.py

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>

* Update gui.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>
Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>
fix(Notification): Fixed notifications
fix(Log): Browser-Cookie success->info
sinun98 and others added 21 commits June 9, 2021 15:36
* fix(Cookies): Optimierte Cookie Generierung

* Update tools/its.py

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>

* Update tools/its.py

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>

* Doc

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>

* Doc

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>

Co-authored-by: Tim Reibe <38082956+iamnotturner@users.noreply.github.com>
* fix(Validierung): Pushover und Telegram Token Validierung

* fix(Validierung): Pushover und Telegram Token Validierung
* fix(GUI): Fix GUI Absturz

* richtiger code anzeigen
…419)

Signed-off-by: Sebastian Hasler <sebastian.hasler@gmx.net>
* Draft for Code gen over GUI

first draft for running Code Gen over GUI

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* 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 <58706771+Floskinner@users.noreply.github.com>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* 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 <58706771+Floskinner@users.noreply.github.com>

* Update tools/gui/qtcodegen.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* Update gui.py

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>

* 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

Co-authored-by: Florian Glaser <58706771+Floskinner@users.noreply.github.com>
* Update .gitignore

Added venv

* Alow multiple use in gui, json support

* changed labels and tooltips

Es wurden ein paar Tooltips hinzugefügt und einige Labels geändert.

* Update .gitignore

* Alow multiple use in gui, json support

changed labels and tooltips

Es wurden ein paar Tooltips hinzugefügt und einige Labels geändert.

Update .gitignore

* Fehlermeldung und kleine Bugfixes

* rename variable

* fixed findChildren

* handling empty codes
Wie man am Kommentar sieht, tauchen immer wieder neue Response-
Inhalte auf, die darauf hindeuten, dass das Terminpaar nicht
mehr gebucht werden kann. Gemein haben sie, dass der Status
Code 400 lautet. In meinen Tests war es bisher so: Immer,
wenn ein 400er zurueck kommt, ist das Terminpaar auch manuell
nicht buchbar, da es nicht mehr verfuegbar ist.
Please try a test build for windows and start codegen
Fix Code Gen not starting with windows builds
@JuliusJacobitz JuliusJacobitz requested review from timreibe and sinun98 and removed request for timreibe June 11, 2021 14:22
@JuliusJacobitz JuliusJacobitz merged commit d56c043 into master Jun 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet