From 12d708180b527ec61908e9f3effa28d81ca21b3a Mon Sep 17 00:00:00 2001 From: Kenan Philips Date: Thu, 28 Jul 2016 13:18:02 -0700 Subject: [PATCH 1/3] update --- app/assets/javascripts/application.js | 4 ++++ app/assets/stylesheets/organizations.scss | 4 ++++ app/views/organizations/_form.html.erb | 5 +++-- dump.rdb | Bin 0 -> 1601 bytes 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 dump.rdb 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/views/organizations/_form.html.erb b/app/views/organizations/_form.html.erb index 751109c..35aa53d 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", :class => "scroll-fix" %> + <%= f.input :tech_team_size, :label => "Tech Team Size", :class => "scroll-fix" %> <%= 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/dump.rdb b/dump.rdb new file mode 100644 index 0000000000000000000000000000000000000000..8e19bfb182f72c5bef7df749bf8461046eba6e7c GIT binary patch literal 1601 zcmb`H&2QX97>8%Qn@u+#OH~t4ClLI#nh+BXLC*7d5LWl#BPnJEe{XD;@5~{DjLk|cydY5)MLeR_)jHZ7dw#H-_N|jz5agihldG9~38}p72?}lY+y0j<;2Wset_2FOZ~10Q)gvFJ`+V92p^8iH5GqSlXn0*^`Z#nRXCNKO5a z6`lay)-jL_G52>dXT>|&)U0zl=iIKUSTi`+a?Y;K6=J!*VhNKgf+5O%Rg@4?g}fdQ zF)s}<--5qQ@TecAABs5e1J0aVAXytgr<91$Yr-cPI9hH7VUlw`ej1*F5O`}F2b*EE zB-d8tCcEBjcOsW{T3_yK2cA7Mv&cf|!gEKJRPcFazVFU_kcfB&V|n#&iR%Rswx-HM zg-`$ie{EfuW~ML*b-BwC_Yw0L7u?cy6|TMh4+@d0)+r{4QnLo%XG_^QEUN}yeYRED zcpw!qHJDs@%}`X4XO6fo&VxsULNpI^ms&KB;qhwg&yDY-Y28P}5Ee2G-B5{vgpaXn zQXg(?RHPANQd-w#sX(-iNht%cXsN4P#gU!Q&&&5{mQ?>e0;w4LFMS(7!@4~dw8IM# z>p&U4n%lnskGxc~8@v7o%UQ*Aj^+C2s)XktRH`X?+YE&uVJIdx4MiZ6ySi#fh`AY< zAKLFex4#xw_6YoF;<-S-A9~61%;5Iq4A!hY)-LT>d!cyuTh6q_ImX*9Cc3UMKSwE$ zp>Ya-ez|y>VHg@Ab*vGj=F;ZakqlHPiJ7Y;MqRUrNhqw2#c>ojyZI(%ZRbw89|mEN z2JrF3P2oWvY;oWG^ESBAN+~yjcIeYxnTh`HS}-9Qf*oxBmir CvF?BX literal 0 HcmV?d00001 From 2db89f4dea0289fa69e2f4f1fe1cea229493226f Mon Sep 17 00:00:00 2001 From: Kenan Philips Date: Wed, 20 Jul 2016 11:27:34 -0700 Subject: [PATCH 2/3] removed hash rockets --- app/views/organizations/_form.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/organizations/_form.html.erb b/app/views/organizations/_form.html.erb index 35aa53d..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, :label => "Employee Count", :class => "scroll-fix" %> - <%= f.input :tech_team_size, :label => "Tech Team Size", :class => "scroll-fix" %> + <%= 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 %> From d2e3f8f9077771ff3babee2ffef6e9b8bea73bbf Mon Sep 17 00:00:00 2001 From: Kenan Philips Date: Thu, 28 Jul 2016 13:20:54 -0700 Subject: [PATCH 3/3] update --- app/models/organization.rb | 4 ++ app/views/layouts/application.html.erb | 34 ++++++------ coverage/.last_run.json | 5 ++ coverage/.resultset.json | 7 +++ coverage/index.html | 72 +++++++++++++++++++++++++ dump.rdb | Bin 1601 -> 1601 bytes spec/models/organization_spec.rb | 10 ++++ 7 files changed, 114 insertions(+), 18 deletions(-) create mode 100644 coverage/.last_run.json create mode 100644 coverage/.resultset.json create mode 100644 coverage/index.html 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 %> -
-
-
    -
  • <%= link_to "About", about_path %>
    • - <%if user_signed_in?%> - <% if current_user.missing_organization? && !current_user.admin?%> -
  • <%= link_to "Create Organization", new_organization_path, class:"directory" %>
    • - - <% elsif !current_user.admin? %> -
  • <%= link_to "My Organization", organization_path(current_user.organization), class:"directory" %>
    • - - <% end %> - <% else %> -
  • <%= link_to "Create Organization", new_organization_path %>
    • -
  • <%= link_to "Sign In", new_session_path %>
    • -
  • <%= link_to "Sign Up", new_user_path, id: "btn-sign-up" %>
    • +
    +
    +
      +
    • <%= link_to "About", about_path %>
      • + <%if user_signed_in?%> + <% if current_user.missing_organization? && !current_user.admin?%> +
    • <%= link_to "Create Organization", new_organization_path, class:"directory" %>
      • + + <% elsif !current_user.admin? %> +
    • <%= link_to "My Organization", organization_path(current_user.organization), class:"directory" %>
      • + <% end %> -
    -
    + <% else %> +
  • <%= link_to "Create Organization", new_organization_path %>
    • + <% 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 index 8e19bfb182f72c5bef7df749bf8461046eba6e7c..f7872b3c4096c9cba61acd9c3495a77ad117f9b6 100644 GIT binary patch delta 148 zcmX@ebC73(fkZObgz#S+rNyZ!y1A*jhXhvhG5llr&B?G?k4b__k%7CoB(cOQEip4E zHRS+110R@MP?VpXS`5^3Kx|^T`DAG}Sz`tk;l42_(14A=i10XUyz`pq|OEjYp10Ptv mpeR2%wHRpC0kMr95=@&pn6ENU-oYfx`QOcJ-a3I5r)&U;mNZ@f 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