Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-24 19:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2842 commits 32 branches 36 tags 32 MiB
Commit graph

2842 commits

This branch
This branch
All branches
Author SHA1 Message Date
Reinier Balt
d7076ca4f9 remove executable modes from these image files 2013-09-05 10:39:06 +02:00
Matt Rogers
6681df9530 Merge pull request #202 from TracksApp/extract-extras-from-user 
Extract time and date concerns from User
 2013-08-01 14:59:17 -07:00
Matt Rogers
96777c2e3a Replace User#time with UserTime#time 2013-07-30 16:21:04 -05:00
Matt Rogers
8512e8db3b rename DateUtils to UserTime 2013-07-29 21:51:15 -05:00
Matt Rogers
6c695aa61a Fix a date-based issue in the project tests 
Due to time zone issues, this test was failing for me because it was
attempting to compare a date in my local time zone with a UTC date.
 2013-07-29 21:43:05 -05:00
Matt Rogers
07a983ca1c clean up whitespace 2013-07-29 16:36:52 -05:00
Matt Rogers
a1aaa283f1 Remove User#at_midnight 
Replace it with a class called DateUtils with a method called
`#midnight_for` that takes a preference instance and date to convert to
midnight.
 2013-07-29 16:34:23 -05:00
Reinier Balt
e3ff831e98 Merge pull request #201 from doncruse/bug1442 
Fixing bug #1442
 2013-07-28 22:01:44 -07:00
Don Cruse
8ed20b35f2 Fixing bug #1442 
This bug was caused when the chart encountered data outside of its
visible range (i.e., the upper bound of the array size). A test was
added that inserts some data from 2 years and 16 months in the past.
The test failed on the old version, throwing exactly the error in bug
report #1442.

The fix is to check whether or not the value is within the array range
before sending the "+=" operator. With this change, the test passes.
 2013-07-28 19:00:51 -05:00
Reinier Balt
58e0393efa add json as dependency 2013-07-28 13:36:47 +02:00
Reinier Balt
8690dc1fcb update gems 2013-07-28 13:34:48 +02:00
Reinier Balt
9fb8cb6881 Merge pull request #196 from mattdbridges/break-apart-login-action 
Pull apart the LoginController#login action
 2013-07-26 05:02:37 -07:00
Reinier Balt
4c4ce911fc Merge pull request #199 from shaded2/csv_import 
Csv import
 2013-07-26 03:04:07 -07:00
Matt Rogers
e7c6142684 Update the version specifier for timecop 2013-07-24 12:35:11 -05:00
Matt Rogers
20f11ceac7 Merge pull request #200 from maddentim/fixes-general 
Fix for #1440 Update db/schema with new syntax
 2013-07-24 09:19:06 -07:00
Tim Madden
45a4210587 Update db/schema with new syntax 2013-07-24 10:14:46 -05:00
Darren Cato
3bf7888d5a i18n changes 2013-07-23 13:21:56 -04:00
Matt Bridges
8ff75f9b7d Pull apart the LoginController#login action 
Begin pulling apart the different paths through the login action to
better understand how the action responds given different state.
 2013-07-23 10:30:50 -05:00
Darren Cato
2feb907204 made changes to MAX_DESCRIPTION_LENGTH everywhere 2013-07-23 01:52:47 -04:00
Darren Cato
2e13affdce typos and style tweaks 2013-07-23 01:28:43 -04:00
Matt Rogers
feeaaf0c05 Merge pull request #198 from brogers/master 
Move calendar test down to unit tests
 2013-07-22 19:54:25 -07:00
Matt Rogers
bcbfe42899 Merge pull request #195 from doncruse/master 
Removing some intermediate values and shifting HTML formatting to a helper
 2013-07-22 19:44:18 -07:00
Darren Cato
3450c22e97 first pass at csv import functionality for tracks 2013-07-21 13:37:35 -04:00
Reinier Balt
28e3f377a8 fix failing validation on creating recurring todos 2013-07-20 14:40:50 +02:00
Brett A. Rogers
f18f1c7345 Move calendar test down to unit tests 
Remove tests that are specific to the calendar model from controller
test and move them to unit tests.
 2013-07-19 17:27:38 -05:00
Brett A. Rogers
7a5374d567 Fix setup for calendar controller test 
Ensure that the expected todos are actually due in the same month
 2013-07-19 15:43:56 -05:00
Don Cruse
845ac14176 Moving label creation to helpers 2013-07-19 00:14:52 -05:00
Don Cruse
5b045d2c1a Moving time labels to separate methods 2013-07-18 23:56:57 -05:00
Don Cruse
25bf820edc Simplufying interpolation method 2013-07-18 23:48:33 -05:00
Don Cruse
3d2c048c44 Tweak to running averages 2013-07-18 23:43:44 -05:00
Don Cruse
ff54506e7f Removing a single-line method 2013-07-18 23:37:34 -05:00
Don Cruse
5e6b82c3e5 Combining the running average methods 2013-07-18 23:22:44 -05:00
Don Cruse
91e4717168 Removing some more intermediate values 
Also removing the python-esque combination methods to set multiple
disparate variables from a single method by refactoring that to a
simpler method.

Reducing the complexity of computing running averages.

Note: It is not clear to me why the actions_done_lastyears_data
action is entirely unscoped on date. That seems to be the expected
behavior, so I left it alone.
 2013-07-18 23:05:38 -05:00
Don Cruse
9073fa1237 Removing some intermediate values 
This removes some intermediate steps that were ultimately not necessary
to the math.  It also consolidates some of the methods for counting events
so that fewer intermediate values are necessary.

To that end, a new scope is added to the ToDo model for events that are
*either* created_at or completed_at after a certain date. This scope
allows the StatsController to pull out the largest possible responsive
set of values, and then filter just the particular slices that it needs
for various steps in the calculation.
 2013-07-18 22:32:44 -05:00
Matt Rogers
c28ffd6763 Merge pull request #193 from mattdbridges/extract-rich-message 
Extract behavior from Todo.from_rich_message
 2013-07-18 20:12:03 -07:00
Matt Rogers
bc61f15c6c Merge pull request #194 from stacyvlasits/master 
fixed next month label for calendar view
 2013-07-18 20:09:18 -07:00
Matt Rogers
efc09f9d3e Merge pull request #192 from crymer11/master 
use a null object like a boss
 2013-07-18 19:54:06 -07:00
Matt Rogers
08d872e3c1 Merge pull request #191 from doncruse/master 
Refactor last year chart
 2013-07-18 19:52:12 -07: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
Matt Bridges
ecdade33c3 Pull out RichMessageExtractor 
No need to have it embedded
  when it should be unit tested!
 2013-07-18 18:34:09 -05:00
Stacy Vlasits
9896705bf2 fixed next month label for calendar view 2013-07-18 16:43:05 -05:00
Matt Bridges
519e3df4d4 TodoFromRichMessage is really a service object 2013-07-18 16:41:28 -05:00
Colin Rymer
0a5936fecf use a null object like a boss 2013-07-18 16:37:34 -05:00
Matt Bridges
c2111b2f8e Extract behavior from Todo.from_rich_message 
`Todo.from_rich_message` was partially tested from the MessageGateway,
but it is mostly untested and does not belong in Todo due to it's unique
nature. Extract it entirely from `Todo` into it's own dedicated object
for unit testing.
 2013-07-18 16:35:51 -05:00
Matt Rogers
6d963f81c0 Merge pull request #190 from crymer11/master 
remove `return`s and clean up some conditionals
 2013-07-18 14:21:34 -07: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
Colin Rymer
55e2f5b6a1 remove returns and clean up some conditionals 2013-07-18 16:03:18 -05:00
Matt Rogers
0877bf9ab8 Merge pull request #189 from crymer11/master 
Stylistic changes and metaprogramming refactoring
 2013-07-18 13:29:06 -07:00
Matt Rogers
a27f4f1dd4 Merge pull request #188 from maddentim/fixes-mobile 
Fix #1438 by adding mobile stylesheets to asset pipeline
 2013-07-18 13:27:38 -07:00
Colin Rymer
c71dc9afc9 remove boolean returning ternary expression 2013-07-18 15:22:46 -05:00