Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

feat: Adds Legal Agreements object for dynamic agreements - #429

Merged
cbaudouinjr merged 12 commits into
2.1from
hm-377
Dec 11, 2020
Merged

feat: Adds Legal Agreements object for dynamic agreements#429
cbaudouinjr merged 12 commits into
2.1from
hm-377

Conversation

@cbaudouinjr

@cbaudouinjr cbaudouinjr commented Dec 11, 2020

Copy link
Copy Markdown
Member

Remaining issues:

  • Need newline for each agreement
  • Need validation for missing agreement while completing questionnaire form
  • manage/questionnaire/#/edit agreements card looks weird
Comment thread test/models/bus_list_test.rb Outdated
Comment thread test/factories/agreement.rb Outdated
Comment thread test/factories/agreement.rb Outdated
Comment thread test/factories/agreement.rb Outdated
Comment thread test/controllers/manage/agreements_controller_test.rb Outdated
Comment thread app/models/questionnaire.rb Outdated
Comment thread app/models/questionnaire.rb Outdated
Comment thread app/models/agreement.rb Outdated
Comment thread app/models/agreement.rb Outdated
Comment thread app/controllers/questionnaires_controller.rb Outdated
Comment thread app/controllers/manage/questionnaires_controller.rb Outdated
Comment thread app/controllers/manage/agreements_controller.rb Outdated
Comment thread app/controllers/manage/agreements_controller.rb Outdated
Comment thread app/controllers/manage/agreements_controller.rb
Comment thread app/controllers/manage/agreements_controller.rb Outdated
Comment thread test/factories/agreement.rb Outdated
Comment thread test/factories/agreement.rb Outdated
Comment thread test/factories/agreement.rb
Comment thread app/controllers/manage/agreements_controller.rb Outdated

@peterkos peterkos left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread config/locales/en.yml Outdated
Comment thread config/locales/en.yml
Comment thread app/controllers/manage/agreements_controller.rb Outdated
Comment thread app/models/agreement.rb Outdated
Comment thread test/controllers/manage/agreements_controller_test.rb
Comment thread db/migrate/20201130220942_create_agreements.rb Outdated
Comment thread app/views/application/_unaccepted_agreements_notice.html.haml Outdated
@cbaudouinjr
cbaudouinjr requested a review from peterkos December 11, 2020 07:06
@cbaudouinjr cbaudouinjr removed this from the v.2.1.0 milestone Dec 11, 2020
@cbaudouinjr cbaudouinjr removed the 2.1 label Dec 11, 2020
Signed-off-by: Peter Kos <pkos91@icloud.com>
@peterkos peterkos added the 2.1 label Dec 11, 2020
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
FRONTEND

Signed-off-by: Peter Kos <pkos91@icloud.com>

@peterkos peterkos left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM


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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screen Shot 2020-12-11 at 2 17 59 AM

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this no longer works haha #437

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug filed #434

@cbaudouinjr
cbaudouinjr merged commit c402b8e into 2.1 Dec 11, 2020
@cbaudouinjr
cbaudouinjr deleted the hm-377 branch December 11, 2020 08:05
cbaudouinjr added a commit that referenced this pull request Dec 11, 2020
* Fixed issue on desktop

* Map overflow scroll

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Fix scroll issue

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Fixed toggle button; fits screen, sidebar width

Sidebar width is better
Toggle button fills height of navbar

Signed-off-by: Peter Kos <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* design: Increases the font-weight and reorganizes the page

* fix: Hound issues

Co-authored-by: Peter Kos <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* fix: Fixes Peter's requests

* Fix agreement checkbox wrap with small names

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Fix straggling merge conflict error

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Removed agreements card

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Force validation for agreement on questionnaire pg

FRONTEND

Signed-off-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>

* refactor: Changes hackathon_manager to HackathonManager (#417)

Co-authored-by: Peter Kos <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>

* fix: Fixes pluralization of "Callback URL" (#421)

* fix: Fixes pluralization of "Callback URL"

* refactor: Adds "(s)" to Callback URLs

Co-authored-by: Peter Kos <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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 <pkos91@icloud.com>

* 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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>
Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@cbaudouinjr cbaudouinjr linked an issue Dec 22, 2020 that may be closed by this pull request
2 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

3 participants