X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.e4%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Fparts%2FDefaultDashboardEditor.java;h=dd1c2b084732003422bc110d68220a7f92c9d0af;hb=d6463016cbcd660c72cc74ebaa2a6e8247ccfa4f;hp=2061f146866f550de5d31e70c2e2a228748551a6;hpb=f0953fddc11686629a53a4100327dd414203db56;p=gpl%2Fargeo-suite.git
diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
index 2061f14..dd1c2b0 100644
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
@@ -18,8 +18,9 @@ import org.argeo.activities.ActivitiesNames;
import org.argeo.activities.ActivitiesService;
import org.argeo.activities.ActivitiesTypes;
import org.argeo.activities.ui.TaskViewerContextMenu;
+import org.argeo.api.NodeUtils;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
import org.argeo.connect.ConnectException;
import org.argeo.connect.ConnectNames;
import org.argeo.connect.ui.ConnectWorkbenchUtils;
@@ -27,7 +28,6 @@ import org.argeo.connect.ui.Refreshable;
import org.argeo.connect.util.ConnectJcrUtils;
import org.argeo.eclipse.ui.EclipseUiUtils;
import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeUtils;
import org.argeo.suite.e4.SuiteMsg;
import org.argeo.tracker.TrackerNames;
import org.argeo.tracker.TrackerService;
@@ -94,10 +94,10 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
@Override
public void forceRefresh(Object object) {
- CmsUtils.clear(headerCmp);
- populateHeaderPart(headerCmp, NodeUtils.getUserHome(getSession()));
+ CmsUiUtils.clear(headerCmp);
+ populateHeaderPart(headerCmp, NodeUtils.getUserHome(getHomeSession()));
- CmsUtils.clear(taskListCmp);
+ CmsUiUtils.clear(taskListCmp);
populateTaskListCmp(taskListCmp);
headerCmp.getParent().layout(true, true);
@@ -105,7 +105,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
private void populateTaskListCmp(Composite parent) {
parent.setLayout(EclipseUiUtils.noSpaceGridLayout());
- NodeIterator nit = activitiesService.getMyTasks(getSession(), true);
+ NodeIterator nit = activitiesService.getMyTasks(getMainSession(), true);
if (!nit.hasNext()) {
Composite noTaskCmp = new Composite(parent, SWT.NO_FOCUS);
noTaskCmp.setLayoutData(EclipseUiUtils.fillAll());
@@ -113,7 +113,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
// Label noTaskLbl = new Label(noTaskCmp, SWT.CENTER);
// noTaskLbl.setText(" You have no pending Task. ");
- // CmsUtils.markup(noTaskLbl);
+ // CmsUiUtils.markup(noTaskLbl);
// noTaskLbl.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, true));
} else {
@@ -122,7 +122,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
tvlc.setLayoutData(EclipseUiUtils.fillAll());
final TableViewer viewer = tvlc.getTableViewer();
viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
- final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getSession(),
+ final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getHomeSession(),
activitiesService) {
@Override
public boolean performAction(String actionId) {
@@ -182,7 +182,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
// Title
Label titleLbl = new Label(leftCmp, SWT.WRAP | SWT.LEAD);
- CmsUtils.markup(titleLbl);
+ CmsUiUtils.markup(titleLbl);
String titleStr = "" + CurrentUser.getDisplayName() + "";
titleLbl.setText(titleStr);
GridData gd = new GridData(SWT.BEGINNING, SWT.TOP, false, false);
@@ -206,13 +206,13 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
// String mainMixin = TrackerTypes.TRACKER_TASK;
String mainMixin = ActivitiesTypes.ACTIVITIES_TASK;
String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(),
- getSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
+ getHomeSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
if (EclipseUiUtils.notEmpty(pathCreated))
forceRefresh(null);
}
});
- NodeIterator nit = activitiesService.getMyTasks(getSession(), true);
+ NodeIterator nit = activitiesService.getMyTasks(getHomeSession(), true);
if (nit.hasNext()) {
List overdueTasks = new ArrayList<>();
while (nit.hasNext()) {
@@ -229,7 +229,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
}
if (trackerService != null) {
- nit = trackerService.getMyMilestones(getSession(), true);
+ nit = trackerService.getMyMilestones(getHomeSession(), true);
List openMilestones = new ArrayList<>();
if (nit.hasNext()) {
@@ -250,7 +250,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
}
// My projects
- List openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getSession(), true));
+ List openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getHomeSession(), true));
if (!openProjects.isEmpty()) {
Group myProjectsGp = new Group(rightCmp, SWT.NO_FOCUS);
myProjectsGp.setText("My open projects");
@@ -381,7 +381,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
// LOCAL HELPERS
private void populateMuliValueClickableList(Composite parent, Node[] nodes, ColumnLabelProvider lp,
String listLabel) {
- CmsUtils.clear(parent);
+ CmsUiUtils.clear(parent);
RowLayout rl = new RowLayout(SWT.HORIZONTAL | SWT.WRAP);
rl.wrap = true;
rl.marginLeft = rl.marginTop = rl.marginBottom = 0;
@@ -397,7 +397,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
int i = 1;
for (Node node : nodes) {
Link link = new Link(parent, SWT.NONE);
- CmsUtils.markup(link);
+ CmsUiUtils.markup(link);
link.setText(lp.getText(node) + (i != nodes.length ? ", " : ""));
i++;
// Color fc = lp.getForeground(node);