Skip to content

Fixed bug regarding water_quality export including data from other sites #664

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

Jump to bottom
Open
jerry-peng wants to merge 162 commits into
base: develop
Choose a base branch
from
Open

Fixed bug regarding water_quality export including data from other sites #664

jerry-peng wants to merge 162 commits into from

Conversation

@jerry-peng
Copy link
Contributor

@jerry-peng jerry-peng commented Jun 20, 2018

fixes issue #519

Changes in this PR.

  • Fix the export water quality bug that's bugging everyone

Testing this PR.

  1. Create some new water quality datasheets (Important)
  2. Export the water quality data from other sites, see if the newly created water quality data is included

Expected Output.

  1. The water quality data from other sites should not be included.
$ make test
[... test output ...]

@osuosl/devs

Tan and others added 30 commits January 3, 2018 15:27
Delete datasheets button added on side page.
66ef64f
@CarvellWakeman
Attempt 1 - stop propagation tag
5ce50d0
Delete icon for datasheets now displays and hides appropriately.
2102287
Working on delete datasheets post.
c88a400
@baileysingleton
Added Y-Axis, Rounded numbers, removed time option
850c62e
Start moving the delete buttons to the view pages.
2caaacd
@CarvellWakeman
Replaced iOS drop downs with selects
5b2833a
@CarvellWakeman
Updated dropdowns to use collections, fixes styling on iOS
553f81d
@CarvellWakeman
Added stop propagation to dropdown buttons
08f9da3
@CarvellWakeman
Removed below origin
6cf23a5
@CarvellWakeman
Reverted to collections
5d1a50d
@CarvellWakeman
Removed all reference to dropdowns
0b41d34
@CarvellWakeman
Added expanding for dropdowns
36aaaa2
Delete for marcoinvertebrates working for super admins.
6888c41
Delete button added to all the data sheet view pages.
2ed34e9
All datasheet deletion buttons now redirect to their respective site …
a1d811a 
…page. For issue #464
Canopy data sheets now delete.
abd3b75
Committing redirecticts for delete buttons on the data sheets.
12c0c69
Soil data sheets now delete.
08342b2
Riparian Aquatic data sheets now delete.
a3f79af
@CarvellWakeman
Added password validation for all forms that use a password field
2ee920b
All data sheets now deleting properly. Issue #464
e3b6e93
Fixing minor merge issues.
344dbc4
@CarvellWakeman
Added approve accounts page basics
2227076
Delete button for data sheets now hides if the user cannot delete. Is…
b3b000c 
…sue #464
@CarvellWakeman
Exclued users in a new org request from new users section
3b2f36e
@CarvellWakeman
Linting pass
d3e7f47
@CarvellWakeman
Linting pass
bbf0fa8
@CarvellWakeman
Reset URLs change
fdcc2a5
@CarvellWakeman
Updated password tests
b4c5782
CarvellWakeman and others added 26 commits February 8, 2018 12:07
@CarvellWakeman
Merge branch 'develop' into feat/gallery
d6c7c59
@CarvellWakeman
Reverted site details accidental change
bae80ac
@CarvellWakeman
Added photopoint delete button
8bee2ec
@CarvellWakeman
So much lint
0983f04
@CarvellWakeman
Tiny lint
56de648
@CarvellWakeman
Merge pull request #638 from osuosl/feat/gallery
bf00585 
Feat/gallery
@ramereth
Set files to execute
d7e146a
@ramereth
Add Sentry.io reporting
6129cca 
This adds support for https://sentry.io so that we can manage our application
errors in a more sane fashion. For it to actually work, you need to setup
projects on an account which we'll do on the OSL side. But for general
development this doesn't require anything.

You will need to rebuild your web docker image to test and use this since we
import the raven (Sentry's python library) in settings.py.
@baileysingleton
edge fix
11a0619
@ramereth
Merge pull request #658 from osuosl/ramereth/sentry.io-integration
cabc786 
Add Sentry.io reporting
@jerry-peng
Modified the data processing function so value None won
a3df1b8 
't make the return value a NaN
@jerry-peng
Fixed water quality graph, fixed typos
45ec7c3
@jerry-peng
Deleted console.log in water_quality.js
8a165d1
@jerry-peng
Merge pull request #657 from osuosl/jerryp/fix_water_points
6d35f22 
Fix water quality graphing code (specifically data filtering)
@jerry-peng
Fixed __str__ function for SchoolRelations object, fixes the bug
b9cdd95
@jerry-peng
Merge pull request #655 from osuosl/jerryp/delete_school_bug
46aa4f4 
Fixes Server 500 when school is deleted
@baileysingleton @jerry-peng
removed educator kits and upload resource
9555eca
@jerry-peng
Merge pull request #654 from osuosl/baileysingleton/resource_removal
961533e 
removed educator kits and upload resource
@baileysingleton
Merge branch 'develop' into bugfix/edge_params
36c6c24
@baileysingleton
Merge pull request #661 from osuosl/bugfix/edge_params
9eeb571 
Edge pages now display gallery and datasheets, drop downs work
@jerry-peng
Changed code to calculate sample averages
1be4e69
@jerry-peng
Merge pull request #662 from osuosl/jerryp/histogram_fix
c1e35c4 
Changed code to calculate sample averages
@baileysingleton @jerry-peng
Fixed side scrolling issues on site details (affects laptops as well)
255f6ed
@jerry-peng
Merge pull request #653 from osuosl/baileysingleton/ipad_fix_v2
bfb923f 
Fixed side scrolling issues on site details (affects laptops as well)
@jerry-peng
Fixed bug regarding water_quality export including data from other sites
470365d
@jerry-peng
Fixed flake8
0ffeeef
@jerry-peng jerry-peng requested review from hertelc and ramereth June 20, 2018 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ramereth ramereth Awaiting requested review from ramereth

@hertelc hertelc Awaiting requested review from hertelc

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

Ready for Review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@jerry-peng @NathanTan @CarvellWakeman @baileysingleton @brennand97 @ramereth