Add online meetings by anaghavl · Pull Request #6572 · decidim/decidim

anaghavl · 2020-09-30T06:55:31Z

🎩 What? Why?

This PR adds a meetings component option to enable the creation of online meetings. Online meetings have an extra field to add the URL of the conference room.

Now in person meetings will have:

All the original fields

Online meetings will have:

All the original fields + the conference room link
The location and address fields are also hidden, since they don't make sense for online meetings

Note that this PR only allows useres to add a link to a conference. Upcoming PRs will improve this feature following other MetaDecidim proposals.

TODO:

Add component config to allow online meetings
Add online_meeting_urlfield to the meetings table
Add field in the form
Only show online_meeting_url if meeting_type is online.
Only show address and location if meeting_type is in_person.
Only show meeting_type and online_meeting_url in form if component setting is active
In the meeting page and card: Show online_meeting_url instead of address and location if meeting_type is online
Add system specs ensuring fields are hidden

📌 Related Issues

Related to https://meta.decidim.org/processes/roadmap/f/122/proposals/15636

Testing

Yet to add tests

📷 Screenshots

Meetings page: Online meeting with external link:

Meetings index:

♥️ Thank you!

andreslucena · 2020-10-01T07:11:43Z

Hi @anaghavl
I've converted the PR to a draft as it's still a WIP, feel free to change it whenever you think is ready to review.
Could you please fix the formating in your PR description 🙏?
Also, could you link to MetaDecidim proposal? I'm 95% sure that I've seen it a couple of days ago... Thanks!

andreslucena · 2020-10-01T07:13:36Z

Also, I think that it'd be better to have it separated as this seems to be lots of meetings proposals at the same time:

Add a "Terms and conditions URL for meeting creators
In-person / online meetings
Registrations disabled
etc
If not it'd be really difficult (and slow!) to review all of this. Thanks again!

alecslupu · 2020-10-01T08:53:41Z

Hi @anaghavl
I've converted the PR to a draft as it's still a WIP, feel free to change it whenever you think is ready to review.
Could you please fix the formating in your PR description pray?
Also, could you link to MetaDecidim proposal? I'm 95% sure that I've seen it a couple of days ago... Thanks!

https://meta.decidim.org/processes/roadmap/f/122/proposals/15636

mrcasals · 2020-10-07T13:40:09Z

@decidim/product this has been deployed to https://decidim-staging-pr-191.herokuapp.com/, can you review it please? We've changed the scope of the PR and updated the description accordingly 😄

mrcasals · 2020-10-09T10:45:29Z

@decidim/core I'm getting some failures that I can't reproduce locally, are those more random failures? :(

andreslucena · 2020-10-09T13:24:27Z

@mrcasals a couple of comments:

Is it really necessary to have the setting "Allow online meetings" in the component configuration?
Can we mark the Address and Location with the (*) for making it clear that is required?
Can we change "Type of meeting" to "Type"? (As we already are in the "Create meeting" form isn't necessary)
When selecting "Type of meeting" -> "Online" then I shouldn't see "Location hints". Can you remove it? If you think it's necessary to explain something else (as I'm seeing in your screenshot) then we should change the name and the help because now it isn't clear: Location hints: additional info. Example: the floor of the building)

Please add validation to "Online meeting URL"; it should be an URL (regexp for starting with :

mrcasals · 2020-10-09T13:36:43Z

@andreslucena

1. Is it really necessary to have the setting "Allow online meetings" in the component configuration?

It's defined in https://meta.decidim.org/processes/roadmap/f/122/proposals/15636, that's why it's added.

2\. Can we mark the Address and Location with the (*) for making it clear that is required?

I'm afraid we can't, because those fields are optional if "Online" is selected in the "Type of meeting" dropdown.

3\. Can we change "Type of meeting" to "Type"? (As we already are in the "Create meeting" form isn't necessary)

Will do!

4\. When selecting "Type of meeting" -> "Online" then I shouldn't see "Location hints". Can you remove it?

It's specified in the MetaDecidim proposal (https://meta.decidim.org/processes/roadmap/f/122/proposals/15636), that's why it's there.

Please add validation to "Online meeting URL"; it should be an URL (regexp for starting with :

Will do!

mrcasals · 2020-10-09T16:01:18Z

@andreslucena @decidim/product can you check it out again, please? I had to deploy it to another URL, new one is https://decidim-staging-pr-196.herokuapp.com/

I fixed the text in the form, validated URLs and added a filter for online/in-person meetings!

andreslucena · 2020-10-13T09:48:37Z

Is it really necessary to have the setting "Allow online meetings" in the component configuration?

It's defined in https://meta.decidim.org/processes/roadmap/f/122/proposals/15636, that's why it's added.

Let's remove this; I've talked with @carolromero and we want to have online meetings enabled by default in every type of meetings.

3. Can we change "Type of meeting" to "Type"? (As we already are in the "Create meeting" form isn't necessary)

Will do!

I've seen it. Please change it in the filters also:

4. When selecting "Type of meeting" -> "Online" then I shouldn't see "Location hints". Can you remove it?

It's specified in the MetaDecidim proposal (https://meta.decidim.org/processes/roadmap/f/122/proposals/15636), that's why it's there.

Ok, we now understand the use case. Thanks for the link. Please change the text to:

Location hints: additional info. Example: the floor of the building if it's an in-person meeting, or the meeting password if it's an online meeting with restricted access.

More details:

Can you please add seeds?
Globe icon

We made a quick user test and we think that the current icon is like a Rorschach Test: you don't know for sure what you're actually looking at the first time you see this:

It's clearer in the mockup from the Meta link:

Can we change it to that?

GraphQL API

Have you added online_meeting_url field? I see the MeetingType but not this new field.

Filters orders

It doesn't have the relevance that it should have, as it's difficult to find if there are lots of scopes/categories/etc:

Please change it to:

Date
Type
Scope
etc

mrcasals · 2020-10-13T10:20:48Z

@andreslucena

Let's remove this; I've talked with @carolromero and we want to have online meetings enabled by default in every type of meetings.

Remove it, or change the default value to true?

Globe icon

I used the one that's available from the pattern library: http://decidim-design.herokuapp.com/public/library/pattern-library#patternIcons The one you point out is not there. What about the link-intact or the cloud icons?

I'll do the rest, thanks!

Regarding the order of the filters, I put it at the end because that's what appears in the screenshot in Metadecidim.

andreslucena · 2020-10-13T10:49:27Z

Remove it, or change the default value to true?

I meant to remove it.

I used the one that's available from the pattern library: http://decidim-design.herokuapp.com/public/library/pattern-library#patternIcons The one you point out is not there. What about the link-intact or the cloud icons?

Ok... I'll review this with @carolromero and tell you something later
(I don't have a good eye for design 🤦)

mrcasals · 2020-10-13T15:42:41Z

@andreslucena @decidim/product should be good to go now, except by the icon issue! Can you check it here, please?

https://decidim-staging-pr-200.herokuapp.com/

ivan-mr

Everything seems quite well but could you do the two changes I comment please? Thanks!

decidim-meetings/app/cells/decidim/meetings/meeting_m/address.erb

ivan-mr · 2020-10-13T21:56:27Z

decidim-meetings/db/migrate/20201009124057_add_type_of_meeting.rb

+
+class AddTypeOfMeeting < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_meetings_meetings, :type_of_meeting, :string, default: "in_person"


I think that @andreslucena said that they have decided to select online meetings by default. Then, it's better to configure it on the migration by default also. Could you change it, please? Thanks!

@andreslucena said "we want to have online meetings enabled by default", but if he can confirm that it'd be cool 😄

Andrés already said "I meant to remove it." here

Yeah, to remove the configuration option, which is already removed.

ivan-mr

Good job. Thanks!

* 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>

* 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 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>

andreslucena marked this pull request as draft October 1, 2020 07:09

mrcasals force-pushed the enhance_meetings_form branch 9 times, most recently from fbf476c to 0682602 Compare October 7, 2020 12:31

mrcasals changed the title ~~[WIP] Enhance meetings form~~ Add onlinemeetings Oct 7, 2020

mrcasals changed the title ~~Add onlinemeetings~~ Add online meetings Oct 7, 2020

github-actions bot mentioned this pull request Oct 7, 2020

Review app for enhance_meetings_form by mrcasals codegram/decidim-staging#191

Closed

mrcasals force-pushed the enhance_meetings_form branch from bbda163 to 26d9e66 Compare October 9, 2020 14:25

This was referenced Oct 9, 2020

Review app for enhance_meetings_form by mrcasals codegram/decidim-staging#195

Closed

Review app for enhance_meetings_form by mrcasals codegram/decidim-staging#196

Closed

mrcasals marked this pull request as ready for review October 9, 2020 16:01

anaghavl mentioned this pull request Oct 12, 2020

Add registration system to meetings #6662

Merged

10 tasks

Add config to allow online meetings

96a5921

mrcasals added 3 commits October 13, 2020 14:36

Address feedback

047f0cb

Fix i18n

2b5a652

Remove config option

1e60697

mrcasals force-pushed the enhance_meetings_form branch from d2722f4 to 1e60697 Compare October 13, 2020 12:36

test: select the type of meeting before filling in location

9b40f7c

github-actions bot mentioned this pull request Oct 13, 2020

Review app for enhance_meetings_form by mrcasals codegram/decidim-staging#200

Closed

ivan-mr added module: meetings module: core in-review labels Oct 13, 2020

ivan-mr self-assigned this Oct 13, 2020

ivan-mr self-requested a review October 13, 2020 21:47

ivan-mr suggested changes Oct 13, 2020

View reviewed changes

mrcasals added 4 commits October 14, 2020 08:58

Move URL details to cell

55467ef

Fix form

438d379

Fix icon

b6c8999

Fix edit form

0c0462b

ivan-mr approved these changes Oct 14, 2020

View reviewed changes

ivan-mr merged commit 269cf5f into develop Oct 14, 2020

ivan-mr deleted the enhance_meetings_form branch October 14, 2020 11:53

verarojman mentioned this pull request Dec 21, 2020

Jitsi meetings #7017 and dependencies Platoniq/decidim#52

Closed

microstudi mentioned this pull request Jan 12, 2021

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

Merged

verarojman mentioned this pull request Feb 23, 2021

Temp/0.23 stable Platoniq/decidim#45

Draft

13 tasks

mrcasals added the type: feature label Feb 26, 2021

innosmith mentioned this pull request Mar 29, 2021

Eventlocation "online" stadtluzern/decidim-ocl#62

Closed

Ouardaoubahri mentioned this pull request Sep 20, 2021

In person meeting can't be created if "Both" meeting type has been selected previously #8346

Closed

andreslucena mentioned this pull request Sep 27, 2021

Fix published and title in seeded meetings #8359

Merged

Uh oh!

Conversation

anaghavl commented Sep 30, 2020 • edited by mrcasals Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎩 What? Why?

📌 Related Issues

Testing

📷 Screenshots

Uh oh!

andreslucena commented Oct 1, 2020

Uh oh!

andreslucena commented Oct 1, 2020

Uh oh!

alecslupu commented Oct 1, 2020

Uh oh!

mrcasals commented Oct 7, 2020

Uh oh!

mrcasals commented Oct 9, 2020

Uh oh!

andreslucena commented Oct 9, 2020

Uh oh!

mrcasals commented Oct 9, 2020

Uh oh!

mrcasals commented Oct 9, 2020

Uh oh!

andreslucena commented Oct 13, 2020

Uh oh!

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

Uh oh!

Uh oh!

andreslucena commented Oct 13, 2020

Uh oh!

mrcasals commented Oct 13, 2020

Uh oh!

ivan-mr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ivan-mr Oct 13, 2020

Choose a reason for hiding this comment

Uh oh!

mrcasals Oct 14, 2020

Choose a reason for hiding this comment

Uh oh!

tramuntanal Oct 14, 2020

Choose a reason for hiding this comment

Uh oh!

mrcasals Oct 14, 2020

Choose a reason for hiding this comment

Uh oh!

ivan-mr left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

anaghavl commented Sep 30, 2020 •

edited by mrcasals

Loading

mrcasals commented Oct 13, 2020 •

edited

Loading