feat: Adds Legal Agreements object for dynamic agreements #429

cbaudouinjr · 2020-12-11T04:26:17Z

Remaining issues:

Need newline for each agreement
Need validation for missing agreement while completing questionnaire form
manage/questionnaire/#/edit agreements card looks weird

test/models/bus_list_test.rb

test/factories/agreement.rb

test/controllers/manage/agreements_controller_test.rb

app/models/questionnaire.rb

app/models/agreement.rb

app/controllers/questionnaires_controller.rb

app/controllers/manage/questionnaires_controller.rb

app/controllers/manage/agreements_controller.rb

…-377

app/controllers/manage/agreements_controller.rb

test/factories/agreement.rb

app/controllers/manage/agreements_controller.rb

peterkos

Looks good overall! Just a few changes for now; i'll take another pass once these are done.

config/locales/en.yml

app/controllers/manage/agreements_controller.rb

app/models/agreement.rb

test/controllers/manage/agreements_controller_test.rb

db/migrate/20201130220942_create_agreements.rb

app/views/application/_unaccepted_agreements_notice.html.haml

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

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

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

peterkos

LGTM

peterkos · 2020-12-11T07:19:16Z

app/models/questionnaire.rb

@@ -215,6 +215,26 @@ def verbal_status
    end
  end

+  def agreements_present
+    if (Agreement.all - agreements).any?
+      errors.add(:agreements, "must be accepted.")


this no longer works haha #437

peterkos · 2020-12-11T07:37:06Z

app/views/manage/questionnaires/_form.html.haml

+        .card.mb-4
+          .card-header Agreements
+          .card-body
+            = f.association :agreements, as: :check_boxes, label_method: :formatted_agreement, value_method: :id, label: ""


Bug filed #434

* Fixed issue on desktop * Map overflow scroll Signed-off-by: Peter Kos <[email protected]> * Fix scroll issue Signed-off-by: Peter Kos <[email protected]> * Fixed toggle button; fits screen, sidebar width Sidebar width is better Toggle button fills height of navbar Signed-off-by: Peter Kos <[email protected]> * fix: Allows optional assets to be unset * Fixes test * feat: Redesigns OAuth2 portal (#404) * feat: Redesigns OAuth2 portal * fix: Some Hound issues * Changes application verbiage * Fixes ID issue * Fixes table link and sign out button * Peter's wishes * fix: Fixes MyMLH branding in config (#412) * feat(settings): Simplifies Config (#409) * feat(settings): Simplifies Config * Resolves Hound issues * Update app/views/manage/configs/index.html.haml Co-authored-by: Peter Kos <[email protected]> * design: Increases the font-weight and reorganizes the page * fix: Hound issues Co-authored-by: Peter Kos <[email protected]> * feat: Adds support for digital-only hackathons (#395) * feat: Adds support for digital-only hackathons * fix: Provides clarity for what is removed from digital hackathons Co-authored-by: Peter Kos <[email protected]> * feat: Adds GitHub Action for releases (#426) * feat: Adds GitHub Action CI testing (#423) * feat: Adds GitHub Action CI testing * fix: Adds sudo * refactor: Changes naming * Removes travis.yml * docs: Adds ruby version comment * feat: Adds Legal Agreements object for dynamic agreements (#429) * feat: Adds Legal Agreements object for dynamic agreements * fix: Fixes several bugs with agreement error checking * fix: Fixes several Hound issues * fix: Fixes some more Hound issues * Update app/views/application/_unaccepted_agreements_notice.html.haml Co-authored-by: Peter Kos <[email protected]> * fix: Fixes Peter's requests * Fix agreement checkbox wrap with small names Signed-off-by: Peter Kos <[email protected]> * Fix straggling merge conflict error Signed-off-by: Peter Kos <[email protected]> * Removed agreements card Signed-off-by: Peter Kos <[email protected]> * Force validation for agreement on questionnaire pg FRONTEND Signed-off-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> * refactor: Changes hackathon_manager to HackathonManager (#417) Co-authored-by: Peter Kos <[email protected]> * feat: Adds GitLab VCS URL support (#415) * feat: Adds GitLab VCS URL support * fix: Corrects Bitbucket capitalization * Update schema.rb Removes events * Update test/models/questionnaire_test.rb Co-authored-by: Peter Kos <[email protected]> * Update test/models/questionnaire_test.rb Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> * fix: Fixes pluralization of "Callback URL" (#421) * fix: Fixes pluralization of "Callback URL" * refactor: Adds "(s)" to Callback URLs Co-authored-by: Peter Kos <[email protected]> * refactor: Removes legal section from config (#440) * refactor: Removes legal section from config * refactor: Removes agreement asset from locals * Removes additional PDF asset messages Co-authored-by: Peter Kos <[email protected]> * fix(map): changed map overflow from scroll to auto (#428) changed the map div from overflow scroll to overflow auto so that the scroll bars do not show up when the map is large enough to not need them Co-authored-by: Peter Kos <[email protected]> * build(deps-dev): Bump semantic-release from 17.2.1 to 17.2.3 (#435) Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.2.1 to 17.2.3. - [Release notes](https://github.com/semantic-release/semantic-release/releases) - [Commits](semantic-release/semantic-release@v17.2.1...v17.2.3) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> Co-authored-by: JeremyRudman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

feat: Adds Legal Agreements object for dynamic agreements

7e9cf5d

houndci-bot reviewed Dec 11, 2020

View reviewed changes

Merge branch '2.1' into hm-377

e62bc73

houndci-bot reviewed Dec 11, 2020

View reviewed changes

cbaudouinjr added 2 commits December 11, 2020 00:10

fix: Fixes several bugs with agreement error checking

c5e97bf

Merge branch 'hm-377' of github.com:codeRIT/hackathon-manager into hm…

6733064

…-377

houndci-bot reviewed Dec 11, 2020

View reviewed changes

app/controllers/manage/agreements_controller.rb Outdated Show resolved Hide resolved

peterkos added the 2.1 label Dec 11, 2020

peterkos added this to the v.2.1.0 milestone Dec 11, 2020

peterkos linked an issue Dec 11, 2020 that may be closed by this pull request

Development of a new Agreement object to allow users to add any number of agreements #377

Closed

peterkos assigned cbaudouinjr Dec 11, 2020

fix: Fixes several Hound issues

e9667dc

houndci-bot reviewed Dec 11, 2020

View reviewed changes

test/factories/agreement.rb Outdated Show resolved Hide resolved

test/factories/agreement.rb Outdated Show resolved Hide resolved

test/factories/agreement.rb Show resolved Hide resolved

app/controllers/manage/agreements_controller.rb Outdated Show resolved Hide resolved

fix: Fixes some more Hound issues

9f6687c

peterkos requested changes Dec 11, 2020

View reviewed changes

cbaudouinjr and others added 2 commits December 11, 2020 00:52

Update app/views/application/_unaccepted_agreements_notice.html.haml

04203db

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

fix: Fixes Peter's requests

2882c29

cbaudouinjr requested a review from peterkos December 11, 2020 07:06

cbaudouinjr removed this from the v.2.1.0 milestone Dec 11, 2020

cbaudouinjr removed the 2.1 label Dec 11, 2020

Fix agreement checkbox wrap with small names

cb13563

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

peterkos added the 2.1 label Dec 11, 2020

peterkos added 2 commits December 11, 2020 02:35

Fix straggling merge conflict error

3341245

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

Removed agreements card

22249c5

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

peterkos mentioned this pull request Dec 11, 2020

Edit questionnaire page agreements card has strange left col #434

Closed

Force validation for agreement on questionnaire pg

1a50f1f

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

peterkos approved these changes Dec 11, 2020

View reviewed changes

cbaudouinjr merged commit c402b8e into 2.1 Dec 11, 2020

cbaudouinjr deleted the hm-377 branch December 11, 2020 08:05

cbaudouinjr linked an issue Dec 22, 2020 that may be closed by this pull request

Add support for non-MLH hackathons #288

Closed

2 tasks

feat: Adds Legal Agreements object for dynamic agreements #429

feat: Adds Legal Agreements object for dynamic agreements #429

Uh oh!

Conversation

cbaudouinjr commented Dec 11, 2020 • edited by peterkos Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

peterkos left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

peterkos left a comment

Choose a reason for hiding this comment

Uh oh!

peterkos Dec 11, 2020

Choose a reason for hiding this comment

Uh oh!

peterkos Dec 11, 2020

Choose a reason for hiding this comment

Uh oh!

peterkos Dec 11, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cbaudouinjr commented Dec 11, 2020 •

edited by peterkos

Loading