Skip to content

Commit 79c4541

Browse files
car031car031
committed
defined specific ListGridField for ids
1 parent 0ee22f1 commit 79c4541

File tree

68 files changed

+286
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+286
-239
lines changed

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIArchive.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class GUIArchive implements Serializable {
1414

1515
private long id = 0;
1616

17-
public static final int STATUS_OPENED = 0;
17+
public static final int STATUS_OPEN = 0;
1818

1919
public static final int STATUS_READY_TO_IMPORT = 0;
2020

@@ -60,7 +60,7 @@ public class GUIArchive implements Serializable {
6060

6161
private Date closure;
6262

63-
private int status = STATUS_OPENED;
63+
private int status = STATUS_OPEN;
6464

6565
private int type = TYPE_DEFAULT;
6666

@@ -112,7 +112,7 @@ public void setCreation(Date creation) {
112112
/**
113113
* The archive status
114114
*
115-
* @see #STATUS_OPENED
115+
* @see #STATUS_OPEN
116116
* @see #STATUS_CLOSED
117117
* @see #STATUS_FINALIZED
118118
* @see #STATUS_READYTOSIGN

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/data/ArchivesDS.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.smartgwt.client.data.DataSource;
55
import com.smartgwt.client.data.fields.DataSourceDateTimeField;
66
import com.smartgwt.client.data.fields.DataSourceFloatField;
7-
import com.smartgwt.client.data.fields.DataSourceImageField;
7+
import com.smartgwt.client.data.fields.DataSourceIntegerField;
88
import com.smartgwt.client.data.fields.DataSourceTextField;
99

1010
/**
@@ -26,8 +26,8 @@ public ArchivesDS(int mode, Integer type, Integer status, Long managerId) {
2626
DataSourceTextField name = new DataSourceTextField("name");
2727
DataSourceTextField description = new DataSourceTextField("description");
2828

29-
DataSourceTextField stat = new DataSourceTextField("status");
30-
DataSourceImageField statusicon = new DataSourceImageField("statusicon");
29+
DataSourceIntegerField stat = new DataSourceIntegerField("status");
30+
DataSourceIntegerField mod = new DataSourceIntegerField("mode");
3131
DataSourceTextField ttype = new DataSourceTextField("type");
3232
DataSourceTextField typelabel = new DataSourceTextField("typelabel");
3333
DataSourceFloatField size = new DataSourceFloatField("size");
@@ -36,8 +36,7 @@ public ArchivesDS(int mode, Integer type, Integer status, Long managerId) {
3636
DataSourceDateTimeField created = new DataSourceDateTimeField("created");
3737
DataSourceTextField pathonserver = new DataSourceTextField("pathonserver");
3838

39-
setFields(id, name, description, size, closer, creator, ttype, typelabel, stat, statusicon, created,
40-
pathonserver);
39+
setFields(id, name, description, size, closer, creator, ttype, typelabel, stat, mod, created, pathonserver);
4140
setClientOnly(true);
4241
setDataURL("data/archives.xml?mode=" + mode + "&locale=" + I18N.getLocale()
4342
+ (status != null ? "&status=" + status : "") + (type != null ? "&type=" + type : "")

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/data/ReportsDS.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public ReportsDS() {
3030
DataSourceDateTimeField lastRun = new DataSourceDateTimeField("lastRun");
3131
DataSourceDateTimeField lastModified = new DataSourceDateTimeField("lastModified");
3232

33-
setFields(id, name, enabled, running, status, lastRun, outputFolderId, outputDocId,
34-
lastModified);
33+
setFields(id, name, enabled, running, status, lastRun, outputFolderId, outputDocId, lastModified);
3534
setDataURL("data/reports.xml");
3635
setClientOnly(true);
3736
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/grid/IdListGridField.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.logicaldoc.gui.common.client.grid;
2+
3+
import com.smartgwt.client.types.AutoFitWidthApproach;
4+
5+
/**
6+
* A field to display the ID, it must be bound to a boolean column named id
7+
*
8+
* @author Marco Meschieri - LogicalDOC
9+
* @since 9.1.1
10+
*/
11+
public class IdListGridField extends ColoredListGridField {
12+
13+
public IdListGridField() {
14+
this(null);
15+
}
16+
17+
public IdListGridField(String label) {
18+
super("id", label);
19+
setAutoFitWidth(true);
20+
setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
21+
setHidden(true);
22+
setCanGroupBy(false);
23+
setCanSort(true);
24+
setCanFilter(true);
25+
setCanEdit(false);
26+
}
27+
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/ItemFactory.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import com.logicaldoc.gui.common.client.data.UsersDS;
5454
import com.logicaldoc.gui.common.client.data.WorkflowsDS;
5555
import com.logicaldoc.gui.common.client.grid.ColoredListGridField;
56+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
5657
import com.logicaldoc.gui.common.client.i18n.I18N;
5758
import com.logicaldoc.gui.common.client.log.GuiLog;
5859
import com.logicaldoc.gui.common.client.services.InfoService;
@@ -966,8 +967,7 @@ public static SelectItem newTenantSelector(boolean appendSystemTenant) {
966967
SelectItem tenant = new SelectItem("tenant");
967968
tenant.setTitle(I18N.message("tenant"));
968969
tenant.setWrapTitle(false);
969-
ListGridField id = new ListGridField("id", I18N.message("id"));
970-
id.setHidden(true);
970+
ListGridField id = new IdListGridField();
971971
ListGridField nname = new ListGridField("name", I18N.message("name"));
972972
nname.setAutoFitWidth(true);
973973
ListGridField displayName = new ListGridField("displayName", I18N.message("displayname"));
@@ -989,8 +989,7 @@ public static SelectItem newAutomationRoutineSelector(String name, Long value, f
989989
select.setDisplayField("name");
990990
select.setEmptyDisplayValue(I18N.message("customcode"));
991991

992-
ListGridField id = new ListGridField("id", I18N.message("id"));
993-
id.setHidden(true);
992+
ListGridField id = new IdListGridField();
994993
ListGridField nname = new ListGridField("name", I18N.message("name"));
995994
ListGridField description = new ListGridField(DESCRIPTION, I18N.message(DESCRIPTION));
996995
select.setPickListFields(id, nname, description);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/widgets/UserSelector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.logicaldoc.gui.common.client.beans.GUIUser;
77
import com.logicaldoc.gui.common.client.data.UsersDS;
8+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
89
import com.logicaldoc.gui.common.client.grid.UserListGridField;
910
import com.logicaldoc.gui.common.client.i18n.I18N;
1011
import com.smartgwt.client.widgets.form.fields.FormItemIcon;
@@ -39,8 +40,7 @@ public UserSelector(String name, String title, String groupIdOrName, boolean all
3940
setTitle(I18N.message(title));
4041
setWrapTitle(false);
4142

42-
ListGridField id = new ListGridField("id", I18N.message("id"));
43-
id.setHidden(true);
43+
ListGridField id = new IdListGridField();
4444
ListGridField username = new ListGridField(USERNAME, I18N.message(USERNAME));
4545
ListGridField label = new ListGridField("label", I18N.message("name"));
4646
UserListGridField avatar = new UserListGridField();

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/account/ApiKeys.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
44
import com.logicaldoc.gui.common.client.data.ApiKeysDS;
55
import com.logicaldoc.gui.common.client.grid.DateListGridField;
6+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
67
import com.logicaldoc.gui.common.client.grid.RefreshableListGrid;
78
import com.logicaldoc.gui.common.client.i18n.I18N;
89
import com.logicaldoc.gui.common.client.services.SecurityService;
@@ -67,9 +68,7 @@ public void onSuccess(String apikey) {
6768
buttons.addFill();
6869
buttons.setWidth100();
6970

70-
ListGridField id = new ListGridField("id", I18N.message("id"), 80);
71-
id.setHidden(true);
72-
id.setCanEdit(false);
71+
ListGridField id = new IdListGridField();
7372

7473
ListGridField name = new ListGridField("name", I18N.message("name"), 150);
7574
name.setCanEdit(true);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/account/LastLogins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.logicaldoc.gui.common.client.Session;
55
import com.logicaldoc.gui.common.client.data.UserHistoryDS;
66
import com.logicaldoc.gui.common.client.grid.DateListGridField;
7+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
78
import com.logicaldoc.gui.common.client.i18n.I18N;
89
import com.logicaldoc.gui.common.client.util.GridUtil;
910
import com.smartgwt.client.types.HeaderControls;
@@ -69,8 +70,7 @@ public LastLogins() {
6970
}
7071

7172
private void prepareGrid() {
72-
ListGridField id = new ListGridField("id", 50);
73-
id.setHidden(true);
73+
ListGridField id = new IdListGridField();
7474

7575
ListGridField date = new DateListGridField("date", "date");
7676

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/account/TrustedDevices.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
77
import com.logicaldoc.gui.common.client.data.DevicesDS;
88
import com.logicaldoc.gui.common.client.grid.DateListGridField;
9+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
910
import com.logicaldoc.gui.common.client.i18n.I18N;
1011
import com.logicaldoc.gui.common.client.services.SecurityService;
1112
import com.logicaldoc.gui.common.client.util.LD;
@@ -49,21 +50,19 @@ public TrustedDevices() {
4950
}
5051

5152
private void prepareGrid() {
52-
ListGridField id = new ListGridField("id", I18N.message("device"), 80);
53-
id.setHidden(true);
54-
id.setCanEdit(false);
53+
ListGridField id = new IdListGridField();
5554

5655
ListGridField label = new ListGridField("label", I18N.message("label"), 150);
5756
label.setCanEdit(true);
58-
label.addCellSavedHandler(
59-
event -> SecurityService.Instance.get().updateDeviceLabel(event.getRecord().getAttributeAsLong("id"),
60-
event.getNewValue() != null ? event.getNewValue().toString() : null, new DefaultAsyncCallback<>() {
57+
label.addCellSavedHandler(event -> SecurityService.Instance.get().updateDeviceLabel(
58+
event.getRecord().getAttributeAsLong("id"),
59+
event.getNewValue() != null ? event.getNewValue().toString() : null, new DefaultAsyncCallback<>() {
6160

62-
@Override
63-
public void onSuccess(Void arg) {
64-
// Nothing to do
65-
}
66-
}));
61+
@Override
62+
public void onSuccess(Void arg) {
63+
// Nothing to do
64+
}
65+
}));
6766

6867
ListGridField deviceId = new ListGridField("deviceId", I18N.message("deviceid"), 150);
6968
deviceId.setHidden(true);
@@ -134,12 +133,12 @@ public void onSuccess(Void result) {
134133
contextMenu.setItems(delete);
135134
contextMenu.showContextMenu();
136135
}
137-
136+
138137
@Override
139138
public boolean equals(Object other) {
140139
return super.equals(other);
141140
}
142-
141+
143142
@Override
144143
public int hashCode() {
145144
return super.hashCode();

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/account/contacts/Contacts.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
import java.util.Arrays;
44
import java.util.Map;
55

6-
import com.logicaldoc.gui.common.client.Feature;
76
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
7+
import com.logicaldoc.gui.common.client.Feature;
88
import com.logicaldoc.gui.common.client.beans.GUIContact;
99
import com.logicaldoc.gui.common.client.data.ContactsDS;
10+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
1011
import com.logicaldoc.gui.common.client.i18n.I18N;
1112
import com.logicaldoc.gui.common.client.util.GridUtil;
1213
import com.logicaldoc.gui.common.client.util.LD;
@@ -117,8 +118,7 @@ public void onSuccess(Void arg0) {
117118
}
118119

119120
private void prepareGrid() {
120-
ListGridField id = new ListGridField("id", 50);
121-
id.setHidden(true);
121+
ListGridField id = new IdListGridField();
122122

123123
ListGridField email = new ListGridField(EMAIL, I18N.message(EMAIL));
124124
email.setWidth("*");

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/account/contacts/ContactsImportPreview.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
77
import com.logicaldoc.gui.common.client.beans.GUIContact;
8+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
89
import com.logicaldoc.gui.common.client.i18n.I18N;
910
import com.logicaldoc.gui.common.client.util.LD;
1011
import com.logicaldoc.gui.frontend.client.services.ContactService;
@@ -92,8 +93,7 @@ public void onSuccess(List<GUIContact> contacts) {
9293

9394
toolStrip.addFill();
9495

95-
ListGridField id = new ListGridField("id", 50);
96-
id.setHidden(true);
96+
ListGridField id = new IdListGridField();
9797

9898
ListGridField email = new ListGridField(EMAIL, I18N.message(EMAIL), 200);
9999
email.setWidth("*");
@@ -157,12 +157,12 @@ public void setContacts(List<GUIContact> contacts) {
157157
}
158158
list.setRecords(records.toArray(new ListGridRecord[0]));
159159
}
160-
160+
161161
@Override
162162
public boolean equals(Object other) {
163163
return super.equals(other);
164164
}
165-
165+
166166
@Override
167167
public int hashCode() {
168168
return super.hashCode();

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/calendar/CalendarEventDialog.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.google.gwt.i18n.client.DateTimeFormat;
99
import com.google.gwt.user.client.rpc.AsyncCallback;
1010
import com.logicaldoc.gui.common.client.Constants;
11-
import com.logicaldoc.gui.common.client.Feature;
1211
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
12+
import com.logicaldoc.gui.common.client.Feature;
1313
import com.logicaldoc.gui.common.client.Session;
1414
import com.logicaldoc.gui.common.client.beans.GUICalendarEvent;
1515
import com.logicaldoc.gui.common.client.beans.GUIDocument;
@@ -18,6 +18,7 @@
1818
import com.logicaldoc.gui.common.client.beans.GUIUser;
1919
import com.logicaldoc.gui.common.client.grid.DateListGridField;
2020
import com.logicaldoc.gui.common.client.grid.FileNameListGridField;
21+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
2122
import com.logicaldoc.gui.common.client.grid.UserListGridField;
2223
import com.logicaldoc.gui.common.client.i18n.I18N;
2324
import com.logicaldoc.gui.common.client.preview.PreviewPopup;
@@ -315,10 +316,7 @@ private void fillRemindersGrid() {
315316
}
316317

317318
private Tab prepareAttendees() {
318-
ListGridField id = new ListGridField("id", I18N.message("id"));
319-
id.setWidth(90);
320-
id.setHidden(true);
321-
id.setCanEdit(false);
319+
ListGridField id = new IdListGridField();
322320

323321
ListGridField name = prepareNameField();
324322

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/clipboard/ClipboardWindow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.logicaldoc.gui.frontend.client.clipboard;
22

33
import com.logicaldoc.gui.common.client.beans.GUIDocument;
4+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
45
import com.logicaldoc.gui.common.client.i18n.I18N;
56
import com.logicaldoc.gui.common.client.util.Util;
67
import com.smartgwt.client.types.Alignment;
@@ -58,8 +59,7 @@ public ClipboardWindow() {
5859
grid.setCanFreezeFields(false);
5960
grid.setCanGroupBy(false);
6061

61-
ListGridField id = new ListGridField("id");
62-
id.setHidden(true);
62+
ListGridField id = new IdListGridField();
6363

6464
ListGridField fileName = new ListGridField("filename", " ", 200);
6565

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/MessageDialog.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
88
import com.logicaldoc.gui.common.client.beans.GUIMessage;
99
import com.logicaldoc.gui.common.client.beans.GUIUser;
10+
import com.logicaldoc.gui.common.client.grid.IdListGridField;
1011
import com.logicaldoc.gui.common.client.grid.UserListGridField;
1112
import com.logicaldoc.gui.common.client.i18n.I18N;
1213
import com.logicaldoc.gui.common.client.log.EventPanel;
@@ -171,9 +172,7 @@ private SectionStack prepareRecipientsGrid() {
171172
ListGridField name = new ListGridField(LABEL, I18N.message("name"));
172173
name.setCanFilter(true);
173174

174-
ListGridField id = new ListGridField("id", I18N.message(" "));
175-
id.setWidth(50);
176-
id.setHidden(true);
175+
ListGridField id = new IdListGridField();
177176

178177
recipientsGrid = new ListGrid();
179178
recipientsGrid.setShowRecordComponents(true);
@@ -272,12 +271,12 @@ private void addRecipients(List<ListGridRecord> newSelection) {
272271
recipientsGrid.addData(newRec);
273272
}
274273
}
275-
274+
276275
@Override
277276
public boolean equals(Object other) {
278277
return super.equals(other);
279278
}
280-
279+
281280
@Override
282281
public int hashCode() {
283282
return super.hashCode();

0 commit comments

Comments
 (0)