Brenda Wallace
c1da5e4dc8
Split plantings#index into two methods to simplify
2017-01-14 16:47:29 +13:00
Brenda Wallace
6bdfe5a669
Moved plantings nav bar to own file and simplified
2017-01-14 16:32:03 +13:00
Shiny
8138aa8c09
Merge branch 'dev' into bw/active-plantings
2017-01-14 15:33:28 +13:00
Brenda Wallace
eba397117c
Planting needs to calculate slugs before model is valid
2017-01-14 11:41:48 +13:00
Brenda Wallace
f9396248e6
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-11 12:12:36 +13:00
Miles Gould
d0351bad70
Merge branch 'dev' into bw/bar_graphs
2017-01-09 15:21:38 +00:00
Miles Gould
7ca371ae43
Merge remote-tracking branch 'mine/bw/bar_graphs' into bw/bar_graphs
2017-01-09 15:19:18 +00:00
Miles Gould
7fa0d22583
Graph real crop sunninesses from server
...
Works for me in superficial manual testing, but needs automated tests.
Also currently does two server round trips (one for planting locations
and one for sunninesses); it would be better to combine these into one,
or alternatively to create a "crop stats" API endpoint and calculate
sunniness stats in SQL.
2017-01-09 15:13:55 +00:00
pozorvlak
f31342c6e0
Merge pull request #1147 from Br3nda/alpha-bundle
...
Bundle alphabetical order to comply with stricter rubocop.
Patch is semantically a no-op, and the static check failure is expected.
2017-01-09 12:11:45 +00:00
Brenda Wallace
87a091d694
Bundle alpha-order to comply with stricter rubocop
2017-01-08 20:50:52 +00:00
Brenda Wallace
2e04d56225
Merge remote-tracking branch 'origin/bw/description-photo-links' into bw/description-photo-links
2017-01-08 21:48:58 +13:00
Brenda Wallace
405dfe4bc9
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-08 21:35:59 +13:00
Shiny
15de4ac08c
Merge branch 'dev' into bw/active-plantings
2017-01-08 11:16:19 +13:00
Shiny
6e535f2403
Merge branch 'dev' into bw/bar_graphs
2017-01-08 11:10:21 +13:00
Shiny
c55208713b
Merge branch 'dev' into bw/description-photo-links
2017-01-08 11:09:19 +13:00
Shiny
48c1b4d0f9
Merge pull request #1142 from Br3nda/bw/harvests-linkto-plantings
...
Link a harvest to a planting, and display
2017-01-08 11:08:42 +13:00
Brenda Wallace
2f38a8585b
Revert "update spec for stringify"
...
This reverts commit 144823bd13
2017-01-07 13:50:11 +13:00
Brenda Wallace
062ff16acf
Put garden.to_s back to garden.name
2017-01-07 13:17:53 +13:00
Brenda Wallace
7f30ce04e0
Garden name (truncated) on front page link
2017-01-07 13:09:35 +13:00
Brenda Wallace
144823bd13
update spec for stringify
2017-01-07 12:52:47 +13:00
Brenda Wallace
90b19d52bb
Don't rely on to_s for slug. Fragile with translations
2017-01-07 12:49:57 +13:00
Brenda Wallace
76be980163
Translate garden.location
2017-01-07 12:48:14 +13:00
Brenda Wallace
88b1f02574
Added require of photo model constants
2017-01-07 12:44:08 +13:00
Brenda Wallace
5b633b484b
Fixes link to seeds, and spec for link to seeds
2017-01-07 12:22:28 +13:00
Brenda Wallace
3be379cee9
updated specs to match new links on photo page
2017-01-07 12:05:35 +13:00
Brenda Wallace
5319d23ee3
Using translations on links from photo page
2017-01-07 12:03:31 +13:00
Brenda Wallace
350c1d4c08
Descriptive links from photo page
2017-01-06 22:25:13 +13:00
Miles Gould
885c9433ce
Merge branch 'dev' into bw/bar_graphs
2017-01-05 11:39:10 +00:00
Miles Gould
b0c132c28f
Replace literal RGB with variable in graph.css
2017-01-05 11:38:55 +00:00
Miles Gould
8765770071
Ignore spurious code duplication error in bar_*.js
...
The code in question is
```
return root.append('g')
.attr("class", "bar")
.selectAll("rect")
.data(bars.map(function(bar) { return bar.value; }))
.enter()
```
in graphs/bar_group.js, and
```
return d3.append('g')
.attr("class", "bar-label")
.selectAll("text")
.data(bars.map(function(bar){ return bar.name;}))
.enter()
.append("text")
.attr('x', -80)
```
in graphs/bar_label_group.js. I don't think it's worth unifying these.
2017-01-05 11:19:44 +00:00
Miles Gould
8083ae9052
Remove duplicate getBarValues() methods
...
I've replaced one with a getMaxValue() function, which is what we
actually want, and deleted the other.
2017-01-05 11:18:51 +00:00
Shiny
5ca8829727
Merge branch 'dev' into bw/active-plantings
2017-01-05 16:35:39 +13:00
Shiny
d40eccdb63
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-05 16:31:22 +13:00
pozorvlak
478fae53ab
Merge pull request #1136 from Br3nda/bw/garden-specs
...
Controller garden specs for member doing what they shouldn't
2017-01-04 12:06:10 +00:00
Shiny
fc71cba6ba
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-04 22:52:54 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Brenda Wallace
18e58809c3
Merge remote-tracking branch 'upstream/dev' into bw/active-plantings
2017-01-04 16:25:44 +13:00
Brenda Wallace
b27b361e2f
Show active plantings by default
2017-01-04 16:25:19 +13:00
Shiny
3fafa87afd
Merge branch 'dev' into bw/garden-specs
2017-01-04 16:18:54 +13:00
pozorvlak
de60dbb9b0
Merge pull request #1140 from Br3nda/bw/descriptive-spec
...
descriptive spec
2017-01-03 12:12:18 +00:00
Shiny
a95fca3682
Merge branch 'dev' into bw/bar_graphs
2017-01-03 22:42:58 +13:00
Brenda Wallace
8047aef692
Merge remote-tracking branch 'upstream/dev' into bw/descriptive-spec
...
Conflicts:
spec/features/signin_spec.rb
2017-01-03 22:16:24 +13:00
Brenda Wallace
b38728c5df
Add login() to signin spec to reduce code duplication
2017-01-03 22:13:27 +13:00
Brenda Wallace
241c3cfdc0
Moves model name into spec description
...
so we can tell which failed.
2017-01-03 22:12:23 +13:00
Shiny
8b3b28b9d6
Merge branch 'dev' into bw/garden-specs
2017-01-03 20:50:20 +13:00
Daniel O'Connor
5f6fc37efd
Merge pull request #1138 from Br3nda/bw/garden-name-in-link
...
Garden's name in link
2017-01-03 13:33:59 +10:30
Brenda Wallace
881acdccc9
Shortening long garden names on a user's page
2017-01-02 20:54:22 +13:00
Brenda Wallace
3b1753d3d5
Garden's name in link
2017-01-02 20:36:25 +13:00
Brenda Wallace
ab75f830fb
Controller garden specs for member doing what they shouldn't
2016-12-25 10:38:07 +13:00
Shiny
0c8345d1e2
Merge branch 'dev' into bw/bar_graphs
2016-12-22 10:22:29 +13:00
Brenda Wallace