Skip to content

merge development into master #56

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

Open
nam20485 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

merge development into master #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95337c2
Upload file with representation of uncertanties
karenng-civicsoftware Sep 30, 2019
22272a7
Change views to use new json file #54
Sep 30, 2019
33a4787
Merge branch 'development' of github.com:hackoregon/disaster-resilien…
nam20485 Sep 30, 2019
7776ca3
Merge pull request #55 from hackoregon/#54-update-aebm-json
karenng-civicsoftware Oct 7, 2019
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
2 changes: 1 addition & 1 deletion api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def get_queryset(self):


def list(self, request, *args, **kwargs):
with open(JSONFILES_FOLDER+'aebm_results_2019_09_25.json') as json_file:
with open(JSONFILES_FOLDER + 'aebm_loss_casualties_2019-09-30.json') as json_file:
data = json.load(json_file)
response = JsonResponse(data)
return response
1 change: 1 addition & 0 deletions json_files/aebm_loss_casualties_2019-09-30.json
View file
Open in desktop

Large diffs are not rendered by default.