Skip to content

Commit a10785e

Browse files
committed
use vectorial icons for messages priority
1 parent f0b8078 commit a10785e

File tree

7 files changed

+58
-18
lines changed

7 files changed

+58
-18
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
* @since 6.0
1010
*/
1111
public class GUIMessage implements Serializable {
12-
12+
13+
public static final int PRIO_LOW = 0;
14+
1315
public static final int PRIO_WARN = 2;
1416

1517
public static final int PRIO_INFO = 1;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.logicaldoc.gui.common.client.i18n.I18N;
44
import com.smartgwt.client.data.DataSource;
55
import com.smartgwt.client.data.fields.DataSourceDateTimeField;
6-
import com.smartgwt.client.data.fields.DataSourceImageField;
6+
import com.smartgwt.client.data.fields.DataSourceIntegerField;
77
import com.smartgwt.client.data.fields.DataSourceTextField;
88

99
/**
@@ -23,7 +23,7 @@ public MessagesDS() {
2323

2424
DataSourceTextField subject = new DataSourceTextField("subject");
2525
DataSourceTextField text = new DataSourceTextField("text");
26-
DataSourceImageField priority = new DataSourceImageField("priority");
26+
DataSourceIntegerField priority = new DataSourceIntegerField("priority");
2727
DataSourceTextField from = new DataSourceTextField("from");
2828
DataSourceDateTimeField sent = new DataSourceDateTimeField("sent");
2929
DataSourceTextField read = new DataSourceTextField("read");

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/DashboardPanel.java renamed to logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/messages/DashboardPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package com.logicaldoc.gui.frontend.client.dashboard;
1+
package com.logicaldoc.gui.frontend.client.dashboard.messages;
22

33
import com.logicaldoc.gui.common.client.Feature;
44
import com.logicaldoc.gui.common.client.Menu;
55
import com.logicaldoc.gui.common.client.i18n.I18N;
66
import com.logicaldoc.gui.common.client.widgets.FeatureDisabled;
77
import com.logicaldoc.gui.frontend.client.calendar.UserCalendarPanel;
8+
import com.logicaldoc.gui.frontend.client.dashboard.UserDashboard;
89
import com.logicaldoc.gui.frontend.client.dashboard.chat.ChatPanel;
910
import com.logicaldoc.gui.frontend.client.dashboard.reading.ReadingRequestsPanel;
1011
import com.logicaldoc.gui.frontend.client.dashboard.tag.TagsDashboard;

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/MessageDialog.java renamed to logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/messages/MessageDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.logicaldoc.gui.frontend.client.dashboard;
1+
package com.logicaldoc.gui.frontend.client.dashboard.messages;
22

33
import java.util.ArrayList;
44
import java.util.Arrays;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package com.logicaldoc.gui.frontend.client.dashboard.messages;
2+
3+
import com.logicaldoc.gui.common.client.beans.GUIMessage;
4+
import com.logicaldoc.gui.common.client.i18n.I18N;
5+
import com.logicaldoc.gui.common.client.util.AwesomeFactory;
6+
import com.smartgwt.client.types.Alignment;
7+
import com.smartgwt.client.types.AutoFitWidthApproach;
8+
import com.smartgwt.client.widgets.grid.ListGridField;
9+
import com.smartgwt.client.widgets.grid.ListGridRecord;
10+
11+
/**
12+
* A field to display the priority of a message, based on field named pririty
13+
*
14+
* @author Marco Meschieri - LogicalDOC
15+
* @since 9.1.1
16+
*/
17+
public class MessagePriorityListGridField extends ListGridField {
18+
19+
public MessagePriorityListGridField() {
20+
super("priority", I18N.message("priority"));
21+
setCanFilter(true);
22+
setCanSort(true);
23+
setAlign(Alignment.CENTER);
24+
setAutoFitWidth(true);
25+
setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
26+
setCellFormatter((value, rec, rowNum, colNum) -> formatPriorityIconCell(rec));
27+
}
28+
29+
private String formatPriorityIconCell(ListGridRecord rec) {
30+
String content = "<div style='display: flex; text-align: center; justify-content: center;'>";
31+
int priority = rec.getAttributeAsInt("priority");
32+
33+
switch (priority) {
34+
case GUIMessage.PRIO_INFO:
35+
content += AwesomeFactory.getIconButtonHTML("square-exclamation", null, "medium", "orange", null);
36+
break;
37+
case GUIMessage.PRIO_WARN:
38+
content += AwesomeFactory.getIconButtonHTML("triangle-exclamation", null, "high", "red", null);
39+
break;
40+
default:
41+
content += AwesomeFactory.getIconButtonHTML("circle-exclamation", null, "low", "green", null);
42+
break;
43+
}
44+
content += "</div>";
45+
return content;
46+
}
47+
}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/MessagesPanel.java renamed to logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/dashboard/messages/MessagesPanel.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.logicaldoc.gui.frontend.client.dashboard;
1+
package com.logicaldoc.gui.frontend.client.dashboard.messages;
22

33
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
44
import com.logicaldoc.gui.common.client.Session;
@@ -14,12 +14,9 @@
1414
import com.logicaldoc.gui.common.client.i18n.I18N;
1515
import com.logicaldoc.gui.common.client.util.GridUtil;
1616
import com.logicaldoc.gui.common.client.util.LD;
17-
import com.logicaldoc.gui.common.client.util.Util;
1817
import com.logicaldoc.gui.frontend.client.services.MessageService;
1918
import com.smartgwt.client.data.Record;
20-
import com.smartgwt.client.types.Alignment;
2119
import com.smartgwt.client.types.ContentsType;
22-
import com.smartgwt.client.types.ListGridFieldType;
2320
import com.smartgwt.client.types.SelectionStyle;
2421
import com.smartgwt.client.types.SortDirection;
2522
import com.smartgwt.client.widgets.HTMLPane;
@@ -60,14 +57,7 @@ public void onDraw() {
6057

6158
ListGridField id = new IdListGridField();
6259

63-
ListGridField priority = new ListGridField("priority", I18N.message("priority"), 50);
64-
priority.setType(ListGridFieldType.IMAGE);
65-
priority.setCanSort(false);
66-
priority.setAlign(Alignment.CENTER);
67-
priority.setShowDefaultContextMenu(false);
68-
priority.setImageURLPrefix(Util.imagePrefix());
69-
priority.setImageURLSuffix(".gif");
70-
priority.setCanFilter(false);
60+
ListGridField priority = new MessagePriorityListGridField();
7161

7262
ListGridField subject = new ListGridField(SUBJECT, I18N.message(SUBJECT));
7363
subject.setCanFilter(true);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/panels/MainPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.logicaldoc.gui.common.client.util.WindowUtils;
1616
import com.logicaldoc.gui.common.client.widgets.IncomingMessage;
1717
import com.logicaldoc.gui.frontend.client.administration.AdminScreen;
18-
import com.logicaldoc.gui.frontend.client.dashboard.DashboardPanel;
18+
import com.logicaldoc.gui.frontend.client.dashboard.messages.DashboardPanel;
1919
import com.logicaldoc.gui.frontend.client.document.DocumentsPanel;
2020
import com.logicaldoc.gui.frontend.client.menu.MainMenu;
2121
import com.logicaldoc.gui.frontend.client.search.Search;

0 commit comments

Comments
 (0)