Adapt to changes in Argeo Commons.

[gpl/argeo-suite.git] / org.argeo.suite.e4 / src / org / argeo / suite / e4 / parts / DefaultDashboardEditor.java

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 1e2be9a690fc5dc5edb7149af1bc58e9f3423cfd..259ea430983f4e8d1d82e3baafe1326e2c322edd 100644 (file)
--- 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
@@ -28,12 +28,13 @@ 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;
 import org.argeo.tracker.core.TrackerUtils;
 import org.argeo.tracker.ui.TaskListLabelProvider;
 import org.argeo.tracker.ui.TaskVirtualListComposite;
-import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -64,7 +65,9 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
        @Inject
        private ActivitiesService activitiesService;
+
        @Inject
+       @Optional
        private TrackerService trackerService;
 
        private String datePattern = "dd MMM yyyy";
@@ -92,7 +95,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        @Override
        public void forceRefresh(Object object) {
                CmsUtils.clear(headerCmp);
-               populateHeaderPart(headerCmp, NodeUtils.getUserHome(getSession()));
+               populateHeaderPart(headerCmp, NodeUtils.getUserHome(getHomeSession()));
 
                CmsUtils.clear(taskListCmp);
                populateTaskListCmp(taskListCmp);
@@ -102,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());
@@ -114,12 +117,12 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                        // noTaskLbl.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, true));
 
                } else {
-                       TaskListLabelProvider labelProvider = new TaskListLabelProvider(trackerService);
+                       TaskListLabelProvider labelProvider = new TaskListLabelProvider(getSystemAppService());
                        tvlc = new TaskVirtualListComposite(parent, SWT.NO_FOCUS, (ILabelProvider) labelProvider, 54);
                        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) {
@@ -188,7 +191,8 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                titleLbl.setLayoutData(gd);
 
                final Link createTaskLk = new Link(leftCmp, SWT.CENTER);
-               createTaskLk.setText("<a>Create a task</a>");
+               // createTaskLk.setText("<a>Create a task</a>");
+               createTaskLk.setText("<a>" + SuiteMsg.newTodo.lead() + "</a>");
                gd = new GridData(SWT.BEGINNING, SWT.TOP, false, false);
                // gd.verticalIndent = 5;
                gd.horizontalIndent = 10;
@@ -202,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<Node> overdueTasks = new ArrayList<>();
                        while (nit.hasNext()) {
@@ -224,41 +228,44 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                        }
                }
 
-               nit = trackerService.getMyMilestones(getSession(), true);
-               List<Node> openMilestones = new ArrayList<>();
-
-               if (nit.hasNext()) {
-                       List<Node> overdueMilestones = new ArrayList<>();
-                       while (nit.hasNext()) {
-                               Node currNode = nit.nextNode();
-                               openMilestones.add(currNode);
-                               if (isOverdue(currNode, TrackerNames.TRACKER_TARGET_DATE))
-                                       overdueMilestones.add(currNode);
-                       }
-                       if (!overdueMilestones.isEmpty()) {
-                               Composite overdueCmp = new Composite(leftCmp, SWT.NO_FOCUS);
-                               long size = overdueMilestones.size();
-                               String overdueStr = "You have " + size + " overdue milestone" + (size > 1 ? "s" : "") + ": ";
-                               populateMuliValueClickableList(overdueCmp, overdueMilestones.toArray(new Node[0]), new MilestoneLp(),
-                                               overdueStr);
+               if (trackerService != null) {
+                       nit = trackerService.getMyMilestones(getHomeSession(), true);
+                       List<Node> openMilestones = new ArrayList<>();
+
+                       if (nit.hasNext()) {
+                               List<Node> overdueMilestones = new ArrayList<>();
+                               while (nit.hasNext()) {
+                                       Node currNode = nit.nextNode();
+                                       openMilestones.add(currNode);
+                                       if (isOverdue(currNode, TrackerNames.TRACKER_TARGET_DATE))
+                                               overdueMilestones.add(currNode);
+                               }
+                               if (!overdueMilestones.isEmpty()) {
+                                       Composite overdueCmp = new Composite(leftCmp, SWT.NO_FOCUS);
+                                       long size = overdueMilestones.size();
+                                       String overdueStr = "You have " + size + " overdue milestone" + (size > 1 ? "s" : "") + ": ";
+                                       populateMuliValueClickableList(overdueCmp, overdueMilestones.toArray(new Node[0]),
+                                                       new MilestoneLp(), overdueStr);
+                               }
                        }
-               }
 
-               // My projects
-               List<Node> openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getSession(), true));
-               if (!openProjects.isEmpty()) {
-                       Group myProjectsGp = new Group(rightCmp, SWT.NO_FOCUS);
-                       myProjectsGp.setText("My open projects");
-                       myProjectsGp.setLayoutData(EclipseUiUtils.fillWidth());
-                       populateMuliValueClickableList(myProjectsGp, openProjects.toArray(new Node[0]), new ProjectLp(), null);
-               }
+                       // My projects
+                       List<Node> openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getHomeSession(), true));
+                       if (!openProjects.isEmpty()) {
+                               Group myProjectsGp = new Group(rightCmp, SWT.NO_FOCUS);
+                               myProjectsGp.setText("My open projects");
+                               myProjectsGp.setLayoutData(EclipseUiUtils.fillWidth());
+                               populateMuliValueClickableList(myProjectsGp, openProjects.toArray(new Node[0]), new ProjectLp(), null);
+                       }
 
-               // My Milestones
-               if (!openMilestones.isEmpty()) {
-                       Group myMilestoneGp = new Group(rightCmp, SWT.NO_FOCUS);
-                       myMilestoneGp.setText("My open milestones");
-                       myMilestoneGp.setLayoutData(EclipseUiUtils.fillWidth());
-                       populateMuliValueClickableList(myMilestoneGp, openMilestones.toArray(new Node[0]), new MilestoneLp(), null);
+                       // My Milestones
+                       if (!openMilestones.isEmpty()) {
+                               Group myMilestoneGp = new Group(rightCmp, SWT.NO_FOCUS);
+                               myMilestoneGp.setText("My open milestones");
+                               myMilestoneGp.setLayoutData(EclipseUiUtils.fillWidth());
+                               populateMuliValueClickableList(myMilestoneGp, openMilestones.toArray(new Node[0]), new MilestoneLp(),
+                                               null);
+                       }
                }
        }
 
@@ -363,18 +370,13 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                }
        }
 
-       @Focus
-       public void setFocus() {
-               // refreshDocListGadget();
-       }
-
-       public void setActivitiesService(ActivitiesService activitiesService) {
-               this.activitiesService = activitiesService;
-       }
-
-       public void setTrackerService(TrackerService trackerService) {
-               this.trackerService = trackerService;
-       }
+       // public void setActivitiesService(ActivitiesService activitiesService) {
+       // this.activitiesService = activitiesService;
+       // }
+       //
+       // public void setTrackerService(TrackerService trackerService) {
+       // this.trackerService = trackerService;
+       // }
 
        // LOCAL HELPERS
        private void populateMuliValueClickableList(Composite parent, Node[] nodes, ColumnLabelProvider lp,