Skip to content

Allow creation of hybrid meetings#6891

Merged
tramuntanal merged 24 commits intodecidim:developfrom
i-need-another-coffee:feature/add-hybrid-event
Dec 15, 2020
Merged

Allow creation of hybrid meetings#6891
tramuntanal merged 24 commits intodecidim:developfrom
i-need-another-coffee:feature/add-hybrid-event

Conversation

@alecslupu
Copy link
Copy Markdown
Contributor

@alecslupu alecslupu commented Nov 18, 2020

🎩 What? Why?

Theses days in-person meetings tend to have an online dimension has they tend to be livestreamed.

📌 Related Issues

Link your PR to an issue

Testing

  1. Login to the system
  2. Visit the admin panel, and attempt to create a meeting
  3. On the Meeting type drop down, you will see "Both" which represent the new hybrid event
  4. fill in the data, and save
  5. Pepeat the steps for user created meeting
  6. go to the meetings list in the frontend, then select "both", you should see only the 2 meetings created by you.

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • AVOID breaking the continuous integration build.
  • AVOID making significant changes to the overall architecture.

📷 Screenshots

Please add screenshots of the changes you're proposing
Description

♥️ Thank you!

@alecslupu alecslupu marked this pull request as draft November 18, 2020 17:29
@alecslupu alecslupu force-pushed the feature/add-hybrid-event branch from 571f425 to a54fb40 Compare November 19, 2020 20:01
@alecslupu alecslupu marked this pull request as ready for review November 27, 2020 13:30
@alecslupu alecslupu marked this pull request as draft November 27, 2020 13:30
@andreslucena andreslucena changed the title Allow creation of hybrid events Allow creation of hybrid meetings Dec 4, 2020
Copy link
Copy Markdown
Contributor

@mrcasals mrcasals left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@alecslupu alecslupu marked this pull request as ready for review December 11, 2020 11:27
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

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

LGTM!

@tramuntanal tramuntanal merged commit 77db6dd into decidim:develop Dec 15, 2020
@alecslupu alecslupu deleted the feature/add-hybrid-event branch December 15, 2020 10:01
verarojman pushed a commit to Platoniq/decidim that referenced this pull request Dec 21, 2020
verarojman pushed a commit to Platoniq/decidim that referenced this pull request Dec 21, 2020
* 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
microstudi pushed a commit to Platoniq/decidim that referenced this pull request Jan 12, 2021
* 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
microstudi added a commit to Platoniq/decidim that referenced this pull request Jan 12, 2021
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants