X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.workbench.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fworkbench%2Fparts%2FDefaultDashboardEditor.java;h=b0e03b0909554bdca4a0d56d66abefbc59955693;hp=cc45bb2557c4de4463cefd43b9c520cb6c14c426;hb=07694dd6c416e5ec27a9d87bafdd92f049383f83;hpb=e7ec976e33b8893b93b953c69c816286d7a118c7

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index cc45bb2..b0e03b0 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -5,12 +5,13 @@ import javax.jcr.NodeIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.connect.people.PeopleConstants;
-import org.argeo.connect.people.PeopleTypes;
-import org.argeo.connect.people.workbench.rap.PeopleRapUtils;
-import org.argeo.connect.ui.workbench.Refreshable;
+import org.argeo.activities.ActivitiesTypes;
+import org.argeo.connect.resources.ResourcesTypes;
 import org.argeo.connect.util.ConnectJcrUtils;
+import org.argeo.connect.workbench.ConnectWorkbenchUtils;
+import org.argeo.connect.workbench.Refreshable;
 import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleTypes;
 import org.argeo.suite.workbench.AsUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -26,7 +27,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 	private int wh = 300;
 	private int hh = 350;
 
-	private Composite projectsGadget;
+	private Composite lastUpdatedDocsGadget;
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -42,13 +43,12 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 		bodyLayout.verticalSpacing = 20;
 		body.setLayout(bodyLayout);
 
-		// Last updated doc List
-		projectsGadget = createGadgetCmp(body, wh, hh);
-		// refreshDocListGadget(projectsGadget);
-
 		// Contacts
 		Composite contactGadget = createGadgetCmp(body, wh, hh);
 		populateContactsGadget(contactGadget);
+
+		// Last updated doc List
+		lastUpdatedDocsGadget = createGadgetCmp(body, wh, hh);
 	}
 
 	@Override
@@ -63,17 +63,17 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
 	/** Links to the various last updated docs */
 	private void refreshDocListGadget() {
-		EclipseUiUtils.clear(projectsGadget);
-		projectsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout());
-		createGadgetTitleCmp(projectsGadget, "Last updated documents");
-		Composite bodyCmp = createGadgetBodyCmp(projectsGadget);
+		EclipseUiUtils.clear(lastUpdatedDocsGadget);
+		lastUpdatedDocsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout());
+		createGadgetTitleCmp(lastUpdatedDocsGadget, "Last updated documents");
+		Composite bodyCmp = createGadgetBodyCmp(lastUpdatedDocsGadget);
 
 		NodeIterator nit = getDocumentsService().getLastUpdatedDocuments(getSession());
 		while (nit.hasNext()) {
 			Node file = nit.nextNode();
 			createOpenEntityEditorLink(getAppWorkbenchService(), bodyCmp, ConnectJcrUtils.getName(file), file);
 		}
-		projectsGadget.layout(true, true);
+		lastUpdatedDocsGadget.layout(true, true);
 	}
 
 	/** Links to the various contact search pages */
@@ -81,25 +81,15 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 		parent.setLayout(EclipseUiUtils.noSpaceGridLayout());
 		createGadgetTitleCmp(parent, "Contacts");
 		Composite bodyCmp = createGadgetBodyCmp(parent);
-
-		PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Persons",
-				PeopleTypes.PEOPLE_PERSON, getPeopleService().getBasePath(PeopleTypes.PEOPLE_PERSON));
-
-		PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Organisations",
-				PeopleTypes.PEOPLE_ORG, getPeopleService().getBasePath(PeopleTypes.PEOPLE_ORG));
-
-		Node tagParent = getPeopleService().getResourceService().getTagLikeResourceParent(getSession(),
+		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Persons",
+				PeopleTypes.PEOPLE_PERSON);
+		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Organisations",
+				PeopleTypes.PEOPLE_ORG);
+		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists",
 				PeopleTypes.PEOPLE_MAILING_LIST);
-		PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists",
-					PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent));
-		PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks", PeopleTypes.PEOPLE_TASK,
-				getPeopleService().getBasePath(null));
-
-		tagParent = getPeopleService().getResourceService().getTagLikeResourceParent(getSession(),
-				PeopleConstants.RESOURCE_TAG);
-
-		PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tags",
-				PeopleTypes.PEOPLE_TAG_INSTANCE, ConnectJcrUtils.getPath(tagParent));
-
+		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks",
+				ActivitiesTypes.ACTIVITIES_TASK);
+		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tags",
+				ResourcesTypes.RESOURCES_TAG);
 	}
 }