master <- develop (2.1.4) (#520)

* fix(questionnaire): missing information now in correct place (#443)

* fix(questionnair): missing information now in correct place

it now displays the correct message "Please read & accept" instead of
missing information and the notification is now in the correct place

* Update app/assets/javascripts/validate.js

* Revert "Update app/assets/javascripts/validate.js"

This reverts commit bc54783.

Signed-off-by: Peter Kos <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes mobile agreements layout bug

Signed-off-by: Peter Kos <[email protected]>

* feat: Removes semantic-release (#446)

* refactor: Moves CI to develop branch (#449)

Co-authored-by: Peter Kos <[email protected]>

* build: Merges 2.1.2 into develop

* fix(hakiri): corrected unescaped model attribute

* fix(hakiri): added html_safe to show proper output

Co-authored-by: Jeremy Rudman <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>

* fix: Shows questionnaires_closed_message on registration

* feat: Allows agreements to be fully customizable (#465)

* feat: Allows agreements to be fully customizable

* fix: Fixes broken migrations

* fix: Migrations misname issue

* feat: Forces agreement links to open in new tab

* Agreement validation detection fixed

Signed-off-by: Peter Kos <[email protected]>

* refactor: Removes old input hint

Co-authored-by: Peter Kos <[email protected]>

* fix(hakiri): fixed un-escaped regex for vcs link (#467)

* fix(hakiri): corrected unescaped model attribute

* fix(hakiri): added html_safe to show proper output

* fix(hakiri): added \A \z to regex

* fix(questionnaire): fixed hakiri error with vcs link regex

* fix(questionnaire): fixed houndci commplaint

Co-authored-by: Chris Baudouin, Jr <[email protected]>

* fix(hakiri): fix hakiri error with user input in html_safe (#475)

Co-authored-by: Peter Kos <[email protected]>

* fix: Uninstalls deprecated chromedriver (#484)

* fix: VCS regex matches all valid usernames for each provider; URLs are now case-insensitive, dokku check extended (#485)

* fixed vcs regex to allow upper case

added a extra test to vcs links to test upper case links. also made it
so portfolio links ands vcs links are stored in lower case

* fixed houndci complaints

* lossened username regex and add another test

* made regex more pleasing to read

* made regex method more readable

* checks now does 300 attempts

* 2.1.4 <- develop (#519)

* fix: Resolves issue preventing new MyMLH users from creating questionnaires (#516)

* fix: Resolves issue preventing new MyMLH users from creating questionnaires

* refactor: Cleans code

* Attempt to pull any # of params from MyMLH

frontend validation is triggered via page skip, whether successful (will skip) or not (no skip)

* Cange error msg, pet hound

Co-authored-by: Peter Kos <[email protected]>

* vcs url error now displayed in edit application page (#518)

changed from redirect_to to render "edit" on error. redirect_to makes
a fresh request which causes the error information to be lost

Co-authored-by: Chris Baudouin, Jr <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>

Co-authored-by: JeremyRudman <[email protected]>
Co-authored-by: Chris Baudouin, Jr <[email protected]>
Co-authored-by: Jeremy Rudman <[email protected]>

Author: 3 people

app/controllers/questionnaires_controller.rb

@@ -11,6 +11,7 @@ def logged_in
   # GET /apply
   # GET /apply.json
   def show
+    flash[:alert] = nil
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @questionnaire }
@@ -29,17 +30,23 @@ def new
     if session["devise.provider_data"] && session["devise.provider_data"]["info"]
       info = session["devise.provider_data"]["info"]
       @skip_my_mlh_fields = true
+      unless all_my_mlh_fields_provided?
+        flash[:notice] = nil
+        flash[:alert] = t(:my_mlh_null, scope: 'errors')
+      end
       @questionnaire.tap do |q|
         q.phone          = info["phone_number"]
         q.level_of_study = info["level_of_study"]
         q.major          = info["major"]
         q.date_of_birth  = info["date_of_birth"]
         q.gender         = info["gender"]
 
-        school = School.where(name: session["devise.provider_data"]["info"]["school"]["name"]).first_or_create do |s|
-          s.name = session["devise.provider_data"]["info"]["school"]["name"]
+        if info["school"]
+          school = School.where(name: info["school"]["name"]).first_or_create do |s|
+            s.name = info["school"]["name"]
+          end
+          q.school_id = school.id
         end
-        q.school_id = school.id
       end
     end
 
@@ -84,12 +91,13 @@ def update
     update_params = questionnaire_params
     update_params = convert_school_name_to_id(update_params)
 
+    @agreements = Agreement.all
     respond_to do |format|
       if @questionnaire.update_attributes(update_params)
         format.html { redirect_to questionnaires_path, notice: 'Application was successfully updated.' }
         format.json { head :no_content }
       else
-        format.html { redirect_to edit_questionnaires_url }
+        format.html { render action: "edit" }
         format.json { render json: @questionnaire.errors, status: :unprocessable_entity }
       end
     end
@@ -124,6 +132,14 @@ def schools
 
   private
 
+  def all_my_mlh_fields_provided?
+    info = session["devise.provider_data"]["info"]
+
+    return true unless info["phone_number"].blank? || info["level_of_study"].blank? || info["major"].blank? ||
+                       info["date_of_birth"].blank? || info["gender"].blank? || info["school"].blank? ||
+                       info["school"]["name"].blank?
+  end
+
   def questionnaire_params
     params.require(:questionnaire).permit(
       :email, :experience, :gender,

config/locales/en.yml

@@ -36,6 +36,8 @@ en:
     registrations:
       user:
         signed_up: Welcome! Your account has been created.
+  errors:
+    my_mlh_null: Some information from MyMLH is missing, please fill in the missing fields.
   simple_form:
     hints:
       bus_list:
@@ -136,7 +138,7 @@ en:
         title: Bus Lists
       schools:
         title: Schools
-      users: 
+      users:
         title: Users & Staff
         users: All Users
         staff: "%{hackathon_name} Staff"