diff --git a/app/components/public/stream/join-video.ts b/app/components/public/stream/join-video.ts index cf57e04816c..bef2b557f39 100644 --- a/app/components/public/stream/join-video.ts +++ b/app/components/public/stream/join-video.ts @@ -26,6 +26,7 @@ export default class JoinVideo extends Component { openPanel(): void { if (this.args.canAccess) { this.args.showSidePanel?.(); + this.eventCheckIn(this.args.event.identifier) this.router.transitionTo({ queryParams: { side_panel: true } }); } else { if (this.session.isAuthenticated) { @@ -35,4 +36,16 @@ export default class JoinVideo extends Component { } } } + + async eventCheckIn(event_identifier: string) { + try { + const data:any = { + 'check_in_type' : 'event', + 'is_check_in' : true + }; + await this.loader.post(`events/${event_identifier}/virtual/check-in`, data); + } catch (e) { + // Ignore error to prevent stackoverflow + } + } } diff --git a/app/components/public/stream/video-stream.ts b/app/components/public/stream/video-stream.ts index 225c27616f8..48697c1150a 100644 --- a/app/components/public/stream/video-stream.ts +++ b/app/components/public/stream/video-stream.ts @@ -166,6 +166,8 @@ export default class PublicStreamVideoStream extends Component { async setupRoomChat(stream:any) { this.currentRoom = stream; this.shown = false; +fix-contributor-guidlines + this.eventCheckIn(this.args.event.identifier, stream.microlocationId) } @action @@ -173,4 +175,20 @@ export default class PublicStreamVideoStream extends Component { this.selectingLanguage.setStreamYardVisibility(false); } + async eventCheckIn(event_identifier: string, microlocation_id: number) { + try { + const data:any = { + 'check_in_type' : 'room', + microlocation_id, + 'is_check_in' : true + }; + if (microlocation_id === undefined) { + data.check_in_type = 'virtual-room' + } + await this.loader.post(`events/${event_identifier}/virtual/check-in`, data); + } catch (e) { + // Ignore error to prevent stackoverflow + } + } + } diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js index 4f595b4ddb2..b56a4492b10 100644 --- a/app/controllers/events/view/tickets/attendees/list.js +++ b/app/controllers/events/view/tickets/attendees/list.js @@ -43,6 +43,15 @@ export default class extends Controller.extend(EmberTableControllerMixin) { isSortable : true }, { + fix-contributor-guidlines + name : 'Ticket Name', + width : 80, + valuePath : 'ticket.name', + headerComponent : 'tables/headers/sort', + isSortable : true + }, + + development name : 'Tags', width : 100, valuePath : 'tagId', diff --git a/docs/installation/local.md b/docs/installation/local.md index bf2f64b1c38..0cbf80f850f 100644 --- a/docs/installation/local.md +++ b/docs/installation/local.md @@ -23,6 +23,19 @@ cd open-event-frontend ``` - `yarn` +## Important Note: +- **Only for Debian-based users (like Ubuntu)** : If you encounter an error when trying to run `yarn`, it's due to a conflict with the cmdtest package. You can resolve this by removing cmdtest and installing yarn using apt. Additionally, if you encounter an error due to Node.js version incompatibility, you can use nvm (Node Version Manager) to install and switch to the compatible Node.js version. Here are the steps: +1. Install nvm by running the following command: `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash` +2. Source nvm to use it in the current session: `source ~/.nvm/nvm.sh` +3. Install and use a compatible version of Node.js (for example, 14.18.1): `nvm install 14.18.1` + `nvm use 14.18.1` +Also, If you encounter an error indicating that your `.npmrc` file has a globalconfig and/or a prefix setting, which are incompatible with nvm, +1. run the following command: `nvm use --delete-prefix v14.18.1` +2. Remove cmdtest: `sudo apt remove cmdtest` +3. Install yarn: `sudo apt install yarn` + +You're good to go. Now, continue with the normal installation. + - `cp .env.example .env` - `yarn l10n:generate` diff --git a/package.json b/package.json index c1ae23637f4..20e2de05b84 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,11 @@ "ember-cli-deprecation-workflow": "^2.1.0", "ember-cli-document-title-northm": "^1.0.3", "ember-cli-dotenv": "^3.1.0", +<<<<<<< HEAD "ember-cli-fastboot": "^4.1.1", +======= + "ember-cli-fastboot": "^4.1.2", +>>>>>>> f8507da3 (Update Node.js version in package.json) "ember-cli-flash": "^2.2.0", "ember-cli-head": "^2.0.0", "ember-cli-html-minifier": "^1.1.0", @@ -168,7 +172,7 @@ "xgettext-template": "^4.1.2" }, "engines": { - "node": ">= 12.x <15", + "node": "18.x", "yarn": ">= 1.2.0" }, "private": true,