Skip to content

Commit

Permalink
fixing searches on reports and created reports pages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed May 21, 2014
1 parent 891aeff commit 80ba9bd
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 101 deletions.
38 changes: 24 additions & 14 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
View file
Expand Up @@ -19,6 +19,7 @@
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.match.PolyStringNormMatchingRule;
import com.evolveum.midpoint.prism.polystring.PolyStringNormalizer;
import com.evolveum.midpoint.prism.query.ObjectPaging;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.RefFilter;
import com.evolveum.midpoint.prism.query.SubstringFilter;
Expand Down Expand Up @@ -47,7 +48,7 @@
import com.evolveum.midpoint.web.page.admin.configuration.component.HeaderMenuAction;
import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDeleteDialogDto;
import com.evolveum.midpoint.web.page.admin.reports.dto.ReportOutputSearchDto;
import com.evolveum.midpoint.web.session.CreatedReportsStorage;
import com.evolveum.midpoint.web.session.ReportsStorage;
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
import com.evolveum.midpoint.web.util.WebMiscUtil;
import com.evolveum.midpoint.web.util.WebModelUtils;
Expand Down Expand Up @@ -121,8 +122,8 @@ public PageCreatedReports(PageParameters pageParameters, PageBase previousPage)
searchModel = new LoadableModel<ReportOutputSearchDto>() {
@Override
protected ReportOutputSearchDto load() {
CreatedReportsStorage storage = getSessionStorage().getCreatedReports();
ReportOutputSearchDto dto = storage.getReportsSearch();
ReportsStorage storage = getSessionStorage().getReports();
ReportOutputSearchDto dto = storage.getReportOutputSearch();

if (dto == null) {
dto = new ReportOutputSearchDto();
Expand Down Expand Up @@ -162,7 +163,14 @@ protected InputStream initStream() {
ajaxDownloadBehavior.setContentType("application/pdf; charset=UTF-8");
mainForm.add(ajaxDownloadBehavior);

ObjectDataProvider provider = new ObjectDataProvider(PageCreatedReports.this, ReportOutputType.class);
ObjectDataProvider provider = new ObjectDataProvider(PageCreatedReports.this, ReportOutputType.class) {

@Override
protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
ReportsStorage storage = getSessionStorage().getReports();
storage.setReportOutputsPaging(paging);
}
};
ObjectQuery query;

String oidValue = getPageParameters().get(OnePageParameterEncoder.PARAMETER).toString();
Expand Down Expand Up @@ -647,9 +655,10 @@ private void reportTypeFilterPerformed(AjaxRequestTarget target) {
ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
provider.setQuery(query);

CreatedReportsStorage storage = getSessionStorage().getCreatedReports();
storage.setReportsSearch(searchModel.getObject());
panel.setCurrentPage(storage.getReportsPaging());
ReportsStorage storage = getSessionStorage().getReports();
storage.setReportOutputSearch(searchModel.getObject());
storage.setReportsPaging(null);
panel.setCurrentPage(null);

target.add(panel);
target.add(getFeedbackPanel());
Expand All @@ -664,9 +673,10 @@ private void searchPerformed(AjaxRequestTarget target) {
ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
provider.setQuery(query);

CreatedReportsStorage storage = getSessionStorage().getCreatedReports();
storage.setReportsSearch(searchModel.getObject());
panel.setCurrentPage(storage.getReportsPaging());
ReportsStorage storage = getSessionStorage().getReports();
storage.setReportOutputSearch(searchModel.getObject());
storage.setReportOutputsPaging(null);
panel.setCurrentPage(null);

target.add(panel);
}
Expand All @@ -685,12 +695,12 @@ private void clearSearchPerformed(AjaxRequestTarget target) {
ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
provider.setQuery(null);

CreatedReportsStorage storage = getSessionStorage().getCreatedReports();
storage.setReportsSearch(searchModel.getObject());
panel.setCurrentPage(storage.getReportsPaging());
ReportsStorage storage = getSessionStorage().getReports();
storage.setReportOutputSearch(searchModel.getObject());
storage.setReportOutputsPaging(null);
panel.setCurrentPage(null);

target.add(get(ID_SEARCH_FORM));
target.add(panel);
}

}
11 changes: 5 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
View file
Expand Up @@ -224,11 +224,7 @@ public void secondClicked(AjaxRequestTarget target, IModel<SelectableBean<Report

@Override
public boolean isFirstButtonEnabled(IModel<SelectableBean<ReportType>> rowModel){
if(rowModel.getObject().getValue().isParent()){
return true;
} else {
return false;
}
return rowModel.getObject().getValue().isParent();
}
};
columns.add(column);
Expand Down Expand Up @@ -281,8 +277,10 @@ private void searchPerformed(AjaxRequestTarget target){

ReportsStorage storage = getSessionStorage().getReports();
storage.setReportSearch(searchModel.getObject());
storage.setReportsPaging(null);

TablePanel table = getReportTable();
table.setCurrentPage(null);
target.add(table);
target.add(getFeedbackPanel());
}
Expand Down Expand Up @@ -332,7 +330,8 @@ private void clearSearchPerformed(AjaxRequestTarget target){

ReportsStorage storage = getSessionStorage().getReports();
storage.setReportSearch(searchModel.getObject());
panel.setCurrentPage(storage.getReportsPaging());
storage.setReportsPaging(null);
panel.setCurrentPage(null);

target.add(get(ID_SEARCH_FORM));
target.add(panel);
Expand Down
54 changes: 0 additions & 54 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/CreatedReportsStorage.java
View file

This file was deleted.

41 changes: 34 additions & 7 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
View file
Expand Up @@ -16,25 +16,36 @@
package com.evolveum.midpoint.web.session;

import com.evolveum.midpoint.prism.query.ObjectPaging;
import com.evolveum.midpoint.web.page.admin.reports.dto.ReportOutputSearchDto;
import com.evolveum.midpoint.web.page.admin.reports.dto.ReportSearchDto;

import java.io.Serializable;

/**
* @author shood
* */
public class ReportsStorage implements Serializable{
* @author shood
*/
public class ReportsStorage implements Serializable {

/**
* DTO used for search purposes in {@link com.evolveum.midpoint.web.page.admin.reports.PageReports}
* */
* DTO used for search purposes in {@link com.evolveum.midpoint.web.page.admin.reports.PageReports}
*/
private ReportSearchDto reportSearch;

/**
* Paging DTO used in table on page {@link com.evolveum.midpoint.web.page.admin.reports.PageReports}
* */
* Paging DTO used in table on page {@link com.evolveum.midpoint.web.page.admin.reports.PageReports}
*/
private ObjectPaging reportsPaging;

/**
* DTO used for search purposes in {@link com.evolveum.midpoint.web.page.admin.reports.PageCreatedReports}
*/
private ReportOutputSearchDto reportOutputSearch;

/**
* Paging DTO used in table on page {@link com.evolveum.midpoint.web.page.admin.reports.PageCreatedReports}
*/
private ObjectPaging reportOutputsPaging;

public ReportSearchDto getReportSearch() {
return reportSearch;
}
Expand All @@ -50,4 +61,20 @@ public ObjectPaging getReportsPaging() {
public void setReportsPaging(ObjectPaging reportsPaging) {
this.reportsPaging = reportsPaging;
}

public ObjectPaging getReportOutputsPaging() {
return reportOutputsPaging;
}

public void setReportOutputsPaging(ObjectPaging reportOutputsPaging) {
this.reportOutputsPaging = reportOutputsPaging;
}

public ReportOutputSearchDto getReportOutputSearch() {
return reportOutputSearch;
}

public void setReportOutputSearch(ReportOutputSearchDto reportOutputSearch) {
this.reportOutputSearch = reportOutputSearch;
}
}
32 changes: 12 additions & 20 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
View file
Expand Up @@ -43,7 +43,6 @@ public class SessionStorage implements Serializable {
* Store sessions information for "users" and other pages
*/
private UsersStorage users;
private CreatedReportsStorage createdReports;
private ReportsStorage reports;
private ResourcesStorage resources;
private RolesStorage roles;
Expand Down Expand Up @@ -81,50 +80,43 @@ public UsersStorage getUsers() {
return users;
}

public CreatedReportsStorage getCreatedReports(){
if(createdReports == null){
createdReports = new CreatedReportsStorage();
}
return createdReports;
}

public ResourcesStorage getResources(){
if(resources == null){
public ResourcesStorage getResources() {
if (resources == null) {
resources = new ResourcesStorage();
}
return resources;
}

public RolesStorage getRoles(){
if(roles == null){
public RolesStorage getRoles() {
if (roles == null) {
roles = new RolesStorage();
}
return roles;
}

public TasksStorage getTasks(){
if(tasks == null){
public TasksStorage getTasks() {
if (tasks == null) {
tasks = new TasksStorage();
}
return tasks;
}

public ResourceContentStorage getResourceContent(){
if(resourceContent == null){
public ResourceContentStorage getResourceContent() {
if (resourceContent == null) {
resourceContent = new ResourceContentStorage();
}
return resourceContent;
}

public ReportsStorage getReports(){
if(reports == null){
public ReportsStorage getReports() {
if (reports == null) {
reports = new ReportsStorage();
}
return reports;
}

public OrgUnitStorage getOrgUnits(){
if(orgUnitStorage == null){
public OrgUnitStorage getOrgUnits() {
if (orgUnitStorage == null) {
orgUnitStorage = new OrgUnitStorage();
}
return orgUnitStorage;
Expand Down

0 comments on commit 80ba9bd

Please sign in to comment.