Merge latest changes from OllisGit #2
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* update plainingprogress section * External Database first version * A lof of stuff "under the hood" - added mysql-driver - databasee type and connection handling changed - tests covered all databasemanager operations - docker supports postgreas and mysql * Implement QR code generation and "scanning" Two new methods /generateQR/<databaseID> and /QR/<databaseID> /generateQR will return a jpg QR code with url encoded data for /QR for the given spool /QR will select and load the given spool and then redirect to the SpoolManager tab if successful QR codes can be viewed in the spool page and printed and then scanned with any phone / qr reader * Preparation for database-scheme v4 done * Preparation for database-scheme v4 done Co-authored-by: VibroAxe <[email protected]>
- OllisGit#103 Removed database driver
Bugfix of OllisGit#103, OllisGit#104 rename column not supported
Bugfix of OllisGit#103, OllisGit#104 rename column not supported Improved logging
Bugfix of OllisGit#103, OllisGit#104 rename column not supported Improved logging Improved zip-build
- OllisGit#109 new columns overwritten by renaming script
* Update SpoolManager.js Fix javascript QR code selection * Update SpoolManager.js Fix sidebar not being updated when spool selecting by QR Code * Update SpoolManager.js Display the SpoolManager tab when scanning a spoolManager barcode * Update SpoolManager.js * Update SpoolManager.js Perform tab switch after selectSpool to allow page to finish loading * Use relative pathing for QR Code Fixes OllisGit#111 using relative pathing, It might be better to do this using jinja native but I can't currently find a basepath reference * Update SpoolManager_tab_dialogs.jinja2 Use flask's url_for instead of hard coding * Update SpoolManager_tab_dialogs.jinja2 Url_for needs full class pathing * Tidied up url_for implementation Use proper routing parsing for generateQRCode * Return to index for url_for Can't use fully qualified procedure reference as we don't know the params yet * Fix incorrect plugin path Fix incorrect plugin path * Generate external qr code QR code was using internal URL
pull latest from ollisGit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.