catch up to master

.gitignore

@@ -17,4 +17,10 @@
 .byebug_history
 
 # Custom ignore files
-/config/application.yml
+/config/application.yml
+/config/database.yml
+/config/secrets.yml
+/db/seeds.rb
+
+# Ignore OSX system files
+*/.DS_Store

Gemfile

@@ -16,29 +16,26 @@ gem 'dalli', '~> 2.7', '>= 2.7.6'
 # CSS
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
-gem 'bootstrap', '~> 4.0.0.alpha6'
-source 'https://rails-assets.org' do
-  gem 'rails-assets-tether', '>= 1.3.3'
-end
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
+gem 'bootstrap', '~> 4.0.0.beta'
+gem "font-awesome-rails"
+gem "animate-rails"
 
 # JavaScript
 gem 'jbuilder', '~> 2.6', '>= 2.6.4'
 gem 'jquery-rails'
+gem 'jquery-ui-rails', '~> 6.0', '>= 6.0.1'
 gem 'coffee-rails', '~> 4.2'
-gem 'react-rails', '~> 2.0', '>= 2.0.2'
+gem 'bootbox-rails', '~> 0.5.0'
+gem 'momentjs-rails', '~> 2.17', '>= 2.17.1'
+gem 'lodash-rails'
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '~> 3.0.5'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 end

Gemfile.lock

@@ -1,6 +1,5 @@
 GEM
   remote: https://rubygems.org/
-  remote: https://rails-assets.org/
   specs:
     actioncable (5.0.2)
       actionpack (= 5.0.2)
@@ -39,33 +38,34 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    animate-rails (1.0.10)
+      rails
     arel (7.1.4)
-    autoprefixer-rails (6.7.6)
+    autoprefixer-rails (7.1.2.4)
       execjs
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
     bcrypt (3.1.11)
-    bootstrap (4.0.0.alpha6)
+    bootbox-rails (0.5.0)
+    bootstrap (4.0.0.beta)
       autoprefixer-rails (>= 6.0.3)
+      popper_js (~> 1.11.1)
       sass (>= 3.4.19)
     builder (3.2.3)
     byebug (9.0.6)
-    coffee-rails (4.2.1)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
     dalli (2.7.6)
     debug_inspector (0.0.2)
     erubis (2.7.0)
     execjs (2.7.0)
     ffi (1.9.17)
+    font-awesome-rails (4.7.0.2)
+      railties (>= 3.2, < 5.2)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.8.1)
@@ -76,9 +76,13 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (6.0.1)
+      railties (>= 3.2.16)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    lodash-rails (4.17.4)
+      railties (>= 3.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -89,11 +93,14 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
+    momentjs-rails (2.17.1)
+      railties (>= 3.1)
     multi_json (1.12.1)
     mysql2 (0.4.5)
     nio4r (2.0.0)
     nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
+    popper_js (1.11.1)
     puma (3.7.1)
     rack (2.0.1)
     rack-test (0.6.3)
@@ -110,7 +117,6 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
-    rails-assets-tether (1.4.0)
     rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6)
@@ -126,12 +132,6 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    react-rails (2.0.2)
-      babel-transpiler (>= 0.7.0)
-      connection_pool
-      execjs
-      railties (>= 3.2)
-      tilt
     redis (3.3.3)
     sass (3.4.23)
     sass-rails (5.0.6)
@@ -175,19 +175,23 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  animate-rails
   bcrypt (~> 3.1.7)
-  bootstrap (~> 4.0.0.alpha6)
+  bootbox-rails (~> 0.5.0)
+  bootstrap (~> 4.0.0.beta)
   byebug
   coffee-rails (~> 4.2)
   dalli (~> 2.7, >= 2.7.6)
+  font-awesome-rails
   jbuilder (~> 2.6, >= 2.6.4)
   jquery-rails
+  jquery-ui-rails (~> 6.0, >= 6.0.1)
   listen (~> 3.0.5)
+  lodash-rails
+  momentjs-rails (~> 2.17, >= 2.17.1)
   mysql2 (>= 0.3.18, < 0.5)
   puma (~> 3.0)
   rails (~> 5.0.1)
-  rails-assets-tether (>= 1.3.3)!
-  react-rails (~> 2.0, >= 2.0.2)
   redis (~> 3.0)
   sass-rails (~> 5.0)
   spring
@@ -198,4 +202,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

README.md

@@ -1,36 +1,19 @@
-# LA Computer Company Blank Forms
+# LA Computer Company Back end Sheets
 
-This is the backend website for the LA Computer Company. As of today, it includes the pre-owned sheets for computers and monitors.
+This is the back end website to create Refurbished Sheets for computers, displays as well as keep track of On Sites Appointments.
 
 * Ruby version: 2.4.0
-* Using Bootstrap: 4.0.6Alpha
+* Using Bootstrap: 4.0.0-beta
 
-* UPDATES - 05/14/2017
-- Created Database for the different forms.
+### Welcome to Version 5
+Some of the things that were updated
+* Updated looks on some sheet
+* Updated onsite section to where it will show a calendar
+* Updated other functionality for the site
 
-* UPDATES - 04/04/2017
-- Added more options to Hard drive and graphics card
-- Sorted options for Pre-owned Comptuer Specifications
-- Refactor code to embeded with Ruby
-
-* UPDATES - 03/23/2017
-- Condense all to one page format
-
-* UPDATES - 03/16/2017
-- Re-designed onsite service form
-- Fixed database testing
-
-* UPDATES - 03/15/2017
-- Pre-owned: Cleaned up code to have logic on helper file.
-
-* UPDATES - 03/02/2017
-- Revised website to have an updated layout. Changed names from RMA to Pre-owned. Introduced Trade-In Sheet form
-- Pre-owned: removed "Code" from box for better handwritten codes. Renamed OP -> Original Part. Fixed spacing from wifi to notes. Made input text darker.
-- New Trade-In Sheet now available
-- Display Pre-owned: updated format and code for pre-owned display sheets
-- Trade-In Progress report: removed
-
-* To upload to server, run git push then on server run following commands
+### To Upload to the server
+* Log in to admin user and pull files
+* Log in to app admin and run following commands within app folder
 <pre><code>$bundle install --deployment --without development test
 $bundle exec rails assets:precompile db:migrate RAILS_ENV=production
 $passenger-config restart-app

app/assets/javascripts/application.js

@@ -10,12 +10,27 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require tether
+//= require jquery3
 //= require jquery_ujs
+//= require jquery-ui
+//= require lodash
 //= require turbolinks
+//= require popper
 //= require bootstrap-sprockets
-//= require react
-//= require react_ujs
-//= require components
+//= require bootbox
+//= require moment
 //= require_tree .
+
+var handleDelete;
+var handleBack;
+var handleNavigation;
+var handleCalendar;
+var handleClients;
+
+$(document).on("turbolinks:load", function() {
+  handleDelete();
+  handleBack();
+  handleNavigation();
+  handleCalendar();
+  handleClients();
+})

app/assets/javascripts/handle_back.js

@@ -0,0 +1,7 @@
+handleBack = function() {
+  var baseSites = ["/computer"];
+
+  $("#backButton").on("click", function() {
+    history.back();
+  });
+}

app/assets/javascripts/handle_calendar.js

@@ -0,0 +1,75 @@
+handleCalendar = function() {
+  var todayMoment = moment();
+  var current = moment(todayMoment.month() + 1, "MM");
+  var todayId = "#day-" + ((Math.floor(todayMoment.date() / 7) * 7) + todayMoment.day());
+  var onsites = $('.onsite-data');
+
+  // Builds and fills in information for the calendar
+  var buildCalendar = function(date) {
+    $(todayId).removeClass('bg-secondary');
+    $('#month').text(date.format('MMMM YYYY'));
+
+    _.each(_.range(1, 43), function(day) {
+      if($('#day-' + day)[0]) {
+        $('#day-' + day)[0].children[0].innerHTML = moment(date).day(day).date();
+      }
+    });
+
+    if (date.isSame(todayMoment, 'year', 'month')) {
+      $(todayId).addClass('bg-secondary');
+    }
+  };
+  buildCalendar(current);
+
+  // Builds onsite information for calendar
+  var parseDateTime = function(dateTime) {
+    return dateTime.toString().split("at ");
+  }
+
+  // Fills in Onsite data to map
+  var buildCellData = function() {
+    $('.onsites').text("");
+
+    var cellData = [];
+
+    _.each($('.onsite-data'), function(data) {
+      var cellObj = {
+        id: data.children[0].innerHTML,
+        date: parseDateTime(data.children[4].innerHTML)[0],
+        cell: data.children[1].innerHTML + " at " + parseDateTime(data.children[4].innerHTML)[1]
+      }
+
+      cellData.push(cellObj);
+    });
+
+    _.each(cellData, function(data) {
+      var dateId = "";
+      var date = moment(data.date, "MM-DD-YYYY");
+
+      if (date.month() === current.month()) {
+        dateId = ("#day-" + ((Math.floor(date.date() / 7) * 7) + date.day()));
+        if ($(dateId)[0]) {
+          $(dateId)[0].children[1].innerHTML = data.cell;
+          $(dateId).on('click', function() {
+            location.pathname = '/onsite/' + data.id;
+          });
+        }
+      }
+    });
+  };
+  buildCellData();
+
+  // Next Month function
+  $('#prev-month').on('click', function() {
+    current.subtract(1, 'months');
+    buildCalendar(current);
+    buildCellData();
+  });
+
+  // Previous Month function
+  $('#next-month').on('click', function() {
+    current.add(1, 'months');
+    buildCalendar(current);
+    buildCellData();
+  });
+}

app/assets/javascripts/handle_clients.js

@@ -0,0 +1,19 @@
+handleClients = function() {
+  var clientNames = [];
+
+  $.ajax({
+    url: '/get_clients'
+  }).done(function(response) {
+    _.each(response, function(data) {
+      clientNames.push(data.name);
+    });
+  });
+
+  $('#on_site_client_name').autocomplete({
+    source: clientNames
+  });
+
+  $('#off_site_client_name').autocomplete({
+    source: clientNames
+  });
+}