Skip to content

Commit

Permalink
fix for infoBox (MID-5614)
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Aug 6, 2019
1 parent e9419c5 commit 9edf89c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 101 deletions.
103 changes: 2 additions & 101 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
View file
Expand Up @@ -15,10 +15,8 @@
*/
package com.evolveum.midpoint.web.page.admin.home;

import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventStageType;
import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventTypeType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import java.util.ArrayList;
Expand All @@ -29,38 +27,17 @@

import javax.xml.namespace.QName;

import org.apache.wicket.Component;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.component.IRequestablePage;

import com.evolveum.midpoint.audit.api.AuditEventRecord;
import com.evolveum.midpoint.gui.api.GuiStyleConstants;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.component.box.BasicInfoBoxPanel;
import com.evolveum.midpoint.web.component.box.InfoBoxPanel;
import com.evolveum.midpoint.web.component.box.InfoBoxType;
import com.evolveum.midpoint.web.component.box.SmallInfoBoxPanel;
import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
import com.evolveum.midpoint.web.page.admin.home.component.DashboardPanel;
import com.evolveum.midpoint.web.page.admin.home.component.PersonalInfoPanel;
import com.evolveum.midpoint.web.page.admin.home.component.SystemInfoPanel;
import com.evolveum.midpoint.web.page.admin.reports.PageAuditLogViewer;
import com.evolveum.midpoint.web.page.admin.reports.dto.AuditSearchDto;
import com.evolveum.midpoint.web.page.admin.resources.PageResources;
import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
import com.evolveum.midpoint.web.page.admin.server.PageTasks;
import com.evolveum.midpoint.web.page.admin.services.PageServices;
import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
import com.evolveum.midpoint.web.page.admin.users.PageUsers;

/**
* @author lazyman
Expand Down Expand Up @@ -92,43 +69,6 @@ protected void createBreadcrumb() {

protected abstract void initLayout();

// protected Model<InfoBoxType> getResourceInfoBoxTypeModel(OperationResult result, Task task) {
// InfoBoxType infoBoxType = new InfoBoxType("object-resource-bg", GuiStyleConstants.CLASS_OBJECT_RESOURCE_ICON,
// getString("PageDashboard.infobox.resources.label"));
// Integer totalCount;
// try {
// totalCount = getModelService().countObjects(ResourceType.class, null, null, task, result);
// if (totalCount == null) {
// totalCount = 0;
// }
//
// ObjectQuery query = getPrismContext().queryFor(ResourceType.class)
// .item(ResourceType.F_OPERATIONAL_STATE, OperationalStateType.F_LAST_AVAILABILITY_STATUS).eq(AvailabilityStatusType.UP)
// .build();
// Integer activeCount = getModelService().countObjects(ResourceType.class, query, null, task, result);
// if (activeCount == null) {
// activeCount = 0;
// }
//
// infoBoxType.setNumber(activeCount + " " + getString("PageDashboard.infobox.resources.number"));
//
// int progress = 0;
// if (totalCount != 0) {
// progress = activeCount * 100 / totalCount;
// }
// infoBoxType.setProgress(progress);
//
// infoBoxType.setDescription(totalCount + " " + getString("PageDashboard.infobox.resources.total"));
//
// } catch (Exception e) {
// infoBoxType.setNumber("ERROR: "+e.getMessage());
// }
//
// customizationResourceInfoBoxType(infoBoxType, result, task);
//
// return new Model<>(infoBoxType);
// }

protected <O extends ObjectType> void customizationObjectInfoBoxType(InfoBoxType infoBoxType, Class<O> type,
List<QName> items, Object eqObject, String bgColor, String icon, String keyPrefix, Integer totalCount,
Integer activeCount, OperationResult result, Task task) {
Expand All @@ -145,8 +85,9 @@ protected <O extends ObjectType> Model<InfoBoxType> getObjectInfoBoxTypeModel(Cl
if (totalCount == null) {
totalCount = 0;
}
QName[] queryItems = new QName[items.size()];
ObjectQuery query = getPrismContext().queryFor(type)
.item((QName[])items.toArray()).eq(eqObject)
.item(items.toArray(queryItems)).eq(eqObject)
.build();

activeCount = getModelService().countObjects(type, query, null, task, result);
Expand Down Expand Up @@ -174,46 +115,6 @@ protected <O extends ObjectType> Model<InfoBoxType> getObjectInfoBoxTypeModel(Cl
return new Model<>(infoBoxType);
}

// protected Model<InfoBoxType> getTaskInfoBoxTypeModel(OperationResult result, Task task) {
// InfoBoxType infoBoxType = new InfoBoxType("object-task-bg", GuiStyleConstants.CLASS_OBJECT_TASK_ICON,
// getString("PageDashboard.infobox.tasks.label"));
// Integer totalCount;
// try {
// totalCount = getModelService().countObjects(TaskType.class, null, null, task, result);
// if (totalCount == null) {
// totalCount = 0;
// }
// ObjectQuery query = getPrismContext().queryFor(TaskType.class)
// .item(TaskType.F_EXECUTION_STATUS).eq(TaskExecutionStatusType.RUNNABLE)
// .build();
// Integer activeCount = getModelService().countObjects(TaskType.class, query, null, task, result);
// if (activeCount == null) {
// activeCount = 0;
// }
//
// infoBoxType.setNumber(activeCount + " " + getString("PageDashboard.infobox.tasks.number"));
//
// int progress = 0;
// if (totalCount != 0) {
// progress = activeCount * 100 / totalCount;
// }
// infoBoxType.setProgress(progress);
//
// infoBoxType.setDescription(totalCount + " " + getString("PageDashboard.infobox.tasks.total"));
//
// } catch (Exception e) {
// infoBoxType.setNumber("ERROR: "+e.getMessage());
// }
//
// customizationTaskInfoBoxType(infoBoxType, result, task);
//
// return new Model<>(infoBoxType);
// }

// protected void customizationTaskInfoBoxType(InfoBoxType infoBoxType, OperationResult result, Task task) {
//
// }

protected <F extends FocusType> Model<InfoBoxType> getFocusInfoBoxType(Class<F> type, String bgColor,
String icon, String keyPrefix, OperationResult result, Task task) {
InfoBoxType infoBoxType = new InfoBoxType(bgColor, icon, getString(keyPrefix + ".label"));
Expand Down
2 changes: 2 additions & 0 deletions gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
View file
Expand Up @@ -93,6 +93,8 @@ div.form-inline > div.form-group {
li.dropdown.user.user-menu {
& > ul.dropdown-menu {
border-color: #367fa9;
right: 0;
left: auto;

& > li.user-footer {
border-color: #367fa9;
Expand Down

0 comments on commit 9edf89c

Please sign in to comment.