From 9ba8ee14c0865a7984f01a0bbf612571bbda8874 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 4 Nov 2022 15:13:24 +0100 Subject: [PATCH 1/4] [UPS-4204] Remove checkboxes in bulkactions screen --- .../passholder/bulk-actions/sidebar-selected-passholders.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/passholder/bulk-actions/sidebar-selected-passholders.html b/app/views/passholder/bulk-actions/sidebar-selected-passholders.html index ab2dc736..027ea4dc 100644 --- a/app/views/passholder/bulk-actions/sidebar-selected-passholders.html +++ b/app/views/passholder/bulk-actions/sidebar-selected-passholders.html @@ -12,7 +12,6 @@
  • - {{ passholder.name.first }} {{ passholder.name.last }}
      From fa7516f5cda6381f274b1d3bccdf74f38df6d064 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 4 Nov 2022 15:34:14 +0100 Subject: [PATCH 2/4] [UPS-4204] Pass uitpas numbers to back button --- .../passholder/bulk-actions/sidebar-selected-passholders.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/passholder/bulk-actions/sidebar-selected-passholders.html b/app/views/passholder/bulk-actions/sidebar-selected-passholders.html index 027ea4dc..ecdf188f 100644 --- a/app/views/passholder/bulk-actions/sidebar-selected-passholders.html +++ b/app/views/passholder/bulk-actions/sidebar-selected-passholders.html @@ -1,7 +1,7 @@
      - Terug + Terug

      From 27498f26e6cea8520f102b332d084988ceca89cd Mon Sep 17 00:00:00 2001 From: david Date: Fri, 4 Nov 2022 16:47:39 +0100 Subject: [PATCH 3/4] [UPS-4204] Add confirmation for bulk punten sparen --- app/scripts/activity/activity.controller.js | 36 ++++++++++++++++++- app/views/activity/content-activities.html | 2 +- .../bulk-actions/modal-confirm.html | 13 +++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 app/views/passholder/bulk-actions/modal-confirm.html diff --git a/app/scripts/activity/activity.controller.js b/app/scripts/activity/activity.controller.js index b8ddabbd..2ffcd939 100644 --- a/app/scripts/activity/activity.controller.js +++ b/app/scripts/activity/activity.controller.js @@ -12,9 +12,10 @@ angular .controller('ActivityController', ActivityController); /* @ngInject */ -function ActivityController (passholder, passholders, bulkSelection, activityService, DateRange, $rootScope, $scope, activityMode, $state, activeCounter) { +function ActivityController (passholder, passholders, bulkSelection, activityService, DateRange, $rootScope, $scope, activityMode, $state, activeCounter, $uibModal) { /*jshint validthis: true */ var controller = this; + var confirmationModal = null; // Set default parameters. controller.query = ''; @@ -287,6 +288,39 @@ function ActivityController (passholder, passholders, bulkSelection, activitySer }); }; + controller.confirmBulkCheckin = function (activity) { + if (controller.passholders.length === 1) { + controller.bulkCheckin(activity); + return; + } + + confirmationModal = $uibModal + .open({ + animation: true, + templateUrl: 'views/passholder/bulk-actions/modal-confirm.html', + size: 'sm', + resolve: { + text: function () { + return { + title: 'Ben je zeker?', + body: 'Puntent sparen voor ' + controller.passholders.length + ' pashouders?', + submit: 'Punten sparen' + }; + } + }, + controller: function (text) { + var $ctrl = this; + $ctrl.text = text; + $ctrl.close = confirmationModal.close; + $ctrl.submit = function() { + controller.bulkCheckin(activity); + confirmationModal.close(); + }; + }, + controllerAs: '$ctrl' + }); + }; + /** * Handle the update of a claimed activity. * @param event diff --git a/app/views/activity/content-activities.html b/app/views/activity/content-activities.html index 6ec114a8..3d6b3e2a 100644 --- a/app/views/activity/content-activities.html +++ b/app/views/activity/content-activities.html @@ -89,7 +89,7 @@

      +
      - +

    diff --git a/app/views/passholder/bulk-actions/modal-confirm.html b/app/views/passholder/bulk-actions/modal-confirm.html new file mode 100644 index 00000000..4372ad57 --- /dev/null +++ b/app/views/passholder/bulk-actions/modal-confirm.html @@ -0,0 +1,13 @@ +
    + +

    {{$ctrl.text.title}}

    +
    +
    +

    {{$ctrl.text.body}}

    +
    +
    + Annuleren + {{$ctrl.text.submit}} +
    From 6aa1ff0861604c53723d3d9d224fc4c1903a7b4c Mon Sep 17 00:00:00 2001 From: david Date: Fri, 4 Nov 2022 16:49:14 +0100 Subject: [PATCH 4/4] [UPS-4204] Fix typo --- app/scripts/activity/activity.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/activity/activity.controller.js b/app/scripts/activity/activity.controller.js index 2ffcd939..0ebeeff2 100644 --- a/app/scripts/activity/activity.controller.js +++ b/app/scripts/activity/activity.controller.js @@ -303,7 +303,7 @@ function ActivityController (passholder, passholders, bulkSelection, activitySer text: function () { return { title: 'Ben je zeker?', - body: 'Puntent sparen voor ' + controller.passholders.length + ' pashouders?', + body: 'Punten sparen voor ' + controller.passholders.length + ' pashouders?', submit: 'Punten sparen' }; }