Commit graph

2583 commits

Author SHA1 Message Date
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
Reinier Balt
6c3f447d8e remove two unused translation keys 2013-03-02 16:44:38 +01: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
Matt Rogers
d518fe6eb0 Merge pull request #165 from kytrinyx/more-context-sql
Fold two more SQL queries into the query object
2013-03-02 05:39:06 -08:00
Katrina Owen
1b7ed32024 Fold two more SQL queries into the query object 2013-03-02 07:54:13 -05: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
Reinier Balt
fbfc9c7086 do a small sleep to hopefully aviod an Element not found error 2013-03-02 11:44:54 +01:00
Reinier Balt
4aa5933946 return aruba to Gemfile and fix aruba scenarios 2013-03-02 11:36:46 +01:00
Dan Rice
257b969aff Fix code formatting in AddStateToContext migration 2013-03-02 03:19:40 -05:00
Dan Rice
560f2ff538 Give the Context.state column a default value of 'active'
SQLite does not permit a NOT NULL column to have default value NULL.
2013-03-02 03:02:05 -05:00
Matt Rogers
ae42f9c076 Merge pull request #163 from kytrinyx/stats-project-view
Simplify stats project view
2013-03-01 22:02:39 -08:00
Matt Rogers
3365b7e79f Merge pull request #162 from kytrinyx/projects-stats
Extract duplicate top projects query from stats controller
2013-03-01 21:58:34 -08:00
Matt Rogers
77df6483da Merge pull request #161 from kytrinyx/contexts-stats
Extract duplicate context query from controller
2013-03-01 21:57:49 -08: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
a23d2eb070 Extract duplicate context query from controller 2013-03-01 23:29:54 -05:00
Katrina Owen
6de4713d38 Extract top projects query object
This removed a bit of duplication from the stats controller.
2013-03-01 23:11:44 -05:00
Matt Rogers
f375c06964 Merge pull request #160 from kytrinyx/tag-counts
Extract duplicated query from stats controller
2013-03-01 18:52:52 -08:00
Matt Rogers
2b2a090173 Merge pull request #159 from kytrinyx/charts
Extract chart value object
2013-03-01 18:48:15 -08:00
Katrina Owen
4dff7538ea Extract duplicated query
This includes a bit of a simplification which assumes that there aren't
any orphan taggings for a user.
2013-03-01 21:27:58 -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
Dan Rice
a8810bbcd3 Move badges below meta in README 2013-03-02 00:13:44 +02:00
Dan Rice
4a3f2c048a Update Code Climate badge in README 2013-03-02 00:12:01 +02:00
Katrina Owen
cd7a5e0866 Delete redundant casting in tag cloud 2013-03-01 16:12:00 -05:00
Katrina Owen
a13199cdda Add unit test for tag cloud 2013-03-01 16:03:35 -05:00
Katrina Owen
63fb7a589c Add test for tag cloud query 2013-03-01 13:26:59 -05:00
Katrina Owen
a81f5b76f3 Separate query from cloud
This will make testing easier
2013-03-01 13:14:27 -05:00
Reinier Balt
67733fa235 Merge branch 'master' of github.com:TracksApp/tracks 2013-03-01 16:49:13 +01:00
Reinier Balt
29f28db810 fix migration for rollback 2013-03-01 16:48:52 +01:00
Dan Rice
22a48bda4c Disable Travis email notifications 2013-03-01 17:47:49 +02:00
Reinier Balt
9000dca33a update CHANGELOG 2013-03-01 16:37:17 +01: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
acab98d4c7 fix failing tests 2013-03-01 16:22:29 +01:00
Reinier Balt
a5031f2069 add test for better unit coverage of project 2013-03-01 16:22:29 +01:00
Reinier Balt
bf3a1e653a increate test coverage for user and project model 2013-03-01 16:22:29 +01:00
Reinier Balt
188baa938d remove unused method from tag model 2013-03-01 16:22:29 +01:00
Reinier Balt
44c602e2ca fix failing cucumber scenario 2013-03-01 16:22:29 +01:00
Reinier Balt
1e7e925c39 fix failing test 2013-03-01 16:22:29 +01:00
Reinier Balt
1e84adc91b get tests running and fix editing context state 2013-03-01 16:22:29 +01:00
Reinier Balt
99eed9f638 add state machine to context including a closed state 2013-03-01 16:22:29 +01:00
Dan Rice
3c6b1737c1 Run CI against Ruby 2.0.0 2013-03-01 17:15:36 +02:00
Matt Rogers
c6637e74aa Merge pull request #157 from kytrinyx/tag-cloud-minimum
Use minimum of tag count for tag cloud
2013-03-01 04:30:27 -08:00
Katrina Owen
0f5b402427 Use minimum of tag count for tag cloud
The tag cloud minimum used to start at 0, then repeatedly compared to
the lowest count and chose the smallest, which is bound to be zero in
every case.

Discussed
[here](8c26ea7cb5 (commitcomment-2719199)).
2013-03-01 00:13:41 -05:00
Katrina Owen
8f42b25e68 Use lowest tag count as minimum 2013-02-28 23:36:08 -05: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