#613 set user availability when creating an event (#614)

linagora · Nov 15, 2021 · 4a78fdc · 4a78fdc
1 parent 51d6635
commit 4a78fdc
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 2 deletions.
diff --git a/src/esn.calendar.libs/app/app.constants.js b/src/esn.calendar.libs/app/app.constants.js
@@ -296,6 +296,19 @@
             label: 'Private'
           }
         ]
+      },
+      availability: {
+        default: 'OPAQUE',
+        values: [
+          {
+            value: 'OPAQUE',
+            label: 'Busy'
+          },
+          {
+            value: 'TRANSPARENT',
+            label: 'Free'
+          }
+        ]
       }
     })
 

diff --git a/src/esn.calendar.libs/app/components/event/form/event-form.controller.js b/src/esn.calendar.libs/app/components/event/form/event-form.controller.js
@@ -196,6 +196,10 @@ function CalEventFormController(
             $scope.editedEvent.class = CAL_EVENT_FORM.class.default;
           }
 
+          if (!$scope.editedEvent.availability) {
+            $scope.editedEvent.availability = CAL_EVENT_FORM.availability.default;
+          }
+
           $scope.displayParticipationButton = displayParticipationButton();
           $scope.displayCalMailToAttendeesButton = displayCalMailToAttendeesButton;
           $scope.$watch('selectedCalendar.uniqueId', setExcludeCurrentUser);

diff --git a/src/esn.calendar.libs/app/components/event/form/event-form.pug b/src/esn.calendar.libs/app/components/event/form/event-form.pug
@@ -131,15 +131,24 @@ form.event-form(role="form", name="form", aria-hidden="true", ng-class="{ 'reado
                 event-recurrence-edition(ng-click="changeBackdropZIndex()", event="editedEvent", can-modify-event-recurrence='canModifyEventRecurrence')
               .col-xs-12
                 cal-event-alarm-edition(ng-click="changeBackdropZIndex()", event="editedEvent", can-modify-event= "canModifyEvent")
-              .col-xs-12
+              div(ng-class="isOrganizer ? 'col-xs-6' : 'col-xs-12'")
                 .form-group
                   .input-group
                     span.input-group-addon
                       i.mdi.mdi-lock
                     .fg-line
                       md-input-container(ng-click="changeBackdropZIndex()")
                         md-select(ng-disabled="!canModifyEvent", ng-model='editedEvent.class', md-container-class="cal-select-dropdown", aria-label="visibility")
-                          md-option(ng-value='class.value', ng-repeat="class in CAL_EVENT_FORM.class.values") {{class.label | translate}} 
+                          md-option(ng-value='class.value', ng-repeat="class in CAL_EVENT_FORM.class.values") {{class.label | translate}}
+              div(ng-class="isOrganizer ? 'col-xs-6' : 'col-xs-12'", ng-if="isOrganizer")
+                .form-group
+                  .input-group
+                    span.input-group-addon
+                      i.mdi.mdi-eye
+                    .fg-line
+                      md-input-container(ng-click="changeBackdropZIndex()")
+                        md-select(ng-disabled="!canModifyEvent", ng-model='editedEvent.availability', md-container-class="cal-select-dropdown", aria-label="availability")
+                          md-option(ng-value='availability.value', ng-repeat="availability in CAL_EVENT_FORM.availability.values") {{ availability.label | translate }}
 
       .modal-footer.flex
         .flex-vertical-centered.flex-start

diff --git a/src/esn.calendar.libs/app/services/shells/calendar-shell.js b/src/esn.calendar.libs/app/services/shells/calendar-shell.js
@@ -456,6 +456,14 @@ require('./valarm-shell.js');
           vevent.updatePropertyWithValue('class', value);
         });
         this.ensureAlarmCoherence();
+      },
+
+      get availability() {
+        return this.vevent.getFirstPropertyValue('transp');
+      },
+
+      set availability(value) {
+        this.vevent.updatePropertyWithValue('transp', value);
       }
     };
 

diff --git a/src/esn.calendar.libs/app/services/shells/calendar-shell.spec.js b/src/esn.calendar.libs/app/services/shells/calendar-shell.spec.js
@@ -2234,4 +2234,23 @@ describe('CalendarShell factory', function() {
       expect((new CalendarShell(newVCalendar)).dtstamp).to.be.null;
     });
   });
+
+  describe('the availability setter', () => {
+    it('should set the event availability', () => {
+      const vcalendar = ICAL.Component.fromString(__FIXTURES__['src/linagora.esn.calendar/app/fixtures/calendar/event.ics']);
+      const calendarShell = new CalendarShell(vcalendar);
+
+      calendarShell.availability = 'TRANSPARENT';
+      expect(calendarShell.vevent.getFirstPropertyValue('transp')).to.equal('TRANSPARENT');
+    });
+  });
+
+  describe('the availability getter', () => {
+    it('should return the event availability', () => {
+      const vcalendar = ICAL.Component.fromString(__FIXTURES__['src/linagora.esn.calendar/app/fixtures/calendar/event.ics']);
+      const calendarShell = new CalendarShell(vcalendar);
+
+      expect(calendarShell.availability).to.equal('OPAQUE');
+    });
+  });
 });