Close #238

Author: Open Lowcode SAS

src/org/openlowcode/module/system/design/SystemModule.java

@@ -541,7 +541,7 @@ public SystemModule() {
 		LinkedToParent sessionuserlinkedtoparent = new LinkedToParent("sessionuser", appuser);
 		usersession.addProperty(sessionuserlinkedtoparent);
 
-		this.moduleusage = new DataObjectDefinition("MODULEUSAGE", "Module Usage", this);
+		this.moduleusage = new DataObjectDefinition("MODULEUSAGE", "Module Usage", this,true);
 		moduleusage.addProperty(new StoredObject());
 		moduleusage.addProperty(new UniqueIdentified());
 		TimestampField dayformoduleusage = new TimestampField("DAY", "Day", "Day of the usage",
@@ -1288,7 +1288,7 @@ public SystemModule() {
 
 		StaticActionDefinition showmodules = new StaticActionDefinition("SHOWMODULESTAT");
 		showmodules.addOutputArgument(new ArrayArgument(new ObjectArgument("MODULEREPORT", modulereport)));
-		showmodules.setButtonlabel("Modules Stat");
+		showmodules.setButtonlabel("Server Usage");
 		this.addasMenuAction(showmodules);
 		DynamicPageDefinition showmodulespage = new DynamicPageDefinition("SHOWMODULESTAT");
 		showmodulespage.linkPageToAction(showmodules);
@@ -1407,7 +1407,7 @@ public SystemModule() {
 		launchsessioncleaning.addOutputArgument(new IntegerArgument("OLDESTLOG"));
 
 		launchsessioncleaning.setButtonlabel("Session Cleaning");
-		this.addasMenuAction(launchsessioncleaning);
+		this.addAction(launchsessioncleaning);
 
 		DynamicPageDefinition launchsessioncleaningpage = new DynamicPageDefinition("SESSIONCLEANING");
 		launchsessioncleaningpage.linkPageToAction(launchsessioncleaning);

src/org/openlowcode/module/system/page/ShowmodulestatPage.java

@@ -10,7 +10,10 @@
 
 package org.openlowcode.module.system.page;
 
+import org.openlowcode.module.system.action.LaunchsessioncleaningAction;
 import org.openlowcode.module.system.action.ModuleusagesummaryAction;
+import org.openlowcode.module.system.action.generated.AtgLaunchsearchmoduleusageAction;
+import org.openlowcode.module.system.action.generated.AtgLaunchsearchusersessionAction;
 import org.openlowcode.module.system.data.Modulereport;
 import org.openlowcode.module.system.page.generated.AbsShowmodulestatPage;
 import org.openlowcode.server.graphic.SPageNode;
@@ -46,15 +49,24 @@ public String generateTitle(Modulereport[] modulereport) {
 	@Override
 	protected SPageNode getContent() {
 		SComponentBand mainband = new SComponentBand(SComponentBand.DIRECTION_DOWN, this);
-		mainband.addElement(new SPageText("Module Summary", SPageText.TYPE_TITLE, this));
+		mainband.addElement(new SPageText("Server Usage", SPageText.TYPE_TITLE, this));
 		mainband.addElement(
 				new SPageText("Modules installed on the server are listed below.", SPageText.TYPE_NORMAL, this));
 		SObjectArray<Modulereport> modulereport = new SObjectArray<Modulereport>("MODULEREPORT", this.getModulereport(),
 				Modulereport.getDefinition(), this);
 
 		mainband.addElement(modulereport);
+		SComponentBand buttonband = new SComponentBand(SComponentBand.DIRECTION_RIGHT,this);
+		mainband.addElement(buttonband);
 		ModuleusagesummaryAction.ActionRef showmodulestat = ModuleusagesummaryAction.get().getActionRef();
-		mainband.addElement(new SActionButton("Show usage stats", showmodulestat, this));
+		buttonband.addElement(new SActionButton("Show usage stats", showmodulestat, this));
+		LaunchsessioncleaningAction.ActionRef sessioncleaning = LaunchsessioncleaningAction.get().getActionRef();
+		buttonband.addElement(new SActionButton("Clean sessions",sessioncleaning,this));
+		AtgLaunchsearchusersessionAction.ActionRef searchsessions = AtgLaunchsearchusersessionAction.get().getActionRef();
+		buttonband.addElement(new SActionButton("Search sessions",searchsessions,this));
+		AtgLaunchsearchmoduleusageAction.ActionRef searchmoduleusage = AtgLaunchsearchmoduleusageAction.get().getActionRef();
+		buttonband.addElement(new SActionButton("Search module usage",searchmoduleusage,this));
+		
 		return mainband;
 	}