Merge dev to master #9
Merged
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
…if no suitable action is found
…al. Most references to UserDTO in typescript now reference UserDetailedDto which has been modified from the original UserDetailedDto to allow for the new naming convention, any duplicate dtos have been removed unless there was a piece that needed to be extended/put into a partial which will now result in {Entity}DetailedDto on the typescript side but will remain inside the {Entity}Dto on the c# side
…the field definition list view
… backbone, backbonesegmenttype) or updated (watershed), map present and shows rsbs, streams, watershed and stations (stations via temporary file while waiting for Austin to enable CORS), placeholder vega embed chart (again waiting for CORS though haven't tested but can assume since same server), also presented temporary properties to show alongside map to demonstrate ability to show data. Need to make form that will query timeseries, but aside from that base is in
…licked, setup initial form for submitting to get time series data
…getting base setup for time series request
…er everywhere, only in the data-dashboard. Plus I shouldn't have used ng-deep in the first place as it's deprecated
Features/4
…ll be messed up too. Related to a known bug in leaflet where bundlers mess up locations of some files. Specifically manipulated the default marker location in data dashboard and added some extra to angular.json to ensure it knows where the files are.
… and 'Site' have been changed to 'Station', map marker turns yellow when a station is selected, when timeseries data calls are successful but return no data an error message appears, time series panel resets when user chooses new selection
…a, switch between rainfall or discharge (which have been filtered down), can trigger individual timeseries from the map view or the chart view, add field definitions for aggregationMode, timeInterval and intervalMultiplier
…ights, jackalope way of self-signed certs
Features/22
… so that if a watershed isn't provided it goes to the database and gets a gets all watersheds and creates the bounding box from that
…perform multi-variable requests
… we aren't trying to reference local machine version of script but the node modules of the project
…son script themselves
… to make a custom component and come out VICTORIOUS!!!!
…elect, move over the other variables to be up to date witht he new multi select
Features/13
…use it somehow was missed
…on's units and giving the forms default values
…witching filters, add filter
…witching filters, add filter
Features/19
… button disappear when form values are changed or stations are updated since it no longer reflects what is selected. Also small update to the unauthenticated access guard to ensure that we have a valid access token, not just that we have a token
…nto a shared component that multisitemultivariable and paired regression will use with diversion being moved over later
…so update divs to not use ngStyle but to just use ngIf to display the charts so diversion scenario doesn't leave behind a large amount of white space after the first chart is rendered
…tton, move view tributary area button out into panel and add zoom to tributary area button to separate functionality there and put control back in the user's hands
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.