From b7d5ce8ea39b6664ff4b0916abfe9d9ebc37e2cc Mon Sep 17 00:00:00 2001
From: hb <hb@rm.com>
Date: Tue, 24 Nov 2020 23:03:19 +0900
Subject: [PATCH 1/2] TRY:Wizard Step3/Scheduler: Rooms are not sortable

---
 .../forms/wizard/sessions-speakers-step.js    | 33 ++++++++++++++++---
 app/models/microlocation.ts                   |  1 +
 .../forms/wizard/sessions-speakers-step.hbs   | 18 ++++++++--
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/app/components/forms/wizard/sessions-speakers-step.js b/app/components/forms/wizard/sessions-speakers-step.js
index 60cd1ffe09a..4f364f8eb9e 100644
--- a/app/components/forms/wizard/sessions-speakers-step.js
+++ b/app/components/forms/wizard/sessions-speakers-step.js
@@ -139,8 +139,13 @@ export default Component.extend(EventWizardMixin, FormMixin, {
     return grouped;
   }),
 
-  microlocations: computed('data.microlocations.@each.isDeleted', function() {
-    return this.data.event.microlocations.filterBy('isDeleted', false);
+  microlocations: computed('data.microlocations.@each.isDeleted', 'data.microlocations.@each.position', function() {
+    const sortedRooms = this.data.event.microlocations.sortBy('position').filterBy('isDeleted', false);
+    sortedRooms.forEach((room, idx) => {
+      room.set('position', idx);
+    });
+
+    return sortedRooms;
   }),
 
   complexCustomForms: computed('data.customForms.@each.isComplex', function() {
@@ -183,9 +188,6 @@ export default Component.extend(EventWizardMixin, FormMixin, {
         case 'track':
           this.data.tracks.addObject(this.store.createRecord('track'));
           break;
-        case 'microlocation':
-          this.data.microlocations.addObject(this.store.createRecord('microlocation'));
-          break;
       }
     },
     addCustomField() {
@@ -197,6 +199,27 @@ export default Component.extend(EventWizardMixin, FormMixin, {
     removeField(field) {
       this.data.customForms.removeObject(field);
     },
+    addRoom(index) {
+      this.microlocations.forEach(room => {
+        const pos = room.get('position');
+        pos > index && room.set('position', pos + 1);
+      });
+      this.data.event.microlocations.addObject(this.store.createRecord('microlocation', { position: index + 1 }));
+    },
+    removeRoom(room, index) {
+      room.deleteRecord();
+      this.microlocations.forEach(item => {
+        const pos = item.get('position');
+        pos > index && item.set('position', pos - 1);
+      });
+    },
+    moveRoom(item, direction) {
+      const idx = item.get('position');
+      const otherIdx = direction === 'up' ? (idx - 1) : (idx + 1);
+      const other = this.microlocations.find(item => item.get('position') === otherIdx);
+      other.set('position', idx);
+      item.set('position', otherIdx);
+    },
     resetCFS() {
       this.set('data.speakersCall.announcement', null);
     },
diff --git a/app/models/microlocation.ts b/app/models/microlocation.ts
index 9c92b4f277d..bf6d0aff653 100644
--- a/app/models/microlocation.ts
+++ b/app/models/microlocation.ts
@@ -7,6 +7,7 @@ export default class Microlocation extends ModelBase.extend({
   floor     : attr('number'),
   latitude  : attr('number'),
   longitude : attr('number'),
+  position  : attr('number', { defaultValue: 0 }),
 
   sessions    : hasMany('session'),
   event       : belongsTo('event'),
diff --git a/app/templates/components/forms/wizard/sessions-speakers-step.hbs b/app/templates/components/forms/wizard/sessions-speakers-step.hbs
index fb169cbd2f8..66928b61032 100644
--- a/app/templates/components/forms/wizard/sessions-speakers-step.hbs
+++ b/app/templates/components/forms/wizard/sessions-speakers-step.hbs
@@ -58,7 +58,7 @@
 
     <div class="field">
       <label class="required">{{t 'Microlocations or Virtual Online Rooms'}}</label>
-      {{#each this.microlocations as |microlocation|}}
+      {{#each this.microlocations as |microlocation index|}}
         <div class="{{if this.device.isMobile 'grouped'}} fields">
           <div class="{{unless this.device.isMobile 'three wide'}} field">
             <Input @type="text" @value={{microlocation.name}} placeholder="Name" />
@@ -67,15 +67,27 @@
             <div class="ui action input fluid">
               <Input @type="number" @value={{microlocation.floor}} placeholder="Floor" />
               {{#if (gt this.microlocations.length 1)}}
-                <button class="ui icon red button" type="button" {{action 'removeItem' microlocation}}>
+                <button class="ui icon red button" type="button" {{action 'removeRoom' microlocation index}}>
                   <i class="minus icon"></i>
                 </button>
               {{/if}}
-              <button class="ui icon primary button" type="button" {{action 'addItem' 'microlocation'}}>
+              <button class="ui icon primary button" type="button" {{action 'addRoom' index}}>
                 <i class="plus icon"></i>
               </button>
             </div>
           </div>
+          <div class="ui icon buttons {{if this.device.isLargeMonitor 'right floated'}}">
+            {{#if (not-eq index 0)}}
+              <button type="button" class="ui button" {{action "moveRoom" microlocation "up"}} data-content="Move room up">
+                <i class="up arrow icon"></i>
+              </button>
+            {{/if}}
+            {{#if (not-eq microlocation.position (dec this.microlocations.length))}}
+              <button type="button" class="ui button" {{action "moveRoom" microlocation "down"}} data-content="Move room down">
+                <i class="down arrow icon"></i>
+              </button>
+            {{/if}}
+          </div>
         </div>
       {{/each}}
     </div>

From b91b8e75b625fa406fe2eb6a166833a9a0c9a738 Mon Sep 17 00:00:00 2001
From: unknown <nikolaytoplev@gmail.com>
Date: Wed, 25 Nov 2020 21:59:10 +0900
Subject: [PATCH 2/2] reflect rooms order on sheduler

---
 app/controllers/events/view/scheduler.js | 5 +++++
 app/templates/events/view/scheduler.hbs  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/events/view/scheduler.js b/app/controllers/events/view/scheduler.js
index b02f23b9d70..77192cbb964 100644
--- a/app/controllers/events/view/scheduler.js
+++ b/app/controllers/events/view/scheduler.js
@@ -18,6 +18,11 @@ export default class extends Controller {
     return false;
   }
 
+  @computed('model.microlocations')
+  get microlocations() {
+    return this.model.microlocations.sortBy('position');
+  }
+
   @computed('model.unscheduled', 'filter')
   get unscheduledSessions() {
     if (!this.filter || !this.model.unscheduled) {return this.model.unscheduled}
diff --git a/app/templates/events/view/scheduler.hbs b/app/templates/events/view/scheduler.hbs
index 227d4dc9c2a..d0053ca1aed 100644
--- a/app/templates/events/view/scheduler.hbs
+++ b/app/templates/events/view/scheduler.hbs
@@ -26,7 +26,7 @@
       <Schedule
         @event={{this.model.event}}
         @sessions={{this.model.scheduled}}
-        @rooms={{this.model.microlocations}}
+        @rooms={{this.microlocations}}
         @editable={{true}}
         @droppable={{true}}
         @defaultTimedEventDuration={{this.model.defaultDuration}}