Merge branch 'master' into av-change-attendee-application-form

Author: AstiV

.rubocop.yml

@@ -16,3 +16,15 @@ Layout/HashAlignment:
 
 Naming/PredicateName:
   Enabled: false
+
+Style/MutableConstant:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false

.rubocop_todo.yml

@@ -11,15 +11,15 @@
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/DuplicatedGem:
   Exclude:
-    - 'Gemfile'
+    - "Gemfile"
 
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: TreatCommentsAsGroupSeparators, Include.
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
   Exclude:
-    - 'Gemfile'
+    - "Gemfile"
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -46,7 +46,7 @@ Layout/BlockAlignment:
 # Cop supports --auto-correct.
 Layout/CommentIndentation:
   Exclude:
-    - 'app/helpers/admin/templates_helper.rb'
+    - "app/helpers/admin/templates_helper.rb"
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -66,7 +66,7 @@ Layout/DotPosition:
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterGuardClause:
   Exclude:
-    - 'app/models/application.rb'
+    - "app/models/application.rb"
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -84,7 +84,7 @@ Layout/EmptyLinesAroundBlockBody:
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundMethodBody:
   Exclude:
-    - 'app/controllers/admin/templates_controller.rb'
+    - "app/controllers/admin/templates_controller.rb"
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -118,13 +118,13 @@ Layout/LeadingCommentSpace:
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
 Layout/MultilineMethodCallIndentation:
   Exclude:
-    - 'app/controllers/admin/coach_applications_controller.rb'
+    - "app/controllers/admin/coach_applications_controller.rb"
 
 # Offense count: 1
 # Cop supports --auto-correct.
 Layout/RescueEnsureAlignment:
   Exclude:
-    - 'app/helpers/admin/templates_helper.rb'
+    - "app/helpers/admin/templates_helper.rb"
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -135,7 +135,7 @@ Layout/SpaceAfterComma:
 # Cop supports --auto-correct.
 Layout/SpaceBeforeComma:
   Exclude:
-    - 'db/migrate/20180122202409_add_event_time.rb'
+    - "db/migrate/20180122202409_add_event_time.rb"
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -144,7 +144,7 @@ Layout/SpaceBeforeComma:
 # SupportedStylesForEmptyBrackets: space, no_space
 Layout/SpaceInsideArrayLiteralBrackets:
   Exclude:
-    - 'config/environments/production.rb'
+    - "config/environments/production.rb"
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -153,7 +153,7 @@ Layout/SpaceInsideArrayLiteralBrackets:
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
   Exclude:
-    - 'test/controllers/applications_controller_test.rb'
+    - "test/controllers/applications_controller_test.rb"
 
 # Offense count: 11
 # Cop supports --auto-correct.
@@ -174,7 +174,7 @@ Layout/Tab:
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingEmptyLines:
   Exclude:
-    - 'app/controllers/sessions_controller.rb'
+    - "app/controllers/sessions_controller.rb"
 
 # Offense count: 15
 # Cop supports --auto-correct.
@@ -185,7 +185,7 @@ Layout/TrailingWhitespace:
 # Offense count: 1
 Lint/UselessAssignment:
   Exclude:
-    - 'app/controllers/admin/applications_controller.rb'
+    - "app/controllers/admin/applications_controller.rb"
 
 # Offense count: 10
 Metrics/AbcSize:
@@ -202,14 +202,6 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 34
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'test/system/edit_event_test.rb'
-
 # Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
@@ -223,7 +215,7 @@ Style/ClassAndModuleChildren:
 # Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
 Style/CommentAnnotation:
   Exclude:
-    - 'app/helpers/admin/templates_helper.rb'
+    - "app/helpers/admin/templates_helper.rb"
 
 # Offense count: 64
 Style/Documentation:
@@ -264,7 +256,7 @@ Style/HashSyntax:
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Exclude:
-    - 'app/controllers/applications_controller.rb'
+    - "app/controllers/applications_controller.rb"
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -280,14 +272,14 @@ Style/MixinUsage:
 # Configuration parameters: MinDigits, Strict.
 Style/NumericLiterals:
   Exclude:
-    - 'db/schema.rb'
+    - "db/schema.rb"
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
-    - 'config/spring.rb'
+    - "config/spring.rb"
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -300,7 +292,7 @@ Style/RedundantBegin:
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
   Exclude:
-    - 'app/helpers/admin/templates_helper.rb'
+    - "app/helpers/admin/templates_helper.rb"
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -313,7 +305,7 @@ Style/SafeNavigation:
 # Cop supports --auto-correct.
 Style/StderrPuts:
   Exclude:
-    - 'bin/yarn'
+    - "bin/yarn"
 
 # Offense count: 567
 # Cop supports --auto-correct.
@@ -342,7 +334,7 @@ Style/SymbolArray:
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
   Exclude:
-    - 'app/helpers/admin/templates_helper.rb'
+    - "app/helpers/admin/templates_helper.rb"
 
 # Offense count: 122
 # Cop supports --auto-correct.

Gemfile.lock

@@ -121,7 +121,7 @@ GEM
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.7.0.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     pg (0.21.0)
     pry (0.12.2)
@@ -163,11 +163,13 @@ GEM
       ffi (~> 1.0)
     rb-readline (0.5.5)
     regexp_parser (1.6.0)
-    rubocop (0.79.0)
+    rexml (3.2.4)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
@@ -206,7 +208,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)

README.md

@@ -6,9 +6,9 @@ This repo is the open source project for the **code curious app** that aims to h
 
 ## Technical Requirements
 
-- Ruby '~> 2.3.x'
+- Ruby '~> 2.6.5'
 - Bundler
-- Ruby on Rails '~> 5.2.3'
+- Ruby on Rails '~> 5.2.x'
 - PostgreSQL '~> 9.5.x'
 
 ## How to set up

app/assets/stylesheets/application.css

@@ -219,6 +219,13 @@ input[type=submit].button_link {
   margin-top: 100px;
 }
 
+#info-for-coaches {
+  background-color: #e7f6fd;
+  text-align: center;
+  border: thin solid #1e64b4;
+  color: #1e64b4;
+}
+
 /*Table*/
 
 table {

app/controllers/admin/events_controller.rb

@@ -71,7 +71,13 @@ def event_params
         :copy_templates_from_event_id,
         :confirmation_deadline,
         :reminder_date,
-        :coach_registration_enabled)
+        :coach_registration_enabled,
+        :coach_the_coaches_date,
+        :coach_the_coaches_start_time,
+        :coach_the_coaches_end_time,
+        :installation_get_together_date,
+        :installation_get_together_start_time,
+        :installation_get_together_end_time)
   end
 
   def send_selection_emails(applications)

app/controllers/coach_applications_controller.rb

@@ -56,7 +56,7 @@ def find_coach_application
 
   def create_coach_application_params
     params.require(:coach_application).
-      permit(:installationparty, :workshopday, :lightningtalk, :notes, :first_time_coaching)
+      permit(:installationparty, :workshopday, :lightningtalk, :notes, :first_time_coaching, :coach_the_coaches, :sponsor)
   end
 
   def check_application_status

app/controllers/coaches_controller.rb

@@ -36,7 +36,7 @@ def update
 
   def coach_params
     params.require(:coach).permit(:name,
-                                  :female,
+                                  :gender,
                                   :language_en,
                                   :language_de,
                                   :notifications,

app/helpers/coaches_helper.rb

@@ -0,0 +1,7 @@
+module CoachesHelper
+  def genders_for_form
+    Coach::GENDERS.map do |gender|
+      [gender.to_s.humanize, gender]
+    end
+  end
+end

app/models/coach.rb

@@ -1,4 +1,5 @@
 class Coach < ApplicationRecord
+  GENDERS = [:female, :male, :other, :prefer_not_to_say]
   belongs_to :user
   accepts_nested_attributes_for :user
   has_many :coach_applications