Merge branch 'development' of https://github.com/fossasia/open-event-frontend into issue-4000

Author: Haider8

app/components/public/session-item.js

@@ -1,7 +1,8 @@
 import classic from 'ember-classic-decorator';
-import { action } from '@ember/object';
+import { action, computed } from '@ember/object';
 import { classNames } from '@ember-decorators/component';
 import Component from '@ember/component';
+import moment from 'moment';
 
 @classic
 @classNames('ui', 'segment')
@@ -15,4 +16,9 @@ export default class SessionItem extends Component {
       this.set('hideImage', false);
     }
   }
+
+  @computed('session.event', 'session.startsAt')
+  get sessionStartsAtInEventTimezone() {
+    return moment.tz(this.session.startsAt, this.session.event.get('timezone'));
+  }
 }

app/templates/components/public/session-item.hbs

@@ -29,7 +29,7 @@
         <div class="right floated five wide column">
           {{#if this.session.startsAt}}
             <div class=""><i class="icon map marker alternate"></i>{{this.session.microlocation.name}}</div>
-            <div class="small text"><i class="wait icon"></i>{{moment-format this.session.startsAt 'hh:mm a / DD-MM-YYYY'}}</div>
+            <div class="small text"><i class="wait icon"></i>{{moment-format this.sessionStartsAtInEventTimezone 'hh:mm a / DD-MM-YYYY'}}</div>
           {{/if}}
         </div>
       {{/if}}

package.json

@@ -127,7 +127,7 @@
     "ember-template-lint": "^2.9.1",
     "ember-truth-helpers": "^2.1.0",
     "ember-uuid": "^2.1.0",
-    "eslint-plugin-ember": "^8.9.2",
+    "eslint-plugin-ember": "^8.10.0",
     "eslint-plugin-ember-suave": "^2.0.1",
     "eslint-plugin-node": "^11.1.0",
     "fastboot-app-server": "^2.0.0",

tests/integration/components/public/session-item-test.js

@@ -1,12 +1,13 @@
 import { hbs } from 'ember-cli-htmlbars';
+import EmberObject from '@ember/object';
 import { module, test } from 'qunit';
 import { setupIntegrationTest } from 'open-event-frontend/tests/helpers/setup-integration-test';
 import { render } from '@ember/test-helpers';
 
 module('Integration | Component | public/session item', function(hooks) {
   setupIntegrationTest(hooks);
 
-  const session = { session_type: { length: '11:00', id: 12, name: 'Talk' }, shortAbstract: 'An introduction to the event', id: '1', title: 'Welcome to FOSSASIA', startsAt: '10:35 AM / 17-03-2017', track: { color: 'green', fontColor: 'green', id: 0, name: 'Track 1' }, microlocation: { id: 0, name: 'Room 1' }, speakers: [{ shortBiography: 'Works for ORG 1', id: 0, city: 'Delhi', name: 'Arnold Singh', speakingExperience: 'GSOC 2015', organisation: 'ORG 1', longBiography: '', photo: { 'iconImageUrl': '' } }] };
+  const session = { session_type: { length: '11:00', id: 12, name: 'Talk' }, shortAbstract: 'An introduction to the event', id: '1', title: 'Welcome to FOSSASIA', startsAt: '10:35 AM / 17-03-2017', event: EmberObject.create({ timezone: 'Asia/Kolkata' }), track: { color: 'green', fontColor: 'green', id: 0, name: 'Track 1' }, microlocation: { id: 0, name: 'Room 1' }, speakers: [{ shortBiography: 'Works for ORG 1', id: 0, city: 'Delhi', name: 'Arnold Singh', speakingExperience: 'GSOC 2015', organisation: 'ORG 1', longBiography: '', photo: { 'iconImageUrl': '' } }] };
 
   test('it renders', async function(assert) {
     this.set('session', session);

yarn.lock

@@ -7345,12 +7345,7 @@ ember-resolver@^8.0.0:
     ember-cli-version-checker "^5.0.2"
     resolve "^1.15.1"
 
-ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.11, ember-rfc176-data@^0.3.13:
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.13.tgz#ed1712a26e65fec703655f35410414aa1982cf3b"
-  integrity sha512-m9JbwQlT6PjY7x/T8HslnXP7Sz9bx/pz3FrNfNi2NesJnbNISly0Lix6NV1fhfo46572cpq4jrM+/6yYlMefTQ==
-
-ember-rfc176-data@^0.3.15:
+ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.11, ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15:
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.15.tgz#af3f1da5a0339b6feda380edc2f7190e0f416c2d"
   integrity sha512-GPKa7zRDBblRy0orxTXt5yrpp/Pf5CkuRFSIR8qMFDww0CqCKjCRwdZnWYzCM4kAEfZnXRIDDefe1tBaFw7v7w==
@@ -7848,13 +7843,13 @@ eslint-plugin-ember@^6.4.1:
     ember-rfc176-data "^0.3.11"
     snake-case "^2.1.0"
 
-eslint-plugin-ember@^8.9.2:
-  version "8.9.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-8.9.2.tgz#064f2ca391958806885356d85d71962b3a69e665"
-  integrity sha512-oHQkQdCkT+q9TVjhYAdpqWQh7y6Z/a8thFgTS1LnlJVuv+M+J/evkOejjr+BM9wrZdBQwPG49d2OK0vIXsm9dw==
+eslint-plugin-ember@^8.10.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-8.10.0.tgz#48571e205fd42859c7e84640563e8de3a2725712"
+  integrity sha512-Ci7LuoBC1vJqWX00v1AcjXNhPo9TY47WwE9hMfNIxmvUvg0oKqaaYVHdzbz2oEkhnJ38kA7v3AjE4ga9BvaDkw==
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
-    ember-rfc176-data "^0.3.13"
+    ember-rfc176-data "^0.3.15"
     lodash.kebabcase "^4.1.1"
     snake-case "^3.0.3"