diff --git a/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceDownloadHandler.java b/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceDownloadHandler.java index 7cd430b2a73..7cfc3ea725d 100644 --- a/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceDownloadHandler.java +++ b/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceDownloadHandler.java @@ -5,9 +5,11 @@ import org.apache.commons.lang.StringUtils; import org.fao.geonet.Util; +import org.fao.geonet.constants.Geonet; import org.fao.geonet.domain.*; import org.fao.geonet.repository.*; import org.fao.geonet.utils.BinaryFile; +import org.fao.geonet.utils.Log; import org.jdom.Element; import java.io.*; @@ -34,14 +36,15 @@ public Element onDownload(ServiceContext context, Element params, int metadataId return BinaryFile.encode(200, file.getAbsolutePath()); } catch (Exception ex) { - // TODO: Log exception + Log.error(Geonet.RESOURCES, "DefaultResourceDownloadHandler (onDownload): " + ex.getMessage()); ex.printStackTrace(); throw new ResourceHandlerException(ex); } } @Override - public Element onDownloadMultiple(ServiceContext context, Element params, int metadataId, List files) throws ResourceHandlerException { + public Element onDownloadMultiple(ServiceContext context, Element params, int metadataId, List files) + throws ResourceHandlerException { try { String requesterName = Util.getParam(params, "name", ""); @@ -79,7 +82,7 @@ public Element onDownloadMultiple(ServiceContext context, Element params, int me return null; } catch (Exception ex) { - // TODO: Log exception + Log.error(Geonet.RESOURCES, "DefaultResourceDownloadHandler (onDownloadMultiple): " + ex.getMessage()); ex.printStackTrace(); throw new ResourceHandlerException(ex); } @@ -97,17 +100,26 @@ public Element onDownloadMultiple(ServiceContext context, Element params, int me * @param requesterOrg * @param requesterComments * @param downloadDate - * @throws ResourceHandlerException */ private void storeFileDownloadRequest(ServiceContext context, int metadataId, String fname, String requesterName, String requesterMail, String requesterOrg, String requesterComments, - String downloadDate) throws ResourceHandlerException { + String downloadDate) { + MetadataFileUpload metadataFileUpload; + + // Each download is related to a file upload record try { - // Each download is related to a file upload record - MetadataFileUpload metadataFileUpload = context.getBean(MetadataFileUploadRepository.class). + metadataFileUpload = context.getBean(MetadataFileUploadRepository.class). findByMetadataIdAndFileNameNotDeleted(metadataId, fname); + } catch (org.springframework.dao.EmptyResultDataAccessException ex) { + Log.warning(Geonet.RESOURCES, "Store file download request: No upload request for (metadataid, file): (" + metadataId + "," + fname + ")"); + + // No related upload is found + metadataFileUpload = null; + } + + if (metadataFileUpload != null) { MetadataFileDownloadRepository repo = context.getBean(MetadataFileDownloadRepository.class); MetadataFileDownload metadataFileDownload = new MetadataFileDownload(); @@ -124,11 +136,6 @@ private void storeFileDownloadRequest(ServiceContext context, int metadataId, St metadataFileDownload.setFileUploadId(metadataFileUpload.getId()); repo.save(metadataFileDownload); - - } catch (Exception ex) { - // TODO: Log exception - ex.printStackTrace(); - throw new ResourceHandlerException(ex); } } } diff --git a/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceRemoveHandler.java b/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceRemoveHandler.java index 09e3a0c3466..20b67d84031 100644 --- a/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceRemoveHandler.java +++ b/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceRemoveHandler.java @@ -24,11 +24,13 @@ package org.fao.geonet.services.resources.handlers; import jeeves.server.context.ServiceContext; +import org.fao.geonet.constants.Geonet; import org.fao.geonet.domain.ISODate; import org.fao.geonet.domain.MetadataFileUpload; import org.fao.geonet.exceptions.OperationAbortedEx; import org.fao.geonet.lib.Lib; import org.fao.geonet.repository.MetadataFileUploadRepository; +import org.fao.geonet.utils.Log; import org.jdom.Element; import java.io.File; @@ -58,7 +60,7 @@ public void onDelete(ServiceContext context, Element params, int metadataId, storeFileUploadDeleteRequest(context, metadataId, fileName); } catch (Exception ex) { - // TODO: Log exception + Log.error(Geonet.RESOURCES, "DefaultResourceRemoveHandler (onDelete): " + ex.getMessage()); ex.printStackTrace(); throw new ResourceHandlerException(ex); } @@ -70,16 +72,18 @@ public void onDelete(ServiceContext context, Element params, int metadataId, * @param context * @param metadataId * @param fileName - * @throws java.sql.SQLException */ private void storeFileUploadDeleteRequest(ServiceContext context, int metadataId, String fileName) { MetadataFileUploadRepository repo = context.getBean(MetadataFileUploadRepository.class); - MetadataFileUpload metadataFileUpload = repo.findByMetadataIdAndFileNameNotDeleted(metadataId, fileName); - if (metadataFileUpload != null) { - metadataFileUpload.setDeletedDate(new ISODate().toString()); + try { + MetadataFileUpload metadataFileUpload = repo.findByMetadataIdAndFileNameNotDeleted(metadataId, fileName); + metadataFileUpload.setDeletedDate(new ISODate().toString()); + + repo.save(metadataFileUpload); - repo.save(metadataFileUpload); - } + } catch (org.springframework.dao.EmptyResultDataAccessException ex) { + Log.warning(Geonet.RESOURCES, "Delete file upload request: No upload request for (metadataid, file): (" + metadataId + "," + fileName + ")"); + } } } diff --git a/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceUploadHandler.java b/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceUploadHandler.java index 317138b1b1b..a11854505c4 100644 --- a/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceUploadHandler.java +++ b/services/src/main/java/org/fao/geonet/services/resources/handlers/DefaultResourceUploadHandler.java @@ -26,11 +26,13 @@ import jeeves.server.context.ServiceContext; import org.apache.commons.io.FileUtils; import org.fao.geonet.Util; +import org.fao.geonet.constants.Geonet; import org.fao.geonet.constants.Params; import org.fao.geonet.domain.*; import org.fao.geonet.lib.Lib; import org.fao.geonet.repository.MetadataFileUploadRepository; import org.fao.geonet.utils.IO; +import org.fao.geonet.utils.Log; import org.jdom.Element; import java.io.File; @@ -59,7 +61,7 @@ public void onUpload(ServiceContext context, Element params, storeFileUploadRequest(context, metadataId, fileName, fileSize); } catch (Exception ex) { - // TODO: Log exception + Log.error(Geonet.RESOURCES, "DefaultResourceUploadHandler (onUpload): " + ex.getMessage()); ex.printStackTrace(); throw new ResourceHandlerException(ex); } @@ -71,7 +73,6 @@ public void onUpload(ServiceContext context, Element params, * @param context * @param metadataId * @param fileName - * @throws java.sql.SQLException */ private void storeFileUploadRequest(ServiceContext context, int metadataId, String fileName, double fileSize) { MetadataFileUploadRepository repo = context.getBean(MetadataFileUploadRepository.class); diff --git a/web-ui/src/main/resources/catalog/js/admin/AdminController.js b/web-ui/src/main/resources/catalog/js/admin/AdminController.js index c4571e97b7b..b1f65d9be42 100644 --- a/web-ui/src/main/resources/catalog/js/admin/AdminController.js +++ b/web-ui/src/main/resources/catalog/js/admin/AdminController.js @@ -3,22 +3,33 @@ + + + + + + + + + + goog.require('gn_adminmetadata_controller'); goog.require('gn_admintools_controller'); goog.require('gn_cat_controller'); goog.require('gn_classification_controller'); goog.require('gn_dashboard_controller'); goog.require('gn_harvest_controller'); + goog.require('gn_report_controller'); goog.require('gn_settings_controller'); goog.require('gn_standards_controller'); goog.require('gn_usergroup_controller'); - goog.require('gn_report_controller'); var module = angular.module('gn_admin_controller', ['gn_dashboard_controller', 'gn_usergroup_controller', 'gn_admintools_controller', 'gn_settings_controller', 'gn_adminmetadata_controller', 'gn_classification_controller', - 'gn_harvest_controller', 'gn_standards_controller', 'gn_report_controller']); + 'gn_harvest_controller', 'gn_standards_controller', + 'gn_report_controller']); var tplFolder = '../../catalog/templates/admin/'; @@ -83,8 +94,8 @@ templateUrl: tplFolder + 'page-layout.html', controller: 'GnStandardsController'}). when('/reports', { - templateUrl: tplFolder + 'page-layout.html', - controller: 'GnReportController'}). + templateUrl: tplFolder + 'page-layout.html', + controller: 'GnReportController'}). when('/reports/:tab', { templateUrl: tplFolder + 'page-layout.html', controller: 'GnReportController'}). @@ -111,10 +122,11 @@ classes: 'btn-primary', icon: 'fa-cloud-download'}, {name: 'statisticsAndStatus', route: '#dashboard', classes: 'btn-success', icon: 'fa-dashboard'}, - {name: 'usersAndGroups', route: '#organization', - classes: 'btn-default', icon: 'fa-group'}, {name: 'reports', route: '#reports', - classes: 'btn-success', icon: 'fa-file-text-o'} + classes: 'btn-success', icon: 'fa-file-text-o'}, + {name: 'usersAndGroups', route: '#organization', + classes: 'btn-default', icon: 'fa-group'} + ]; $scope.menu = { UserAdmin: userAdminMenu, @@ -131,6 +143,8 @@ classes: 'btn-primary', icon: 'fa-cloud-download'}, {name: 'statisticsAndStatus', route: '#dashboard', classes: 'btn-success', icon: 'fa-dashboard'}, + {name: 'reports', route: '#reports', + classes: 'btn-success', icon: 'fa-file-text-o'}, {name: 'classificationSystems', route: '#classification', classes: 'btn-info', icon: 'fa-tags'}, {name: 'standards', route: '#standards', @@ -140,9 +154,7 @@ {name: 'settings', route: '#settings', classes: 'btn-warning', icon: 'fa-gear'}, {name: 'tools', route: '#tools', - classes: 'btn-warning', icon: 'fa-medkit'}, - {name: 'reports', route: '#reports', - classes: 'btn-success', icon: 'fa-file-text-o'}] + classes: 'btn-warning', icon: 'fa-medkit'}] // TODO : add other role menu }; diff --git a/web-ui/src/main/resources/catalog/js/admin/ReportController.js b/web-ui/src/main/resources/catalog/js/admin/ReportController.js index b06621d7488..ddbce5a09bc 100644 --- a/web-ui/src/main/resources/catalog/js/admin/ReportController.js +++ b/web-ui/src/main/resources/catalog/js/admin/ReportController.js @@ -1,9 +1,8 @@ -(function () { +(function() { goog.provide('gn_report_controller'); var module = angular.module('gn_report_controller', - []); - + []); /** * ReportController provides all necessary operations @@ -11,52 +10,52 @@ */ module.controller('GnReportController', [ '$scope', '$routeParams', '$http', '$rootScope', '$translate', - function ($scope, $routeParams, $http, $rootScope, $translate) { + function($scope, $routeParams, $http, $rootScope, $translate) { $scope.pageMenu = { folder: 'report/', defaultTab: 'report-updated-metadata', tabs: - [{ - type: 'report-updated-metadata', - label: 'reportUpdatedMetadata', - icon: 'fa-th', - href: '#/reports/report-updated-metadata' - },{ - type: 'report-internal-metadata', - label: 'reportInternalMetadata', - icon: 'fa-th', - href: '#/reports/report-internal-metadata' - },{ - type: 'report-fileupload-metadata', - label: 'reportFileUploadMetadata', - icon: 'fa-th', - href: '#/reports/report-fileupload-metadata' - },{ - type: 'report-filedownload-metadata', - label: 'reportFileDownloadMetadata', - icon: 'fa-th', - href: '#/reports/report-filedownload-metadata' - },{ - type: 'report-users', - label: 'reportUsers', - icon: 'fa-th', - href: '#/reports/report-users' - }] + [{ + type: 'report-updated-metadata', + label: 'reportUpdatedMetadata', + icon: 'fa-th', + href: '#/reports/report-updated-metadata' + },{ + type: 'report-internal-metadata', + label: 'reportInternalMetadata', + icon: 'fa-th', + href: '#/reports/report-internal-metadata' + },{ + type: 'report-fileupload-metadata', + label: 'reportFileUploadMetadata', + icon: 'fa-th', + href: '#/reports/report-fileupload-metadata' + },{ + type: 'report-filedownload-metadata', + label: 'reportFileDownloadMetadata', + icon: 'fa-th', + href: '#/reports/report-filedownload-metadata' + },{ + type: 'report-users', + label: 'reportUsers', + icon: 'fa-th', + href: '#/reports/report-users' + }] }; $scope.groups = null; $scope.report = {}; - $scope.report.suggestedDate = ""; + $scope.report.suggestedDate = ''; - $scope.report.dateFrom = getCurrentDate(); - $scope.report.dateTo = getCurrentDate(); + $scope.report.dateFrom = moment().format('YYYY-MM-DD'); + $scope.report.dateTo = moment().format('YYYY-MM-DD'); /** * Creates the records updated report */ - $scope.createReport = function (formId, service) { + $scope.createReport = function(formId, service) { $http({ method: 'POST', url: service, @@ -66,78 +65,71 @@ } }) .success(function(data) { - // Download the csv file. The AngularJs friendly way! - var element = angular.element(''); - element.attr({ - href: 'data:attachment/csv;charset=utf-8,' + encodeURI(data), - target: '_blank', - download: service - })[0].click(); - - }) + // Download the csv file. The AngularJs friendly way! + var element = angular.element(''); + element.attr({ + href: 'data:attachment/csv;charset=utf-8,' + encodeURI(data), + target: '_blank', + download: service + })[0].click(); + + }); }; /** - * Listener for suggested date range selection to update the date controls with the date range selected. + * Listener for suggested date range selection to update + * the date controls with the date range selected. */ $scope.$watch( - "report.suggestedDate", - function( newValue, oldValue ) { - - // Ignore empty value, initial setup and if form already mirrors new value. - if ((newValue === "") || (newValue === oldValue) || ($scope.report.suggestedDate.value === newValue)) { - return; - } - - // Calculate the dateFrom and dateTo values - var today = new Date(); + 'report.suggestedDate', + function(newValue, oldValue) { - if (newValue === "currentMonth") { - var month = (today.getMonth() + 1 < 10) ? "0" + (today.getMonth() + 1) : (today.getMonth() + 1) - var year = today.getFullYear(); + // Ignore empty value: in initial setup and + // if form already mirrors new value. + if ((newValue === '') || (newValue === oldValue) || + ($scope.report.suggestedDate.value === newValue)) { + return; + } - $scope.report.dateFrom = year + "-" + month + "-" + "01";; - $scope.report.dateTo = year + "-" + month + "-" + daysInMonth(today.getMonth(), today.getYear()); + // Calculate the dateFrom and dateTo values + var today = moment(); - } else if (newValue === "previousMonth") { - // Set previous month - today.setMonth(today.getMonth() - 1); + if (newValue === 'currentMonth') { + var month = today.format('MM'); + var year = today.format('YYYY'); - var month = (today.getMonth() + 1 < 10) ? "0" + (today.getMonth() + 1) : (today.getMonth() + 1) - var year = today.getFullYear(); + $scope.report.dateFrom = year + '-' + month + '-' + '01'; + $scope.report.dateTo = year + '-' + month + '-' + + today.daysInMonth(); - $scope.report.dateFrom = year + "-" + month + "-" + "01"; // + "T00:00:00.000Z"; - $scope.report.dateTo = year + "-" + month + "-" + daysInMonth(today.getMonth(), today.getYear()); + } else if (newValue === 'previousMonth') { + // Set previous month + today.add('months', -1); - } else if (newValue == "currentYear") { - var year = today.getFullYear(); + var month = today.format('MM'); + var year = today.format('YYYY'); - $scope.report.dateFrom = year + "-" + "01" + "-" + "01"; - $scope.report.dateTo = year + "-" + "12" + "-" + "31"; + $scope.report.dateFrom = year + '-' + month + '-' + '01'; + $scope.report.dateTo = year + '-' + month + '-' + + today.daysInMonth(); - } else if (newValue == "previousYear") { - // Set previous year - var year = today.getFullYear() -1 ; + } else if (newValue == 'currentYear') { + var year = today.format('YYYY'); - $scope.report.dateFrom = year + "-" + "01" + "-" + "01"; - $scope.report.dateTo = year + "-" + "12" + "-" + "31"; + $scope.report.dateFrom = year + '-' + '01' + '-' + '01'; + $scope.report.dateTo = year + '-' + '12' + '-' + '31'; - } - }); + } else if (newValue == 'previousYear') { + // Set previous year + today.add('year', -1); - // http://dzone.com/snippets/determining-number-days-month - function daysInMonth(iMonth, iYear) { - return 32 - new Date(iYear, iMonth, 32).getDate(); - } + var year = today.format('YYYY'); - function getCurrentDate() { - var today = new Date(); - var day = (today.getDate() < 10) ? ("0" + today.getDate()) : (today.getDate()); - var month = (today.getMonth() + 1 < 10) ? "0" + (today.getMonth() + 1) : (today.getMonth() + 1); - var year = today.getFullYear(); + $scope.report.dateFrom = year + '-' + '01' + '-' + '01'; + $scope.report.dateTo = year + '-' + '12' + '-' + '31'; - return year + "-" + month + "-" + day; - } + } + }); function loadGroups() { $http.get('admin.group.list@json').success(function(data) { diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml b/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml index 4b7f38379ad..87563b6de68 100644 --- a/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml +++ b/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml @@ -650,11 +650,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans - - - diff --git a/web/src/main/webapp/WEB-INF/config/config-service-reports.xml b/web/src/main/webapp/WEB-INF/config/config-service-reports.xml index 1872a72d1ab..a053489bdf1 100644 --- a/web/src/main/webapp/WEB-INF/config/config-service-reports.xml +++ b/web/src/main/webapp/WEB-INF/config/config-service-reports.xml @@ -3,43 +3,84 @@ - - - - - + - + + + - + - + + + - + - + + + - + - + + + - + - + + + diff --git a/web/src/main/webapp/loc/ara/xml/reports.xml b/web/src/main/webapp/loc/ara/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/ara/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/ara/xml/strings.xml b/web/src/main/webapp/loc/ara/xml/strings.xml index 6d6fda50ecd..ca633ef7a7b 100644 --- a/web/src/main/webapp/loc/ara/xml/strings.xml +++ b/web/src/main/webapp/loc/ara/xml/strings.xml @@ -1413,74 +1413,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/cat/xml/reports.xml b/web/src/main/webapp/loc/cat/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/cat/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/cat/xml/strings.xml b/web/src/main/webapp/loc/cat/xml/strings.xml index 7af90ca1102..59998a9bcaa 100644 --- a/web/src/main/webapp/loc/cat/xml/strings.xml +++ b/web/src/main/webapp/loc/cat/xml/strings.xml @@ -1403,74 +1403,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/chi/xml/reports.xml b/web/src/main/webapp/loc/chi/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/chi/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/chi/xml/strings.xml b/web/src/main/webapp/loc/chi/xml/strings.xml index 52fe3aacaf0..492f984e39f 100644 --- a/web/src/main/webapp/loc/chi/xml/strings.xml +++ b/web/src/main/webapp/loc/chi/xml/strings.xml @@ -1398,74 +1398,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/dut/xml/reports.xml b/web/src/main/webapp/loc/dut/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/dut/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/dut/xml/strings.xml b/web/src/main/webapp/loc/dut/xml/strings.xml index 670d6373251..17e588cddb6 100644 --- a/web/src/main/webapp/loc/dut/xml/strings.xml +++ b/web/src/main/webapp/loc/dut/xml/strings.xml @@ -1418,74 +1418,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/eng/xml/reports.xml b/web/src/main/webapp/loc/eng/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/eng/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/eng/xml/strings.xml b/web/src/main/webapp/loc/eng/xml/strings.xml index 07a8e36fdb1..c5940e27f65 100644 --- a/web/src/main/webapp/loc/eng/xml/strings.xml +++ b/web/src/main/webapp/loc/eng/xml/strings.xml @@ -1417,75 +1417,4 @@ Records are available from the following URL:\r\n Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - - diff --git a/web/src/main/webapp/loc/fin/xml/reports.xml b/web/src/main/webapp/loc/fin/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/fin/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/fin/xml/strings.xml b/web/src/main/webapp/loc/fin/xml/strings.xml index 9d41a422947..87f789f2c01 100644 --- a/web/src/main/webapp/loc/fin/xml/strings.xml +++ b/web/src/main/webapp/loc/fin/xml/strings.xml @@ -1432,74 +1432,4 @@ Kuvailujen tekemiseksi tarvitset käyttäjätunnuksen. Pyydä se osoitteesta Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/fre/xml/reports.xml b/web/src/main/webapp/loc/fre/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/fre/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/fre/xml/strings.xml b/web/src/main/webapp/loc/fre/xml/strings.xml index 3a3b2d4408d..719152f15d9 100644 --- a/web/src/main/webapp/loc/fre/xml/strings.xml +++ b/web/src/main/webapp/loc/fre/xml/strings.xml @@ -1428,74 +1428,4 @@ La liste des changements d'état sont accessibles ici : Tags Carte Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/ger/xml/reports.xml b/web/src/main/webapp/loc/ger/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/ger/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/ger/xml/strings.xml b/web/src/main/webapp/loc/ger/xml/strings.xml index 2221ed78e75..04983e17688 100644 --- a/web/src/main/webapp/loc/ger/xml/strings.xml +++ b/web/src/main/webapp/loc/ger/xml/strings.xml @@ -1396,74 +1396,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/ita/xml/reports.xml b/web/src/main/webapp/loc/ita/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/ita/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/ita/xml/strings.xml b/web/src/main/webapp/loc/ita/xml/strings.xml index 64db35ddcd9..f9c4eb5a1b1 100644 --- a/web/src/main/webapp/loc/ita/xml/strings.xml +++ b/web/src/main/webapp/loc/ita/xml/strings.xml @@ -1410,74 +1410,4 @@ Questo elemento fornisce anche informazioni su eventuali tariffe richieste per a Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/nor/xml/reports.xml b/web/src/main/webapp/loc/nor/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/nor/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/nor/xml/strings.xml b/web/src/main/webapp/loc/nor/xml/strings.xml index e245dd6410f..f50fdfe49aa 100644 --- a/web/src/main/webapp/loc/nor/xml/strings.xml +++ b/web/src/main/webapp/loc/nor/xml/strings.xml @@ -1405,74 +1405,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/pol/xml/reports.xml b/web/src/main/webapp/loc/pol/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/pol/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/pol/xml/strings.xml b/web/src/main/webapp/loc/pol/xml/strings.xml index deeb322a5d9..02faa62c389 100644 --- a/web/src/main/webapp/loc/pol/xml/strings.xml +++ b/web/src/main/webapp/loc/pol/xml/strings.xml @@ -1473,74 +1473,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/por/xml/reports.xml b/web/src/main/webapp/loc/por/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/por/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/por/xml/strings.xml b/web/src/main/webapp/loc/por/xml/strings.xml index 0b7d0ca4bcd..a86349cc9b3 100644 --- a/web/src/main/webapp/loc/por/xml/strings.xml +++ b/web/src/main/webapp/loc/por/xml/strings.xml @@ -1412,74 +1412,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/rus/xml/reports.xml b/web/src/main/webapp/loc/rus/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/rus/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/rus/xml/strings.xml b/web/src/main/webapp/loc/rus/xml/strings.xml index 744b43de6aa..ed9bfa87b70 100644 --- a/web/src/main/webapp/loc/rus/xml/strings.xml +++ b/web/src/main/webapp/loc/rus/xml/strings.xml @@ -1409,74 +1409,4 @@ ISO 19115 не позволяет иметь более одного. Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/spa/xml/reports.xml b/web/src/main/webapp/loc/spa/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/spa/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/spa/xml/strings.xml b/web/src/main/webapp/loc/spa/xml/strings.xml index 7f0a112ae21..13df7567d0f 100644 --- a/web/src/main/webapp/loc/spa/xml/strings.xml +++ b/web/src/main/webapp/loc/spa/xml/strings.xml @@ -1413,74 +1413,4 @@ TAGS Mapa Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/loc/tur/xml/reports.xml b/web/src/main/webapp/loc/tur/xml/reports.xml new file mode 100644 index 00000000000..d0bb1a85d44 --- /dev/null +++ b/web/src/main/webapp/loc/tur/xml/reports.xml @@ -0,0 +1,70 @@ + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner Group + OwnerGroup (Admin Email) + Last Updated Date + Record Name + Metadata uuid + + + + Owner (User name) + Owner (Last name) + Owner (First name) + Owner (Email) + Owner (User Role) + Owner Group (Name) + Owner Group (Admin Email) + Creation Date + Record Name + Metadata uuid + + + + User name + Last name + First name + Email + Groups/User Roles + Last Login Date + + + + Uploader (User name) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (User Role) + Group + Product Name + File Name + Download Date + Record Name + Metadata uuid + Requester Name + Requester Mail + Requester Organization + Requester Comments + Expiry Date + + + + Uploader (Username) + Uploader (Last name) + Uploader (First name) + Uploader (Email) + Uploader (Role) + Group + Product Name + File Name + Upload Date + Record Name + Metadata uuid + Expiry Date + + diff --git a/web/src/main/webapp/loc/tur/xml/strings.xml b/web/src/main/webapp/loc/tur/xml/strings.xml index 769a9311059..bd3a9871742 100644 --- a/web/src/main/webapp/loc/tur/xml/strings.xml +++ b/web/src/main/webapp/loc/tur/xml/strings.xml @@ -1344,74 +1344,4 @@ Tags Map Unknown - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner Group - OwnerGroup (Admin Email) - Last Updated Date - Record Name - Metadata uuid - - - - Owner (User name) - Owner (Last name) - Owner (First name) - Owner (Email) - Owner (User Role) - Owner Group (Name) - Owner Group (Admin Email) - Creation Date - Record Name - Metadata uuid - - - - User name - Last name - First name - Email - Groups/User Roles - Last Login Date - - - - Uploader (User name) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (User Role) - Group - Product Name - File Name - Download Date - Record Name - Metadata uuid - Requester Name - Requester Mail - Requester Organization - Requester Comments - Expiry Date - - - - Uploader (Username) - Uploader (Last name) - Uploader (First name) - Uploader (Email) - Uploader (Role) - Group - Product Name - File Name - Upload Date - Record Name - Metadata uuid - Expiry Date - - diff --git a/web/src/main/webapp/xsl/reports/reportCommon-output.xsl b/web/src/main/webapp/xslt/services/reports/reportCommon-output.xsl similarity index 97% rename from web/src/main/webapp/xsl/reports/reportCommon-output.xsl rename to web/src/main/webapp/xslt/services/reports/reportCommon-output.xsl index 8e3f25ab571..b9726b71c6b 100644 --- a/web/src/main/webapp/xsl/reports/reportCommon-output.xsl +++ b/web/src/main/webapp/xslt/services/reports/reportCommon-output.xsl @@ -10,11 +10,11 @@ , + ' - diff --git a/web/src/main/webapp/xsl/reports/reportDataDownloads-output.xsl b/web/src/main/webapp/xslt/services/reports/reportDataDownloads-output.xsl similarity index 91% rename from web/src/main/webapp/xsl/reports/reportDataDownloads-output.xsl rename to web/src/main/webapp/xslt/services/reports/reportDataDownloads-output.xsl index dd16c225a16..081abd15ec2 100644 --- a/web/src/main/webapp/xsl/reports/reportDataDownloads-output.xsl +++ b/web/src/main/webapp/xslt/services/reports/reportDataDownloads-output.xsl @@ -18,7 +18,7 @@ - + diff --git a/web/src/main/webapp/xsl/reports/reportDataUploads-output.xsl b/web/src/main/webapp/xslt/services/reports/reportDataUploads-output.xsl similarity index 91% rename from web/src/main/webapp/xsl/reports/reportDataUploads-output.xsl rename to web/src/main/webapp/xslt/services/reports/reportDataUploads-output.xsl index ace2306a02b..b31dcc8b28d 100644 --- a/web/src/main/webapp/xsl/reports/reportDataUploads-output.xsl +++ b/web/src/main/webapp/xslt/services/reports/reportDataUploads-output.xsl @@ -18,7 +18,7 @@ - + diff --git a/web/src/main/webapp/xsl/reports/reportInternal-output.xsl b/web/src/main/webapp/xslt/services/reports/reportInternal-output.xsl similarity index 90% rename from web/src/main/webapp/xsl/reports/reportInternal-output.xsl rename to web/src/main/webapp/xslt/services/reports/reportInternal-output.xsl index 886f94472e0..b230ddd532c 100644 --- a/web/src/main/webapp/xsl/reports/reportInternal-output.xsl +++ b/web/src/main/webapp/xslt/services/reports/reportInternal-output.xsl @@ -18,7 +18,7 @@ - + diff --git a/web/src/main/webapp/xsl/reports/reportUpdated-output.xsl b/web/src/main/webapp/xslt/services/reports/reportUpdated-output.xsl similarity index 90% rename from web/src/main/webapp/xsl/reports/reportUpdated-output.xsl rename to web/src/main/webapp/xslt/services/reports/reportUpdated-output.xsl index 1b8a2690d46..7ce873acf24 100644 --- a/web/src/main/webapp/xsl/reports/reportUpdated-output.xsl +++ b/web/src/main/webapp/xslt/services/reports/reportUpdated-output.xsl @@ -18,7 +18,7 @@ - + diff --git a/web/src/main/webapp/xsl/reports/reportUsers-output.xsl b/web/src/main/webapp/xslt/services/reports/reportUsers-output.xsl similarity index 91% rename from web/src/main/webapp/xsl/reports/reportUsers-output.xsl rename to web/src/main/webapp/xslt/services/reports/reportUsers-output.xsl index d5297dc346f..8e15c1fccd9 100644 --- a/web/src/main/webapp/xsl/reports/reportUsers-output.xsl +++ b/web/src/main/webapp/xslt/services/reports/reportUsers-output.xsl @@ -18,7 +18,7 @@ - +