From 063e57efcab966e1fec29a22392bc0b65bc3f7a4 Mon Sep 17 00:00:00 2001
From: gmanifavas <george.manifavas@sword-group.com>
Date: Wed, 4 Nov 2020 17:10:26 +0200
Subject: [PATCH 1/3] [UNIONVMS-4866] Add selection for exporting activities to
 csv.

---
 .../activityReportsList.html                  |   6 +
 .../activityReportsList.js                    |  10 ++
 .../activityReportsList.less                  | 155 +++++++++---------
 .../service/activity/activityRestService.js   |  12 ++
 .../app/service/activity/activityService.js   |  28 +++-
 5 files changed, 136 insertions(+), 75 deletions(-)

diff --git a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
index dc0ff7be3..373dd3dbb 100644
--- a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
+++ b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
@@ -13,6 +13,12 @@
 	<div class="col-md-12 buttonSection">
 		<div class="row">
 			<!-- COLUMNS BUTTON -->
+            <div class="col-md-2 nopaddingleft">
+                <dropdown class="activity-actions" ng-disabled="actServ.csvLoading" callback="selectFromDropdown" ng-model="selectionsDropdown.selection" initialtext="{{'common.actions' | i18n}}" items="dropdownItems" menu-style input-field-id="asset-dropdown-actions"></dropdown>
+            </div>
+            <div class="col-md-1 spinner" ng-if="actServ.csvLoading">
+                <i class="fa fa-spinner fa-spin loading-spinner"></i>
+            </div>
 			<div class="btn-group btn-left">
 				<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 						{{'activity.columns' | i18n}}
diff --git a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.js b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.js
index bdf0043fd..a1a6d406a 100644
--- a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.js
+++ b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.js
@@ -29,6 +29,16 @@ angular.module('unionvmsWeb').controller('ActivityreportslistCtrl',function($sco
     $scope.attrVisibility = visibilityService;
     $scope.visServ = visibilityService;
 
+    $scope.selectionsDropdown = {
+      'selection' : ''
+    };
+    $scope.dropdownItems = [{'text':'Export results to CSV','code':'EXPORT'}];
+    $scope.selectFromDropdown = function(selectedItem) {
+        if(selectedItem.code === 'EXPORT') {
+            activityService.exportActivityListToCsv();
+        }
+    };
+
     /**
      * Update the Activvity list
      *
diff --git a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.less b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.less
index 7bf03b0bb..48c3e5a55 100644
--- a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.less
+++ b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.less
@@ -1,74 +1,81 @@
-/*
-Developed with the contribution of the European Commission - Directorate General for Maritime Affairs and Fisheries
-© European Union, 2015-2016.
-
-This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The IFDM Suite is free software: you can
-redistribute it and/or modify it under the terms of the GNU General Public License as published by the
-Free Software Foundation, either version 3 of the License, or any later version. The IFDM Suite is distributed in
-the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details. You should have received a
-copy of the GNU General Public License along with the IFDM Suite. If not, see <http://www.gnu.org/licenses/>.
-*/
-.activityReportsList {
-    border: 1px solid #dddddd;
-    border-top: 0;
-    .buttonSection {
-        padding-left: 30px;
-        margin-top: 10px;
-        margin-bottom: 20px;
-        .dropdown-menu {
-            width: 300px;
-            max-width: 300px;
-            .row {
-                margin-right: 15px;
-                margin-left: 15px;
-                .checkbox {
-                    margin-top: 5px;
-                    margin-bottom: 5px;
-                }
-            }
-        }
-        .btn-left {
-            display: table-cell;
-            text-align: left;
-            button {
-                padding: 5px;
-                span {
-                    margin-left: 5px;
-                }
-            }
-        }
-        .btn-right {
-            display: table-cell;
-            text-align: right;
-            button {
-                text-transform: uppercase;
-            }
-        }
-    }
-    .table-responsive-force {
-        width: 100%;
-        overflow-y: hidden;
-        overflow-x: auto;
-        -ms-overflow-style: -ms-autohiding-scrollbar;
-        -webkit-overflow-scrolling: touch;
-        table > thead > tr > th {
-            position: relative;
-            padding: 8px;
-        }
-        .fa-trash-o, .fa-ban {
-            color: @errorColor;
-        }
-    }
-    .notSortable {
-        cursor: default;
-    }
-    .with-icon {
-        color: @primaryColor;
-        /*font-size: 16px;*/
-    }
-
-    .activity-reports-pagination {
-        padding-right: 10px;
-    }
-}
+/*
+Developed with the contribution of the European Commission - Directorate General for Maritime Affairs and Fisheries
+© European Union, 2015-2016.
+
+This file is part of the Integrated Fisheries Data Management (IFDM) Suite. The IFDM Suite is free software: you can
+redistribute it and/or modify it under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or any later version. The IFDM Suite is distributed in
+the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details. You should have received a
+copy of the GNU General Public License along with the IFDM Suite. If not, see <http://www.gnu.org/licenses/>.
+*/
+.activityReportsList {
+    border: 1px solid #dddddd;
+    border-top: 0;
+    .buttonSection {
+        padding-left: 30px;
+        margin-top: 10px;
+        margin-bottom: 20px;
+        .dropdown-menu {
+            width: 300px;
+            max-width: 300px;
+            .row {
+                margin-right: 15px;
+                margin-left: 15px;
+                .checkbox {
+                    margin-top: 5px;
+                    margin-bottom: 5px;
+                }
+            }
+        }
+        .btn-left {
+            display: table-cell;
+            text-align: left;
+            button {
+                padding: 5px;
+                span {
+                    margin-left: 5px;
+                }
+            }
+        }
+        .btn-right {
+            display: table-cell;
+            text-align: right;
+            button {
+                text-transform: uppercase;
+            }
+        }
+        .spinner {
+            height: 30px;
+            width: 30px;
+            padding-left: 15px;
+            padding-right: 45px;
+            margin-left: -15px;
+        }
+    }
+    .table-responsive-force {
+        width: 100%;
+        overflow-y: hidden;
+        overflow-x: auto;
+        -ms-overflow-style: -ms-autohiding-scrollbar;
+        -webkit-overflow-scrolling: touch;
+        table > thead > tr > th {
+            position: relative;
+            padding: 8px;
+        }
+        .fa-trash-o, .fa-ban {
+            color: @errorColor;
+        }
+    }
+    .notSortable {
+        cursor: default;
+    }
+    .with-icon {
+        color: @primaryColor;
+        /*font-size: 16px;*/
+    }
+
+    .activity-reports-pagination {
+        padding-right: 10px;
+    }
+}
diff --git a/unionvms-web/app/service/activity/activityRestService.js b/unionvms-web/app/service/activity/activityRestService.js
index e95b4d817..5b7959d9d 100644
--- a/unionvms-web/app/service/activity/activityRestService.js
+++ b/unionvms-web/app/service/activity/activityRestService.js
@@ -153,6 +153,9 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
                    }
                }
             });
+        },
+        exportActivityListToCsv: function (query) {
+            return $http.post('activity/rest/csv/', query);
         }
     };
 
@@ -397,6 +400,15 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
                 deferred.reject(error);
             });
             return deferred.promise;
+        },
+        exportActivityListToCsv: function (query) {
+            return activityRestFactory.exportActivityListToCsv(query).then(
+                function (response) {
+                    return response.data;
+                }, function () {
+                    console.error('Failed to export activities to CSV');
+                    return {};
+            });
         }
     };
 
diff --git a/unionvms-web/app/service/activity/activityService.js b/unionvms-web/app/service/activity/activityService.js
index 6f90c0b06..96b55c816 100644
--- a/unionvms-web/app/service/activity/activityService.js
+++ b/unionvms-web/app/service/activity/activityService.js
@@ -32,7 +32,7 @@ copy of the GNU General Public License along with the IFDM Suite. If not, see <h
  * @description
  *  A service to deal with all activity data
  */
-angular.module('unionvmsWeb').factory('activityService',function(locale, activityRestService, visibilityService, breadcrumbService, fishingActivityService) {
+angular.module('unionvmsWeb').factory('activityService',function(locale, activityRestService, visibilityService, breadcrumbService, fishingActivityService, $window) {
     var actServ = {};
     var pageSize = 25;
     var tableNames = ['reportsList','tripsList'];
@@ -506,5 +506,31 @@ angular.module('unionvmsWeb').factory('activityService',function(locale, activit
         return comboList;
     };
 
+    actServ.csvLoading = false;
+
+    actServ.exportActivityListToCsv = function() {
+        actServ.csvLoading = true;
+
+        var simpleCriteria = {};
+        if (angular.isDefined(actServ['reportsList'].searchObject.simpleCriteria)){
+            simpleCriteria = actServ['reportsList'].searchObject.simpleCriteria;
+        }
+
+        var payload = {
+            pagination: getPaginationForServer(undefined),
+            sorting: actServ['reportsList'].sorting,
+            searchCriteriaMap: simpleCriteria,
+            searchCriteriaMapMultipleValues: actServ['reportsList'].searchObject.multipleCriteria,
+            showOnlyLatest: true
+        };
+        activityRestService.exportActivityListToCsv(payload).then(function (data) {
+            if(!angular.equals({}, data)) {
+                var file = new Blob([data], {type: 'text/csv;charset=UTF-8'});
+                $window.saveAs(file, "csvExport" + moment().format("YYYY-MM-DDTHH:mm") + ".csv");
+            }
+            actServ.csvLoading = false;
+        })
+    };
+
 	return actServ;
 });

From 5aa2ff436b1381092411f469bd6e835038eba61f Mon Sep 17 00:00:00 2001
From: gmanifavas <george.manifavas@sword-group.com>
Date: Mon, 16 Nov 2020 12:04:22 +0200
Subject: [PATCH 2/3] [UNIONVMS-4866] Export trips to CSV.

---
 .../activityReportsList.html                  | 22 +++++-----
 .../tripReportsList/tripReportsList.html      | 14 ++++--
 .../tripReportsList/tripReportsList.js        | 15 +++++--
 .../tripReportsList/tripReportsList.less      |  9 +++-
 .../service/activity/activityRestService.js   | 44 ++++++++++++-------
 .../app/service/activity/activityService.js   | 31 +++++++++++--
 6 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
index 373dd3dbb..664d9e10b 100644
--- a/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
+++ b/unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
@@ -14,9 +14,9 @@
 		<div class="row">
 			<!-- COLUMNS BUTTON -->
             <div class="col-md-2 nopaddingleft">
-                <dropdown class="activity-actions" ng-disabled="actServ.csvLoading" callback="selectFromDropdown" ng-model="selectionsDropdown.selection" initialtext="{{'common.actions' | i18n}}" items="dropdownItems" menu-style input-field-id="asset-dropdown-actions"></dropdown>
+                <dropdown class="activity-actions" ng-disabled="actServ.activitiesCsvLoading" callback="selectFromDropdown" ng-model="selectionsDropdown.selection" initialtext="{{'common.actions' | i18n}}" items="dropdownItems" menu-style input-field-id="asset-dropdown-actions"></dropdown>
             </div>
-            <div class="col-md-1 spinner" ng-if="actServ.csvLoading">
+            <div class="col-md-1 spinner" ng-if="actServ.activitiesCsvLoading">
                 <i class="fa fa-spinner fa-spin loading-spinner"></i>
             </div>
 			<div class="btn-group btn-left">
@@ -45,7 +45,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.purposeCode" ng-change="updateVisibilityCache('purposeCode')">{{'activity.header_fa_purpose_code' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.purposeCode" ng-change="updateVisibilityCache('purposeCode')">{{'activity.header_fa_purpose_code' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -57,7 +57,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.fromName" ng-change="updateVisibilityCache('fromName')">{{'activity.header_fa_from_name' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.fromName" ng-change="updateVisibilityCache('fromName')">{{'activity.header_fa_from_name' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -69,7 +69,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.endDate" ng-change="updateVisibilityCache('endDate')">{{'activity.header_fa_end_date' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.endDate" ng-change="updateVisibilityCache('endDate')">{{'activity.header_fa_end_date' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -81,7 +81,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.ircs" ng-change="updateVisibilityCache('ircs')">{{'spatial.reports_form_vessel_search_table_header_ircs' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.ircs" ng-change="updateVisibilityCache('ircs')">{{'spatial.reports_form_vessel_search_table_header_ircs' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -93,7 +93,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.uvi" ng-change="updateVisibilityCache('uvi')">{{'activity.header_fa_uvi' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.uvi" ng-change="updateVisibilityCache('uvi')">{{'activity.header_fa_uvi' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -105,7 +105,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.gfcm" ng-change="updateVisibilityCache('gfcm')">{{'activity.header_fa_gfcm' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.gfcm" ng-change="updateVisibilityCache('gfcm')">{{'activity.header_fa_gfcm' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -117,7 +117,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.port" ng-change="updateVisibilityCache('port')">{{'activity.header_fa_port' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.port" ng-change="updateVisibilityCache('port')">{{'activity.header_fa_port' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -129,7 +129,7 @@
 						</div>
 						<div class="checkbox col-md-6">
 							<label>
-								<input type="checkbox" ng-model="visServ.fishingActivities.speciesCode" ng-change="updateVisibilityCache('speciesCode')">{{'activity.header_fa_species' | i18n }} 
+								<input type="checkbox" ng-model="visServ.fishingActivities.speciesCode" ng-change="updateVisibilityCache('speciesCode')">{{'activity.header_fa_species' | i18n }}
 								</label>
 						</div>
 					</div>
@@ -237,4 +237,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.html b/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.html
index 90a169007..41ba4488b 100644
--- a/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.html
+++ b/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.html
@@ -1,6 +1,12 @@
 <div class="tripReportsList" ng-controller="TripreportslistCtrl">
 	<div class="col-md-12 buttonSection">
 		<div class="row">
+            <div class="col-md-2 nopaddingleft">
+                <dropdown class="activity-actions" ng-disabled="actServ.tripsCsvLoading" callback="selectFromDropdown" ng-model="selectionsDropdown.selection" initialtext="{{'common.actions' | i18n}}" items="dropdownItems" menu-style input-field-id="asset-dropdown-actions"></dropdown>
+            </div>
+            <div class="col-md-1 spinner" ng-if="actServ.tripsCsvLoading">
+                <i class="fa fa-spinner fa-spin loading-spinner"></i>
+            </div>
 			<div class="btn-group btn-left">
 			<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 				{{'activity.columns' | i18n}}
@@ -31,7 +37,7 @@
 					<div class="checkbox col-md-6">
 						<label>
 							<input type="checkbox" ng-model="attrVisibility.trips.ircs" ng-change="updateVisibilityCache('ircs')">
-							{{'spatial.reports_form_vessel_search_table_header_ircs' | i18n }} 
+							{{'spatial.reports_form_vessel_search_table_header_ircs' | i18n }}
 						</label>
 					</div>
 				</div>
@@ -59,14 +65,14 @@
 					<div class="checkbox col-md-6">
 						<label>
 							<input type="checkbox" ng-model="attrVisibility.trips.gfcm" ng-change="updateVisibilityCache('gfcm')">
-							{{'activity.fa_details_item_gfcm' | i18n }} 
+							{{'activity.fa_details_item_gfcm' | i18n }}
 						</label>
 					</div>
 				</div>
 				<div class="row">
 					<div class="checkbox col-md-6">
 						<label>
-							<input type="checkbox" ng-model="attrVisibility.trips.firstEventType" ng-change="updateVisibilityCache('firstEventType')"> 
+							<input type="checkbox" ng-model="attrVisibility.trips.firstEventType" ng-change="updateVisibilityCache('firstEventType')">
 							{{'activity.tab_trip_table_header_first_event' | i18n }}
 						</label>
 					</div>
@@ -95,7 +101,7 @@
 					<div class="checkbox col-md-6">
 						<label>
 							<input type="checkbox" ng-model="attrVisibility.trips.duration" ng-change="updateVisibilityCache('duration')">
-							{{'activity.tab_trip_table_header_duration' | i18n }} 
+							{{'activity.tab_trip_table_header_duration' | i18n }}
 						</label>
 					</div>
 					<div class="checkbox col-md-6">
diff --git a/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.js b/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.js
index acfba346a..fd1aae900 100644
--- a/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.js
+++ b/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.js
@@ -21,7 +21,7 @@ copy of the GNU General Public License along with the IFDM Suite. If not, see <h
  * @description
  *  The controller for the fisihing trips reports table list
  */
-angular.module('unionvmsWeb').controller('TripreportslistCtrl',function($scope, tripSummaryService, visibilityService, $stateParams){
+angular.module('unionvmsWeb').controller('TripreportslistCtrl',function($scope, tripSummaryService, activityService, visibilityService, $stateParams){
 
     $scope.isTripFilterVisible = false;
     $scope.startDate = undefined;
@@ -30,7 +30,16 @@ angular.module('unionvmsWeb').controller('TripreportslistCtrl',function($scope,
     $scope.tripSummServ = tripSummaryService;
     $scope.activityTypes = [];
     var stLastTableState;
-   
+
+    $scope.selectionsDropdown = {
+        'selection' : ''
+    };
+    $scope.dropdownItems = [{'text':'Export results to CSV','code':'EXPORT'}];
+    $scope.selectFromDropdown = function(selectedItem) {
+        if(selectedItem.code === 'EXPORT') {
+            activityService.exportTripListToCsv();
+        }
+    };
 
     $scope.updateTripsList = function(tableState, ctrl){
       if (angular.isUndefined($stateParams.tripId) || $stateParams.tripId === null){
@@ -49,7 +58,7 @@ angular.module('unionvmsWeb').controller('TripreportslistCtrl',function($scope,
 
      /**
      * Update the fishing activities column visibility settings
-     *  
+     *
      * @memberof ActivityreportslistCtrl
      * @public
      * @alias updateVisibilityCache
diff --git a/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.less b/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.less
index d691f904f..6ede8cb89 100644
--- a/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.less
+++ b/unionvms-web/app/partial/activity/tripReportsList/tripReportsList.less
@@ -35,6 +35,13 @@
                 text-transform: uppercase;
             }
         }
+        .spinner {
+            height: 30px;
+            width: 30px;
+            padding-left: 15px;
+            padding-right: 45px;
+            margin-left: -15px;
+        }
     }
     .table-responsive-force {
         width: 100%;
@@ -60,4 +67,4 @@
     .activity-trips-pagination {
         padding-right: 10px;
     }
-}
\ No newline at end of file
+}
diff --git a/unionvms-web/app/service/activity/activityRestService.js b/unionvms-web/app/service/activity/activityRestService.js
index 5b7959d9d..64877eeaa 100644
--- a/unionvms-web/app/service/activity/activityRestService.js
+++ b/unionvms-web/app/service/activity/activityRestService.js
@@ -14,7 +14,7 @@ copy of the GNU General Public License along with the IFDM Suite. If not, see <h
  * @ngdoc service
  * @name activityRestFactory
  * @param $resource {service} angular resource service
- * @param $http {service} angular http service 
+ * @param $http {service} angular http service
  * @description
  *  REST factory for the activity module
  */
@@ -155,7 +155,10 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
             });
         },
         exportActivityListToCsv: function (query) {
-            return $http.post('activity/rest/csv/', query);
+            return $http.post('activity/rest/csv/activities/', query);
+        },
+        exportTripListToCsv: function (query) {
+            return $http.post('activity/rest/csv/trips/', query);
         }
     };
 
@@ -165,7 +168,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
  * @ngdoc service
  * @name activityRestService
  * @param $q {service} angular $q service
- * @param activityRestFactory {service} The REST factory for the activity module <p>{@link unionvmsWeb.activityRestFactory}</p> 
+ * @param activityRestFactory {service} The REST factory for the activity module <p>{@link unionvmsWeb.activityRestFactory}</p>
  * @description
  *  REST services for the activity module
  */
@@ -173,7 +176,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
     var activityService = {
         /**
          * Get the user preferences for the activty module
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @returns {Promise} A promise with either the user preferences of the activity module or reject error
@@ -190,7 +193,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get a list of fishing activity reports according to search criteria
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @param {Object} data - The search criteria and table pagination data object
@@ -228,7 +231,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
 	     * Get the history for a FA report
-         * 
+         *
     	 * @memberof activityRestService
 	     * @public
          * @param {Number} refId - The reference ID
@@ -264,7 +267,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get the vessel and roles details of a specific trip
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @param {String} id - The trip id of the selected trip
@@ -281,7 +284,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get the message type count of a specific trip
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @param {String} id - The trip id of the selected trip
@@ -298,7 +301,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get the trip reports of a specific trip
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @param {String} id - The trip id of the selected trip
@@ -315,7 +318,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get the trip map data
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @param {String} id - The trip id of the selected trip
@@ -348,8 +351,8 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
             return deferred.promise;
         },
         /**
-         * Get the Catches Evolution Details. 
-         * 
+         * Get the Catches Evolution Details.
+         *
          * @memberof activityRestService
          * @public
          * @param {String} id - The trip id of the selected trip
@@ -367,11 +370,11 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get Fishing Activity details by type
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @param {String} type - The fisihing activity type (e.g. departure, landing, arrival)
-         * @param {Object} payload - The post payload containing the activity id (mandatory) and the trip id (not mandatory and to be used only in the report tab) 
+         * @param {Object} payload - The post payload containing the activity id (mandatory) and the trip id (not mandatory and to be used only in the report tab)
          * @returns {Promise}  A promise with either the fishing activity details or reject error
          */
         getFishingActivityDetails: function(type, payload){
@@ -387,7 +390,7 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
         },
         /**
          * Get commchannels data
-         * 
+         *
          * @memberof activityRestService
          * @public
          * @returns {Promise}  A promise with either the fishing activity details or reject error
@@ -408,7 +411,16 @@ angular.module('unionvmsWeb').factory('activityRestFactory', function ($resource
                 }, function () {
                     console.error('Failed to export activities to CSV');
                     return {};
-            });
+                });
+        },
+        exportTripListToCsv: function (query) {
+            return activityRestFactory.exportTripListToCsv(query).then(
+                function (response) {
+                    return response.data;
+                }, function () {
+                    console.error('Failed to export trips to CSV');
+                    return {};
+                });
         }
     };
 
diff --git a/unionvms-web/app/service/activity/activityService.js b/unionvms-web/app/service/activity/activityService.js
index 96b55c816..c3ed4cc42 100644
--- a/unionvms-web/app/service/activity/activityService.js
+++ b/unionvms-web/app/service/activity/activityService.js
@@ -506,10 +506,11 @@ angular.module('unionvmsWeb').factory('activityService',function(locale, activit
         return comboList;
     };
 
-    actServ.csvLoading = false;
+    actServ.activitiesCsvLoading = false;
+    actServ.tripsCsvLoading = false;
 
     actServ.exportActivityListToCsv = function() {
-        actServ.csvLoading = true;
+        actServ.activitiesCsvLoading = true;
 
         var simpleCriteria = {};
         if (angular.isDefined(actServ['reportsList'].searchObject.simpleCriteria)){
@@ -528,7 +529,31 @@ angular.module('unionvmsWeb').factory('activityService',function(locale, activit
                 var file = new Blob([data], {type: 'text/csv;charset=UTF-8'});
                 $window.saveAs(file, "csvExport" + moment().format("YYYY-MM-DDTHH:mm") + ".csv");
             }
-            actServ.csvLoading = false;
+            actServ.activitiesCsvLoading = false;
+        })
+    };
+
+    actServ.exportTripListToCsv = function() {
+        actServ.tripsCsvLoading = true;
+
+        var simpleCriteria = {};
+        if (angular.isDefined(actServ['tripsList'].searchObject.simpleCriteria)){
+            simpleCriteria = actServ['tripsList'].searchObject.simpleCriteria;
+        }
+
+        var payload = {
+            pagination: getPaginationForServer(undefined),
+            sorting: actServ['tripsList'].sorting,
+            searchCriteriaMap: simpleCriteria,
+            searchCriteriaMapMultipleValues: actServ['tripsList'].searchObject.multipleCriteria,
+            showOnlyLatest: true
+        };
+        activityRestService.exportTripListToCsv(payload).then(function (data) {
+            if(!angular.equals({}, data)) {
+                var file = new Blob([data], {type: 'text/csv;charset=UTF-8'});
+                $window.saveAs(file, "csvExport" + moment().format("YYYY-MM-DDTHH:mm") + ".csv");
+            }
+            actServ.tripsCsvLoading = false;
         })
     };
 

From dbe7fb17b582ede21e6fc0a7473b9e46f90227b2 Mon Sep 17 00:00:00 2001
From: gmanifavas <george.manifavas@sword-group.com>
Date: Wed, 18 Nov 2020 14:26:29 +0200
Subject: [PATCH 3/3] [UNIONVMS-4866] Fix queries for csv export.

---
 unionvms-web/app/service/activity/activityService.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/unionvms-web/app/service/activity/activityService.js b/unionvms-web/app/service/activity/activityService.js
index c3ed4cc42..85fd3c27d 100644
--- a/unionvms-web/app/service/activity/activityService.js
+++ b/unionvms-web/app/service/activity/activityService.js
@@ -545,8 +545,7 @@ angular.module('unionvmsWeb').factory('activityService',function(locale, activit
             pagination: getPaginationForServer(undefined),
             sorting: actServ['tripsList'].sorting,
             searchCriteriaMap: simpleCriteria,
-            searchCriteriaMapMultipleValues: actServ['tripsList'].searchObject.multipleCriteria,
-            showOnlyLatest: true
+            searchCriteriaMapMultipleValues: actServ['tripsList'].searchObject.multipleCriteria
         };
         activityRestService.exportTripListToCsv(payload).then(function (data) {
             if(!angular.equals({}, data)) {