merge main into branch

cultuurnet · Mar 25, 2024 · 59dcfaa · 59dcfaa
2 parents 7bd021b + 97e60c5
commit 59dcfaa
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 32 deletions.
diff --git a/dist/udb3-angular.js b/dist/udb3-angular.js
diff --git a/dist/udb3-angular.min.js b/dist/udb3-angular.min.js
diff --git a/src/core/translations/dutch-translations.constant.js b/src/core/translations/dutch-translations.constant.js
@@ -346,7 +346,8 @@ angular.module('udb.core')
       'sameAs': 'Externe IDs',
       'typicalAgeRange': 'Leeftijd',
       'language': 'Taal',
-      'audience': 'Toegang'
+      'audience': 'Toegang',
+      'completeness': 'Volledigheid'
     },
     preview: {
       tabs: {
@@ -787,6 +788,7 @@ angular.module('udb.core')
       'status': 'status',
       'booking_availability': 'tickets & plaatsen',
       'organiser_label': 'organisatie (naam)',
+      'completeness': 'volledigheid',
       'category_facility_name': 'voorzieningen',
       'category_targetaudience_name': 'doelgroep',
       'startdate': 'startdatum',

diff --git a/src/core/translations/french-translations.constant.js b/src/core/translations/french-translations.constant.js
@@ -346,7 +346,8 @@ angular.module('udb.core')
       'sameAs': 'IDs externes',
       'typicalAgeRange': ' ge',
       'language': 'Langue',
-      'audience': 'Accès'
+      'audience': 'Accès',
+      'completeness': 'Intégralité'
     },
     preview: {
       tabs: {
@@ -782,6 +783,7 @@ angular.module('udb.core')
       'status': 'status',
       'booking_availability': 'billets & places',
       'organiser_label': 'organisation (nom)',
+      'completeness': 'intégralité',
       'category_facility_name': 'dispositions',
       'category_targetaudience_name': 'public cible',
       'startdate': 'date de début',

diff --git a/src/core/translations/german-translations.constant.js b/src/core/translations/german-translations.constant.js
@@ -344,6 +344,7 @@ angular.module('udb.core').constant('udbGermanTranslations', {
     'typicalAgeRange': 'Alter',
     'language': 'Sprache',
     'audience': 'Zutritt',
+    'completeness': 'Integrität'
   },
   'preview': {
     'tabs': {
@@ -837,6 +838,7 @@ angular.module('udb.core').constant('udbGermanTranslations', {
     'status': 'Status',
     'booking_availability': 'Tickets & Plätze',
     'organiser_label': 'Organisation (Name)',
+    'completeness': 'integrität',
     'add_facility': 'Ausstattung',
     'category_targetaudience_name': 'Zielgruppe',
     'startdate': 'Startdatum',

diff --git a/src/export/event-export.controller.js b/src/export/event-export.controller.js
@@ -49,7 +49,8 @@ function EventExportController($uibModalInstance, eventExporter, ExportFormats,
     {name: 'sameAs', include: false, sortable: false, excludable: true},
     {name: 'typicalAgeRange', include: false, sortable: false, excludable: true},
     {name: 'language', include: false, sortable: false, excludable: true},
-    {name: 'audience', include: false, sortable: false, excludable: true, format: ExportFormats.OOXML}
+    {name: 'audience', include: false, sortable: false, excludable: true, format: ExportFormats.OOXML},
+    {name: 'completeness', include: false, sortable: false, excludable: true}
   ];
 
   exporter.exportFormats = _.map(ExportFormats);

diff --git a/src/saved-searches/components/save-search-modal.html b/src/saved-searches/components/save-search-modal.html
@@ -5,8 +5,8 @@ <h5 class="modal-title" translate-once="search.savedSearches.modal.mainTitle"></
     </div>
 
     <ul class="nav nav-tabs">
-        <li  ng-class="{active: isTabActive('new')}"><a ng-click="makeTabActive('new')" translate-once="search.savedSearches.modal.newTab"></a></li>
-        <li  ng-class="{active: isTabActive('existing')}"><a ng-click="makeTabActive('existing')" translate-once="search.savedSearches.modal.existingTab"></a></li>
+        <li ng-class="{active: isTabActive('new')}"><a style="cursor: pointer;" ng-click="makeTabActive('new')" translate-once="search.savedSearches.modal.newTab"></a></li>
+        <li ng-class="{active: isTabActive('existing')}"><a style="cursor: pointer;" ng-click="makeTabActive('existing')" translate-once="search.savedSearches.modal.existingTab"></a></li>
     </ul>
 
 

diff --git a/src/saved-searches/components/save-search.directive.html b/src/saved-searches/components/save-search.directive.html
@@ -1,6 +1,9 @@
-<p>
+<p style="margin-top: 12px;">
     <strong translate-once="search.savedSearches.yourSearch"></strong>
-    <a href="#" ng-click="saveSearch()" class="btn btn-sm btn-default">
-        <i class="fa fa-bookmark-o"></i> <span translate-once="search.savedSearches.save"></span>
-    </a>
+    <button href="#" ng-click="saveSearch()" class="btn btn-default rv-action">
+        <i class="fa fa-save"></i> <span translate-once="search.savedSearches.save"></span>
+    </button>
+    <span style="cursor:pointer;color:#999999;margin-left: 5px;" ng-click="openAnnouncementModal()">
+        <i class="fa fa-question-circle"></i>
+    </span>
 </p>
diff --git a/src/saved-searches/components/save-search.directive.js b/src/saved-searches/components/save-search.directive.js
@@ -45,6 +45,14 @@ function udbSaveSearch(savedSearchesService, $uibModal) {
 
       });
     };
+
+    scope.openAnnouncementModal = function () {
+      window.parent.postMessage({
+        source: 'UDB',
+        type: 'OPEN_ANNOUNCEMENT_MODAL',
+        id: '2833ab49-cf44-4504-89d1-f6ba3f81aa63'
+      }, '*');
+    };
   }
 
   function displayErrorModal() {

diff --git a/src/saved-searches/components/save-search.directive.spec.js b/src/saved-searches/components/save-search.directive.spec.js
@@ -29,7 +29,7 @@ describe('Directive: udbSaveSearch', function () {
     $rootScope.queryString = 'city:leuven';
     var element = $compile('<udb-save-search udb-query-string="queryString"></udb-save-search>')($rootScope);
     $rootScope.$digest();
-    element.find('a').triggerHandler('click');
+    element.find('button').triggerHandler('click');
     spyOn(savedSearchesService, 'createSavedSearch').and.callFake(function() {
       apiRequest = $q.defer();
       return apiRequest.promise;

diff --git a/src/search/services/query-fields.value.js b/src/search/services/query-fields.value.js
@@ -53,6 +53,7 @@ angular
     {name: 'status', field: 'status', type: 'choice', group: 'other', editable: true, options: ['Available', 'Unavailable', 'TemporarilyUnavailable']},
     {name: 'booking_availability', field: 'bookingAvailability', type: 'choice', group: 'other', editable: true, options: ['available', 'unavailable']},
     {name: 'organiser_label', field: 'organizer.name.\\*', type: 'tokenized-string', group: 'other', editable: true},
+    {name: 'completeness', field: 'completeness', type: 'number' , group: 'other', editable: true},
     {name: 'category_facility_name', field:'terms.id', type: 'term', group: 'other', editable: true},
     {name: 'category_targetaudience_name', field: 'audienceType', type: 'choice', group: 'other', editable: true, options: ['everyone', 'members', 'education']},