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
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
cec96ed
Merge remote-tracking branch 'refs/remotes/origin/main' into develop
Jan 13, 2022
fd3ce09
form datetime issue fix
Jan 13, 2022
e02833c
debugging path structure
Jan 13, 2022
de65cae
debugging shp load
Jan 13, 2022
17681a1
another path fix try
Jan 13, 2022
41ea823
new path attempt
Jan 13, 2022
d1e776f
png path update
Jan 13, 2022
e31d30e
still working on path fixes
Jan 13, 2022
06d3dfe
dummy map no inputs
Jan 13, 2022
806bc04
path update
Jan 13, 2022
31627ee
shots in the dark
Jan 13, 2022
b2faadc
more consistent path organization
Jan 13, 2022
604d487
path definition for current folder
Jan 13, 2022
c111716
another path try
Jan 13, 2022
86d9f24
loading none type shp attempt
Jan 13, 2022
da2b41d
no shp found return to match assignment
Jan 13, 2022
b8e5e26
error message path update
Jan 13, 2022
06f5940
more updated path structure
Jan 13, 2022
6428c7a
path correction
Jan 13, 2022
1218202
more path updates
Jan 13, 2022
d29ca9e
another path
Jan 13, 2022
c77001e
multipage class updates
Jan 13, 2022
f260ae5
selectbox format_func issue
Jan 13, 2022
94ca306
new menu method
Jan 13, 2022
7a219f0
path updates with option to run locally
Jan 13, 2022
fd3103a
removed Darwin platform check
Jan 13, 2022
f1a7d20
form load path update
Jan 13, 2022
fa7f7ee
Update README.md
kbefus Jan 13, 2022
a5edc92
Update submit_page.md
rreinecke Jan 15, 2022
cdb09e0
Plotting domains with and without full metadata.
Jan 17, 2022
b5ceac6
Merge pull request #35 from Gromopo/plot_points
rreinecke Jan 19, 2022
b5b6ea6
inital working version to submit data to hydroshare
Jan 21, 2022
1bcef45
now automatically scrolls to top to display message if not all fields…
Jan 28, 2022
7556f4f
added all necessary fields to upload to hydroshare. Testing necessary
Jan 28, 2022
48d4144
store upload shapes to tmp dir
Feb 2, 2022
05f8103
submission of form now working - data upload of shapes still buggy
Feb 2, 2022
7f7869c
added streamlit theme and fixed a caching bug
Feb 4, 2022
de7709f
removed qgis folder
Feb 4, 2022
1c1ec9c
removed unused notebook
Feb 4, 2022
4b5b0a7
uncommented citation check -> brocken doi check
Feb 4, 2022
dc0a510
added a first pytest file to test the automatic checks for data conci…
Feb 4, 2022
d205c4c
added check if file exists
Feb 4, 2022
4c44108
test for uploading a file works :) - unfortuantly still not in the form
Feb 4, 2022
b696b83
file upload is a streamlit bug.. somehow the list of files is empty
Feb 4, 2022
c274a6d
KJK- First Draft
kristyj004 Nov 19, 2022
e84c315
hsclient upload
kristyj004 Jan 31, 2023
f5f4d11
February Update
kristyj004 Feb 21, 2023
f78d5b0
Popup updates
kristyj004 Feb 22, 2023
045a686
2/22/23 Update
kristyj004 Feb 22, 2023
f77f22e
3/6/23 Update
kristyj004 Mar 6, 2023
df35f10
update HydroShare data pull
kristyj004 Mar 6, 2023
bef1b5d
Merge branch 'issue-30-Use-the-hydroshare-API-KJK'
Mar 7, 2023
c5347f6
Merge branch 'main' into develop
rreinecke Mar 7, 2023
5055db0
Update requirements.txt
kbefus Mar 7, 2023
88fa6b8
Fix set_page_config error and minor form updates
Mar 23, 2023
8227992
Update model_finder.py
Mar 23, 2023
8fe4b97
Update model_finder.py
Mar 23, 2023
2917f45
Update model_finder.py
Mar 23, 2023
e1eceae
Update model_finder.py
Mar 23, 2023
b2701a1
Update model_finder.py
Mar 23, 2023
a5a7041
Update model_finder.py
Mar 23, 2023
b65e0a0
Update model_finder.py
Mar 23, 2023
ffaec2d
Update model_finder.py
Mar 23, 2023
b3c4448
Update model_finder.py
Mar 23, 2023
69a30e1
Update model_finder.py
Mar 23, 2023
1a70c3e
Update model_finder.py
Mar 23, 2023
153440d
Updates to text on about, home, submit, and model_finder pages
samzipper Mar 24, 2023
c1c1943
Updates Sam requested
Mar 24, 2023
577c89a
Merge pull request #50 from samzipper/develop
kbefus Mar 24, 2023
c0cdf38
Fixing image paths for streamlit attempt
kbefus Mar 24, 2023
be3ed12
trying relative with forward slashes
kbefus Mar 24, 2023
9f23045
Full link attempt
kbefus Mar 24, 2023
5130925
using cache_data and update to Hydroshare URL
Mar 24, 2023
96ac940
Merge branch 'develop' of https://github.com/Gromopo/GroMoPo into dev…
Mar 24, 2023
47bed84
remove "Gromopo metadata for ___" from model name header in map
Mar 24, 2023
0666898
Fix about page images and udpate README instructions
samzipper Mar 28, 2023
b92f776
Merge pull request #51 from samzipper/develop
kbefus Mar 28, 2023
05e4d23
Adding Model Link
kristyj004 Apr 3, 2023
e627631
Minor form tweaks
samzipper Apr 4, 2023
139c5f2
Data model tweaks
kristyj004 Apr 4, 2023
a145989
Merge pull request #52 from samzipper/develop
samzipper Apr 4, 2023
091857c
Minor debugging for new field names
samzipper Apr 4, 2023
6af6a32
Edits to extent inputs
kristyj004 Apr 4, 2023
51fddd5
Merge pull request #53 from samzipper/develop
kristyj004 Apr 4, 2023
3764be5
Update title/favicon and add link to GitHub on pages
samzipper Apr 5, 2023
acf899b
Minor tweaks to text
samzipper Apr 5, 2023
e76d910
Get rid of unneeded images
samzipper Apr 5, 2023
42751f1
Adding Creator Email
kristyj004 Apr 5, 2023
8ab8e47
Merge pull request #54 from samzipper/develop
samzipper Apr 5, 2023
799fec4
GroMoPo form info & duplicate info
kristyj004 Apr 6, 2023
7b31631
Editing form validation
kristyj004 Apr 6, 2023
9741bf7
ModelCountry to string
kristyj004 Apr 10, 2023
7c4cd92
Typo Fix
kristyj004 Apr 10, 2023
5c3e282
Troubleshooting
kristyj004 Apr 10, 2023
a9c042a
More troubleshooting
kristyj004 Apr 10, 2023
8ba9b0f
Fixing spelling typo
kristyj004 Apr 11, 2023
5fa89ad
Remove deGraaf map. No replacement since open topgraphy data can be a…
Apr 12, 2023
79ad0df
Editing title
kristyj004 Apr 12, 2023
eb1052a
Update GetDataOutOfHydroShare.py
kristyj004 Apr 12, 2023
c4dcacf
Merge branch 'develop' of https://github.com/Gromopo/GroMoPo into dev…
kristyj004 Apr 12, 2023
400e101
Update pop-up with new fields
samzipper Apr 17, 2023
3efeb0f
change mandatory form fields
samzipper Apr 17, 2023
4538598
Merge pull request #55 from samzipper/develop
kristyj004 Apr 18, 2023
d5d1f40
Merge branch 'develop' of https://github.com/Gromopo/GroMoPo into dev…
kristyj004 Apr 19, 2023
a6809f0
Form submission fixes
kristyj004 Apr 19, 2023
6d0291e
Adding error trapping
kristyj004 Apr 19, 2023
d7f70dd
More complex error trapping
kristyj004 Apr 19, 2023
721b487
More testing
kristyj004 Apr 19, 2023
b992738
Fixing scale issue
kristyj004 Apr 19, 2023
9b26eb1
Removing email notifications
kristyj004 Apr 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More complex error trapping
Apparently, the error trapping needed error trapping
  • Loading branch information
kristyj004 committed Apr 19, 2023
commit d7f70dd7e1196d8686cd6c49c7824bd5ff5692d9
16 changes: 12 additions & 4 deletions streamlit/pages/submit_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,20 @@ def emailNotification(resourceID, gmp_form_time, gmp_feedback, msg=''):
send_mail(emailList, subject, message)


def errorNotification(msg, dataDict, HS_ID=''):
def errorNotification(msg, dataDict, HS_ID='', prettyPrint=True):
email = "kristen.kgs@ku.edu"

subject = "Issue with GroMoPo Form Submission"

if HS_ID != '':
subject += ": " + HS_ID

message = msg + "\n" + prettyDict(dataDict)
message = msg + "\n"

if prettyPrint:
message += prettyDict(dataDict)
else:
message += str(dataDict)

send_mail(email, subject, message)

Expand Down Expand Up @@ -436,8 +441,11 @@ def push_to_hydroshare(data, method="webform"):
emailNotification(resIdentifier, st_data["TimeToFillOut"], st_data["Additional"])

except Exception as e:
print("Error with data upload for record " + resIdentifier + ". The issue is being recorded.")
errorNotification(str(e), st_data, resIdentifier)
try:
print("Error with data upload for record " + resIdentifier + ". The issue is being recorded.")
errorNotification(str(e), st_data, resIdentifier)
except:
errorNotification(str(e), st_data, resIdentifier, prettyPrint=False)


def process_data(data:dict):
Expand Down