Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

Commit

Permalink
Spell available correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
iHiD committed Oct 12, 2018
1 parent c0f9fe3 commit e278410
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ bundle exec rails s
```

Something like this will get a working webserver on http://lvh.me:3000
Note: Teams will be avaliable on http://teams.lvh.me:3000
Note: Teams will be available on http://teams.lvh.me:3000

### Notes

Expand Down
8 changes: 4 additions & 4 deletions app/models/user_track.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ def num_completed_side_exercises
completed_side_exercise_ids.count
end

def num_avaliable_exercises
def num_available_exercises
if mentored_mode?
num_avaliable_core_exercises + num_avaliable_side_exercises
num_available_core_exercises + num_available_side_exercises
else
solutions.not_completed.count
end
end

def num_avaliable_core_exercises
def num_available_core_exercises
if mentored_mode?
solutions.not_completed.
where("exercises.core": true).
Expand All @@ -47,7 +47,7 @@ def num_avaliable_core_exercises
end
end

def num_avaliable_side_exercises
def num_available_side_exercises
if mentored_mode?
solutions.not_completed.
where.not("exercises.unlocked_by": nil).
Expand Down
2 changes: 1 addition & 1 deletion app/views/my/solutions/_nav_and_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
%h3 Track progress:
-num_core_exercises = @track.exercises.core.count
-num_completed_exercises = @user_track.num_completed_core_exercises
-num_available_exercises = @user_track.num_avaliable_core_exercises + num_completed_exercises
-num_available_exercises = @user_track.num_available_core_exercises + num_completed_exercises

.dots
-num_core_exercises.times do |i|
Expand Down
6 changes: 3 additions & 3 deletions app/views/my/solutions/_show_finished_independent.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- num_avaliable_exercises = @user_track.num_avaliable_exercises
- num_available_exercises = @user_track.num_available_exercises

.finished-section
.title-block
Expand Down Expand Up @@ -31,12 +31,12 @@

=render "my/solutions/widgets/community_solutions"

-if num_avaliable_exercises.size > 0
-if num_available_exercises.size > 0
.next-option
%p
%strong Carry on coding.
You have
#{pluralize num_avaliable_exercises, "exercise"}
#{pluralize num_available_exercises, "exercise"}
that you have not yet completed on this track. Why not try a new challenge?

=link_to "Choose next exercise", my_track_path(@track), class: 'pure-button'
Expand Down
16 changes: 8 additions & 8 deletions app/views/my/solutions/_show_finished_mentored.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- num_avaliable_core_exercises = @user_track.num_avaliable_core_exercises
- num_avaliable_side_exercises = @user_track.num_avaliable_side_exercises
- num_available_core_exercises = @user_track.num_available_core_exercises
- num_available_side_exercises = @user_track.num_available_side_exercises
.finished-section
.title-block
%h3
Expand All @@ -17,17 +17,17 @@

=render "my/solutions/widgets/community_solutions"

-if num_avaliable_core_exercises.size > 0 || num_avaliable_side_exercises.size > 0
-if num_available_core_exercises.size > 0 || num_available_side_exercises.size > 0
.next-option
%p
%strong Carry on coding.
You have
-if num_avaliable_core_exercises > 0
#{pluralize num_avaliable_core_exercises, "unlocked core exercise"}
-if num_avaliable_side_exercises > 0
-if num_available_core_exercises > 0
#{pluralize num_available_core_exercises, "unlocked core exercise"}
-if num_available_side_exercises > 0
and
-if num_avaliable_side_exercises > 0
#{pluralize num_avaliable_side_exercises, "unlocked side exercise"}
-if num_available_side_exercises > 0
#{pluralize num_available_side_exercises, "unlocked side exercise"}
that you have not yet completed on this track. Why not try a new challenge?

=link_to "Choose next exercise", my_track_path(@track), class: 'pure-button'
Expand Down
4 changes: 2 additions & 2 deletions app/views/my/solutions/_show_finished_side.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- num_avaliable_core_exercises = @user_track.num_avaliable_core_exercises
- num_avaliable_side_exercises = @user_track.num_avaliable_side_exercises
- num_available_core_exercises = @user_track.num_available_core_exercises
- num_available_side_exercises = @user_track.num_available_side_exercises
.finished-section
.title-block
%h3
Expand Down
16 changes: 8 additions & 8 deletions app/views/my/solutions/_show_legacy.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- num_avaliable_core_exercises = @user_track.num_avaliable_core_exercises
- num_avaliable_side_exercises = @user_track.num_avaliable_side_exercises
- num_available_core_exercises = @user_track.num_available_core_exercises
- num_available_side_exercises = @user_track.num_available_side_exercises
.finsished-section
.title-block
%h3
Expand Down Expand Up @@ -31,17 +31,17 @@

=link_to "View community solutions", track_exercise_solutions_path(@track, @exercise), class: 'pure-button'

-if num_avaliable_core_exercises.size > 0 || num_avaliable_side_exercises.size > 0
-if num_available_core_exercises.size > 0 || num_available_side_exercises.size > 0
.next-option
%p
%strong Carry on coding.
You have
-if num_avaliable_core_exercises > 0
#{pluralize num_avaliable_core_exercises, "core exercise"}
-if num_avaliable_side_exercises > 0
-if num_available_core_exercises > 0
#{pluralize num_available_core_exercises, "core exercise"}
-if num_available_side_exercises > 0
and
-if num_avaliable_side_exercises > 0
#{pluralize num_avaliable_side_exercises, "side exercise"}
-if num_available_side_exercises > 0
#{pluralize num_available_side_exercises, "side exercise"}
that you have not yet completed on this track. Why not try a new challenge?

=link_to "Choose next exercise", my_track_path(@track), class: 'pure-button'
Expand Down
2 changes: 1 addition & 1 deletion docs/API-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## V1

- The API is avaliable at `https://api.exercism.io/api/v1`
- The API is available at `https://api.exercism.io/api/v1`
- The API uses the Bearer Authentication header to identify a user

### Ping
Expand Down
8 changes: 4 additions & 4 deletions test/models/user_track_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ class UserTrackTest < ActiveSupport::TestCase
user_track = create :user_track, user: user, track: track, independent_mode: false
assert_equal 1, user_track.num_completed_core_exercises
assert_equal 2, user_track.num_completed_side_exercises
assert_equal 1, user_track.num_avaliable_core_exercises
assert_equal 2, user_track.num_avaliable_side_exercises
assert_equal 1, user_track.num_available_core_exercises
assert_equal 2, user_track.num_available_side_exercises
end

test "counters in independent mode" do
Expand All @@ -176,7 +176,7 @@ class UserTrackTest < ActiveSupport::TestCase
user_track = create :user_track, user: user, track: track, independent_mode: true
assert_equal 1, user_track.num_completed_core_exercises
assert_equal 2, user_track.num_completed_side_exercises
assert_equal 2, user_track.num_avaliable_core_exercises
assert_equal 4, user_track.num_avaliable_side_exercises
assert_equal 2, user_track.num_available_core_exercises
assert_equal 4, user_track.num_available_side_exercises
end
end

0 comments on commit e278410

Please sign in to comment.