Dev 20231212 #131
Open
Dev 20231212 #131
Conversation
This file contains 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
Syncing dev branch with main branch
Equipment Inventory
Updating equipment inventory
Sync with dev
* Building Bug Fix * Added equipment history
This reverts commit 6a3dd41, reversing changes made to 80d8667. Changes to be committed: modified: api/wx/admin.py deleted: api/wx/migrations/0026_auto_20230705_1900.py deleted: api/wx/migrations/0027_auto_20230707_2048.py modified: api/wx/models.py modified: api/wx/templates/wx/maintenance_reports/maintenance_reports.html modified: api/wx/templates/wx/maintenance_reports/new_report.html deleted: api/wx/templates/wx/maintenance_reports_old/equipment_inventory.html deleted: api/wx/templates/wx/maintenance_reports_old/maintenance_reports.html deleted: api/wx/templates/wx/maintenance_reports_old/new_report.html deleted: api/wx/templates/wx/maintenance_reports_old/view_report.html modified: api/wx/urls.py modified: api/wx/views.py deleted: api/wx/views_old.py
Updating maintenance report with dev changes
Sync maintenance-reports with dev
Maintenance reports refactoring
* decoder for tx325 * Update sat_tx325.py * Update tasks.py
* decoder for tx325 * Update sat_tx325.py * Update tasks.py * Update and minor bug fixes to SAT_TX325 decoder --------- Co-authored-by: Fabio Sato (@grooel) <[email protected]>
* Maintenance Reports Refactoring (#124) * Create equipment inventory and hide old maintenance reports. * Adding new fields * Fixing typos * Fixing typos * Fix edit equipment_type bug * Add validation to equipment inventory * Added new fields to equipments model and fixed some buugs * Multiple Equipment * Fix compile error * Equipment history (#119) * Building Bug Fix * Added equipment history * Equipment inventory bug fixes from last update * Revert "Merge branch 'maintenance-reports-refactor' into dev" This reverts commit 6a3dd41, reversing changes made to 80d8667. Changes to be committed: modified: api/wx/admin.py deleted: api/wx/migrations/0026_auto_20230705_1900.py deleted: api/wx/migrations/0027_auto_20230707_2048.py modified: api/wx/models.py modified: api/wx/templates/wx/maintenance_reports/maintenance_reports.html modified: api/wx/templates/wx/maintenance_reports/new_report.html deleted: api/wx/templates/wx/maintenance_reports_old/equipment_inventory.html deleted: api/wx/templates/wx/maintenance_reports_old/maintenance_reports.html deleted: api/wx/templates/wx/maintenance_reports_old/new_report.html deleted: api/wx/templates/wx/maintenance_reports_old/view_report.html modified: api/wx/urls.py modified: api/wx/views.py deleted: api/wx/views_old.py * Improved equipment history and removed delete option from equipment inventory. * Added maintenance reports creation and update for the new model. * Contacts bug fix * Added fine grained permission to delete maintenance report. * Set default search in Maintenance Reports to display records from 3 months ago --------- Co-authored-by: Fabio Sato (@grooel) <[email protected]> * Changing MISSING constant from -99999 to -99.9 --------- Co-authored-by: Abner F. B. Costa <[email protected]> Co-authored-by: Surface <surface@surface>
* Maintenance Reports Refactoring (#124) * Create equipment inventory and hide old maintenance reports. * Adding new fields * Fixing typos * Fixing typos * Fix edit equipment_type bug * Add validation to equipment inventory * Added new fields to equipments model and fixed some buugs * Multiple Equipment * Fix compile error * Equipment history (#119) * Building Bug Fix * Added equipment history * Equipment inventory bug fixes from last update * Revert "Merge branch 'maintenance-reports-refactor' into dev" This reverts commit 6a3dd41, reversing changes made to 80d8667. Changes to be committed: modified: api/wx/admin.py deleted: api/wx/migrations/0026_auto_20230705_1900.py deleted: api/wx/migrations/0027_auto_20230707_2048.py modified: api/wx/models.py modified: api/wx/templates/wx/maintenance_reports/maintenance_reports.html modified: api/wx/templates/wx/maintenance_reports/new_report.html deleted: api/wx/templates/wx/maintenance_reports_old/equipment_inventory.html deleted: api/wx/templates/wx/maintenance_reports_old/maintenance_reports.html deleted: api/wx/templates/wx/maintenance_reports_old/new_report.html deleted: api/wx/templates/wx/maintenance_reports_old/view_report.html modified: api/wx/urls.py modified: api/wx/views.py deleted: api/wx/views_old.py * Improved equipment history and removed delete option from equipment inventory. * Added maintenance reports creation and update for the new model. * Contacts bug fix * Added fine grained permission to delete maintenance report. * Set default search in Maintenance Reports to display records from 3 months ago --------- Co-authored-by: Fabio Sato (@grooel) <[email protected]> * Changing MISSING constant from -99999 to -99.9 * Changing MISSING constant from -99999 to -99.9 --------- Co-authored-by: Abner F. B. Costa <[email protected]> Co-authored-by: Surface <surface@surface> Co-authored-by: Surface <[email protected]>
Dev rebase
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.