Skip to content

Everything but mode #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qahmad wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Everything but mode #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
00d58ae
I think I solved the first part
qahmad Jul 5, 2017
2fff230
Solved 2 and 3
qahmad Jul 5, 2017
daa338f
Made a change for #4
qahmad Jul 6, 2017
9e572f3
Word Count Completed
qahmad Jul 6, 2017
4fd6038
Loan payment calculation completed
qahmad Jul 6, 2017
55b67e5
Addressed special characters in word calculator, completed monthly pa…
qahmad Jul 6, 2017
b6bfbaa
Made changes for date difference calculator
qahmad Jul 6, 2017
eab038c
Merge branch 'master' into loan-payment-calculator-complete
qahmad Jul 6, 2017
437fcfa
More progress on date difference calculator
qahmad Jul 6, 2017
39c6eec
Merge pull request #3 from qahmad/loan-payment-calculator-complete
qahmad Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
//= require bootstrap
//= require turbolinks
//= require_tree .
//= require jquery
//= require moment
//= require bootstrap-datetimepicker

Expand Down
23 changes: 12 additions & 11 deletions app/controllers/calculations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ def word_count
# ================================================================================


@word_count = "Replace this string with your answer."
@word_count = @text.split.count

@character_count_with_spaces = "Replace this string with your answer."
@character_count_with_spaces = @text.size

@character_count_without_spaces = "Replace this string with your answer."
@character_count_without_spaces = @text.gsub(" ","").size

@occurrences = "Replace this string with your answer."
@occurrences = @text.downcase.gsub(/[^a-z0-9\s]/i,"").split.count(@special_word.downcase)

# ================================================================================
# Your code goes above.
Expand All @@ -38,7 +38,8 @@ def loan_payment
# The principal value the user input is in the decimal @principal.
# ================================================================================

@monthly_payment = "Replace this string with your answer."
@apr_decimal = @apr/1200
@monthly_payment = (@apr_decimal/(1-(1+@apr_decimal)**(-1*@years*12)))*@principal

# ================================================================================
# Your code goes above.
Expand All @@ -60,12 +61,12 @@ def time_between
# number of seconds as a result.
# ================================================================================

@seconds = "Replace this string with your answer."
@minutes = "Replace this string with your answer."
@hours = "Replace this string with your answer."
@days = "Replace this string with your answer."
@weeks = "Replace this string with your answer."
@years = "Replace this string with your answer."
@seconds = @ending-@starting
@minutes = @seconds/60
@hours = @minutes/60
@days = @hours/24
@weeks = @days/7
@years = @weeks/52 #hopefully this is done

# ================================================================================
# Your code goes above.
Expand Down