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

Edb mnemonic monitor rebase #1060

Merged
merged 122 commits into from Nov 11, 2022

Conversation

bhilbert4
Copy link
Collaborator

This PR is a test to get around problems with conflict resolution when rebasing the edb-mnemonic-monitor branch. I've added back the 3 MIRI data trending files that had recent updates, to hopefully remove them from the list of files with conflicts, in the hopes that the github conflict resolution button will come back. Eventually the data trending files need to be deleted, as they're not actually used.

@bhilbert4
Copy link
Collaborator Author

bhilbert4 commented Oct 26, 2022

Hooray it worked! So much easier than working manually one commit at a time on the command line.

Items left to do:

  • Add EDB monitor pull down menu entry for niriss, nirspec, fgs (already have miri, nircam)
  • Re-remove the data_trending files
  • One final test on test server
  • Change list of instrument names to loop over back to JWST_INSTRUMENT_NAMES
  • set self._today to the correct value
  • set EDB_DEFAULT_PLOT_RANGE back to production value of 14
  • Add new database tables to instrument-based table lists in database_interface
  • Add lock
  • Remove NIRISS entries that are producing too many points

@bhilbert4 bhilbert4 changed the title Edb mnemonic monitor rebase [WIP]: Edb mnemonic monitor rebase Oct 26, 2022
@bhilbert4 bhilbert4 changed the title [WIP]: Edb mnemonic monitor rebase Edb mnemonic monitor rebase Nov 1, 2022
@bhilbert4
Copy link
Collaborator Author

@mfixstsci I want to remove the NIRISS entries that are causing plots to have way too many points and slowing the browser, but in terms of the code, this is finally finally ready for review.

Copy link
Collaborator

@mfixstsci mfixstsci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of hard work here, thank you @bhilbert4 this looks great. A couple of comments and questions and then we can get this in. Thank you!

jwql/tests/test_edb.py Show resolved Hide resolved
jwql/tests/test_edb.py Outdated Show resolved Hide resolved
jwql/tests/test_edb_telemetry_monitor.py Outdated Show resolved Hide resolved
jwql/tests/test_edb_telemetry_monitor.py Outdated Show resolved Hide resolved
jwql/website/apps/jwql/static/js/popper.min.js.map Outdated Show resolved Hide resolved
jwql/website/apps/jwql/templates/edb_monitor.html Outdated Show resolved Hide resolved
jwql/website/apps/jwql/urls.py Show resolved Hide resolved
jwql/website/apps/jwql/forms.py Show resolved Hide resolved
@mfixstsci
Copy link
Collaborator

@bhilbert4 is all the testing for this PR finished? I am going to take a look on test and then merge if so.

@mfixstsci mfixstsci merged commit 758f16b into spacetelescope:develop Nov 11, 2022
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

2 participants