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

Consolidating ranges and stats #4887

Merged
merged 14 commits into from
Mar 5, 2019

Conversation

cesswairimu
Copy link
Collaborator

Fixes #4577

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • PR is descriptively titled 📑
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

@cesswairimu cesswairimu force-pushed the consolidating-ranges-and-stats branch from 746a6fe to ed50515 Compare February 27, 2019 23:53
@plotsbot
Copy link
Collaborator

plotsbot commented Feb 28, 2019

2 Messages
📖 @cesswairimu Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 It looks like you haven’t marked all the checkboxes. Help us review and accept your suggested changes by going through the steps one by one. If it is still a ‘Work in progress’, please include ‘[WIP]’ in the title.

Generated by 🚫 Danger

@jywarren
Copy link
Member

ooooohhhhh

Please post some screenshots once you're ready! Thanks Cess this is the biggest one in your project in some ways - the culmination of all your work into a single page type!!!! Great work!!!!!

@cesswairimu
Copy link
Collaborator Author

screencapture-localhost-3000-stats-2019-03-01-02_08_25
Here it is @jywarren but I am not quite satisfied with this. I am working on another design will open another PR so that we can compare. Thanks

@jywarren
Copy link
Member

jywarren commented Mar 1, 2019 via email

@cesswairimu
Copy link
Collaborator Author

Oh yeah I see...Yes it makes sense. Thanks

@jywarren
Copy link
Member

jywarren commented Mar 1, 2019 via email

@cesswairimu cesswairimu force-pushed the consolidating-ranges-and-stats branch 4 times, most recently from 03d8233 to 7530778 Compare March 3, 2019 23:06
@cesswairimu
Copy link
Collaborator Author

@jywarren thoughts?
screencapture-unstable-publiclab-org-stats-2019-03-04-02_01_07
Thanks

@jywarren
Copy link
Member

jywarren commented Mar 3, 2019 via email

@jywarren
Copy link
Member

jywarren commented Mar 3, 2019 via email

@cesswairimu
Copy link
Collaborator Author

Yes it does...you can take a look on unstable pushed the code there

@cesswairimu
Copy link
Collaborator Author

cesswairimu commented Mar 3, 2019

The url is now /stats to get the range /stats?start=&end=

@cesswairimu
Copy link
Collaborator Author

Oh, yeah let me add a test for the new contribution_graph_making method. Thanks

@cesswairimu cesswairimu changed the title (WIP) Consolidating ranges and stats Consolidating ranges and stats Mar 3, 2019
@jywarren
Copy link
Member

jywarren commented Mar 3, 2019 via email

@jywarren
Copy link
Member

jywarren commented Mar 3, 2019

screenshot_20190303-184636

@cesswairimu
Copy link
Collaborator Author

Thanks @jywarren. The filter period is the previously preset range...should I move it back just before the date-selector form?

@jywarren
Copy link
Member

jywarren commented Mar 3, 2019 via email

@cesswairimu
Copy link
Collaborator Author

Oh yeah it would make sense to remove the options parameter now and just have start and end set. Thanks fixing that. Will also try and remove the "utf8" not sure how it got there 🤔

@jywarren
Copy link
Member

jywarren commented Mar 4, 2019 via email

@cesswairimu cesswairimu force-pushed the consolidating-ranges-and-stats branch 3 times, most recently from 1a6255a to a6bf21a Compare March 5, 2019 15:30
@cesswairimu cesswairimu force-pushed the consolidating-ranges-and-stats branch from a6bf21a to 705b169 Compare March 5, 2019 15:51
@cesswairimu
Copy link
Collaborator Author

cesswairimu commented Mar 5, 2019

@jywarren I managed to remove the utf8, have the date picker field data persist after post and also changed the preset periods to past week, past month and past year. However I was not able to do away with the options parameter. I tried to make the select options links but couldn't find a way even tried using javascripr listener but couldn't get it to work..If you have any suggestions please let me know. Thanks.
Here is the updated page
screencapture-localhost-3000-stats-2019-03-05-18_57_47

@cesswairimu
Copy link
Collaborator Author

I am using the options param to get what option is selected and set start_date using it. So if past week is selected I set start_date to Time.now - 1.week

@jywarren
Copy link
Member

jywarren commented Mar 5, 2019 via email

@cesswairimu
Copy link
Collaborator Author

yeah sure will create a follow-up. Yes its ready to merge 😃

@jywarren jywarren merged commit 960dba0 into publiclab:master Mar 5, 2019
@jywarren
Copy link
Member

jywarren commented Mar 5, 2019

CONGRATS CESS!!!!!! 🎉 🎉 🎉 🎉

@cesswairimu cesswairimu mentioned this pull request Mar 5, 2019
@grvsachdeva
Copy link
Member

Awesome work @cesswairimu 🎉

@cesswairimu
Copy link
Collaborator Author

Thanks @gauravano 😃

jywarren pushed a commit that referenced this pull request Mar 9, 2019
* Added debounce for typeahead search optimization

* Update README.md (#4883)

The "What makes this project different" section had several long sentences which were difficult to understand. I tried to fix this by breaking the sentences down into smaller more concise sentences.

* convert chars to unicode (#4901)

* fixes for map module (#4909)

* fixes for map module

* yarn.lock update

* updated yarn.lock (#4911)

* updated yarn.lock

* tweak

* Remove useless variable assignment (#4885)

* Simplify username generation

* Use status module

* Tiny fix

* Fix indentation

* Made moderate buttons to appear on the same line (#4913)

* Made moderate buttons to appear on the same line

* Removed break tag.

* Clean up (#4902)

* Clean up with Rubocop

* More cleanup

* Excluse views

* Small refactor

* More clean up

* Clean up

* Fix conflict

* Tiny fix

* Follow tag asynchronously (#4587)

* Follow tag asynchronously


Added link to manage subscriptions


Add precondition failed http error code


cleanup


codeclimate fix


Fix typo change


remove data-remote


Preserve code for non xhr requests


Seperate JS and html


Codeclimate fix


Code Climate fixes


Updated tests

* Remove pre-compilation of async.js

* pre compilation of js assets

* cc fix try

* Move verification link (#4786)

* Move verification link

* Change link to text

* Remove unnecessary message

* popover works, styling is still not showing under elements but is und… (#4906)

* popover works, styling is still not showing under elements but is under.btn-default

* copied yml file back in

* First timer tag script (#4878)

* First timer tag script

* migration for attaching first-time-poster

* change migration bump version to 5.1

* Update schema.rb.example

* Consolidating ranges and stats (#4887)

* restyle range page to be a partial

* remove static stats

* merge range and main stats

* render range in main stats

* fix failing range test

* add questions vs answers graph

* add go back and further buttons

* minor fixes

* Change contribution graph making method

Change method to create graph based on the range given

* fix failing test and code climate issues

* remove commented code and indent

* remove stats_nav partial

* add contribution graph tests

* review requests implemetation

* move tag graph button (#4921)

* move tag graph button

* Update _user_controls.html.erb

* Added reply by tweet feature (#3175)

* Added reply by tweet feature

* Updated schedule.rb file

* Finalized reply-by-tweet

* Corrected schema version

* Minor change

* Added reply_by_tweet doc

* Minor changes

* Added twitter gem

* Minor changes

* Added Environment variables in Docker

* Added summery in Doc file

* Corrected schema version

* Added some documentation

* Added some documentation

* Migration timestamp changed

* Changed migration

* Minor change

* Minor changes

* Added rake to general gem list

* Added bundle exec for rake/rails tasks in schedule.rb

* Added path env variable

* MINOR CHANGE

* MINOR CHANGE

* MINOR CHANGE

* MINOR CHANGE

* Added print statement to check print

* Minor change

* Minor change

* Changed whenever config

* Minor change

* Completed reply by tweet feature

* Minor change

* Minor change

* Added gemfile.lock

* Update comment.rb

* Added gemfile.lock

* Minor changes

* Minor changes

* Minor changes

* Minor changes

* Add more relevant search results (#4848)

* add helper functions

* Modify controller to take extra results

* add dict file

* add  more objects

* refactor code and add tests

* cc fix

* change numbers to account for additions in fixtures

* fix tests

* remove unused include

* code quality fixes

* tab fix

* changing implementation ideas, removal of unnecessary code

* newline fix

* cc fix

* cc space inside brackets fix

* modify query to get rid of redundant words

* reduce word to root then tranform

* Change file name

* chore: update README.md (#4926)

Fixes task mentioned in issue #4749

* Bump cytoscape from 3.4.2 to 3.5.0 (#4929)

Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/cytoscape/cytoscape.js/releases)
- [Commits](cytoscape/cytoscape.js@v3.4.2...v3.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Tiny fix (#4933)

* Tiny fix

* Rubocop

* Update 20190301075323_add_first_tag_poster.rb

* updates (#4851)

* fix for wiki update (#4942)

* fixes, extend to title suggestions

* extended to atwho
icarito pushed a commit to icarito/plots2 that referenced this pull request Apr 9, 2019
* restyle range page to be a partial

* remove static stats

* merge range and main stats

* render range in main stats

* fix failing range test

* add questions vs answers graph

* add go back and further buttons

* minor fixes

* Change contribution graph making method

Change method to create graph based on the range given

* fix failing test and code climate issues

* remove commented code and indent

* remove stats_nav partial

* add contribution graph tests

* review requests implemetation
icarito pushed a commit to icarito/plots2 that referenced this pull request Apr 9, 2019
* Added debounce for typeahead search optimization

* Update README.md (publiclab#4883)

The "What makes this project different" section had several long sentences which were difficult to understand. I tried to fix this by breaking the sentences down into smaller more concise sentences.

* convert chars to unicode (publiclab#4901)

* fixes for map module (publiclab#4909)

* fixes for map module

* yarn.lock update

* updated yarn.lock (publiclab#4911)

* updated yarn.lock

* tweak

* Remove useless variable assignment (publiclab#4885)

* Simplify username generation

* Use status module

* Tiny fix

* Fix indentation

* Made moderate buttons to appear on the same line (publiclab#4913)

* Made moderate buttons to appear on the same line

* Removed break tag.

* Clean up (publiclab#4902)

* Clean up with Rubocop

* More cleanup

* Excluse views

* Small refactor

* More clean up

* Clean up

* Fix conflict

* Tiny fix

* Follow tag asynchronously (publiclab#4587)

* Follow tag asynchronously


Added link to manage subscriptions


Add precondition failed http error code


cleanup


codeclimate fix


Fix typo change


remove data-remote


Preserve code for non xhr requests


Seperate JS and html


Codeclimate fix


Code Climate fixes


Updated tests

* Remove pre-compilation of async.js

* pre compilation of js assets

* cc fix try

* Move verification link (publiclab#4786)

* Move verification link

* Change link to text

* Remove unnecessary message

* popover works, styling is still not showing under elements but is und… (publiclab#4906)

* popover works, styling is still not showing under elements but is under.btn-default

* copied yml file back in

* First timer tag script (publiclab#4878)

* First timer tag script

* migration for attaching first-time-poster

* change migration bump version to 5.1

* Update schema.rb.example

* Consolidating ranges and stats (publiclab#4887)

* restyle range page to be a partial

* remove static stats

* merge range and main stats

* render range in main stats

* fix failing range test

* add questions vs answers graph

* add go back and further buttons

* minor fixes

* Change contribution graph making method

Change method to create graph based on the range given

* fix failing test and code climate issues

* remove commented code and indent

* remove stats_nav partial

* add contribution graph tests

* review requests implemetation

* move tag graph button (publiclab#4921)

* move tag graph button

* Update _user_controls.html.erb

* Added reply by tweet feature (publiclab#3175)

* Added reply by tweet feature

* Updated schedule.rb file

* Finalized reply-by-tweet

* Corrected schema version

* Minor change

* Added reply_by_tweet doc

* Minor changes

* Added twitter gem

* Minor changes

* Added Environment variables in Docker

* Added summery in Doc file

* Corrected schema version

* Added some documentation

* Added some documentation

* Migration timestamp changed

* Changed migration

* Minor change

* Minor changes

* Added rake to general gem list

* Added bundle exec for rake/rails tasks in schedule.rb

* Added path env variable

* MINOR CHANGE

* MINOR CHANGE

* MINOR CHANGE

* MINOR CHANGE

* Added print statement to check print

* Minor change

* Minor change

* Changed whenever config

* Minor change

* Completed reply by tweet feature

* Minor change

* Minor change

* Added gemfile.lock

* Update comment.rb

* Added gemfile.lock

* Minor changes

* Minor changes

* Minor changes

* Minor changes

* Add more relevant search results (publiclab#4848)

* add helper functions

* Modify controller to take extra results

* add dict file

* add  more objects

* refactor code and add tests

* cc fix

* change numbers to account for additions in fixtures

* fix tests

* remove unused include

* code quality fixes

* tab fix

* changing implementation ideas, removal of unnecessary code

* newline fix

* cc fix

* cc space inside brackets fix

* modify query to get rid of redundant words

* reduce word to root then tranform

* Change file name

* chore: update README.md (publiclab#4926)

Fixes task mentioned in issue publiclab#4749

* Bump cytoscape from 3.4.2 to 3.5.0 (publiclab#4929)

Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/cytoscape/cytoscape.js/releases)
- [Commits](cytoscape/cytoscape.js@v3.4.2...v3.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Tiny fix (publiclab#4933)

* Tiny fix

* Rubocop

* Update 20190301075323_add_first_tag_poster.rb

* updates (publiclab#4851)

* fix for wiki update (publiclab#4942)

* fixes, extend to title suggestions

* extended to atwho
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* restyle range page to be a partial

* remove static stats

* merge range and main stats

* render range in main stats

* fix failing range test

* add questions vs answers graph

* add go back and further buttons

* minor fixes

* Change contribution graph making method

Change method to create graph based on the range given

* fix failing test and code climate issues

* remove commented code and indent

* remove stats_nav partial

* add contribution graph tests

* review requests implemetation
SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019
* Added debounce for typeahead search optimization

* Update README.md (publiclab#4883)

The "What makes this project different" section had several long sentences which were difficult to understand. I tried to fix this by breaking the sentences down into smaller more concise sentences.

* convert chars to unicode (publiclab#4901)

* fixes for map module (publiclab#4909)

* fixes for map module

* yarn.lock update

* updated yarn.lock (publiclab#4911)

* updated yarn.lock

* tweak

* Remove useless variable assignment (publiclab#4885)

* Simplify username generation

* Use status module

* Tiny fix

* Fix indentation

* Made moderate buttons to appear on the same line (publiclab#4913)

* Made moderate buttons to appear on the same line

* Removed break tag.

* Clean up (publiclab#4902)

* Clean up with Rubocop

* More cleanup

* Excluse views

* Small refactor

* More clean up

* Clean up

* Fix conflict

* Tiny fix

* Follow tag asynchronously (publiclab#4587)

* Follow tag asynchronously


Added link to manage subscriptions


Add precondition failed http error code


cleanup


codeclimate fix


Fix typo change


remove data-remote


Preserve code for non xhr requests


Seperate JS and html


Codeclimate fix


Code Climate fixes


Updated tests

* Remove pre-compilation of async.js

* pre compilation of js assets

* cc fix try

* Move verification link (publiclab#4786)

* Move verification link

* Change link to text

* Remove unnecessary message

* popover works, styling is still not showing under elements but is und… (publiclab#4906)

* popover works, styling is still not showing under elements but is under.btn-default

* copied yml file back in

* First timer tag script (publiclab#4878)

* First timer tag script

* migration for attaching first-time-poster

* change migration bump version to 5.1

* Update schema.rb.example

* Consolidating ranges and stats (publiclab#4887)

* restyle range page to be a partial

* remove static stats

* merge range and main stats

* render range in main stats

* fix failing range test

* add questions vs answers graph

* add go back and further buttons

* minor fixes

* Change contribution graph making method

Change method to create graph based on the range given

* fix failing test and code climate issues

* remove commented code and indent

* remove stats_nav partial

* add contribution graph tests

* review requests implemetation

* move tag graph button (publiclab#4921)

* move tag graph button

* Update _user_controls.html.erb

* Added reply by tweet feature (publiclab#3175)

* Added reply by tweet feature

* Updated schedule.rb file

* Finalized reply-by-tweet

* Corrected schema version

* Minor change

* Added reply_by_tweet doc

* Minor changes

* Added twitter gem

* Minor changes

* Added Environment variables in Docker

* Added summery in Doc file

* Corrected schema version

* Added some documentation

* Added some documentation

* Migration timestamp changed

* Changed migration

* Minor change

* Minor changes

* Added rake to general gem list

* Added bundle exec for rake/rails tasks in schedule.rb

* Added path env variable

* MINOR CHANGE

* MINOR CHANGE

* MINOR CHANGE

* MINOR CHANGE

* Added print statement to check print

* Minor change

* Minor change

* Changed whenever config

* Minor change

* Completed reply by tweet feature

* Minor change

* Minor change

* Added gemfile.lock

* Update comment.rb

* Added gemfile.lock

* Minor changes

* Minor changes

* Minor changes

* Minor changes

* Add more relevant search results (publiclab#4848)

* add helper functions

* Modify controller to take extra results

* add dict file

* add  more objects

* refactor code and add tests

* cc fix

* change numbers to account for additions in fixtures

* fix tests

* remove unused include

* code quality fixes

* tab fix

* changing implementation ideas, removal of unnecessary code

* newline fix

* cc fix

* cc space inside brackets fix

* modify query to get rid of redundant words

* reduce word to root then tranform

* Change file name

* chore: update README.md (publiclab#4926)

Fixes task mentioned in issue publiclab#4749

* Bump cytoscape from 3.4.2 to 3.5.0 (publiclab#4929)

Bumps [cytoscape](https://github.com/cytoscape/cytoscape.js) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/cytoscape/cytoscape.js/releases)
- [Commits](cytoscape/cytoscape.js@v3.4.2...v3.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Tiny fix (publiclab#4933)

* Tiny fix

* Rubocop

* Update 20190301075323_add_first_tag_poster.rb

* updates (publiclab#4851)

* fix for wiki update (publiclab#4942)

* fixes, extend to title suggestions

* extended to atwho
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