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

Develop into main #49

Merged
merged 110 commits into from
Apr 22, 2023
Merged

Develop into main #49

merged 110 commits into from
Apr 22, 2023

Conversation

rreinecke
Copy link
Collaborator

@rreinecke rreinecke commented Mar 7, 2023

This merges the work of Kristen into main.

kbefus and others added 30 commits January 13, 2022 10:06
submit form required assignment of timezone. was resulting in an error
without one. also changed to only display publication year in the
slider.
still have path printing, trying turning off crs conversion that is
probably redundant
convert Path obj to str
not using Path for current dir
shp worked without Path, fixing png path and then can identify correct
order for using Path module
converted to windows or not windows
Added a warning and link to the current google docs
Some moderate changes to plotting method to allow multiple raster layers
eventually and to add different outline colors based on shp source.
Metadata to populate the popups is a relatively important next step.
kristyj004 and others added 23 commits April 5, 2023 11:37
Adding stored attribute for creator email
Minor beautification steps
Included GroMoPo form feedback of time & info with form submission email to admins
Removed "Model Authors" attribute from HydroShare additional information since the info is duplicated with Authors attribute
Testing if string validation is preventing form submission
Converting form ModelCountry output from list to string
Troubleshooting
Changing ModelCountry to text input as a test
Adding "GroMoPo Metadata for" to the beginning of all titles
Adding CSV as export type, expanding the number of fields in the export, not limiting number of characters for geojson and csv
Update map, change mandatory form fields
In submit_model, the form should submit data now.
Edits mostly involved removing blank values and lists from data sent to HydroShare.
Also including form feedback in submission email.
Removed old comments
Switched Model Country input back to multi-country list

Various updates to code that pulls GroMoPo data out of HydroShare to create the index
Adding an error notification email
Apparently, the error trapping needed error trapping
Taking out email notifications & associated email contact information
@samzipper
Copy link
Collaborator

@rreinecke I think everything needed is in here, so please review/approve

@rreinecke rreinecke requested a review from kbefus April 21, 2023 05:33
@rreinecke
Copy link
Collaborator Author

@samzipper Awesome! @kbefus you need to approve please so that I can merge.

Copy link
Collaborator

@samzipper samzipper left a comment

Choose a reason for hiding this comment

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

As far as I can tell, this all looks good to me

@rreinecke rreinecke merged commit eeb3a64 into main Apr 22, 2023
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.

4 participants