From d1c87fcf344f7f26f70059860235db1a2ff60e2c Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 12 Apr 2017 12:56:25 +0000
Subject: [PATCH] Task #8070: completed

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@146818 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                            | 10 ++++++++--
 pom.xml                                         |  2 +-
 .../view/grids/GxtGridFilterGroupPanel.java     | 17 ++++++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index a2e108f..504db1f 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,11 +1,17 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-0"
+		date="2017-04-12">
+		<Change>Task #8070: file versioning shown in a column of workspace grid</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-16-0"
 		date="2017-03-03">
 		<Change>Removed accesslogger dependency</Change>
 		<Change>[Task #6988] Fixed Edit administrator showing</Change>
 		<Change>[Feature #7006] File Versioning</Change>
-		<Change>Edit administrator can be performed also by other Administrator/s</Change>
-		<Change>Edit permissions can be performed also by Administrators</Change>
+		<Change>Edit administrator can be performed also by other
+			Administrator/s</Change>
+		<Change>Edit permissions can be performed also by Administrators
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.workspace-portlet.6-15-1"
 		date="2017-02-02">
diff --git a/pom.xml b/pom.xml
index a250fe6..89f1d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.16.0-SNAPSHOT</version>
+	<version>6.17.0-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
index 2cd7983..f94d9b8 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java
@@ -84,22 +84,23 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
 		setId("GxtGridFilterGroupPanel "+Random.nextInt());
 		ColumnConfig icon = new ColumnConfig(FileModel.ICON, "", 25);
 		icon.setSortable(false);
-		ColumnConfig name = new ColumnConfig(FileGridModel.NAME, FileGridModel.NAME, 300);
-		ColumnConfig type = new ColumnConfig(FileGridModel.TYPE, FileGridModel.TYPE, 50);
-		ColumnConfig lastUpdate = new ColumnConfig(FileGridModel.LASTMODIFIED, "Last Update", 100);
+		ColumnConfig name = new ColumnConfig(FileGridModel.NAME, FileGridModel.NAME, 280);
+		ColumnConfig type = new ColumnConfig(FileGridModel.TYPE, FileGridModel.TYPE, 60);
+		ColumnConfig lastUpdate = new ColumnConfig(FileGridModel.LASTMODIFIED, "Last Update", 90);
 		lastUpdate.setDateTimeFormat(DateTimeFormat.getFormat("dd MMM hh:mm aaa yyyy"));
 		ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100);
-		ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 50);
-		ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 100);
+		ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45);
+		ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90);
+		ColumnConfig fileVersion = new ColumnConfig(FileGridModel.VERSION, FileGridModel.VERSION, 35);
 
 		size.setEditor(new CellEditor(new NumberField()));
 
 		ColumnModel cm  = null;
 
 		if(group)
-			cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size, category));
+			cm = new ColumnModel(Arrays.asList(icon, name, fileVersion, ownerFullName, type, lastUpdate, size, category));
 		else
-			cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size));
+			cm = new ColumnModel(Arrays.asList(icon, name, fileVersion, ownerFullName, type, lastUpdate, size));
 
 		final ColumnModel columnModel = cm;
 
@@ -163,10 +164,12 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
 
 		StringFilter nameFilter = new StringFilter(FileGridModel.NAME);
 		StringFilter authorFilter = new StringFilter(FileGridModel.TYPE);
+		StringFilter versionFilter = new StringFilter(FileGridModel.VERSION);
 		DateFilter dateFilter = new DateFilter(FileGridModel.LASTMODIFIED);
 		NumericFilter sizeFilter = new NumericFilter(FileGridModel.SIZE);
 
 		filters.addFilter(nameFilter);
+		filters.addFilter(versionFilter);
 		filters.addFilter(authorFilter);
 		filters.addFilter(dateFilter);
 		filters.addFilter(sizeFilter);