0876

Author: emklick

Gemfile

@@ -73,3 +73,9 @@ end
 gem 'bootstrap', '~> 4.0.0.alpha6'
 gem 'jquery-rails'
 gem 'font-awesome-sass', '~> 4.7.0'
+
+
+gem 'momentjs-rails'
+gem 'bootstrap3-datetimepicker-rails'
+gem 'chronic'
+

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/firstdraft/grade_runner.git
-  revision: dabf435a51bb4742f4c5b863d9f232c34f85ba87
+  revision: 83db5d2b90086055aa3204afe38a18394aecea16
   specs:
     grade_runner (0.0.1)
 
@@ -62,7 +62,7 @@ GEM
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
     arel (8.0.0)
-    autoprefixer-rails (7.1.2.1)
+    autoprefixer-rails (7.1.2.2)
       execjs
     awesome_print (1.8.0)
     better_errors (2.1.1)
@@ -75,6 +75,8 @@ GEM
     bootstrap (4.0.0.alpha6)
       autoprefixer-rails (>= 6.0.3)
       sass (>= 3.4.19)
+    bootstrap3-datetimepicker-rails (4.17.47)
+      momentjs-rails (>= 2.8.1)
     builder (3.2.3)
     byebug (9.0.6)
     callsite (0.0.11)
@@ -85,6 +87,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    chronic (0.10.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     crack (0.4.3)
@@ -110,7 +113,7 @@ GEM
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     hashdiff (0.3.4)
-    i18n (0.8.5)
+    i18n (0.8.6)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
@@ -140,6 +143,8 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
     minitest (5.10.2)
+    momentjs-rails (2.17.1)
+      railties (>= 3.1)
     multi_json (1.12.1)
     nio4r (2.1.0)
     nokogiri (1.8.0)
@@ -262,8 +267,10 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap (~> 4.0.0.alpha6)
+  bootstrap3-datetimepicker-rails
   byebug
   capybara
+  chronic
   dotenv-rails
   factory_girl_rails
   firstdraft_generators
@@ -274,6 +281,7 @@ DEPENDENCIES
   letter_opener
   listen (>= 3.0.5, < 3.2)
   meta_request
+  momentjs-rails
   pry-rails
   puma (~> 3.7)
   rails (~> 5.1.2)

app/assets/javascripts/application.js

@@ -11,6 +11,15 @@
 // about supported directives.
 //
 //= require rails-ujs
+//= require jquery
 //= require bootstrap
 //= require turbolinks
 //= require_tree .
+
+
+/= require moment
+//= require bootstrap-datetimepicker
+
+$(function () {
+  $('.datetimepicker').datetimepicker();
+});

app/controllers/calculations_controller.rb

@@ -11,6 +11,7 @@ def word_count
     # ================================================================================
 
 
+
     @word_count = @text.split(" ").length
 
     @character_count_with_spaces = @text.length
@@ -44,8 +45,8 @@ def loan_payment
     # The principal value the user input is in the decimal @principal.
     # ================================================================================
 
-      monthly_interest = (@apr/12)/100
-      number_of_monthly_payments = @years*-12
+  monthly_interest = (@apr/12)/100
+  number_of_monthly_payments = @years*-12
 
     @monthly_payment = @principal*(monthly_interest/(1-(1+monthly_interest)**number_of_monthly_payments))
 
@@ -76,7 +77,6 @@ def time_between
     @weeks = @days/7
     @years = @weeks/52
 
-
     # ================================================================================
     # Your code goes above.
     # ================================================================================
@@ -86,6 +86,8 @@ def time_between
 
   def descriptive_statistics
     @numbers = params[:list_of_numbers].gsub(',', '').split.map(&:to_f)
+  
+    
 
     # ================================================================================
     # Your code goes below.