diff --git a/src/main/resources/config/liquibase/cnr/view-acquisti-v1.csv b/src/main/resources/config/liquibase/cnr/view-acquisti-v1.csv
index 6d57face4..1aeb6cee4 100644
--- a/src/main/resources/config/liquibase/cnr/view-acquisti-v1.csv
+++ b/src/main/resources/config/liquibase/cnr/view-acquisti-v1.csv
@@ -1,5 +1,5 @@
ID;PROCESS_ID;VERSION;TYPE;VIEW
-2;acquisti;1;detail;
DECISIONE A CONTRATTARE
DITTA ATTUALMENTE CANDIDATA
+2;acquisti;1;detail;
DECISIONE A CONTRATTARE
DITTA ATTUALMENTE CANDIDATA
3;acquisti;1;export-csv;[{ varName: 'titolo', label: 'Oggetto Acquisizione'}, { varName: 'descrizione', label: 'Descrizione Acquisizione'}, { varName: 'strumentoAcquisizione', label: 'Strumeto Acquisizione'}, { varName: 'tipologiaAcquisizione', label: 'Tipologia Acquisizione'}, { varName: 'importoTotale', label: 'Importo Totale'}]
4;acquisti;1;export-trasparenza;[ "processInstanceId", "title", "cig", "nrDetermina", "annoDetermina", "titolo", "descrizione", "strumentoAcquisizione", "tipologiaAcquisizione", "impegni_json", "importoTotale", "ditteCandidate_json" ]
5;acquisti;1;search;
diff --git a/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.controller.js b/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.controller.js
index e79a792ec..9ad91b97a 100644
--- a/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.controller.js
+++ b/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.controller.js
@@ -4,11 +4,12 @@
angular.module('sprintApp')
.controller('DetailsMetadatumModalController', DetailsMetadatumModalController);
- DetailsMetadatumModalController.$inject = ['$uibModalInstance', 'experience', 'columns'];
+ DetailsMetadatumModalController.$inject = ['$uibModalInstance', 'detailsLabel', 'row', 'columns', 'modalColumns'];
- function DetailsMetadatumModalController ($uibModalInstance, experience, columns) {
+ function DetailsMetadatumModalController ($uibModalInstance, detailsLabel, row, columns, modalColumns) {
var vm = this;
- vm.experience = experience;
- vm.columns = columns;
+ vm.row = row;
+ vm.columns = modalColumns ? columns.concat(modalColumns) : columns;
+ vm.detailsLabel = detailsLabel || 'Esperienze';
}
})();
\ No newline at end of file
diff --git a/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.html b/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.html
index 2e5b776ac..a1b1003fd 100644
--- a/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.html
+++ b/src/main/webapp/app/components/metadatum/detailsMetadatum.modal.html
@@ -1,10 +1,26 @@
\ No newline at end of file
+
diff --git a/src/main/webapp/app/components/metadatum/metadatum.directive.js b/src/main/webapp/app/components/metadatum/metadatum.directive.js
index b5b9ce5d2..b0e64fee6 100644
--- a/src/main/webapp/app/components/metadatum/metadatum.directive.js
+++ b/src/main/webapp/app/components/metadatum/metadatum.directive.js
@@ -16,6 +16,8 @@
value: '@',
type: '@?',
columns: '=?',
+ modalColumns: '=?',
+ detailsLabel: '@?',
rows: '=?',
details: '@'
},
@@ -37,19 +39,25 @@
});
- $scope.experience = function(experience, columns) {
+ $scope.detailsModal = function(row) {
$uibModal.open({
templateUrl: 'app/components/metadatum/detailsMetadatum.modal.html',
controller: 'DetailsMetadatumModalController',
controllerAs: 'vm',
size: 'md',
resolve: {
- experience: function() {
- return experience;
+ row: function() {
+ return row;
},
columns: function() {
- return columns;
- }
+ return $scope.columns;
+ },
+ modalColumns: function() {
+ return $scope.modalColumns;
+ },
+ detailsLabel: function() {
+ return $scope.detailsLabel;
+ },
}
})
};
diff --git a/src/main/webapp/app/components/metadatum/metadatum.html b/src/main/webapp/app/components/metadatum/metadatum.html
index c292134a6..0304cf19d 100644
--- a/src/main/webapp/app/components/metadatum/metadatum.html
+++ b/src/main/webapp/app/components/metadatum/metadatum.html
@@ -19,7 +19,7 @@
-
|