Don Cruse
845ac14176
Moving label creation to helpers
2013-07-19 00:14:52 -05:00
Don Cruse
70f633c150
Shifting more instance variables to the controller
...
Also removing some instance variables that were never invoked in the
views. This sets up a future refactoring of the method of comptuting
rolling averages, which differs between the two types of "last year"
views being refactored.
2013-07-18 21:01:39 -05:00
Don Cruse
1493304fc1
Refactor last year chart
...
Pulled some instance variable assignment into the controller.
Also extracted a method regarding interpolated values for the present
month.
2013-07-18 16:17:30 -05:00
Reinier Balt
d64f6e003e
Merge branch 'master' into rails4
...
Conflicts:
Gemfile.lock
2013-06-21 10:20:36 +02:00
Reinier Balt
f4908f2b7b
fix cache invariant for grouped todos in context and project view
2013-06-19 17:47:51 +02:00
Reinier Balt
4a485558e2
Merge branch 'master' into rails4
...
Conflicts:
Gemfile.lock
config/routes.rb
2013-06-17 09:25:02 +02:00
Reinier Balt
be1a9528d5
move the two toggle links in top-right to view menu
2013-06-11 16:13:46 +02:00
Reinier Balt
7084c11263
fix failing tests
2013-06-11 15:36:27 +02:00
Reinier Balt
0a57a68a87
Project and context view can now be grouped by context and project (using view menu)
2013-06-11 11:12:21 +02:00
Reinier Balt
0e8552ac4e
fix #1273 . Used the wording suggested in this ticket.
2013-06-05 16:58:52 +02:00
Reinier Balt
651e45d389
merge i18n keys to better support fr locale and update en, fr and nl locale for the change
...
es was updated by tolk, but no changes in content
2013-06-04 11:47:47 +02:00
Reinier Balt
b6e110c917
fix #1422 . Changing default tags of a project is now remembered
...
when not updating the whole page
2013-06-04 10:50:42 +02:00
Reinier Balt
80974fb0d5
empty non-saved project caused rss builder to fail
2013-05-13 12:50:10 +02:00
Reinier Balt
5cfa115cdc
small refactorings
...
fix passing params in use of _collection
2013-05-03 21:54:03 +02:00
Reinier Balt
f891ee86fe
fix clearing show_from fails
...
caused by slightly different (better) workings of aasm
2013-05-03 19:28:26 +02:00
Matt Rogers
d1ff0daf6f
Move the calendar to its own controller
2013-04-30 20:09:46 -05:00
Reinier Balt
93b0a2557c
add verbose action description to cache invariant to handle changes in this setting. fixes #1409
2013-04-29 09:58:54 +02:00
Matt Rogers
6b8e745234
Use Todos::Calendar in the view
2013-04-26 23:23:56 -05:00
Reinier Balt
a987ff3727
use size in stead of count to prevent unnecessary querying
2013-04-22 11:11:53 +02:00
Reinier Balt
caec4f214a
enable group by project for tickler
2013-04-20 20:20:57 +02:00
Reinier Balt
8b464112ad
further fixing regressions
2013-04-19 22:55:54 +02:00
Reinier Balt
d732779e14
#1411 also fails on project list page, so fix that too
2013-04-19 15:26:34 +02:00
Reinier Balt
549aa35e61
fix #1411 where the context list page was not adding new context on the page after the last was deleted.
2013-04-19 15:23:28 +02:00
Reinier Balt
9172d5e001
fix failing scenario
2013-04-17 23:26:46 +02:00
Reinier Balt
8641ecfc4e
add some project grouping scenarios to edit_a_todo and fix failures
...
also refactor step definitions
2013-04-17 22:11:24 +02:00
Reinier Balt
5f8f2eefa9
fix failing calendar scenarios
2013-04-16 10:20:44 +02:00
Reinier Balt
a4e0860aa4
fix failing scenarios
2013-04-14 11:50:21 +02:00
Reinier Balt
9c0445fcb7
make adding of todos from sidebar work in context and project grouping
2013-04-11 10:53:35 +02:00
Reinier Balt
42566b6fee
add test for collapsing project containers
2013-04-06 12:57:53 +02:00
Reinier Balt
3fd2b175f5
restore menu entry
2013-04-06 12:57:53 +02:00
Katrina Owen
961227da0c
Extract pie chart data logic into model layer
...
Move most of the tests for this logic into the unit test layer.
2013-03-18 19:49:54 -06:00
Katrina Owen
6e2f1a8e5f
De-dupe pie chart view
...
Pull logic into the controller from the view. There were only a couple
of tiny differences between the running actions and the total actions
view, so I added a couple of instance variables and then called the same
template twice.
2013-03-18 18:56:41 -06:00
Reinier Balt
2596d612fa
hide group by project from menu to safely merge refactorings with master
2013-03-18 12:36:40 +01:00
Reinier Balt
85fc82d494
refactor done todos view and tests
2013-03-18 12:36:40 +01:00
Reinier Balt
0a9755c8a3
get all scenario's running again, first pass.
2013-03-18 12:36:40 +01:00
Reinier Balt
ede898120c
remove option to show empty containers and start fixing failing cucumber scenarios
2013-03-18 12:36:40 +01:00
Reinier Balt
22b371ef8c
do a big refactor of rendering collections of todos for home page, tag page, project page, context page
2013-03-18 12:36:40 +01:00
Reinier Balt
f22dfc1f9b
initial changes to add an option to select either context or project as grouping of todos on home or tag page
...
* new menu item in view menu
* js to toggle view
* store setting in cookie to keep de choice of view persistent
* refactor index and tag page of todos to look more alike
* refactor context and project partials to look more alike
2013-03-18 12:32:28 +01:00
Dan Rice
dc311221f1
Render notes using RedCloth without formatize
...
Removes the outdated bluecloth dependency
2013-03-13 17:03:58 +02:00
Dan Rice
d7e9b384f7
Clean up a couple hardcoded strings in alt tags
2013-03-09 12:46:05 -05:00
Katrina Owen
d5a555fbac
Encapsulate dependencies of stats index page
...
This may be a bit extreme.
It's modeled after the ideal "rails way".
In the controller, we now know the name of a single resource. It
doesn't happen to be backed by a database table, but it does know all
about the task of collecting stats, leaving the controller concerned
with just munging params and rendering stuff.
I called the resource `IndexPage`, to avoid the temptation of trying to
reuse it, which can get pretty messy.
Later, if a better abstraction appears, it should be fairly painless to
alter.
2013-03-02 17:35:19 -07:00
Katrina Owen
615a9e46c9
Encapsulate counts and totals into a class.
...
Move queries out of the view and into the model layer.
2013-03-02 17:22:15 -07:00
Katrina Owen
6ccb9a81fb
Group context-related pieces in a class
2013-03-02 17:21:03 -07:00
Katrina Owen
8b1f0a34a0
Group project-related stats into a class.
...
Reduce number of instance variables available to the views.
Replace raw SQL with AR-type query.
2013-03-02 17:12:14 -07:00
Reinier Balt
1e3782ce67
Merge pull request #168 from kytrinyx/stats-actions
...
Encapsulate the stats for actions on the stats index page
2013-03-02 13:58:32 -08:00
Matt Rogers
9e4ec67dd2
Merge pull request #167 from kytrinyx/stats-contexts-view
...
Simplify context partial in stats
2013-03-02 13:52:52 -08:00
Katrina Owen
03282638af
Move calculation out of view
2013-03-02 16:16:45 -05:00
Katrina Owen
27ba50b460
Extract time to complete partial
2013-03-02 16:16:45 -05:00
Katrina Owen
62336f94cd
Move time to complete stats into separate class
...
This separates out the calculations from the queries so we can get
decent tests around them.
2013-03-02 16:16:45 -05:00
Katrina Owen
0ebb98d49f
Encapsulate action stats
...
This gets rid of a bunch of instance variables in the view/controller
layer.
2013-03-02 16:16:45 -05:00
