Add registration system to meetings by anaghavl · Pull Request #6662 · decidim/decidim

anaghavl · 2020-10-12T18:00:04Z

🎩 What? Why?

This PR adds a meetings component option to enable the external registration system. External registration have an extra field to add the URL of external registration.

Registration type is an option to be selected - on this platform, registration disabled and on different platform(only if the component setting is set to true)

Drop down options

On choosing registration disabled the user doesn't have to enter anything.

On choosing on this platform

The public view can enter available slots and registration terms
The admin view can enter available slots

On choosing on different platform (Assuming the component setting is enabled)
Both admin and public view and enter external registration link. There is also a display of the disclaimer.
Public side

Admin side

Registration button getting disabled

📌 Related Issues

Link your PR to an issue

Related to Add online meetings #6572
Implements https://meta.decidim.org/processes/roadmap/f/122/proposals/15641

Testing

Describe the best way to test or validate your PR.

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

♥️ Thank you!

…lowed

It stores whether the meeting is in-person or online

carolromero · 2020-10-22T13:54:28Z

Hi @anaghavl, I've checked this, thanks for the clarification about the conditional fields. Awesome work! 🚀

mrcasals

Looks good to me! There are some conflicts though, can you check them out?

tramuntanal · 2020-11-03T08:16:00Z

Hi @anaghavl we're ready for review, can you resolve conflicts please?

mrcasals · 2020-11-04T11:56:35Z

@tramuntanal I've fixed the conflicts! 😄

mrcasals · 2020-11-05T08:00:01Z

@tramuntanal @decidim/core can you review this, please? 😄

tramuntanal

Good job @anaghavl !
Can you check the small detail I've commented please?

tramuntanal · 2020-11-10T08:03:47Z

decidim-meetings/app/forms/decidim/meetings/meeting_form.rb

+      attribute :registration_terms, String

      TYPE_OF_MEETING = %w(in_person online).freeze
+      REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze


why re define the same constant in the model here? Can't we remove this constant?

tramuntanal · 2020-11-10T08:04:08Z

decidim-meetings/app/forms/decidim/meetings/meeting_form.rb

+      end
+
+      def registration_type_select
+        REGISTRATION_TYPE.map do |type|


Suggested change

REGISTRATION_TYPE.map do |type|

Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|

orlera · 2020-11-10T12:15:45Z

@tramuntanal now using REGISTRATION_TYPE and TYPE_OF_MEETING from the model. Applied the same change to the admin area form since it was doing the same. (21f0730)

Also, noticed that the "Registration terms" field was rendered as a map. Changed it to behave like the other translatable fields in the form.
BEFORE

AFTER

tramuntanal

Good job @orlera !

* Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * WIP added registration options to meetings form * fixing specs and merging branch * Fix en.yml file * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * fix failing specs * test: select the type of meeting before filling in location * remove extra stuff from conflicts * fix example length lint error * Resolving comments * removing duplicate code * remove trailing white space * Changing migration file * Remove component setting to allow external registration * adding functionality to the registration button * Add join meeting button for external registration for users * Join meeting button fix * fix failing specs * fix the default error on form * remove unwanted stuff * Fix locale fail * fix specs * Merging develop and resolving conflicts * Fix specs and lints * refactor: use constants from model * fix: only show default locale for registration terms in meeting form Co-authored-by: Marc Riera Casals <mrc2407@gmail.com> Co-authored-by: David Morcillo <david.morcillo@gmail.com> Co-authored-by: Andrea Orler <andrea@codegram.com>

* Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * WIP added registration options to meetings form * fixing specs and merging branch * Fix en.yml file * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * fix failing specs * test: select the type of meeting before filling in location * remove extra stuff from conflicts * fix example length lint error * Resolving comments * removing duplicate code * remove trailing white space * Changing migration file * Remove component setting to allow external registration * adding functionality to the registration button * Add join meeting button for external registration for users * Join meeting button fix * fix failing specs * fix the default error on form * remove unwanted stuff * Fix locale fail * fix specs * Merging develop and resolving conflicts * Fix specs and lints * refactor: use constants from model * fix: only show default locale for registration terms in meeting form Co-authored-by: Marc Riera Casals <mrc2407@gmail.com> Co-authored-by: David Morcillo <david.morcillo@gmail.com> Co-authored-by: Andrea Orler <andrea@codegram.com> # Conflicts: # decidim-forms/app/views/decidim/forms/admin/questionnaires/edit.html.erb # decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb

* Add online meetings (decidim#6572) * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * test: select the type of meeting before filling in location * Move URL details to cell * Fix form * Fix icon * Fix edit form Co-authored-by: Marc Riera Casals <mrc2407@gmail.com> Co-authored-by: David Morcillo <david.morcillo@gmail.com> # Conflicts: # decidim-meetings/app/commands/decidim/meetings/create_meeting.rb * Add registration system (decidim#6662) * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * WIP added registration options to meetings form * fixing specs and merging branch * Fix en.yml file * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * fix failing specs * test: select the type of meeting before filling in location * remove extra stuff from conflicts * fix example length lint error * Resolving comments * removing duplicate code * remove trailing white space * Changing migration file * Remove component setting to allow external registration * adding functionality to the registration button * Add join meeting button for external registration for users * Join meeting button fix * fix failing specs * fix the default error on form * remove unwanted stuff * Fix locale fail * fix specs * Merging develop and resolving conflicts * Fix specs and lints * refactor: use constants from model * fix: only show default locale for registration terms in meeting form Co-authored-by: Marc Riera Casals <mrc2407@gmail.com> Co-authored-by: David Morcillo <david.morcillo@gmail.com> Co-authored-by: Andrea Orler <andrea@codegram.com> # Conflicts: # decidim-forms/app/views/decidim/forms/admin/questionnaires/edit.html.erb # decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb * feat: automatically enalble registrations when meeting on this platform (decidim#6874) * Allow creation of hybrid meetings (decidim#6891) * Add Hybrid meeting events * Normalize translations * Run Linters * Fixing I18n Key error * Fixing Failing test * Running linters * Running linters * Add Geocoder setup for hybrid meetings * Fix issue with filter defaults # Conflicts: # decidim-meetings/app/models/decidim/meetings/meeting.rb # decidim-meetings/app/services/decidim/meetings/meeting_search.rb * Feature/15596 embed jitsi meeting (#65) * Stub embedded jitsi videoconference * Add embedded jitsi videoconference component * Improve toolbar items control * Remove iframe when videoconference over * Use user role for videoconference * Don't show videoconference if visitors not allowed * Fix erb * Fix rubocop offenses * Add button to start meeting * Log meetings attendance * Remove whitespace * Add videoconference setttings templates and docs * Display "Embedded videoconference" in meeting card * Set jitsi domain and api_url in config * Fix offenses * Log attendance * Make rubocop happy * Show attendance logs in admin * Add missing value in secrets template * Remove whitespace * Normalize locale * Don't require custom jitsi variables * Add spec for permissions * Make embedded videoconference an additional option for meetings * Refactor permissions for embedded_videoconference as boolean * Update commands and form * Fix initializer defining empty videoconferences hash * Update meetings form * Improve meeting public page * Rename js component for videoconference * Improve class comment for attendance log command * Simplify cell * Improve index for logs * Simplify videoconference cell * Add spec for videoconference cell * Fix rubocop offenses * Change parent class for VideoconferenceAttendanceLogsController * Fix rubocop offenses * Normalize locales * Fix missing and unused locale errors * Add spec for create videoconference attendance log command * Add spec for create videoconference attendance logs command * Update meeting form spec * Update meeting model spec * Add spec for videoconference attendance log model * Update spec for admin manage meetings * Lint js * Add spec for viewing attendance logs * Normalize locale * Add system spec for videoconference * Add consent message to videoconference explanation * Add missing translations * Fix create meeting spec * Fix update meeting command spec * Prevent authenticity token error * Fix toggle for embed videoconference checkbox * Fix embed checkbox toggle * Add seeds for embedded videoconference meetings * Fix variable name Co-authored-by: Vera Rojman <vrojman@protonmail.com> # Conflicts: # decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb # decidim-meetings/config/locales/en.yml # decidim-meetings/lib/decidim/meetings/component.rb # decidim-meetings/spec/models/meeting_spec.rb # docs/services/videoconferences.md * Add a config flag to disable the registration code (decidim#6698) * Ref. DIFE-148 - add registration_code_enabled as an admin flag on meetings settings page - remove registration code from email and notification - do not display registration code on the interface after joining to a meeting * Ref. DIFE-148 - hide "Validate registration code" from Admin - Components - Meeting section * Ref. DIFE-148 - fix rspec error * Ref. DIFE-148 - fix bad reference * Ref. DIFE-148 - fix tests for join_meeting_spec.rb * Ref. DIFE-148 - fix tests for meeting_registrations_spec.rb * Ref. DIFE-148 - fix tests for registration_mailer_spec.rb * Ref. DIFE-148 - fix tests for admin_manages_meetings_spec.rb * Ref. DIFE-148 - fix tests for validate_registration_code_spec.rb * Ref. DIFE-148 - fix linter errors * Add functionality to enable/disable registration code. * Add unit tests and fix the old ones. * Add PR number to Change Log * Updating the i18n tasks * Fixing i18n specs * Running linters on Changelog.md * run linters * Fixing Linking issues * Remove changes done in CHANGELOG.md * Ref. DIFE-148 - add registration_code_enabled as an admin flag on meetings settings page - remove registration code from email and notification - do not display registration code on the interface after joining to a meeting * Ref. DIFE-148 - hide "Validate registration code" from Admin - Components - Meeting section * Ref. DIFE-148 - fix bad reference * Ref. DIFE-148 - fix tests for join_meeting_spec.rb * Ref. DIFE-148 - fix tests for meeting_registrations_spec.rb * Ref. DIFE-148 - fix tests for registration_mailer_spec.rb * Ref. DIFE-148 - fix tests for admin_manages_meetings_spec.rb * Ref. DIFE-148 - fix tests for validate_registration_code_spec.rb * Add functionality to enable/disable registration code. * Add PR number to Change Log * Running linters on Changelog.md * run linters * Fixing Linking issues * Remove changes done in CHANGELOG.md * Remove changes done in CHANGELOG.md * Set flag's default value to TRUE and remove duplicate entries * Fix tests after changing the default value of flag Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> Co-authored-by: Cristian Georgescu <georgescu.cristi@gmail.com> * fix merge error * fix merge errors * fix more merge errors Co-authored-by: anagha vl <44900292+anaghavl@users.noreply.github.com> Co-authored-by: Andrea Orler <orlera@users.noreply.github.com> Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> Co-authored-by: roxanaopr <66411127+roxanaopr@users.noreply.github.com> Co-authored-by: Cristian Georgescu <georgescu.cristi@gmail.com>

mrcasals and others added 22 commits October 7, 2020 09:57

Add config to allow online meetings

2642da9

Add online_meeting_url fields to DB

0ecd98a

Add fields to forms and commands

1ce8a38

Use data- attributes instead of specific field names

c2f7e1b

Remove unused locales

c13e834

Fix JS

f7a1978

Fix locale

d74f957

Fix forms specs

0a1e24f

Fix specs

fdf55b9

Hide meeting type and online url fields if online meetings are not al…

639fe9b

…lowed

Show online meeting URL

0682602

Ensure fields are hidden

753c2ff

Fix meeting form

0b3b3ef

Merge branch 'develop' into enhance_meetings_form

d2a7a89

Fix tests

258389d

Add type_ofmeeting` column to meetings

e4708a8

It stores whether the meeting is in-person or online

Filter meetings by type

c0e259e

Add missing i18n string

1508465

Validate URLs

26d9e66

WIP added registration options to meetings form

b5a87fb

fixing specs and merging branch

f863930

merging branch resolving conflicts

7a3a18e

anaghavl requested a review from mrcasals October 12, 2020 18:59

anaghavl and others added 7 commits October 13, 2020 00:40

Fix en.yml file

8c1d9f0

Add config to allow online meetings

96a5921

Add online_meeting_url fields to DB

acd4561

Add fields to forms and commands

bdb0124

Use data- attributes instead of specific field names

bf15306

Remove unused locales

2ba8a67

Fix JS

3b5ef62

fix specs

991ad77

mrcasals mentioned this pull request Oct 22, 2020

Add registration system i-need-another-coffee/decidim#30

Merged

Merging develop and resolving conflicts

769361c

mrcasals previously approved these changes Oct 26, 2020

View reviewed changes

Merge branch 'develop' into add_registration_system

30a9cb4

mrcasals dismissed their stale review via 30a9cb4 November 4, 2020 11:54

Fix specs and lints

63eb2a6

tramuntanal suggested changes Nov 10, 2020

View reviewed changes

tramuntanal self-assigned this Nov 10, 2020

tramuntanal added the in-review label Nov 10, 2020

Andrea Orler added 2 commits November 10, 2020 13:08

refactor: use constants from model

21f0730

fix: only show default locale for registration terms in meeting form

3a1f469

tramuntanal approved these changes Nov 11, 2020

View reviewed changes

tramuntanal merged commit f425f34 into develop Nov 11, 2020

tramuntanal deleted the add_registration_system branch November 11, 2020 07:54

tramuntanal changed the title ~~Add registration system~~ Add registration system to meetings Nov 11, 2020

orlera mentioned this pull request Nov 17, 2020

Automatically enable registrations when meeting is "on this platform" #6874

Merged

12 tasks

microstudi mentioned this pull request Jan 12, 2021

Add jitsi embeded + others (#6572) Platoniq/decidim#66

Merged

verarojman mentioned this pull request Jan 13, 2021

Update to latest temp/0.23-stable revision SomComuns/decidim-bcnencomu#22

Merged

mrcasals added module: meetings type: feature labels Feb 26, 2021

Ouardaoubahri mentioned this pull request Aug 25, 2021

Meeting - two fields to indicate the available slots #8267

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add registration system to meetings#6662

Add registration system to meetings#6662
tramuntanal merged 68 commits intodevelopfrom
add_registration_system

anaghavl commented Oct 12, 2020 •

edited

Loading

Uh oh!

carolromero commented Oct 22, 2020

Uh oh!

mrcasals left a comment

Uh oh!

tramuntanal commented Nov 3, 2020

Uh oh!

mrcasals commented Nov 4, 2020

Uh oh!

mrcasals commented Nov 5, 2020

Uh oh!

tramuntanal left a comment

Uh oh!

tramuntanal Nov 10, 2020

Uh oh!

tramuntanal Nov 10, 2020

Uh oh!

orlera commented Nov 10, 2020

Uh oh!

tramuntanal left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

	REGISTRATION_TYPE.map do \|type\|
	Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do \|type\|

Uh oh!

Conversation

anaghavl commented Oct 12, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎩 What? Why?

📌 Related Issues

Testing

📋 Checklist

Uh oh!

carolromero commented Oct 22, 2020

Uh oh!

mrcasals left a comment

Choose a reason for hiding this comment

Uh oh!

tramuntanal commented Nov 3, 2020

Uh oh!

mrcasals commented Nov 4, 2020

Uh oh!

mrcasals commented Nov 5, 2020

Uh oh!

tramuntanal left a comment

Choose a reason for hiding this comment

Uh oh!

tramuntanal Nov 10, 2020

Choose a reason for hiding this comment

Uh oh!

tramuntanal Nov 10, 2020

Choose a reason for hiding this comment

Uh oh!

orlera commented Nov 10, 2020

Uh oh!

tramuntanal left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

anaghavl commented Oct 12, 2020 •

edited

Loading