Back vs. Cancel editing clarification. Icons for task execution states.

Evolveum · Apr 1, 2016 · da5cac9 · da5cac9
1 parent cf26293
commit da5cac9
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java
@@ -271,16 +271,20 @@ private void afterSave(AjaxRequestTarget target, OperationResult result) {
 	}
 
 	public void backPerformed(AjaxRequestTarget target) {
+		parentPage.goBack(PageTasks.class);			// TODO implement correctly
+	}
+
+	public void cancelEditingPerformed(AjaxRequestTarget target) {
 		if (!parentPage.isEdit()) {
-			parentPage.goBack(PageTasks.class);			// TODO implement correctly
-		} else {
-			parentPage.setEdit(false);
-			parentPage.refreshModel();
-			parentPage.startRefreshing();
-			target.add(parentPage.getFeedbackPanel());
-			target.add(parentPage.get(PageTaskEdit.ID_SUMMARY_PANEL));
-			target.add(parentPage.get(PageTaskEdit.ID_MAIN_PANEL));
+			backPerformed(target);			// just for sure
+			return;
 		}
+		parentPage.setEdit(false);
+		parentPage.refreshModel();
+		parentPage.startRefreshing();
+		target.add(parentPage.getFeedbackPanel());
+		target.add(parentPage.get(PageTaskEdit.ID_SUMMARY_PANEL));
+		target.add(parentPage.get(PageTaskEdit.ID_MAIN_PANEL));
 	}
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.html
@@ -22,6 +22,7 @@
         <div class="main-button-bar">
             <span class="button-group">
                 <a class="btn btn-default" wicket:id="back" />
+                <a class="btn btn-default" wicket:id="cancelEditing" />
             </span>
             <span class="button-group">
                 <a class="btn btn-primary" wicket:id="save"/>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
@@ -47,6 +47,7 @@ public class TaskMainPanel extends Panel {
 	private static final String ID_MAIN_FORM = "mainForm";
 	private static final String ID_EDIT = "edit";
 	private static final String ID_BACK = "back";
+	private static final String ID_CANCEL_EDITING = "cancelEditing";
 	private static final String ID_SAVE = "save";
 	private static final String ID_SUSPEND = "suspend";
 	private static final String ID_RESUME = "resume";
@@ -205,14 +206,33 @@ public boolean isVisible() {
 
 	private void initButtons() {
 		AjaxButton backButton = new AjaxButton(ID_BACK, parentPage.createStringResource("pageTaskEdit.button.back")) {
-
 			@Override
 			public void onClick(AjaxRequestTarget target) {
 				parentPage.getController().backPerformed(target);
 			}
 		};
+		backButton.add(new VisibleEnableBehaviour() {
+			@Override
+			public boolean isVisible() {
+				return !parentPage.isEdit();
+			}
+		});
 		mainForm.add(backButton);
 
+		AjaxButton cancelEditingButton = new AjaxButton(ID_CANCEL_EDITING, parentPage.createStringResource("pageTaskEdit.button.cancelEditing")) {
+			@Override
+			public void onClick(AjaxRequestTarget target) {
+				parentPage.getController().cancelEditingPerformed(target);
+			}
+		};
+		cancelEditingButton.add(new VisibleEnableBehaviour() {
+			@Override
+			public boolean isVisible() {
+				return parentPage.isEdit();
+			}
+		});
+		mainForm.add(cancelEditingButton);
+
 		AjaxSubmitButton saveButton = new AjaxSubmitButton(ID_SAVE, parentPage.createStringResource("pageTaskEdit.button.save")) {
 
 			@Override

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
@@ -64,13 +64,27 @@ protected void initialize(ObjectWrapper<TaskType> wrapper) {
 			protected void initialize(ObjectWrapper<TaskType> wrapper) {
 				TaskType taskType = wrapper.getObject().asObjectable();
 				TaskDtoExecutionStatus status = TaskDtoExecutionStatus.fromTaskExecutionStatus(taskType.getExecutionStatus(), taskType.getNodeAsObserved() != null);
+				String icon = getIconForExecutionStatus(status);
+				setIconCssClass(icon);
 				setLabel(PageBase.createStringResourceStatic(TaskSummaryPanel.this, status).getString());
 				// TODO setColor
 			}
 		};
 		addTag(tagExecutionStatus);
 	}
 
+	private String getIconForExecutionStatus(TaskDtoExecutionStatus status) {
+		switch (status) {
+			case RUNNING: return "fa fa-fw fa-lg fa-spinner";
+			case RUNNABLE: return "fa fa-fw fa-lg fa-hand-o-up";
+			case SUSPENDED: return "fa fa-fw fa-lg fa-bed";
+			case SUSPENDING: return "fa fa-fw fa-lg fa-bed";
+			case WAITING: return "fa fa-fw fa-lg fa-clock-o";
+			case CLOSED: return "fa fa-fw fa-lg fa-power-off";
+			default: return "";
+		}
+	}
+
 	@Override
 	protected QName getDisplayNamePropertyName() {
 		return TaskType.F_NAME;

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1923,6 +1923,7 @@ pageTaskEdit.boundHelp=Tightly bound tasks are used to run short actions, which
 pageTaskEdit.bound=Tightly bound (use if recurring task runs often)
 pageTaskEdit.binding=Binding
 pageTaskEdit.button.back=Back
+pageTaskEdit.button.cancelEditing=Cancel editing
 pageTaskEdit.button.edit=Edit
 pageTaskEdit.button.resume=Resume
 pageTaskEdit.button.runNow=Run now