Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Process instance details update #14

Merged
merged 1 commit into from
Jun 13, 2016
Merged

Process instance details update #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 40 additions & 39 deletions ...ime-backend/src/main/java/org/jbpm/console/ng/pr/backend/server/DocumentsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,77 +43,78 @@
@Service
@ApplicationScoped
public class DocumentsServiceImpl implements DocumentsService {
private static final Logger logger = LoggerFactory.getLogger(DocumentsServiceImpl.class);

@Inject
private ProcessVariablesService processVariablesService;
private static final Logger logger = LoggerFactory.getLogger(DocumentsServiceImpl.class);

@Inject
private RemoteProcessService remoteProcessService;
@Inject
private ProcessVariablesService processVariablesService;

@Override
public PageResponse<DocumentSummary> getData(QueryFilter filter) {
PageResponse<DocumentSummary> response = new PageResponse<DocumentSummary>();
List<DocumentSummary> documents = getDocuments(filter);
@Inject
private RemoteProcessService remoteProcessService;

response.setStartRowIndex(filter.getOffset());
response.setTotalRowSize(documents.size() - 1);

response.setTotalRowSizeExact( true );
response.setTotalRowSize( documents.size() );

if (!documents.isEmpty()){
if (documents.size() > (filter.getCount() + filter.getOffset())) {
response.setPageRowList( new ArrayList<DocumentSummary>( documents.subList( filter.getOffset(), filter.getOffset() + filter.getCount() ) ) );
response.setLastPage( false );
} else {
response.setPageRowList( new ArrayList<DocumentSummary>( documents.subList( filter.getOffset(),documents.size()) ) );
response.setLastPage( true );
}
@Override
public PageResponse<DocumentSummary> getData(QueryFilter filter) {
PageResponse<DocumentSummary> response = new PageResponse<DocumentSummary>();
List<DocumentSummary> documents = getDocuments(filter);

response.setStartRowIndex(filter.getOffset());
response.setTotalRowSize(documents.size() - 1);

response.setTotalRowSizeExact(true);
response.setTotalRowSize(documents.size());

if (!documents.isEmpty()) {
if (documents.size() > (filter.getCount() + filter.getOffset())) {
response.setPageRowList(new ArrayList<DocumentSummary>(documents.subList(filter.getOffset(), filter.getOffset() + filter.getCount())));
response.setLastPage(false);
} else {
response.setPageRowList(new ArrayList<DocumentSummary>(documents.subList(filter.getOffset(), documents.size())));
response.setLastPage(true);
}

} else {
response.setPageRowList(new ArrayList<DocumentSummary>(documents));
response.setLastPage(true);
} else {
response.setPageRowList(new ArrayList<DocumentSummary>(documents));
response.setLastPage(true);

}
return response;
}
return response;

}
}

private List<DocumentSummary> getDocuments(QueryFilter filter) throws NumberFormatException {

String serverTemplateId = (String) filter.getParams().get("serverTemplateId");

Collection<ProcessVariableSummary> processVariables = processVariablesService.getData(filter).getPageRowList();
SimpleDateFormat sdf = new SimpleDateFormat( Document.DOCUMENT_DATE_PATTERN );
SimpleDateFormat sdf = new SimpleDateFormat(Document.DOCUMENT_DATE_PATTERN);
List<DocumentSummary> documents = new ArrayList<DocumentSummary>();
for (ProcessVariableSummary pv : processVariables) {
if ("org.jbpm.document.Document".equals(pv.getType())) {
if (pv.getNewValue() != null && !pv.getNewValue().isEmpty()) {
String[] values = pv.getNewValue().split( Document.PROPERTIES_SEPARATOR );
String[] values = pv.getNewValue().split(Document.PROPERTIES_SEPARATOR);
if (values.length == 4) {
Date lastModified = null;
try {
lastModified = sdf.parse( values[ 2 ] );
lastModified = sdf.parse(values[2]);
} catch (ParseException ex) {
logger.error("Can not parse last modified date!", ex);
}
documents.add(new DocumentSummary(values[0], lastModified, Long.valueOf(values[1]), remoteProcessService.getDocumentLink(serverTemplateId, values[3])));
}
}
}

}
} return documents;
return documents;
}

@Override
public DocumentSummary getItem(DocumentKey key) {
return null;
}
@Override
public DocumentSummary getItem(DocumentKey key) {
return null;
}

@Override
public List<DocumentSummary> getAll(QueryFilter filter) {
return getDocuments(filter);
}

}
}
11 changes: 2 additions & 9 deletions ...va/org/jbpm/console/ng/pr/client/editors/documents/list/ProcessDocumentListPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@
@Dependent
public class ProcessDocumentListPresenter extends AbstractListPresenter<DocumentSummary> {

private Constants constants = GWT.create( Constants.class );
private Constants constants = Constants.INSTANCE;

public interface ProcessDocumentListView extends AbstractListView.ListView<DocumentSummary, ProcessDocumentListPresenter> {

void init( final ProcessDocumentListPresenter presenter );
}

@Inject
Expand All @@ -57,16 +56,10 @@ public interface ProcessDocumentListView extends AbstractListView.ListView<Docum
private String processInstanceId;
private String processDefId;
private String deploymentId;
private String documentId;
private String serverTemplateId;

public ProcessDocumentListPresenter() {
super();
}

@PostConstruct
public void init() {

view.init( this );
}

Expand Down Expand Up @@ -141,4 +134,4 @@ public boolean error( Message message,
}
}

}
}
71 changes: 21 additions & 50 deletions ...g/jbpm/console/ng/pr/client/editors/instance/details/ProcessInstanceDetailsPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import javax.enterprise.event.Observes;
import javax.inject.Inject;

import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.IsWidget;
Expand All @@ -35,12 +34,8 @@
import org.jbpm.console.ng.pr.client.i18n.Constants;
import org.jbpm.console.ng.pr.model.events.ProcessInstanceSelectionEvent;
import org.jbpm.console.ng.pr.model.events.ProcessInstanceStyleEvent;
import org.jbpm.console.ng.pr.model.events.ProcessInstancesUpdateEvent;
import org.jbpm.console.ng.pr.service.ProcessInstanceService;
import org.jbpm.console.ng.pr.service.integration.RemoteRuntimeDataService;
import org.kie.api.runtime.process.ProcessInstance;
import org.uberfire.backend.vfs.Path;
import org.uberfire.client.mvp.PlaceManager;
import org.uberfire.ext.widgets.common.client.callbacks.DefaultErrorCallback;

@Dependent
Expand All @@ -53,8 +48,7 @@ public class ProcessInstanceDetailsPresenter {

public interface ProcessInstanceDetailsView extends IsWidget {

void displayNotification( String text );

// TODO Review interface to not expose GWT components
HTML getCurrentActivitiesListBox();

HTML getActiveTasksListBox();
Expand All @@ -63,8 +57,6 @@ public interface ProcessInstanceDetailsView extends IsWidget {

HTML getStateText();

void setProcessInstance( ProcessInstanceSummary processInstance );

HTML getProcessDeploymentText();

HTML getProcessVersionText();
Expand All @@ -73,42 +65,18 @@ public interface ProcessInstanceDetailsView extends IsWidget {

HTML getParentProcessInstanceIdText();

void setProcessAssetPath( Path processAssetPath );

void setCurrentActiveNodes( List<NodeInstanceSummary> activeNodes );

void setCurrentCompletedNodes( List<NodeInstanceSummary> completedNodes );

void setEncodedProcessSource( String encodedProcessSource );

List<NodeInstanceSummary> getCompletedNodes();

Path getProcessAssetPath();

String getEncodedProcessSource();

List<NodeInstanceSummary> getActiveNodes();
}

@Inject
private PlaceManager placeManager;

@Inject
private ProcessInstanceDetailsView view;

@Inject
private Caller<ProcessInstanceService> processInstanceService;

@Inject
private Event<ProcessInstanceStyleEvent> processInstanceStyleEvent;

@Inject
private Event<ProcessInstancesUpdateEvent> processInstancesUpdatedEvent;

@Inject
private Caller<RemoteRuntimeDataService> remoteRuntimeDataService;

private Constants constants = GWT.create(Constants.class);
private Constants constants = Constants.INSTANCE;

private ProcessInstanceSummary processSelected = null;

Expand All @@ -121,29 +89,35 @@ private void changeStyleRow( long processInstanceId,
String processDefVersion,
Date startTime ) {
processInstanceStyleEvent.fire( new ProcessInstanceStyleEvent( processInstanceId, processDefName, processDefVersion, startTime ) );

}

public void onProcessInstanceSelectionEvent( @Observes ProcessInstanceSelectionEvent event ) {
this.currentDeploymentId = event.getDeploymentId();
this.currentProcessInstanceId = String.valueOf( event.getProcessInstanceId() );
this.currentProcessDefId = event.getProcessDefId();
this.currentServerTemplateId = event.getServerTemplateId();
refreshProcessInstanceDataRemote(currentDeploymentId, currentProcessInstanceId, currentProcessDefId, currentServerTemplateId);

refreshProcessInstanceDataRemote(currentDeploymentId, currentProcessInstanceId, currentProcessDefId, currentServerTemplateId);
}

public void refreshProcessInstanceDataRemote( final String deploymentId,
final String processId,
final String processDefId,
final String serverTemplateId) {
public void refreshProcessInstanceDataRemote(final String deploymentId,
final String processId,
final String processDefId,
final String serverTemplateId) {
processSelected = null;

view.getProcessDefinitionIdText().setText( processId );
view.getProcessDefinitionIdText().setText("");
view.getProcessVersionText().setText("");
view.getProcessDeploymentText().setText("");
view.getCorrelationKeyText().setText("");
view.getParentProcessInstanceIdText().setText("");
view.getActiveTasksListBox().setText("");
view.getStateText().setText("");
view.getCurrentActivitiesListBox().setText( "" );

remoteRuntimeDataService.call( new RemoteCallback<ProcessInstanceSummary>() {
@Override
public void callback( ProcessInstanceSummary process ) {
public void callback( final ProcessInstanceSummary process ) {
view.getProcessDefinitionIdText().setText( process.getProcessId() );
view.getProcessVersionText().setText( process.getProcessVersion() );
view.getProcessDeploymentText().setText( process.getDeploymentId() );
Expand All @@ -154,8 +128,6 @@ public void callback( ProcessInstanceSummary process ) {
view.getParentProcessInstanceIdText().setText(constants.No_Parent_Process_Instance());
}

view.setProcessInstance( process );

String statusStr = constants.Unknown();
switch ( process.getState() ) {
case ProcessInstance.STATE_ACTIVE:
Expand All @@ -176,7 +148,7 @@ public void callback( ProcessInstanceSummary process ) {
default:
break;
}
view.getActiveTasksListBox().setText( "" );

if (process.getActiveTasks() != null && !process.getActiveTasks().isEmpty()) {
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();

Expand All @@ -196,10 +168,8 @@ public void callback( ProcessInstanceSummary process ) {

remoteRuntimeDataService.call( new RemoteCallback<List<NodeInstanceSummary>>() {
@Override
public void callback( List<NodeInstanceSummary> details ) {
view.setCurrentActiveNodes( details );
view.getCurrentActivitiesListBox().setText( "" );
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
public void callback( final List<NodeInstanceSummary> details ) {
final SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
for ( NodeInstanceSummary nis : details ) {
safeHtmlBuilder.appendEscapedLines( nis.getTimestamp() + ": "
+ nis.getId() + " - " + nis.getNodeName() + " (" + nis.getType() + ") \n" );
Expand All @@ -208,4 +178,5 @@ public void callback( List<NodeInstanceSummary> details ) {
}
}, new DefaultErrorCallback() ).getProcessInstanceActiveNodes( serverTemplateId, Long.parseLong( processId ) );
}
}

}
Loading