Add forward stat page #3812
Add forward stat page #3812
Conversation
Generated by 🚫 Danger |
|
@Souravirus Thank you, |
|
Nice work @kevinzluo, I was actually traveling yesterday and currently reaching home, that's why didn't see this. I will surely do the review and approve it on gci. Till then can you correct the codeclimate issues. Thank you for your hardwork !! |
app/views/stats/index.html.erb
Outdated
| @@ -17,9 +17,13 @@ | |||
|
|
|||
| <p><%= raw t('notes.stats.looking_back', :time => @time.to_formatted_s(:long)) %></p> | |||
| <p> | |||
| <%= raw t('notes.stats.try_time_further_back', :url1 => "?time="+(@time-1.year).to_formatted_s(:long), | |||
| <%= raw t('notes.stats.try_time_back', :url1 => "?time="+(@time-1.year).to_formatted_s(:long), | |||
There was a problem hiding this comment.
@kevinzluo, there is no need to correct this variable here. If there is some issue with this variable, please change it in another PR as we follow one type of change in one PR.
|
@Souravirus Kevin Luo |
|
Ok nice!! Lets @jywarren See these changes and this would be nice to merge. |
| @@ -15,6 +15,12 @@ en: | |||
| <a href='%{url2}'>one month</a>, or | |||
| <a href='%{url3}'>one week</a> | |||
| further back. | |||
| try_time_further_forward: | | |||
There was a problem hiding this comment.
Would you mind adding these to config/locales/en.yml as we are seeking to consolidate these -- see #3515
Otherwise this is great! Can you upload a screenshot? 📸 Thanks!!!
There was a problem hiding this comment.
I believe I added a screenshot to my original pull request, but I will attach another one here.
Would you like me to move the translations in another PR or commit to this one? Sorry, I am somewhat new to GitHub :( .
Thank you,
Kevin Luo
There was a problem hiding this comment.
You can work on it here @kevinzluo
|
Ok I am sorry but I believe I just messed up my branch. I am so sorry. |
|
I guess you have merged your branch with the new changes. Although, it won't affect anything, but try to use |
kevinzluo
force-pushed
the
add-forward-stat-page
branch
from
2d5c256
to
e63366f
Compare
|
Yep. I think I accidentally merged the master into the development branch, and then rebased it, causing all the commits to be out of order. Sorry again, |
|
ok nice work @kevinzluo, @jywarren please see this. I think this is complete. |
|
This is beautifully implemented. Thank you so much! Were the translations in the previous location deleted, or are they duplicated? If duplicated, would you mind deleting the previous ones? thank you!!! |
kevinzluo
force-pushed
the
add-forward-stat-page
branch
from
e63366f
to
7693faf
Compare
|
Thank you!!! |
ghost
removed
the
* Added options to try time forward on stats page * changed spacing * Fixed typo in stats and finished edits. * Reverting changes * Added try_time_further_forward * Hopefully correcting mistakes and moving translations * Deleting translations that were moved.
Fixes #2650 (<=== Add issue number here)
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
rake test@publiclab/reviewersfor help, in a comment belowIf tests do fail, click on the red
Xto learn why by reading the logs.Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
Hello Everyone.
I have added buttons to move forward in the stats page
Thank you,
Kevin Luo