From f1f14656962f7388f138da06498f93f96918a238 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 5 Aug 2021 17:38:21 +0200 Subject: [PATCH] revisited the columns --- .../client/ui/table/ItemsTable.java | 106 ++++++------------ 1 file changed, 34 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java index fbc93e6..9edee64 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/table/ItemsTable.java @@ -64,15 +64,17 @@ public class ItemsTable extends AbstractItemsCellTable< * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it Feb 1, 2016 */ public static enum DISPLAY_FIELD { - NAME, INTRO, AUTHOR, PROJECT_START_DATE, PROJECT_END_DATE, INSERTED_BY + NAME, INTRO, AUTHOR, PROJECT_START_DATE, PROJECT_START_END_DATE, CREATED, CREATED_BY }; private List displayFields; - private Column startProjectDateColumn; - private Column endProjectDateColumn; + private TextColumn startEndProjectColumn; + // private Column startProjectDateColumn; + // private Column endProjectDateColumn; private DISPLAY_FIELD startSortByColumn; private boolean isAsyncronusTable; private TextColumn insertedBy; + private Column createdColumn; /** * Instantiates a new items table. @@ -210,20 +212,39 @@ public class ItemsTable extends AbstractItemsCellTable< } - if (this.displayFields.contains(DISPLAY_FIELD.PROJECT_START_DATE)) { + if (this.displayFields.contains(DISPLAY_FIELD.PROJECT_START_END_DATE)) { + + startEndProjectColumn = new TextColumn() { + @Override + public String getValue(T object) { + if (object == null) + return ""; + + Date dS = (((ConcessioneDV) object).getDataInizioProgetto()); + Date dE = (((ConcessioneDV) object).getDataFineProgetto()); + return dtformat.format(dS) + " / " + dtformat.format(dE); + } + }; + + sortedCellTable.addColumn(startEndProjectColumn, "Start/End Date", false); + sortedCellTable.setColumnWidth(startEndProjectColumn, 180, Unit.PX); + + } + + if (this.displayFields.contains(DISPLAY_FIELD.CREATED)) { DateCell date = new DateCell(dtformat); - startProjectDateColumn = new Column(date) { + createdColumn = new Column(date) { @Override public Date getValue(T object) { if (object == null) return null; - return (((ConcessioneDV) object).getDataInizioProgetto()); + return (((ConcessioneDV) object).getCreationTime()); } }; - sortedCellTable.addColumn(startProjectDateColumn, "Project Start Date", true); + sortedCellTable.addColumn(createdColumn, "Created", true); if (!isAsyncronusTable) { Comparator c = new Comparator() { @@ -235,8 +256,8 @@ public class ItemsTable extends AbstractItemsCellTable< if (o2 == null) return 1; - Date d1 = (((ConcessioneDV) o1).getDataInizioProgetto()); - Date d2 = (((ConcessioneDV) o2).getDataInizioProgetto()); + Date d1 = (((ConcessioneDV) o1).getCreationTime()); + Date d2 = (((ConcessioneDV) o2).getCreationTime()); // GWT.log(d1.toString() + "is after "+d2.toString() +" ? "+d2.after(d1)); @@ -247,58 +268,14 @@ public class ItemsTable extends AbstractItemsCellTable< } }; GWT.log("date colum sortable"); - sortedCellTable.setComparator(startProjectDateColumn, c); + sortedCellTable.setComparator(createdColumn, c); } - sortedCellTable.setColumnWidth(startProjectDateColumn, 150, Unit.PX); + sortedCellTable.setColumnWidth(createdColumn, 150, Unit.PX); } - if (this.displayFields.contains(DISPLAY_FIELD.PROJECT_END_DATE)) { - - DateCell date = new DateCell(dtformat); - endProjectDateColumn = new Column(date) { - - @Override - public Date getValue(T object) { - if (object == null) - return null; - - return (((ConcessioneDV) object).getDataFineProgetto()); - } - }; - sortedCellTable.addColumn(startProjectDateColumn, "Project End Date", true); - - if (!isAsyncronusTable) { - Comparator c = new Comparator() { - @Override - public int compare(T o1, T o2) { - if (o1 == null) - return -1; - - if (o2 == null) - return 1; - - Date d1 = (((ConcessioneDV) o1).getDataFineProgetto()); - Date d2 = (((ConcessioneDV) o2).getDataFineProgetto()); - - // GWT.log(d1.toString() + "is after "+d2.toString() +" ? "+d2.after(d1)); - - if (d1.after(d2)) - return 1; - else - return -1; - } - }; - GWT.log("date colum sortable"); - sortedCellTable.setComparator(endProjectDateColumn, c); - } - - sortedCellTable.setColumnWidth(endProjectDateColumn, 150, Unit.PX); - - } - - if (this.displayFields.contains(DISPLAY_FIELD.INSERTED_BY)) { + if (this.displayFields.contains(DISPLAY_FIELD.CREATED_BY)) { // NAME insertedBy = new TextColumn() { @@ -310,7 +287,7 @@ public class ItemsTable extends AbstractItemsCellTable< } }; - sortedCellTable.addColumn(insertedBy, "Inserted by", true); + sortedCellTable.addColumn(insertedBy, "Created by", true); if (!isAsyncronusTable) { Comparator c = new Comparator() { @@ -378,21 +355,6 @@ public class ItemsTable extends AbstractItemsCellTable< sortedCellTable.setInitialSortColumn(author); } break; - case PROJECT_START_DATE: - if (this.displayFields.contains(DISPLAY_FIELD.PROJECT_START_DATE)) { - sortedCellTable.setDefaultSortOrder(startProjectDateColumn, false); // sorts ascending on first - // click - sortedCellTable.setInitialSortColumn(startProjectDateColumn); - GWT.log("sortedCellTable: " + sortedCellTable); - } - break; - case PROJECT_END_DATE: - if (this.displayFields.contains(DISPLAY_FIELD.PROJECT_START_DATE)) { - sortedCellTable.setDefaultSortOrder(endProjectDateColumn, false); // sorts ascending on first click - sortedCellTable.setInitialSortColumn(endProjectDateColumn); - GWT.log("sortedCellTable: " + sortedCellTable); - } - break; default: break; }