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.

Sign up for GitHub

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

Jump to bottom

Dev 20231212 #131

Closed
wants to merge 33 commits into from
Closed

Dev 20231212 #131

wants to merge 33 commits into from

Commits on Jun 13, 2023

  1. Merge pull request #114 from opencdms/main 

    Syncing dev branch with main branch
    @AbnerBissolli
    AbnerBissolli authored Jun 13, 2023
    Configuration menu
    Copy the full SHA
    54aebd9 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Create equipment inventory and hide old maintenance reports.

    @AbnerBissolli
    AbnerBissolli committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    7d1a211 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #115 from opencdms/maintenance-reports-refactor 

    Equipment Inventory
    @fabiosato
    fabiosato authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    59c543e View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Adding new fields

    @AbnerBissolli
    AbnerBissolli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    d3da8be View commit details
    Browse the repository at this point in the history

  2. Merge pull request #116 from opencdms/maintenance-reports-refactor 

    Updating equipment inventory
    @AbnerBissolli
    AbnerBissolli authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    edd3191 View commit details
    Browse the repository at this point in the history

  3. Fixing typos

    @AbnerBissolli
    AbnerBissolli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    84676bc View commit details
    Browse the repository at this point in the history

  4. Fixing typos

    @AbnerBissolli
    AbnerBissolli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7f6756c View commit details
    Browse the repository at this point in the history

  5. Fix edit equipment_type bug

    @AbnerBissolli
    AbnerBissolli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    c12ae6b View commit details
    Browse the repository at this point in the history

  6. Add validation to equipment inventory

    @AbnerBissolli
    AbnerBissolli committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    c35e382 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Added new fields to equipments model and fixed some buugs

    @AbnerBissolli
    AbnerBissolli committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    07495cc View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Merge pull request #118 from opencdms/dev 

    Sync with dev
    @AbnerBissolli
    AbnerBissolli authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    4a93107 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Multiple Equipment

    @AbnerBissolli
    AbnerBissolli committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    467cf4d View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Fix compile error

    @AbnerBissolli
    AbnerBissolli committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    7d9e2e1 View commit details
    Browse the repository at this point in the history

  2. Equipment history (#119) 

    * Building Bug Fix

* Added equipment history
    @AbnerBissolli
    AbnerBissolli authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    235d71c View commit details
    Browse the repository at this point in the history

  3. Equipment inventory bug fixes from last update

    @AbnerBissolli
    AbnerBissolli committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    80d8667 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'maintenance-reports-refactor' into dev

    @AbnerBissolli
    AbnerBissolli authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    6a3dd41 View commit details
    Browse the repository at this point in the history

  2. 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
    @AbnerBissolli
    AbnerBissolli committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    1cdaf99 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #120 from opencdms/dev 

    Updating maintenance report with dev changes
    @AbnerBissolli
    AbnerBissolli authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    aaecd2e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into dev

    @AbnerBissolli
    AbnerBissolli authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    1583fa0 View commit details
    Browse the repository at this point in the history

  5. Improved equipment history and removed delete option from equipment i… 

    …nventory.
    @AbnerBissolli
    AbnerBissolli committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    232a2e5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of https://github.com/opencdms/surface into dev

    @AbnerBissolli
    AbnerBissolli committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    064036e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #122 from opencdms/dev 

    Sync maintenance-reports with dev
    @AbnerBissolli
    AbnerBissolli authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    c93e5b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Added maintenance reports creation and update for the new model.

    @AbnerBissolli
    AbnerBissolli committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    b17b9c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #123 from opencdms/maintenance-reports-refactor 

    Maintenance reports refactoring
    @fabiosato
    fabiosato authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    383d673 View commit details
    Browse the repository at this point in the history

  3. Contacts bug fix

    @AbnerBissolli
    AbnerBissolli committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    7476bb8 View commit details
    Browse the repository at this point in the history

  4. Added fine grained permission to delete maintenance report.

    @AbnerBissolli
    AbnerBissolli committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    e25644f View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Set default search in Maintenance Reports to display records from 3 m… 

    …onths ago
    @AbnerBissolli
    AbnerBissolli committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    87f9a97 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge branch 'main' into dev

    @AbnerBissolli
    AbnerBissolli authored Aug 8, 2023
    Configuration menu
    Copy the full SHA
    f0e0ff8 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Tx325 decoder (#125) 

    * decoder for tx325

* Update sat_tx325.py

* Update tasks.py
    @JerryHamm
    JerryHamm authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    68d5e62 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Tx325 decoder (#126) 

    * 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]>
    @JerryHamm @fabiosato
    JerryHamm and fabiosato authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    e29df0e View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Main -> Dev (#128) 

    * 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>
    @fabiosato @AbnerBissolli
    3 people authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    489528f View commit details
    Browse the repository at this point in the history

  2. Dev rebase (#129) 

    * 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]>
    @fabiosato @AbnerBissolli
    4 people authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    de9b6cf View commit details
    Browse the repository at this point in the history

  3. Merge pull request #130 from opencdms/main 

    Dev rebase
    @isedwards
    isedwards authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    488e51d View commit details
    Browse the repository at this point in the history