-
+
+
+
+
{{ document.route_step.name }}
+
+
+
+ {{ 'workflow_type.' + document.route_step.type | translate }}
+
+
+
+
+
+ {{ 'workflow_transition.VALIDATED' | translate }}
+
+
+ {{ 'workflow_transition.APPROVED' | translate }}
+
+
+ {{ 'workflow_transition.REJECTED' | translate }}
+
+
+
+
+
+
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.workflow.html b/docs-web/src/main/webapp/src/partial/docs/document.view.workflow.html
new file mode 100644
index 00000000..972cbcc8
--- /dev/null
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.workflow.html
@@ -0,0 +1,72 @@
+
{{ 'document.view.workflow.message' | translate }}
+
+
+
+
+
+
+
+
+ | Type |
+ Name |
+ For |
+ Validation |
+
+
+
+
+ |
+
+
+ {{ 'workflow_type.' + step.type | translate }}
+ |
+ {{ step.name }} |
+
+
+ |
+
+
+ {{ 'workflow_transition.' + step.transition | translate }}
+ {{ step.end_date | timeAgo: dateTimeFormat }}
+ by
+ {{ step.validator_username }}
+
+
+ {{ step.comment }}
+
+
+ |
+
+
+
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less
index 7fe6872f..aee9a1c8 100644
--- a/docs-web/src/main/webapp/src/style/main.less
+++ b/docs-web/src/main/webapp/src/style/main.less
@@ -237,7 +237,7 @@ input[readonly].share-link {
}
// Comments
-.page-header-comments {
+.page-header-side {
margin: 14px 0 20px;
}
@@ -449,4 +449,22 @@ input[readonly].share-link {
.mb-10 {
margin-bottom: 10px;
+}
+
+// Buttons
+.btn {
+ transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+ font-weight: 400;
+ border-radius: 4px;
+}
+
+// Cards
+.card {
+ min-width: 0;
+ word-wrap: break-word;
+ background-color: #fff;
+ background-clip: border-box;
+ border: 1px solid rgba(0,0,0,.125);
+ border-radius: .25em;
+ padding: 1.25em;
}
\ No newline at end of file
diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestRouteResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestRouteResource.java
index 8fd5dedb..9209411d 100644
--- a/docs-web/src/test/java/com/sismics/docs/rest/TestRouteResource.java
+++ b/docs-web/src/test/java/com/sismics/docs/rest/TestRouteResource.java
@@ -52,11 +52,13 @@ public class TestRouteResource extends BaseJerseyTest {
String document1Id = json.getString("id");
// Start the default route on document 1
- target().path("/route/start").request()
+ json = target().path("/route/start").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, route1Token)
.post(Entity.form(new Form()
.param("documentId", document1Id)
.param("routeModelId", routeModels.getJsonObject(0).getString("id"))), JsonObject.class);
+ JsonObject step = json.getJsonObject("route_step");
+ Assert.assertEquals("Check the document's metadata", step.getString("name"));
// Get the route on document 1
json = target().path("/route")
@@ -71,7 +73,7 @@ public class TestRouteResource extends BaseJerseyTest {
Assert.assertNotNull(route.getJsonNumber("create_date"));
JsonArray steps = route.getJsonArray("steps");
Assert.assertEquals(3, steps.size());
- JsonObject step = steps.getJsonObject(0);
+ step = steps.getJsonObject(0);
Assert.assertEquals("Check the document's metadata", step.getString("name"));
Assert.assertEquals("VALIDATE", step.getString("type"));
Assert.assertTrue(step.isNull("comment"));
@@ -102,11 +104,14 @@ public class TestRouteResource extends BaseJerseyTest {
Assert.assertEquals("Check the document's metadata", routeStep.getString("name"));
// Validate the current step with admin
- target().path("/route/validate").request()
+ json = target().path("/route/validate").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.post(Entity.form(new Form()
.param("documentId", document1Id)
.param("transition", "VALIDATED")), JsonObject.class);
+ step = json.getJsonObject("route_step");
+ Assert.assertEquals("Add relevant files to the document", step.getString("name"));
+ Assert.assertTrue(json.getBoolean("readable"));
// Get the route on document 1
json = target().path("/route")
@@ -136,12 +141,15 @@ public class TestRouteResource extends BaseJerseyTest {
Assert.assertEquals("Add relevant files to the document", routeStep.getString("name"));
// Validate the current step with admin
- target().path("/route/validate").request()
+ json = target().path("/route/validate").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.post(Entity.form(new Form()
.param("documentId", document1Id)
.param("transition", "VALIDATED")
.param("comment", "OK")), JsonObject.class);
+ step = json.getJsonObject("route_step");
+ Assert.assertEquals("Approve the document", step.getString("name"));
+ Assert.assertTrue(json.getBoolean("readable"));
// Get the route on document 1
json = target().path("/route")
@@ -171,11 +179,13 @@ public class TestRouteResource extends BaseJerseyTest {
Assert.assertEquals("Approve the document", routeStep.getString("name"));
// Validate the current step with admin
- target().path("/route/validate").request()
+ json = target().path("/route/validate").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.post(Entity.form(new Form()
.param("documentId", document1Id)
.param("transition", "APPROVED")), JsonObject.class);
+ Assert.assertFalse(json.containsKey("route_step"));
+ Assert.assertFalse(json.getBoolean("readable"));
// Get the route on document 1
json = target().path("/route")