-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Don't merge - Review Tuesday #34
base: review-base
Are you sure you want to change the base?
Changes from all commits
a9886c5
5ff2147
c073021
a4ca6cf
1d36805
e2a8b39
c54e360
bc55a06
24cebab
fac7727
61d965f
74b9c39
5ab6b91
df63182
7ce53af
e389652
473dc6d
5e4ff2b
22e28fb
bc21602
474228d
5d4a384
856fe11
70756fb
0be1f87
587dc71
3d754e6
2e9a2b3
4d8eeda
35eb8fe
de2d652
b51235b
608191e
e858e76
9f9529f
fded56a
d4f989b
7e07c63
c8e60ea
3b89c87
5735602
6fd417c
d5081f3
d0eaaf7
1a9e933
7cce5cd
4dd3fa7
bba4a5b
41be6ea
b202c2f
0ace1e2
e7c3a0b
f8146fc
a5e73a1
b915283
92fffda
2ba4e0d
306c812
0c08709
93fb7a8
1378ba3
dd34615
65c38fc
335e335
2068baa
2fa3a53
b266865
0a2cec1
0531047
8e1ce63
c8f2ca0
731bf86
4225625
75f26da
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
exit | ||
exit!!! | ||
!!! | ||
params |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
source 'https://rubygems.org' | ||
ruby '2.2.3' | ||
|
||
|
||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | ||
gem 'rails', '4.2.5' | ||
|
@@ -27,13 +27,31 @@ gem 'bcrypt', '~> 3.1.7' | |
|
||
# Use Capistrano for deployment | ||
# gem 'capistrano-rails', group: :development | ||
gem 'geocoder' | ||
gem "simple_calendar", "~> 2.0" | ||
gem "combined_time_select", "~> 1.0.1" | ||
|
||
#gem for SMS messaging between Primary Caregivers and On Call Caregivers. | ||
gem 'twilio-ruby' | ||
|
||
#gem for sending email between PCC and OCC | ||
gem 'mail' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You don't need this - use ActionMailer? |
||
|
||
#gem for adding rankings and points to users. | ||
gem 'merit' | ||
|
||
#gem for running code asynchronously | ||
gem 'delayed_job_active_record' | ||
#gem for running delayed jobs | ||
gem "daemons" | ||
|
||
group :development, :test do | ||
# Call 'byebug' anywhere in the code to stop execution and get a debugger console | ||
gem 'byebug' | ||
gem 'rspec-rails' | ||
gem 'faker' | ||
gem 'factory_girl_rails' | ||
gem 'pry' | ||
end | ||
|
||
group :development do | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,3 +13,6 @@ | |
//= require jquery | ||
//= require jquery_ujs | ||
//= require_tree . | ||
//= require appointment.js | ||
//= require patient.js | ||
//= require bootstrap.min | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you have require_tree you don't need to explicitly require appointment and patient. Also, require bootstrap above your own js but below jquery. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
$(document).ready(function() { | ||
$('.delete-confirmation').hide() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You could probably start this with display:none in css |
||
$('.delete-appointment').click(function(event){ | ||
$('.delete-appointment').hide() | ||
$('.delete-confirmation').show() | ||
$('.no-delete').click(function(event){ | ||
$('.delete-appointment').show() | ||
$('.delete-confirmation').hide() | ||
}) | ||
}) | ||
|
||
$('.select-confirmation').hide() | ||
$('.select-application').click(function(event){ | ||
$('.select-application').hide() | ||
$('.select-confirmation').show() | ||
$('.no-select').click(function(event){ | ||
$('.select-application').show() | ||
$('.select-confirmation').hide() | ||
}) | ||
}) | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// Place all the behaviors and hooks related to the matching controller here. | ||
// All this logic will automatically be available in application.js. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you use generators and they generate js files that you don't use, delete them. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// Place all the behaviors and hooks related to the matching controller here. | ||
// All this logic will automatically be available in application.js. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
$(document).ready(function() { | ||
$(".additional-patient-info").hide() | ||
$('.patient').click(function(event){ | ||
$(".additional-patient-info").toggle(); | ||
}) | ||
}) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// Place all the behaviors and hooks related to the matching controller here. | ||
// All this logic will automatically be available in application.js. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// Place all the behaviors and hooks related to the matching controller here. | ||
// All this logic will automatically be available in application.js. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// Place all the behaviors and hooks related to the matching controller here. | ||
// All this logic will automatically be available in application.js. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,4 +12,6 @@ | |
* | ||
*= require_tree . | ||
*= require_self | ||
*= require simple_calendar | ||
*= require bootstrap.min | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Require libraries before your files. |
||
*/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#footer { | ||
background-color: #424242; | ||
border-top: 1px solid black; | ||
color: #222222; | ||
} | ||
|
||
#footer { | ||
width: 100%; | ||
height: 20px; | ||
position: absolute; | ||
bottom: 0; | ||
left: 0; | ||
} | ||
|
||
#footer-text { | ||
position:relative; | ||
top: 4%; | ||
color: white; | ||
padding-left: 2em; | ||
padding-top: 0.3em; | ||
font-size: 10px; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
#app-title { | ||
font-size: 35px; | ||
color: black; | ||
font-family: 'Libre Baskerville', serif; | ||
text-shadow:#2e2e2e 0 4px 5px; | ||
padding-right: 1em; | ||
} | ||
|
||
p:first-letter { | ||
text-transform: uppercase; | ||
} | ||
|
||
#app-description { | ||
position:relative; | ||
top: 100px; | ||
color: #222222; | ||
font-family: "Adobe Caslon Pro", "Hoefler Text", Georgia, Garamond, Times, serif; | ||
letter-spacing:0.1em; | ||
text-align: center; | ||
margin: 40px auto; | ||
text-transform: : lowercase; | ||
line-height: 145%; | ||
font-size: 15pt; | ||
font-variant: small-caps; | ||
} | ||
|
||
|
||
.nav { | ||
|
||
position: fixed; | ||
left: 1%; | ||
top: 2%; | ||
} | ||
|
||
.navbar-static-top { | ||
height: 3.8em; | ||
padding: 0 1.69125em; | ||
position: absolute; | ||
-webkit-transform: translateY(0); | ||
-ms-transform: translateY(0); | ||
transform: translateY(0); | ||
transition: -webkit-transform 400ms ease-in-out; | ||
transition: transform 400ms ease-in-out; | ||
width: 100%; | ||
border-bottom: 1px solid #fff; | ||
border-bottom: 1px solid rgba(255,255,255,.1); | ||
background-color: #e5e5e5; | ||
background-color: rgba(0,0,0,.1); | ||
} | ||
|
||
|
||
.nav.nav-pills.navbar-static-top li a { | ||
color: black; | ||
font-family: 'Noto Serif', serif; | ||
font-size: 25px; | ||
} | ||
|
||
.nav.nav-pills.navbar-static-top li a:hover { | ||
background-color:#595959; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the login controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the logins controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the session controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the sessions controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
.simple-calendar { | ||
table { | ||
-webkit-border-horizontal-spacing: 0px; | ||
-webkit-border-vertical-spacing: 0px; | ||
background-color: rgba(0, 0, 0, 0); | ||
border: 1px solid rgb(221, 221, 221); | ||
border-collapse: collapse; | ||
box-sizing: border-box; | ||
max-width: 100%; | ||
width: 100%; | ||
} | ||
|
||
tr { | ||
border-collapse: collapse; | ||
} | ||
|
||
th { | ||
padding: 6px; | ||
border-bottom: 2px solid rgb(221, 221, 221); | ||
border-collapse: collapse; | ||
border-left: 1px solid rgb(221, 221, 221); | ||
border-right: 1px solid rgb(221, 221, 221); | ||
border-top: 0px none rgb(51, 51, 51); | ||
box-sizing: border-box; | ||
text-align: left; | ||
} | ||
|
||
td { | ||
padding: 6px; | ||
vertical-align: top; | ||
width: 14%; | ||
|
||
border: 1px solid #ddd; | ||
border-top-color: rgb(221, 221, 221); | ||
border-top-style: solid; | ||
border-top-width: 1px; | ||
border-right-color: rgb(221, 221, 221); | ||
border-right-style: solid; | ||
border-right-width: 1px; | ||
border-bottom-color: rgb(221, 221, 221); | ||
border-bottom-style: solid; | ||
border-bottom-width: 1px; | ||
border-left-color: rgb(221, 221, 221); | ||
border-left-style: solid; | ||
border-left-width: 1px; | ||
} | ||
|
||
.day { | ||
height: 80px; | ||
} | ||
|
||
.wday-0 {} | ||
.wday-1 {} | ||
.wday-2 {} | ||
.wday-3 {} | ||
.wday-4 {} | ||
.wday-5 {} | ||
.wday-6 {} | ||
|
||
.today { | ||
background: #FFFFC0 | ||
} | ||
|
||
.past {} | ||
.future {} | ||
|
||
.start-date {} | ||
|
||
.prev-month { | ||
background: #DDD; | ||
} | ||
.next-month { | ||
background: #DDD; | ||
} | ||
.current-month {} | ||
|
||
.has-events {} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should ignore this