Merge branch 'development' into sorting-of-sales

Author: ranjitkshah

app/components/forms/events/view/videoroom-form.hbs

@@ -48,7 +48,7 @@
         <UiPopup
           @tagName="i"
           @class="info circle icon"
-          @content={{'This column shows the original link of the video. We do not recommend to share this link as users can access it without loggin into ' this.settings.appName '.com.'}} />
+          @content={{t 'This column shows the original link of the video. We do not recommend to share this link as users can access it without loggin into ' this.settings.appName '.com.'}} />
       </label>
       {{#if (eq this.data.stream.videoChannel.provider 'youtube')}}
         <Widgets::Forms::SocialLinkField
@@ -75,7 +75,7 @@
         <UiPopup
           @tagName="i"
           @class="info circle icon"
-          @content={{'The room password field can be used to communicate a password which is necessary to access online video rooms for example for external video services such a Zoom, Teams and Webex. The need for a password entry depends on the configuration of your video channel. The integrated Big Blue Button video solution in ' this.settings.appName '.com does not need a password as only ticket holders are able to access it. The difference between the password and PIN is that the password option is used for online access while PINs are used to access video rooms through the telephone.'}} />
+          @content={{t 'The room password field can be used to communicate a password which is necessary to access online video rooms for example for external video services such a Zoom, Teams and Webex. The need for a password entry depends on the configuration of your video channel. The integrated Big Blue Button video solution in ' this.settings.appName '.com does not need a password as only ticket holders are able to access it. The difference between the password and PIN is that the password option is used for online access while PINs are used to access video rooms through the telephone.'}} />
         </label>
       <Input
         @value={{this.data.stream.password}} />
@@ -87,7 +87,7 @@
       <UiPopup
           @tagName="i"
           @class="info circle icon"
-          @content={{'Additional Information fields can be used to share information such as phone access, PINs and other video room specific information.'}} />
+          @content={{t 'Additional Information fields can be used to share information such as phone access, PINs and other video room specific information.'}} />
     </label>
     <Textarea
       @value={{this.data.stream.additionalInformation}} />

app/components/forms/group/group-events-form.js

@@ -73,17 +73,17 @@ export default class GroupEventsForm extends Component.extend(FormMixin) {
       });
   }
 
-  @computed('events.[]', 'group.events.[]')
+  @computed('events.[]', 'groupEvents.[]')
   get remainingEvents() {
-    return sortBy(this.events.toArray().filter(event => !this.group.events.toArray().includes(event)), ['startsAt']).reverse();
+    return sortBy(this.events.toArray().filter(event => !this.groupEvents.toArray().includes(event)), ['startsAt']).reverse();
   }
 
-  @computed('events.[]', 'group.events.[]')
+  @computed('events.[]', 'groupEvents.[]')
   get pastEvents() {
     return sortBy(this.remainingEvents.toArray().filter(event => { return moment(event.endsAt) < moment()}), ['startsAt']).reverse();
   }
 
-  @computed('events.[]', 'group.events.[]')
+  @computed('events.[]', 'groupEvents.[]')
   get upcomingEvents() {
     return sortBy(this.remainingEvents.toArray().filter(event => { return moment(event.endsAt) > moment()}), ['startsAt']).reverse();
   }
@@ -114,7 +114,7 @@ export default class GroupEventsForm extends Component.extend(FormMixin) {
           {
             id: 'group_save'
           });
-        this.router.transitionTo('groups.list');
+        this.router.transitionTo('my-groups.list');
       } catch (e) {
         console.error('Error while saving group', e);
         this.errorHandler.handle(e);

app/components/forms/session-section.js

@@ -6,5 +6,19 @@ import { levels } from 'open-event-frontend/utils/dictionary/levels';
 
 export default Component.extend(FormMixin, {
   languages : orderBy(languages, 'name'),
-  levels    : orderBy(levels, 'position')
+  levels    : orderBy(levels, 'position'),
+
+  actions: {
+    removeDocument(document) {
+      this.data.session.slides = this.data.session.slides.filter(dl => dl !== document);
+    },
+    addSessionDocument() {
+      if (this.data.session.slides) {
+        this.data.session.slides = [...this.data.session.slides, { name: '', link: '' }];
+      } else {
+        this.data.session.slides = [{ name: '', link: '' }];
+      }
+    }
+  }
+
 });

app/components/forms/session-speaker-form.js

@@ -106,31 +106,6 @@ export default Component.extend(FormMixin, {
             }
           ]
         },
-        slidesUrlRequired: {
-          identifier : 'session_slidesUrl_required',
-          rules      : [
-            {
-              type   : 'empty',
-              prompt : this.l10n.t('Please enter a url')
-            },
-            {
-              type   : 'regExp',
-              value  : protocolLessValidUrlPattern,
-              prompt : this.l10n.t('Please enter a valid url')
-            }
-          ]
-        },
-        slidesUrl: {
-          identifier : 'session_slidesUrl',
-          optional   : true,
-          rules      : [
-            {
-              type   : 'regExp',
-              value  : protocolLessValidUrlPattern,
-              prompt : this.l10n.t('Please enter a valid url')
-            }
-          ]
-        },
         videoUrlRequired: {
           identifier : 'session_videoUrl_required',
           rules      : [

app/components/forms/wizard/basic-details-step.js

@@ -448,18 +448,41 @@ export default Component.extend(FormMixin, EventWizardMixin, {
         });
 
     },
-    addTicket(type, position) {
+
+    async addTicket(type, position) {
       const { event } = this.data;
       const salesStartDateTime = moment();
-      const salesEndDateTime = this.data.event.startsAt;
+      const salesEndDateTime = this.data.event.endsAt;
+      if (type === 'registration') {
+        if (this.data.event.isOneclickSignupEnabled) {
+          this.data.event.isOneclickSignupEnabled = false;
+          return;
+        }
+        try {
+          await this.confirm.prompt(this.l10n.t('If you choose this option other ticket options will not be available. Do you want to proceed? '));
+          this.data.event.isOneclickSignupEnabled = true;
+          let countRegistration = 0;
+          this.data.event.tickets?.toArray().filter(x => {
+            if (x.type === 'registration') {
+              countRegistration += 1;
+            }
+          });
+          if (countRegistration > 0) {
+            return;
+          }
+        } catch (e) {
+          this.data.event.isOneclickSignupEnabled = false;
+        }
+      }
       this.data.event.tickets.pushObject(this.store.createRecord('ticket', {
+        name          : type === 'registration' ? 'registration' : '',
         event,
         type,
         position,
         quantity      : 100,
         maxPrice      : type === 'donation' ? 10000 : null,
         salesStartsAt : salesStartDateTime,
-        salesEndsAt   : salesEndDateTime
+        salesEndsAt   : type === 'registration' ? this.data.event.endsAt : salesEndDateTime
       }));
     },
 

app/components/forms/wizard/sessions-speakers-step.js

@@ -257,6 +257,18 @@ export default Component.extend(EventWizardMixin, FormMixin, {
         isComplex : true
       }));
     },
+    async toggle(microlocation) {
+      try {
+        if (!microlocation.hiddenInScheduler) {
+          await this.confirm.prompt(this.l10n.t('If you hide this microlocation you will not be able to schedule sessions in it. The location will still be available for online events without scheduled sessions, e.g. break-out or discussion rooms. '));
+          microlocation.hiddenInScheduler = true;
+        } else {
+          microlocation.hiddenInScheduler = false;
+        }
+      } catch {
+        microlocation.hiddenInScheduler = false;
+      }
+    },
     removeField(field) {
       this.data.customForms.removeObject(field);
     },

app/components/nav-bar.js

@@ -4,19 +4,33 @@ import Component from '@ember/component';
 
 @classic
 export default class NavBar extends Component {
+  @computed('session.currentRouteName')
+  get isGroupRoute() {
+    return (String(this.session.currentRouteName).includes('group'));
+  }
+
   @computed('session.currentRouteName')
   get isNotEventPageRoute() {
+    if (this.isGroupRoute) {
+      return true;
+    }
     return !(String(this.session.currentRouteName).includes('public'));
   }
 
   @computed('session.currentRouteName')
   get isNotWizardPageRoute() {
+    if (this.isGroupRoute) {
+      return true;
+    }
     return !(String(this.session.currentRouteName).includes('edit'))
     && String(this.session.currentRouteName) !== 'create';
   }
 
   @computed('session.currentRouteName')
   get isNotExplorePageRoute() {
+    if (this.isGroupRoute) {
+      return true;
+    }
     return !(String(this.session.currentRouteName).includes('explore'));
   }
 

app/components/public/session-documents.hbs

@@ -0,0 +1,15 @@
+<UiAccordion class="segment p-0">
+  <div class="title ui header m-2">
+    {{t 'Session Documents'}}
+  </div>
+  <div class="content m-2">
+    <div class="d-flex flex-row mb-2 mr-2">
+      {{#each @session.slides as |slide|}}
+        <button class="ui button fluid {{if (eq this.currDoc slide.link) 'grey' 'white'}}" style="width:auto;" {{action 'selectedDocument' slide.link}}>
+          {{slide.name}}
+        </button>
+      {{/each}} 
+    </div>
+    <iframe title="session-slides" id="googleFrame" class="slide-iframe mb-2" width="100%" style="max-width: 1200px; height: 600px;" frameborder="0" src="https://docs.google.com/gview?url={{ this.currDoc }}&embedded=true"></iframe>
+  </div>
+</UiAccordion>

app/components/public/session-documents.js

@@ -0,0 +1,24 @@
+import { action } from '@ember/object';
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+
+export default class SessionDocuments extends Component {
+
+@service session;
+
+@tracked currDoc = this.args.session?.slides[0].link;
+
+  @action
+refreshSlide() {
+  if (document.getElementById('googleFrame')) {
+    document.getElementById('googleFrame').src += '';
+  }
+}
+
+  @action
+  selectedDocument(doc) {
+    this.currDoc = doc;
+    this.refreshSlide();
+  }
+}

app/components/public/session-item.hbs

@@ -10,12 +10,6 @@
           </div>
         </div>
         <div class="d-flex ml-auto" style="height: fit-content;">
-          {{#if @session.slidesUrl}}
-            <button class="ui basic {{text-color @session.track.color 'basic' 'inverted'}} button no-wrap" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} {{action this.goToSlides}}>
-              <i class="icon {{if this.slidesUploaded 'download' 'linkify'}}"></i>
-              {{if this.slidesUploaded (t 'Download Slides') (t 'Link to Slides')}}
-            </button>
-          {{/if}}
           {{#if this.sessionEnded}}
             {{#if @session.videoUrl}}
               <button class="ui basic {{text-color @session.track.color 'basic' 'inverted'}} button no-wrap" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} {{action this.goToVideo}}>
@@ -150,20 +144,9 @@
         {{/if}}
          </div>
     </div>
-    {{#if (and @expanded (or @session.slidesUrl @session.videoUrl))}}
+    {{#if (and @expanded @session.videoUrl)}}
       <div class="row p-4">
-        <div class="column" style={{css display='flex' align-items='center' flex-direction='column'}}>
-          {{#if (or this.pdfLink this.pptLink)}}
-            <iframe title="session-slides" class="slide-iframe mb-2" width="100%" frameborder="0" src="https://docs.google.com/gview?url={{ @session.slidesUrl }}&embedded=true"></iframe>
-          {{else if @session.slidesUrl}}
-            <a class="mb-2" href={{ @session.slidesUrl }} target="_blank" rel="noopener noreferrer">
-              <button class="ui labeled icon button">
-                <i class="file powerpoint icon"></i>
-                {{t 'Slides'}}
-              </button>
-            </a>
-          {{/if}}
-          
+        <div class="column" style={{css display='flex' align-items='center' flex-direction='column'}}>        
           {{#if this.youtubeLink}}
             <iframe title="youtube-session-video" class="video-iframe" width="100%" src="https://www.youtube.com/embed/{{ this.youtubeLink }}?enablejsapi=1&modestbranding=1" frameborder="0" allowfullscreen></iframe>
           {{else if @session.videoUrl}}