diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 2da2dba..38e2d0e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -54,4 +54,8 @@ $(document).ready(function(){ } }); }); + + $(function(){ + $(':input[type=number]').on('mousewheel',function(e){ $(this).blur(); }); + }); }); diff --git a/app/assets/stylesheets/organizations.scss b/app/assets/stylesheets/organizations.scss index a6cc171..fc8f587 100644 --- a/app/assets/stylesheets/organizations.scss +++ b/app/assets/stylesheets/organizations.scss @@ -126,4 +126,8 @@ div.container { #twitter-feed { padding-left: 0; padding-right: 0; +input[type=number]::-webkit-inner-spin-button, +input[type=number]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; } diff --git a/app/models/organization.rb b/app/models/organization.rb index 7514137..8a6f7f9 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -6,8 +6,12 @@ class Organization < ActiveRecord::Base validates :address, presence: true validates :overview, presence: true validates :employee_count, presence: true, numericality: {greater_than_or_equal_to: 1} +<<<<<<< 2db89f4dea0289fa69e2f4f1fe1cea229493226f validates :tech_team_size, presence: true, numericality: {greater_than_or_equal_to: 1} validate :reasonable_tech_team_size +======= + validates :tech_team_size, presence: true, numericality: {greater_than_or_equal_to: 0} +>>>>>>> validation testing has_many :organization_technologies, dependent: :destroy has_many :technologies, through: :organization_technologies diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 23300c5..602b86a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -67,25 +67,23 @@ <%= yield %> -
-
- +
diff --git a/app/views/organizations/_form.html.erb b/app/views/organizations/_form.html.erb index 751109c..3989975 100644 --- a/app/views/organizations/_form.html.erb +++ b/app/views/organizations/_form.html.erb @@ -2,8 +2,8 @@ <%= f.input :name, input_html: {class: "abc"}, label_html: {class: "hey"} %> <%= f.input :address %> <%= f.input :overview %> - <%= f.input :employee_count %> - <%= f.input :tech_team_size %> + <%= f.input :employee_count, {label: "Employee Count"} %> + <%= f.input :tech_team_size, {label: "Tech Team Size"} %> <%= f.input :website %> <%= f.input :twitter %> <%#= f.input :manager %> @@ -15,5 +15,6 @@ <%= f.file_field :image2 %> <%= f.file_field :image3 %> <%= f.file_field :image4 %> +
<%= f.submit class: "btn btn-primary" %> <% end %> diff --git a/coverage/.last_run.json b/coverage/.last_run.json new file mode 100644 index 0000000..3cb5e70 --- /dev/null +++ b/coverage/.last_run.json @@ -0,0 +1,5 @@ +{ + "result": { + "covered_percent": 100.0 + } +} diff --git a/coverage/.resultset.json b/coverage/.resultset.json new file mode 100644 index 0000000..42a6dc7 --- /dev/null +++ b/coverage/.resultset.json @@ -0,0 +1,7 @@ +{ + "RSpec": { + "coverage": { + }, + "timestamp": 1469123623 + } +} diff --git a/coverage/index.html b/coverage/index.html new file mode 100644 index 0000000..6652b47 --- /dev/null +++ b/coverage/index.html @@ -0,0 +1,72 @@ + + + + Code coverage for Vancouvertechhub + + + + + + + + +
+ loading +
+ + + diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000..f7872b3 Binary files /dev/null and b/dump.rdb differ diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb index 43f8585..8da57f6 100644 --- a/spec/models/organization_spec.rb +++ b/spec/models/organization_spec.rb @@ -26,6 +26,16 @@ it "should have employees" do o = Organization.new FactoryGirl.attributes_for(:organization).merge({employee_count: 0}) expect(o).to be_invalid + it "requires the employee count to be greater than or equal to 1" do + o = Organization.new employee_count: 5 + o.valid? + expect(o.errors).to have_key(:employee_count) + end + + it "requires the tech team size to be greater than or equal to 0" do + o = Organization.new tech_team_size: 5 + o.valid? + expect(o.errors).to have_key(:tech_team_size) end end end