Skip to content

[UNIONVMS-4866] Export activity module results to csv. #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Georgemanif wants to merge 3 commits into
base: sword-dev
Choose a base branch
from
Open

[UNIONVMS-4866] Export activity module results to csv. #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
063e57e
[UNIONVMS-4866] Add selection for exporting activities to csv.
Nov 4, 2020
5aa2ff4
[UNIONVMS-4866] Export trips to CSV.
Nov 16, 2020
dbe7fb1
[UNIONVMS-4866] Fix queries for csv export.
Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions unionvms-web/app/partial/activity/activityReportsList/activityReportsList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.activitiesCsvLoading">
<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}}
Expand All @@ -39,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>
Expand All @@ -51,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>
Expand All @@ -63,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>
Expand All @@ -75,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>
Expand All @@ -87,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>
Expand All @@ -99,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>
Expand All @@ -111,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>
Expand All @@ -123,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>
Expand Down Expand Up @@ -231,4 +237,4 @@
</div>
</div>
</div>
</div>
</div>
10 changes: 10 additions & 0 deletions unionvms-web/app/partial/activity/activityReportsList/activityReportsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
155 changes: 81 additions & 74 deletions unionvms-web/app/partial/activity/activityReportsList/activityReportsList.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
14 changes: 10 additions & 4 deletions unionvms-web/app/partial/activity/tripReportsList/tripReportsList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
15 changes: 12 additions & 3 deletions unionvms-web/app/partial/activity/tripReportsList/tripReportsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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){
Expand All @@ -49,7 +58,7 @@ angular.module('unionvmsWeb').controller('TripreportslistCtrl',function($scope,

/**
* Update the fishing activities column visibility settings
*
*
* @memberof ActivityreportslistCtrl
* @public
* @alias updateVisibilityCache
Expand Down
9 changes: 8 additions & 1 deletion unionvms-web/app/partial/activity/tripReportsList/tripReportsList.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand All @@ -60,4 +67,4 @@
.activity-trips-pagination {
padding-right: 10px;
}
}
}
Loading