Commit graph

637 commits

Author SHA1 Message Date
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
Katrina Owen
2d2e5fd133 Simplify context partial in stats 2013-03-02 16:15:18 -05:00
Katrina Owen
d4fb1f95d8 Add spaces so tag cloud columns can wrap. 2013-03-02 15:52:39 -05:00
Reinier Balt
f649c6ce0c fix js for contexts and add i18n keys for closed contexts 2013-03-02 16:33:38 +01:00
Reinier Balt
2719cb87c7 use state machine from controller and handle exception 2013-03-02 14:52:21 +01:00
Matt Rogers
004339a2ca Merge pull request #164 from kytrinyx/adjust-font-size
Split up the font size calculation
2013-03-02 05:40:38 -08:00
Katrina Owen
3f496db4b4 Split up the font size calculation
The font size is a view concern, but the relative size belongs in the
model layer.
2013-03-02 07:14:52 -05:00
Katrina Owen
a41704b72f Collapse duplication in stats project view 2013-03-02 00:48:59 -05:00
Katrina Owen
254179b4c8 Simplify stats projects view
Use `each_with_index` instead of hand-wrought index to loop through
projects, and use a partial for the duplicated empty list items.
2013-03-02 00:38:54 -05:00
Katrina Owen
2686a0d3b5 Don't link to null projects
If you have fewer than 10 projects, then empty running projects were
linked to with the path `/projects/-1`.

Copy/pasted the list strategy from the other project sections in the
same partial so the duplication becomes explicit.
2013-03-02 00:19:47 -05:00
Katrina Owen
6385059de8 Increment list counter in project view
This fixes a bug where if you have fewer than 10 projects, your top 10
projects were listed as:

6 - n/a (n/a)
6 - n/a (n/a)
6 - n/a (n/a)
6 - n/a (n/a)

rather than

7 - n/a (n/a)
8 - n/a (n/a)
9 - n/a (n/a)
10 - n/a (n/a)
2013-03-02 00:11:31 -05:00
Katrina Owen
0aa6ea183b Extract chart value object
This simplifies the views (slightly).
2013-03-01 20:38:24 -05:00
Matt Rogers
8b0f3e986a Merge branch 'tag-cloud' of https://github.com/kytrinyx/tracks 2013-03-01 16:49:53 -06:00
Reinier Balt
4df340bd7b add ui for changing state of context to closed. This fixes #645 2013-03-01 16:22:30 +01:00
Reinier Balt
1e84adc91b get tests running and fix editing context state 2013-03-01 16:22:29 +01:00
Matt Rogers
14a47f0480 Merge pull request #156 from kytrinyx/min-max
Swap min/max variables in i18n translation
2013-02-28 19:36:33 -08:00
Katrina Owen
d577dd9201 Completely whimsical whitespace adjustment. 2013-02-28 22:32:24 -05:00
Katrina Owen
d478efdd01 Move font calculation into tag cloud 2013-02-28 22:30:34 -05:00
Katrina Owen
2321d1f2a3 Call the cloud partial twice
Delete half the partial, and use each of the cloud objects to call it.
2013-02-28 22:03:39 -05:00
Katrina Owen
b5868d5c70 Use tag cloud objects in view
This allows us to not set the individual instance variables for the tag
cloud attributes.
2013-02-28 22:00:23 -05:00
Katrina Owen
cb9073f4bd Swap min/max variables in i18n translation
The :min was pointing at the max value, and the inverse.

I had to tweak a few of the language files as well, to make sure that
minimum and maximum are pointing to the correct values.

I didn't touch the hebrew language file, so someone with the correct
language skills may want to take a look at it to make sure that the text
matches the interpolation variables that get sent in.
2013-02-28 20:43:11 -05:00
Katrina Owen
ce9db80743 Correct typo in variable name 2013-02-28 20:34:46 -05:00
Reinier Balt
cf248b9115 fix #1396 and add a test for it 2013-02-18 17:15:09 +01:00
Reinier Balt
c61d0cbdb7 fix #1395 and speedup context.autocomplete a lot 2013-02-18 16:44:46 +01:00
Reinier Balt
6fa70db39e fix updating dependency trees when changin a name. Including invalidating cache when
necessary
2013-02-17 17:37:44 +01:00
Reinier Balt
1b0d08bbb5 fix timing issues on failing scenarios. Fix deprecated jquery functions and update jqueryui
Signed-off-by: Reinier Balt <lrbalt@gmail.com>
2013-02-15 22:27:39 +01:00
Renaud AUBIN
9b4db12971 Delete a fr partial
Manage the fr particularism within the default partial.
2013-02-07 18:19:31 +01:00
Renaud AUBIN
63678cabff Particularize a project partial for french language
Words order isn't the same for fr projects state labels. This commit
duplicate the default partial and reorder the wording for fr.
2013-02-07 00:34:21 +01:00
Reinier Balt
2acfbd8f00 fix dependency features 2012-12-25 15:46:26 +01:00
Reinier Balt
b18b222834 another set of fixes for the cucumber scenario's 2012-12-24 15:36:47 +01:00
Reinier Balt
da2bee2e53 start fiingx failing cucumber scenario's and some small fixes
new capybara introduces some failing scenario's
2012-12-23 23:16:22 +01:00
Reinier Balt
bd656ee1c7 fix #1350 by removing admin_email from preferences model and add it as a site option in
site.yml.tmpl. This one needs running migrations
2012-12-23 21:03:37 +01:00
Reinier Balt
a32f928fc8 add tag_name to cache invariant 2012-12-16 17:03:23 +01:00
Reinier Balt
5454ba385f fix styling of error messages 2012-12-16 15:20:43 +01:00
Reinier Balt
9550b89b25 fix caching of todo where [C] and [P] were not part of the invariant
thus the first generated todo was cached, leading to invalid todo in other views
2012-12-05 16:38:39 +01:00
Dan Rice
268d37c02d Remove tab-indexes for recurring todo forms
Using the natural tab order makes the Create and Cancel buttons accessible.

Fixes #1371
2012-12-03 16:25:20 -05:00
Reinier Balt
b5d71190b5 Merge pull request #127 from zoombody/bug/1366-tab-order
Fix tab order when creating monthly recurring actions
2012-12-01 01:14:04 -08:00
Dan Rice
41d8fe5550 Remove duplicate render_flash from mobile login
The flash is already rendered in the layout.

Fixes #1370
2012-11-30 23:27:54 -05:00
Dan Rice
c0056675be Fix tab order when creating monthly recurring actions
Fixes #1366
2012-11-30 23:14:36 -05:00
Dan Rice
f6d251d3a0 Fix stray HTML tags in mobile layout
Fixes #1369
2012-11-30 17:23:03 -05:00
Tim Madden
8cef2b41c1 Creating new todo link for context headers 2012-11-26 10:14:55 -06:00