diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-api/src/main/java/org/jbpm/console/ng/ht/service/TaskOperationsService.java b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-api/src/main/java/org/jbpm/console/ng/ht/service/TaskOperationsService.java index 10f31af17d..c373bb4f46 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-api/src/main/java/org/jbpm/console/ng/ht/service/TaskOperationsService.java +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-api/src/main/java/org/jbpm/console/ng/ht/service/TaskOperationsService.java @@ -16,36 +16,12 @@ package org.jbpm.console.ng.ht.service; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.jboss.errai.bus.server.annotations.Remote; -import org.jbpm.console.ng.ht.model.TaskAssignmentSummary; -import org.jbpm.console.ng.ht.model.TaskSummary; @Remote public interface TaskOperationsService { - public long addQuickTask( - final String taskName, - int priority, - Date dueDate, final List users, List groups, String identity, boolean start, - boolean claim,String taskFormName, String deploymentId, Long processInstanceId); - - public void updateTask(long taskId, int priority, List taskDescription, Date dueDate); - - TaskSummary getTaskDetails(long taskId); - - long saveContent(long taskId, Map values); - - boolean existInDatabase(long taskId); - - TaskAssignmentSummary getTaskAssignmentDetails(String serverTemplateId, String containerId, long taskId); - void executeReminderForTask(long taskId,String fromUser); - Boolean allowDelegate(long taskId, String userId, Set groups); - } diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-backend/src/main/java/org/jbpm/console/ng/ht/backend/server/TaskOperationsServiceImpl.java b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-backend/src/main/java/org/jbpm/console/ng/ht/backend/server/TaskOperationsServiceImpl.java index ff298f7b28..e8ba30f71d 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-backend/src/main/java/org/jbpm/console/ng/ht/backend/server/TaskOperationsServiceImpl.java +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-backend/src/main/java/org/jbpm/console/ng/ht/backend/server/TaskOperationsServiceImpl.java @@ -16,79 +16,18 @@ package org.jbpm.console.ng.ht.backend.server; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; import javax.enterprise.context.ApplicationScoped; import org.jboss.errai.bus.server.annotations.Service; -import org.jbpm.console.ng.ht.model.TaskAssignmentSummary; -import org.jbpm.console.ng.ht.model.TaskSummary; import org.jbpm.console.ng.ht.service.TaskOperationsService; @Service @ApplicationScoped public class TaskOperationsServiceImpl implements TaskOperationsService { - - @Override - public long addQuickTask( - final String taskName, - int priority, - Date dueDate, final List users, List groups, String identity, boolean start, - boolean claim,String taskformName,String deploymentId, Long processInstanceId){ - - - return -1; - } - - @Override - public void updateTask(long taskId, int priority, List taskDescription, - Date dueDate) { - - } - - - @Override - public TaskSummary getTaskDetails(long taskId) { - - return null; - } - - @Override - public long saveContent(long taskId, Map values) { - return -1; - } - - @Override - public boolean existInDatabase(long taskId) { - return false; - } - - @Override - public TaskAssignmentSummary getTaskAssignmentDetails(String serverTemplateId, String containerId, long taskId) { - - return null; - } - @Override public void executeReminderForTask(long taskId,String fromUser) { } - /** - * Checks if the user is allowed to delegate the given task - * - * @param taskId - * @param userId - * @param groups - * @return - */ - @Override - public Boolean allowDelegate(long taskId, final String userId, final Set groups) { - - return false; - } - } \ No newline at end of file diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/quicknewtask/QuickNewTaskPopup.java b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/quicknewtask/QuickNewTaskPopup.java index 5b3e699d4d..f6579129dd 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/quicknewtask/QuickNewTaskPopup.java +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/quicknewtask/QuickNewTaskPopup.java @@ -462,6 +462,8 @@ public void addTask( final List users, } } +/* + taskOperationsService.call( new RemoteCallback() { @Override public void callback( Long taskId ) { @@ -479,7 +481,7 @@ public boolean error( Message message, } } ).addQuickTask( taskName, priority, due, users, groups, identity.getIdentifier(), start, claim, taskFormName, deploymentId, processInstanceId ); - +*/ } private void refreshNewTask( Long taskId, diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskcomments/TaskCommentsViewImpl.java b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskcomments/TaskCommentsViewImpl.java index 04d50342eb..e912b5ba71 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskcomments/TaskCommentsViewImpl.java +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskcomments/TaskCommentsViewImpl.java @@ -31,7 +31,6 @@ import com.google.gwt.cell.client.HasCell; import com.google.gwt.cell.client.TextCell; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Style; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.user.cellview.client.Column; @@ -146,7 +145,7 @@ public String getValue( CommentSummary c ) { addedByColumn.setSortable( false ); addedByColumn.setDataStoreName(COL_ADDEDBY); commentsListGrid.addColumn( addedByColumn, constants.Added_By() ); - commentsListGrid.setColumnWidth( addedByColumn, 100, Style.Unit.PX ); + // date Column addedAtColumn = new Column( new TextCell() ) { diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskslist/grid/dash/DataSetTasksListGridPresenter.java b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskslist/grid/dash/DataSetTasksListGridPresenter.java index 6410eac67a..c9dc981661 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskslist/grid/dash/DataSetTasksListGridPresenter.java +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/editors/taskslist/grid/dash/DataSetTasksListGridPresenter.java @@ -16,16 +16,12 @@ package org.jbpm.console.ng.ht.client.editors.taskslist.grid.dash; import javax.enterprise.context.Dependent; -import javax.inject.Inject; import org.jbpm.console.ng.gc.client.menu.RestoreDefaultFiltersMenuBuilder; -import org.jbpm.console.ng.ht.client.editors.quicknewtask.QuickNewTaskPopup; import org.jbpm.console.ng.ht.client.editors.taskslist.grid.AbstractTasksListGridPresenter; -import org.jbpm.console.ng.ht.client.i18n.Constants; import org.uberfire.client.annotations.WorkbenchMenu; import org.uberfire.client.annotations.WorkbenchScreen; import org.uberfire.ext.widgets.common.client.menu.RefreshMenuBuilder; -import org.uberfire.mvp.Command; import org.uberfire.workbench.model.menu.MenuFactory; import org.uberfire.workbench.model.menu.Menus; diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/i18n/Constants.java b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/i18n/Constants.java index 80f0169e53..59a337a14d 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/i18n/Constants.java +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/java/org/jbpm/console/ng/ht/client/i18n/Constants.java @@ -83,8 +83,6 @@ public interface Constants extends Messages { String Actions(); - String No_Parent(); - String User(); String Process_Id(); @@ -137,20 +135,14 @@ public interface Constants extends Messages { String Refresh(); - String Tasks_Refreshed(); - String Add_User(); String Add_Group(); String Remove_User(); - String Remove_Group(); - String Assignments(); - String Auto_Assign_To_Me(); - String Created_On(); String DeploymentId(); @@ -159,10 +151,6 @@ public interface Constants extends Messages { String ParentId(); - String Text_Require(); - - String UserOrGroup(); - String Forward(); String Delegate(); @@ -171,12 +159,6 @@ public interface Constants extends Messages { String No_Potential_Owners(); - String Add_TypeRole(); - - String Type_Role(); - - String Parent_Group(); - String Save(); String Delete(); @@ -189,10 +171,6 @@ public interface Constants extends Messages { String Provide_User_Or_Group(); - String Show_Details(); - - String Hide_Details(); - String Task_Admin(); String FilterTaskAdmin(); @@ -239,26 +217,14 @@ public interface Constants extends Messages { String InProgress(); - String Suspended(); - String Failed(); String Error(); - String Exited(); - String Obsolete(); String Completed(); - String TaskRole(); - - String Initiator(); - - String Stakeholder(); - - String Potential_Owner(); - String Administrator(); String Task_Form(); @@ -273,8 +239,6 @@ public interface Constants extends Messages { String UnexpectedError(String errorMessage); - String NotFoundDataSetWithId(); - String TaskReleased(String taskId); String TaskClaimed(String taskId); diff --git a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/resources/org/jbpm/console/ng/ht/client/i18n/Constants.properties b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/resources/org/jbpm/console/ng/ht/client/i18n/Constants.properties index d33f045f5c..9da5fe6591 100644 --- a/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/resources/org/jbpm/console/ng/ht/client/i18n/Constants.properties +++ b/jbpm-console-ng-human-tasks/jbpm-console-ng-human-tasks-client/src/main/resources/org/jbpm/console/ng/ht/client/i18n/Constants.properties @@ -28,7 +28,6 @@ Work=Work Start=Start Details=Details Actions=Actions -No_Parent=No Parent User=User Process_Id=Process Id Process_Name=Process Name @@ -53,32 +52,22 @@ Form=Form Advanced=Advanced Basic=Basic Refresh=Refresh -Tasks_Refreshed=Tasks Refreshed Add_User=Add User Add_Group=Add Group Remove_User=Remove User -Remove_Group=Remove Group Assignments=Assignments -Auto_Assign_To_Me=Auto Assign To Me Created_On=Created On -Text_Require=This text is required -UserOrGroup=User or Group Forward=Forward Delegate=Delegate Potential_Owners=Potential Owners No_Potential_Owners=There are no Potential Owners No_Actual_Owner=There are no Actual Owners -Add_TypeRole=Add Type Role -Type_Role=Type Role -Parent_Group=Parent Group Save=Save Delete=Delete Calendar=Calendar Logs=Logs Task_Log=Task Log Provide_User_Or_Group=You should provide at least a user or a group -Show_Details=Show Details -Hide_Details=Hide Details Task_Admin=Admin FilterTaskAdmin=Filter Admin Loading=Loading... @@ -94,16 +83,11 @@ Created=Created Ready=Ready Reserved=Reserved InProgress=InProgress -Suspended=Suspended Failed=Failed Error=Error -Exited=Exited Obsolete=Obsolete Completed=Completed -TaskRole=Task role Initiator=Initiator -Stakeholder=Stakeholder -Potential_Owner=Potential_Owner Administrator=Administrator Task_Form=Form Task_Form_Name=Task form name @@ -111,7 +95,6 @@ Task_Form_DeploymentId=Task form deploymentId New_FilteredList=New filtered list Administrators=Administrators UnexpectedError=Unexpected error occurred\: {0} -NotFoundDataSetWithId=Not Found dataset with id TaskReleased=Task with id {0} released TaskClaimed=Task with id {0} claimed ActivationTime=Activation Time