Changed Events location/office display order in the list (a bit more)

Author: Aleksanderis

src/api/Shrooms.Domain/Services/Email/Kudos/KudosNotificationService.cs

@@ -113,7 +113,7 @@ public void NotifyApprovedKudosDecreaseRecipient(KudosLog kudosLog)
                 userNotificationSettingsUrl,
                 kudosLog.Points,
                 kudosLog.KudosTypeName,
-                sendingUserFullName == null ? BusinessLayerConstants.DeletedUserName : sendingUserFullName,
+                sendingUserFullName ?? BusinessLayerConstants.DeletedUserName,
                 kudosLog.Comments,
                 kudosProfileUrl);
             var body = _mailTemplate.Generate(emailTemplateViewModel, EmailTemplateCacheKeys.KudosDecreased);

src/webapp/src/client/app/events/content/description/description.component.js

@@ -26,7 +26,7 @@
         };
 
         vm.hasDatePassed = hasDatePassed;
-        
+
         ////////
 
         function hasDatePassed(date) {

src/webapp/src/client/app/events/content/description/description.html

@@ -49,9 +49,9 @@
                     <b><span ng-if="vm.event.officesName.length < 2" translate="events.eventOffice"></span>
                         <span ng-if="vm.event.officesName.length > 1" translate="events.eventOffices"></span>
                         :</b>
-                    <span data-test-id="event-office" ng-cloak ng-if="vm.event.officesName" ng-repeat="officeName in vm.event.officesName">
+                    <span data-test-id="event-office" ng-cloak ng-if="!vm.event.isForAllOffices && vm.event.officesName" ng-repeat="officeName in vm.event.officesName">
                         {{officeName}}{{$last ? '' :', '}}</span>
-                    <span data-test-id="event-office" ng-cloak ng-if="!vm.event.officesName.length">{{"events.eventOutside" | translate}}</span>
+                    <span data-test-id="event-office" ng-cloak ng-if="vm.event.isForAllOffices || !vm.event.officesName.length">{{"events.eventForOfficeAll" | translate}}</span>
                 </div>
                 <div class="col-xs-12">
                     <span class="glyphicon glyphicon-map-marker"></span>

src/webapp/src/client/app/events/list/by-type/by-type.html

@@ -19,11 +19,9 @@
                 <div class="col-xs-12">
                     <p class="event-list-item-place" data-test-id="event-list-item-place" ng-cloak>
                         {{:: event.place}}
-                        <span
-                            ng-if="event.officesName.length == vm.offices.length-1">({{ :: "events.eventOfficeAll" | translate }})</span>
+                        <span ng-if="event.officesName.length == vm.offices.length-1 || !event.officesName">({{ :: "events.eventForOfficeAll" | translate }})</span>
                         <span ng-if="event.officesName.length != vm.offices.length-1 && event.officesName"
                             ng-repeat="officeName in event.officesName">{{$first ? '(' : ''}}{{:: officeName}}{{$last ? ')' : ', '}}</span>
-                        <span ng-if="!event.officesName">({{:: "events.eventOutside" | translate }})</span>
                     </p>
                 </div>
                 <!-- date/time -->

src/webapp/src/client/resources/en_US/events.json

@@ -32,6 +32,7 @@
   "eventOffices": "Target offices",
   "eventOutside": "Outside office",
   "eventOfficeAll": "All offices",
+  "eventForOfficeAll": "For all offices",
   "eventLocation": "City/room/venue",
   "eventRecurring": "Recurring",
   "eventSave": "Save",

src/webapp/src/client/resources/lt_LT/events.json

@@ -32,6 +32,7 @@
   "eventOffices": "Skirta ofisams",
   "eventOutside": "Už ofiso teritorijos",
   "eventOfficeAll": "Visi ofisai",
+  "eventForOfficeAll": "Visiems ofisams",
   "eventLocation": "Miestas/kambarys/vieta",
   "eventRecurring": "Pasikartojantis",
   "eventSave": "Išsaugoti",