From 68b8d693ecc42389baac9853669c80216ece67b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 7 Mar 2016 21:28:20 +0100
Subject: [PATCH] general: add handling of criticality levels (#10134)

---
 tests/test_admin_pages.py           |  62 +++++++++++++++++
 tests/test_backoffice_pages.py      | 122 +++++++++++++++++++++++++++++++++-
 tests/test_formdata.py              |  39 +++++++++++
 tests/test_sql.py                   |  56 +++++++++++++++-
 tests/test_workflow_import.py       |  15 ++++-
 tests/test_workflows.py             |  49 +++++++++++++-
 tests/utilities.py                  |   1 +
 wcs/admin/workflows.py              | 129 ++++++++++++++++++++++++++++++++++--
 wcs/backoffice/management.py        |  54 ++++++++++++++-
 wcs/formdata.py                     |  42 ++++++++++++
 wcs/formdef.py                      |   2 +-
 wcs/forms/backoffice.py             |  24 ++++++-
 wcs/forms/common.py                 |  14 ----
 wcs/qommon/static/css/dc2/admin.css |  34 ++++++++++
 wcs/qommon/static/js/biglist.js     |   1 +
 wcs/sql.py                          |  26 +++++++-
 wcs/wf/criticality.py               |  77 +++++++++++++++++++++
 wcs/workflows.py                    |  52 +++++++++++++--
 18 files changed, 765 insertions(+), 34 deletions(-)
 create mode 100644 wcs/wf/criticality.py

diff --git a/tests/test_admin_pages.py b/tests/test_admin_pages.py
index c5c852e..665c824 100644
--- a/tests/test_admin_pages.py
+++ b/tests/test_admin_pages.py
@@ -1378,6 +1378,8 @@ def test_workflows_delete(pub):
     assert Workflow.count() == 0
 
 def test_workflows_add_all_actions(pub):
+    create_superuser(pub)
+
     Workflow.wipe()
     workflow = Workflow(name='foo')
     workflow.add_status(name='baz')
@@ -1705,6 +1707,66 @@ def test_workflows_global_actions_edit(pub):
     resp = resp.form.submit('submit')
     assert Workflow.get(workflow.id).global_actions[0].triggers[0].roles == ['_receiver']
 
+def test_workflows_criticality_levels(pub):
+    create_superuser(pub)
+    create_role()
+
+    Workflow.wipe()
+    workflow = Workflow(name='foo')
+    workflow.store()
+
+    app = login(get_app(pub))
+    resp = app.get('/backoffice/workflows/%s/' % workflow.id)
+    resp = resp.click('add criticality level')
+    resp = resp.forms[0].submit('cancel')
+    assert not Workflow.get(workflow.id).criticality_levels
+
+    resp = app.get('/backoffice/workflows/%s/' % workflow.id)
+    resp = resp.click('add criticality level')
+    resp.forms[0]['name'] = 'vigilance'
+    resp = resp.forms[0].submit('submit')
+    assert len(Workflow.get(workflow.id).criticality_levels) == 1
+    assert Workflow.get(workflow.id).criticality_levels[0].name == 'vigilance'
+
+    # test rename
+    resp = app.get('/backoffice/workflows/%s/' % workflow.id)
+    resp = resp.click('vigilance')
+    resp = resp.forms[0].submit('cancel')
+
+    resp = app.get('/backoffice/workflows/%s/' % workflow.id)
+    resp = resp.click('vigilance')
+    resp.forms[0]['name'] = 'Vigilance'
+    resp = resp.forms[0].submit('submit')
+    assert len(Workflow.get(workflow.id).criticality_levels) == 1
+    assert Workflow.get(workflow.id).criticality_levels[0].name == 'Vigilance'
+
+    # add a second level
+    resp = app.get('/backoffice/workflows/%s/' % workflow.id)
+    resp = resp.click('add criticality level')
+    resp.forms[0]['name'] = 'Alerte attentat'
+    resp = resp.forms[0].submit('submit')
+    assert len(Workflow.get(workflow.id).criticality_levels) == 2
+    assert Workflow.get(workflow.id).criticality_levels[0].name == 'Vigilance'
+    assert Workflow.get(workflow.id).criticality_levels[1].name == 'Alerte attentat'
+
+    # test reorder
+    level1_id = Workflow.get(workflow.id).criticality_levels[0].id
+    level2_id = Workflow.get(workflow.id).criticality_levels[1].id
+    app.get('/backoffice/workflows/%s/update_criticality_levels_order?order=%s;%s;' % (
+            workflow.id, level1_id, level2_id))
+    assert Workflow.get(workflow.id).criticality_levels[0].id == level1_id
+    assert Workflow.get(workflow.id).criticality_levels[1].id == level2_id
+    app.get('/backoffice/workflows/%s/update_criticality_levels_order?order=%s;%s;' % (
+            workflow.id, level2_id, level1_id))
+    assert Workflow.get(workflow.id).criticality_levels[0].id == level2_id
+    assert Workflow.get(workflow.id).criticality_levels[1].id == level1_id
+
+    # test removal
+    resp = app.get('/backoffice/workflows/%s/' % workflow.id)
+    resp = resp.click('Vigilance')
+    resp = resp.forms[0].submit('delete-level')
+    assert len(Workflow.get(workflow.id).criticality_levels) == 1
+
 def test_workflows_wscall_label(pub):
     create_superuser(pub)
     create_role()
diff --git a/tests/test_backoffice_pages.py b/tests/test_backoffice_pages.py
index b68aa67..b5c1dc4 100644
--- a/tests/test_backoffice_pages.py
+++ b/tests/test_backoffice_pages.py
@@ -18,7 +18,7 @@ from wcs.qommon.http_request import HTTPRequest
 from wcs.roles import Role
 from wcs.workflows import (Workflow, CommentableWorkflowStatusItem,
         ChoiceWorkflowStatusItem, EditableWorkflowStatusItem,
-        JumpOnSubmitWorkflowStatusItem)
+        JumpOnSubmitWorkflowStatusItem, WorkflowCriticalityLevel)
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.wscall import WebserviceCallStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
@@ -1835,3 +1835,123 @@ def test_backoffice_resubmit(pub):
     assert resp.form['f2'].value == 'XXX'
     assert 'Original form' in resp.body
     assert formdata.get_url(backoffice=True) in resp.body
+
+def test_backoffice_criticality_in_formdef_listing(pub):
+    if not pub.is_using_postgresql():
+        pytest.skip('this requires SQL')
+        return
+    user = create_user(pub)
+    create_environment(pub)
+
+    wf = Workflow.get_default_workflow()
+    wf.id = '2'
+    wf.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red'),
+    ]
+    wf.store()
+    formdef = FormDef.get_by_urlname('form-title')
+    formdef.workflow_id = wf.id
+    formdef.store()
+
+    formdata1, formdata2, formdata3, formdata4 = [
+            x for x in formdef.data_class().select() if x.status == 'wf-new'][:4]
+
+    formdata1.set_criticality_level(1)
+    formdata1.store()
+    formdata1_str = '>%s<' % formdata1.get_display_id()
+    formdata2.set_criticality_level(2)
+    formdata2.store()
+    formdata2_str = '>%s<' % formdata2.get_display_id()
+    formdata3.set_criticality_level(2)
+    formdata3.store()
+    formdata3_str = '>%s<' % formdata3.get_display_id()
+    formdata4_str = '>%s<' % formdata4.get_display_id()
+
+    app = login(get_app(pub))
+    resp = app.get('/backoffice/management/form-title/?order_by=-criticality_level&limit=100')
+    assert resp.body.index(formdata1_str) > resp.body.index(formdata2_str)
+    assert resp.body.index(formdata1_str) > resp.body.index(formdata3_str)
+    assert resp.body.index(formdata1_str) < resp.body.index(formdata4_str)
+
+    resp = app.get('/backoffice/management/form-title/?order_by=criticality_level&limit=100')
+    assert resp.body.index(formdata1_str) < resp.body.index(formdata2_str)
+    assert resp.body.index(formdata1_str) < resp.body.index(formdata3_str)
+    assert resp.body.index(formdata1_str) > resp.body.index(formdata4_str)
+
+def test_backoffice_criticality_in_global_listing(pub):
+    if not pub.is_using_postgresql():
+        pytest.skip('this requires SQL')
+        return
+
+    user = create_user(pub)
+    create_environment(pub)
+
+    wf = Workflow.get_default_workflow()
+    wf.id = '2'
+    wf.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red'),
+    ]
+    wf.store()
+    formdef = FormDef.get_by_urlname('form-title')
+    formdef.workflow_id = wf.id
+    formdef.store()
+
+    formdata1, formdata2, formdata3, formdata4 = [
+            x for x in formdef.data_class().select() if x.status == 'wf-new'][:4]
+
+    formdata1.set_criticality_level(1)
+    formdata1.store()
+    formdata1_str = '>%s<' % formdata1.get_display_id()
+    formdata2.set_criticality_level(2)
+    formdata2.store()
+    formdata2_str = '>%s<' % formdata2.get_display_id()
+    formdata3.set_criticality_level(2)
+    formdata3.store()
+    formdata3_str = '>%s<' % formdata3.get_display_id()
+    formdata4_str = '>%s<' % formdata4.get_display_id()
+
+    app = login(get_app(pub))
+    resp = app.get('/backoffice/management/listing?order_by=-criticality_level&limit=100')
+    assert resp.body.index(formdata1_str) > resp.body.index(formdata2_str)
+    assert resp.body.index(formdata1_str) > resp.body.index(formdata3_str)
+    assert resp.body.index(formdata1_str) < resp.body.index(formdata4_str)
+
+    resp = app.get('/backoffice/management/listing?order_by=criticality_level&limit=100')
+    assert resp.body.index(formdata1_str) < resp.body.index(formdata2_str)
+    assert resp.body.index(formdata1_str) < resp.body.index(formdata3_str)
+    assert resp.body.index(formdata1_str) > resp.body.index(formdata4_str)
+
+def test_backoffice_criticality_formdata_view(pub):
+    user = create_user(pub)
+    create_environment(pub)
+
+    wf = Workflow.get_default_workflow()
+    wf.id = '2'
+    wf.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red'),
+    ]
+    wf.store()
+    formdef = FormDef.get_by_urlname('form-title')
+    formdef.workflow_id = wf.id
+    formdef.store()
+
+    formdef = FormDef.get_by_urlname('form-title')
+    formdata = [x for x in formdef.data_class().select() if x.status == 'wf-new'][0]
+
+    formdata.set_criticality_level(1)
+    formdata.store()
+
+    app = login(get_app(pub))
+    resp = app.get(formdata.get_url(backoffice=True))
+    assert 'Criticality Level: yellow' in resp.body
+
+    formdata.set_criticality_level(2)
+    formdata.store()
+    resp = app.get(formdata.get_url(backoffice=True))
+    assert 'Criticality Level: red' in resp.body
diff --git a/tests/test_formdata.py b/tests/test_formdata.py
index 0720b63..b4f6671 100644
--- a/tests/test_formdata.py
+++ b/tests/test_formdata.py
@@ -10,6 +10,8 @@ from wcs.qommon.http_request import HTTPRequest
 from wcs import fields, formdef
 from wcs.formdef import FormDef
 from wcs.formdata import Evolution
+from wcs.workflows import Workflow, WorkflowCriticalityLevel
+from wcs.wf.anonymise import AnonymiseWorkflowStatusItem
 
 from utilities import create_temporary_pub, clean_temporary_pub
 
@@ -240,3 +242,40 @@ def test_clean_drafts(pub):
     clean_drafts(pub)
     assert formdef.data_class().count() == 1
     assert formdef.data_class().select()[0].id == d_id1
+
+def test_criticality_levels(pub):
+    workflow = Workflow(name='criticality')
+    workflow.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red'),
+    ]
+    workflow.store()
+
+    formdef = FormDef()
+    formdef.name = 'foo'
+    formdef.fields = []
+    formdef.workflow_id = workflow.id
+    formdef.store()
+    formdef.data_class().wipe()
+
+    d = formdef.data_class()()
+    assert d.get_criticality_level_object().name == 'green'
+    d.increase_criticality_level()
+    assert d.get_criticality_level_object().name == 'yellow'
+    d.increase_criticality_level()
+    assert d.get_criticality_level_object().name == 'red'
+    d.increase_criticality_level()
+    assert d.get_criticality_level_object().name == 'red'
+    d.decrease_criticality_level()
+    assert d.get_criticality_level_object().name == 'yellow'
+    d.decrease_criticality_level()
+    assert d.get_criticality_level_object().name == 'green'
+    d.decrease_criticality_level()
+    assert d.get_criticality_level_object().name == 'green'
+    d.set_criticality_level(1)
+    assert d.get_criticality_level_object().name == 'yellow'
+    d.set_criticality_level(2)
+    assert d.get_criticality_level_object().name == 'red'
+    d.set_criticality_level(4)
+    assert d.get_criticality_level_object().name == 'red'
diff --git a/tests/test_sql.py b/tests/test_sql.py
index 4e03ba1..343ae6d 100644
--- a/tests/test_sql.py
+++ b/tests/test_sql.py
@@ -10,7 +10,7 @@ from quixote import cleanup
 from wcs import formdef, publisher, fields
 from wcs.formdef import FormDef
 from wcs.formdata import Evolution
-from wcs.workflows import Workflow, CommentableWorkflowStatusItem
+from wcs.workflows import Workflow, CommentableWorkflowStatusItem, WorkflowCriticalityLevel
 from wcs import sql
 import wcs.qommon.storage as st
 
@@ -1351,3 +1351,57 @@ def test_materialized_view():
     assert sql.get_yearly_totals() == [(str(datetime.date.today().year), 2)]
     sql.refresh_materialized_views()
     assert sql.get_yearly_totals() == [(str(datetime.date.today().year), 3)]
+
+@postgresql
+def test_criticality_levels():
+    drop_formdef_tables()
+    conn, cur = sql.get_connection_and_cursor()
+
+    workflow1 = Workflow(name='criticality1')
+    workflow1.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red'),
+        WorkflowCriticalityLevel(name='redder'),
+        WorkflowCriticalityLevel(name='reddest'),
+    ]
+    workflow1.store()
+
+    workflow2 = Workflow(name='criticality2')
+    workflow2.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='reddest'),
+    ]
+    workflow2.store()
+
+    formdef1 = FormDef()
+    formdef1.name = 'test criticality levels 1'
+    formdef1.fields = []
+    formdef1.workflow_id = workflow1.id
+    formdef1.store()
+
+    formdef2 = FormDef()
+    formdef2.name = 'test criticality levels 2'
+    formdef2.fields = []
+    formdef2.workflow_id = workflow2.id
+    formdef2.store()
+
+    data_class = formdef1.data_class(mode='sql')
+    for i in range(5):
+        formdata = data_class()
+        formdata.set_criticality_level(i)
+        formdata.store()
+
+    data_class = formdef2.data_class(mode='sql')
+    for i in range(2):
+        formdata = data_class()
+        formdata.set_criticality_level(i)
+        formdata.store()
+
+    objects = sql.AnyFormData.select(order_by='-criticality_level')
+    # make sure first two formdata are the highest priority ones, and the last
+    # two formdata are the lowest priority ones.
+    assert objects[0].get_criticality_level_object().name == 'reddest'
+    assert objects[1].get_criticality_level_object().name == 'reddest'
+    assert objects[-1].get_criticality_level_object().name == 'green'
+    assert objects[-2].get_criticality_level_object().name == 'green'
diff --git a/tests/test_workflow_import.py b/tests/test_workflow_import.py
index 0b06360..d4c95ac 100644
--- a/tests/test_workflow_import.py
+++ b/tests/test_workflow_import.py
@@ -6,7 +6,8 @@ import xml.etree.ElementTree as ET
 from quixote import cleanup
 from wcs import publisher
 
-from wcs.workflows import Workflow, CommentableWorkflowStatusItem
+from wcs.workflows import (Workflow, CommentableWorkflowStatusItem,
+        WorkflowCriticalityLevel)
 from wcs.wf.wscall import WebserviceCallStatusItem
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
@@ -426,3 +427,15 @@ def test_display_message_action():
         assert role_id in wf2.possible_status[0].items[0].to
 
     wf2 = assert_import_export_works(wf, include_id=True)
+
+def test_criticality_level():
+    wf = Workflow(name='criticality level')
+    wf.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red', colour='FF0000'),
+    ]
+
+    wf2 = assert_import_export_works(wf)
+    assert wf2.criticality_levels[0].name == 'green'
+    assert wf2.criticality_levels[1].name == 'yellow'
diff --git a/tests/test_workflows.py b/tests/test_workflows.py
index 3c79e7c..ad62a57 100644
--- a/tests/test_workflows.py
+++ b/tests/test_workflows.py
@@ -14,8 +14,9 @@ from wcs.roles import Role
 from wcs.workflows import (Workflow, WorkflowStatusItem,
         SendmailWorkflowStatusItem, SendSMSWorkflowStatusItem,
         DisplayMessageWorkflowStatusItem,
-        AbortActionException)
+        AbortActionException, WorkflowCriticalityLevel)
 from wcs.wf.anonymise import AnonymiseWorkflowStatusItem
+from wcs.wf.criticality import ModifyCriticalityWorkflowStatusItem, MODE_INC, MODE_DEC, MODE_SET
 from wcs.wf.dispatch import DispatchWorkflowStatusItem
 from wcs.wf.form import FormWorkflowStatusItem, WorkflowFormFieldsFormDef
 from wcs.wf.jump import JumpWorkflowStatusItem, _apply_timeouts
@@ -943,3 +944,49 @@ def test_workflow_roles(pub):
     assert emails.get('Foobar')
     assert set(emails.get('Foobar')['email_rcpt']) == set(
             ['foo@localhost', 'bar@localhost', 'baz@localhost'])
+
+def test_criticality(pub):
+    FormDef.wipe()
+
+    workflow = Workflow(name='criticality')
+    workflow.criticality_levels = [
+        WorkflowCriticalityLevel(name='green'),
+        WorkflowCriticalityLevel(name='yellow'),
+        WorkflowCriticalityLevel(name='red'),
+    ]
+    workflow.store()
+
+    formdef = FormDef()
+    formdef.name = 'baz'
+    formdef.workflow_id = workflow.id
+    formdef.store()
+
+    item = ModifyCriticalityWorkflowStatusItem()
+
+    formdata = formdef.data_class()()
+    item.perform(formdata)
+    assert not formdata.criticality_level
+
+    item.mode = MODE_INC
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'yellow'
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'red'
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'red'
+
+    item.mode = MODE_DEC
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'yellow'
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'green'
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'green'
+
+    item.mode = MODE_SET
+    item.absolute_value = 2
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'red'
+    item.absolute_value = 0
+    item.perform(formdata)
+    assert formdata.get_criticality_level_object().name == 'green'
diff --git a/tests/utilities.py b/tests/utilities.py
index e8407c9..a580bff 100644
--- a/tests/utilities.py
+++ b/tests/utilities.py
@@ -99,6 +99,7 @@ def create_temporary_pub(sql_mode=False):
     fd.write('formdef-captcha-option = true\n')
     fd.write('workflow-resubmit-action = true\n')
     fd.write('workflow-global-actions = true\n')
+    fd.write('workflow-criticality-levels = true\n')
     if sql_mode:
         fd.write('postgresql = true\n')
         conn = psycopg2.connect(user=os.environ['USER'])
diff --git a/wcs/admin/workflows.py b/wcs/admin/workflows.py
index 743b5c8..3337df6 100644
--- a/wcs/admin/workflows.py
+++ b/wcs/admin/workflows.py
@@ -949,6 +949,91 @@ class FunctionsDirectory(Directory):
         return redirect('..')
 
 
+class CriticalityLevelsDirectory(Directory):
+    _q_exports = ['', 'new']
+
+    def __init__(self, workflow):
+        self.workflow = workflow
+
+    def _q_traverse(self, path):
+        get_response().breadcrumb.append(
+                ('criticality-levels/', _('Criticality Levels')))
+        return Directory._q_traverse(self, path)
+
+    def new(self):
+        currentlevels = self.workflow.criticality_levels or []
+        default_colours = ['FFFFFF', 'FFFF00', 'FF9900', 'FF6600', 'FF0000']
+        try:
+            default_colour = default_colours[len(currentlevels)]
+        except IndexError:
+            default_colour = '000000'
+        form = Form(enctype='multipart/form-data')
+        form.add(StringWidget, 'name', title=_('Name'), required=True, size=50)
+        form.add(ColourWidget, 'colour', title=_('Colour'), required=False,
+                value=default_colour)
+        form.add_submit('submit', _('Add'))
+        form.add_submit('cancel', _('Cancel'))
+        if form.get_widget('cancel').parse():
+            return redirect('..')
+
+        if form.is_submitted() and not form.has_errors():
+            if not self.workflow.criticality_levels:
+                self.workflow.criticality_levels = []
+            level = WorkflowCriticalityLevel()
+            level.name = form.get_widget('name').parse()
+            level.colour = form.get_widget('colour').parse()
+            self.workflow.criticality_levels.append(level)
+            self.workflow.store()
+            return redirect('..')
+
+        get_response().breadcrumb.append(('new', _('New Criticality Level')))
+        html_top('workflows', title=_('New Criticality level'))
+        r = TemplateIO(html=True)
+        r += htmltext('<h2>%s</h2>') % _('New Criticality Level')
+        r += form.render()
+        return r.getvalue()
+
+    def _q_lookup(self, component):
+        for level in (self.workflow.criticality_levels or []):
+            if level.id == component:
+                break
+        else:
+            raise errors.TraversalError()
+
+        form = Form(enctype='multipart/form-data')
+        form.add(StringWidget, 'name', title=_('Name'), required=True, size=50,
+                value=level.name)
+        form.add(ColourWidget, 'colour', title=_('Colour'), required=False,
+                value=level.colour)
+        form.add_submit('submit', _('Submit'))
+        form.add_submit('cancel', _('Cancel'))
+        form.add_submit('delete-level', _('Delete'))
+
+        if form.get_widget('cancel').parse():
+            return redirect('..')
+
+        if form.get_submit() == 'delete-level':
+            self.workflow.criticality_levels.remove(level)
+            self.workflow.store()
+            return redirect('..')
+
+        if form.is_submitted() and not form.has_errors():
+            level.name = form.get_widget('name').parse()
+            level.colour = form.get_widget('colour').parse()
+            self.workflow.store()
+            return redirect('..')
+
+        get_response().breadcrumb.append(('new', _('Edit Criticality Level')))
+        html_top('workflows', title=_('Edit Criticality Level'))
+        r = TemplateIO(html=True)
+        r += htmltext('<h2>%s</h2>') % _('Edit Criticality Level')
+        r += form.render()
+        return r.getvalue()
+
+    def _q_index(self):
+        return redirect('..')
+
+
 class GlobalActionPage(WorkflowStatusPage):
     _q_exports = ['', 'new', 'delete', 'newitem', ('items', 'items_dir'),
                   'edit', ('triggers', 'triggers_dir'),
@@ -1139,8 +1224,10 @@ class GlobalActionsDirectory(Directory):
 class WorkflowPage(Directory):
     _q_exports = ['', 'edit', 'delete', 'newstatus', ('status', 'status_dir'), 'update_order',
             'duplicate', 'export', 'svg', ('variables', 'variables_dir'),
-            'update_actions_order',
-            ('functions', 'functions_dir'), ('global-actions', 'global_actions_dir')]
+            'update_actions_order', 'update_criticality_levels_order',
+            ('functions', 'functions_dir'), ('global-actions', 'global_actions_dir'),
+            ('criticality-levels', 'criticality_levels_dir'),
+            ]
 
     def __init__(self, component, html_top):
         try:
@@ -1153,12 +1240,14 @@ class WorkflowPage(Directory):
         self.variables_dir = VariablesDirectory(self.workflow)
         self.functions_dir = FunctionsDirectory(self.workflow)
         self.global_actions_dir = GlobalActionsDirectory(self.workflow, html_top)
+        self.criticality_levels_dir = CriticalityLevelsDirectory(self.workflow)
         get_response().breadcrumb.append((component + '/', self.workflow.name))
 
     def _q_index(self):
         self.html_top(title = _('Workflow - %s') % self.workflow.name)
         r = TemplateIO(html=True)
-        get_response().add_javascript(['jquery.js', 'jquery-ui.js', 'biglist.js', 'svg-pan-zoom.js'])
+        get_response().add_javascript(['jquery.js', 'jquery-ui.js', 'biglist.js',
+            'svg-pan-zoom.js', 'jquery.colourpicker.js'])
         get_response().add_javascript_code('$(function () { svgPanZoom("svg", {controlIconsEnabled: true}); });')
         r += htmltext('<h2>%s - ') % _('Workflow')
         r += htmltext('%s') % self.workflow.name
@@ -1257,7 +1346,7 @@ class WorkflowPage(Directory):
                 r += htmltext('<ul id="status-list" class="biglist sortable" '
                               'data-order-function="update_actions_order">')
             else:
-                r += htmltext('<ul id="status-list" class="biglist">')
+                r += htmltext('<ul class="biglist">')
 
             for action in (self.workflow.global_actions or []):
                 r += htmltext('<li class="biglistitem" id="itemId_%s">' % action.id)
@@ -1270,6 +1359,30 @@ class WorkflowPage(Directory):
             r += htmltext('</ul>')
             r += htmltext('</div>')
 
+        if not str(self.workflow.id).startswith('_') and get_publisher().has_site_option('workflow-criticality-levels'):
+            r += htmltext('<div class="bo-block">')
+            r += htmltext('<h3>%s') % _('Criticality Levels')
+            if not str(self.workflow.id).startswith('_'):
+                r += htmltext(' <span class="change">'
+                              '(<a rel="popup" href="criticality-levels/new">'
+                              '%s</a>)</span>') % _('add criticality level')
+            r += htmltext('</h3>')
+            r += htmltext('<ul class="biglist sortable criticality-levels" '
+                              'data-order-function="update_criticality_levels_order">')
+            for level in (self.workflow.criticality_levels or []):
+                style = ''
+                if level.colour:
+                    style = 'style="border-left-color: #%s"' % level.colour
+                r += htmltext('<li class="biglistitem" id="itemId_%s" %s>' % (level.id, style))
+                if not str(self.workflow.id).startswith('_'):
+                    r += htmltext('<a rel="popup" href="criticality-levels/%s">%s</a>') % (
+                            level.id, level.name)
+                else:
+                    r += htmltext('<a>%s</a>') % level.name
+                r += htmltext('</li>')
+            r += htmltext('</ul>')
+            r += htmltext('</div>')
+
         r += htmltext('</div>') # .splitcontent-right
 
         r += htmltext('<br style="clear:both;"/>')
@@ -1355,6 +1468,14 @@ class WorkflowPage(Directory):
         self.workflow.store()
         return 'ok'
 
+    def update_criticality_levels_order(self):
+        request = get_request()
+        new_order = request.form['order'].strip(';').split(';')
+        self.workflow.criticality_levels = [
+                [x for x in self.workflow.criticality_levels if x.id == y][0] for y in new_order]
+        self.workflow.store()
+        return 'ok'
+
     def newstatus(self):
         form = Form(enctype='multipart/form-data', action = 'newstatus')
         form.add(StringWidget, 'name', title = _('Name'), size = 50)
diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py
index c700247..bb6894c 100644
--- a/wcs/backoffice/management.py
+++ b/wcs/backoffice/management.py
@@ -688,11 +688,15 @@ class ManagementDirectory(Directory):
                 order_by=order_by, limit=limit, offset=offset)
         include_submission_channel = bool(
                 get_publisher().get_site_option('welco_url', 'variables'))
+        include_criticality_level = get_publisher().has_site_option('workflow-criticality-levels')
 
         r = TemplateIO(html=True)
         r += htmltext('<table id="listing" class="main">')
         r += htmltext('<thead>')
-        r += htmltext('<th></th>') # lock
+        if include_criticality_level:
+            r += htmltext('<th data-field-sort-key="criticality_level"><span></span></th>')
+        else:
+            r += htmltext('<th></th>') # lock
         if include_submission_channel:
             r += htmltext('<th data-field-sort-key="submission_channel"><span>%s</span></th>') % _('Channel')
         r += htmltext('<th data-field-sort-key="formdef_name"><span>%s</span></th>') % _('Form')
@@ -713,10 +717,19 @@ class ManagementDirectory(Directory):
             object_key = 'formdata-%s-%s' % (formdata.formdef.url_name, formdata.id)
             if object_key in visited_objects:
                 classes.append('advisory-lock')
+            style = ''
+            if include_criticality_level:
+                try:
+                    level = formdata.get_criticality_level_object()
+                except IndexError:
+                    pass
+                else:
+                    classes.append('criticality-level')
+                    style = 'style="border-left-color: #%s;"' % level.colour
             r += htmltext('<tr class="%s" data-link="%s">' % (
                     ' '.join(classes),
                     formdata.get_url(backoffice=True)))
-            r += htmltext('<td></td>') # lock
+            r += htmltext('<td %s></td>' % style) # lock
             if include_submission_channel:
                 r += htmltext('<td>%s</td>') % formdata.get_submission_channel_label()
             r += htmltext('<td>%s</td>') % formdata.formdef.name
@@ -1642,6 +1655,43 @@ class FormBackOfficeStatusPage(FormStatusPage):
         formdata = self.filled
 
         r = TemplateIO(html=True)
+
+        if formdata.receipt_time:
+            r += htmltext('<div class="extra-context">')
+            r += htmltext('<h3>%s</h3>') % _('General Information')
+            r += htmltext('<p>')
+            tm = misc.localstrftime(formdata.receipt_time)
+            r += _('The form has been recorded on %(date)s with the number %(number)s.') % {
+                    'date': tm, 'number': formdata.get_display_id()}
+            r += htmltext('</p>')
+            try:
+                status_colour = formdata.get_status().colour
+            except AttributeError:
+                status_colour = 'ffffff'
+            fg_colour = misc.get_foreground_colour(status_colour)
+
+            r += htmltext('<p class="current-status"><span class="item" style="background: #%s; color: %s;"></span>' %
+                    (status_colour, fg_colour))
+            r += htmltext('<span>%s %s</span></p>') % (_('Status:'), formdata.get_status_label())
+            if formdata.formdef.workflow.criticality_levels:
+                try:
+                    level = formdata.get_criticality_level_object()
+                except IndexError:
+                    pass
+                else:
+                    r += htmltext('<p class="current-level">')
+                    if level.colour:
+                        r += htmltext('<span class="item" style="background: #%s;"></span>' % level.colour)
+                    r += htmltext('<span>%s %s</span></p>') % (_('Criticality Level:'), level.name)
+
+            if formdata.anonymised:
+                r += htmltext('<div class="infonotice">')
+                r += htmltext(_('This form has been anonymised on %(date)s.')) % {
+                        'date': formdata.anonymised.strftime(misc.date_format())}
+                r += htmltext('</div>')
+
+            r += htmltext('</div>')
+
         if formdata.submission_context or formdata.submission_channel:
             extra_context = formdata.submission_context or {}
             r += htmltext('<div class="extra-context">')
diff --git a/wcs/formdata.py b/wcs/formdata.py
index 0d0e36c..ca4fdbf 100644
--- a/wcs/formdata.py
+++ b/wcs/formdata.py
@@ -171,6 +171,7 @@ class FormData(StorableObject):
     backoffice_submission = False
     submission_context = None
     submission_channel = None
+    criticality_level = 0
 
     workflow_data = None
     workflow_roles = None
@@ -279,6 +280,45 @@ class FormData(StorableObject):
         processor.generate(fd, ctx)
         self.id_display = fd.getvalue()
 
+    # criticality levels are stored as [0, 101, 102, 103...], this makes it
+    # easier to group "uncritical" formdatas (=0) together when sorting.
+    def increase_criticality_level(self):
+        levels = len(self.formdef.workflow.criticality_levels or [0])
+        current_level = self.criticality_level or 0
+        if current_level == 0:
+            current_level = 100
+        if current_level < (100 + levels - 1):
+            self.criticality_level = current_level + 1
+            self.store()
+
+    def decrease_criticality_level(self):
+        levels = len(self.formdef.workflow.criticality_levels or [0])
+        current_level = self.criticality_level or 0
+        if current_level == 0:
+            return
+        self.criticality_level = current_level - 1
+        if self.criticality_level <= 100:
+            self.criticality_level = 0
+        self.store()
+
+    def set_criticality_level(self, level):
+        levels = len(self.formdef.workflow.criticality_levels or [0])
+        level = min(levels-1, level)
+        if level > 0:
+            self.criticality_level = 100 + level
+        else:
+            self.criticality_level = 0
+        self.store()
+
+    def get_criticality_level_object(self):
+        levels = self.formdef.workflow.criticality_levels or []
+        if not levels:
+            raise IndexError()
+        level = self.criticality_level
+        if level > 0:
+            level = level - 100
+        return levels[level]
+
     def perform_workflow(self):
         url = None
         get_publisher().substitutions.feed(self)
@@ -408,6 +448,7 @@ class FormData(StorableObject):
                 'form_url': self.get_url(),
                 'form_url_backoffice': self.get_url(backoffice=True),
                 'form_uri': '%s/%s/' % (self.formdef.url_name, self.id),
+                'form_criticality_level': self.criticality_level,
             })
 
         d['form_status'] = self.get_status_label()
@@ -641,6 +682,7 @@ class FormData(StorableObject):
                 'id': data['display_id']}
         data['receipt_time'] = self.receipt_time
         data['last_update_time'] = self.last_update_time
+        data['criticality_level'] = self.criticality_level
         data['url'] = self.get_url()
 
         try:
diff --git a/wcs/formdef.py b/wcs/formdef.py
index f29f554..ccdd713 100644
--- a/wcs/formdef.py
+++ b/wcs/formdef.py
@@ -290,7 +290,7 @@ class FormDef(StorableObject):
                     rebuild_global_views=True)
         return t
 
-    def update_endpoints(self):
+    def rebuild_views(self):
         if get_publisher().is_using_postgresql():
             import sql
             sql.do_formdef_tables(self, rebuild_views=True,
diff --git a/wcs/forms/backoffice.py b/wcs/forms/backoffice.py
index af0b4c4..579eabf 100644
--- a/wcs/forms/backoffice.py
+++ b/wcs/forms/backoffice.py
@@ -75,8 +75,12 @@ class FormDefUI(object):
             r += htmltext('<col />')
         r += htmltext('</colgroup>')
 
+        include_criticality_level = get_publisher().has_site_option('workflow-criticality-levels')
         r += htmltext('<thead><tr>')
-        r += htmltext('<td></td>') # lock
+        if include_criticality_level:
+            r += htmltext('<th style="width: 4ex;" data-field-sort-key="criticality_level"><span></span>')
+        else:
+            r += htmltext('<td></td>') # lock
         for f in fields:
             field_sort_key = None
             if getattr(f, 'fake', False):
@@ -209,6 +213,9 @@ class FormDefUI(object):
             url_action = ''
         root_url = get_publisher().get_root_url()
         visited_objects = get_publisher().get_visited_objects(exclude_user=get_session().user)
+        include_criticality_level = get_publisher().has_site_option('workflow-criticality-levels')
+        if include_criticality_level:
+            include_criticality_level = bool(self.formdef.workflow.criticality_levels)
         for i, filled in enumerate(items):
             classes = ['status-%s-%s' % (filled.formdef.workflow.id, filled.status)]
             if i%2:
@@ -220,12 +227,25 @@ class FormDefUI(object):
             if object_key in visited_objects:
                 classes.append('advisory-lock')
 
+            style = ''
+            if include_criticality_level:
+                try:
+                    level = filled.get_criticality_level_object()
+                except IndexError:
+                    style = ''
+                else:
+                    classes.append('criticality-level')
+                    style = ' style="border-color: #%s;"' % level.colour
+
             link = str(filled.id) + '/'
             data = ' data-link="%s"' % link
             if filled.anonymised:
                 data += ' data-anonymised="true"'
             r += htmltext('<tr class="%s"%s>' % (' '.join(classes), data))
-            r += htmltext('<td></td>') # lock
+            if include_criticality_level:
+                r += htmltext('<td %s></td>' % style) # criticality_level
+            else:
+                r += htmltext('<td></td>') # lock
             for i, f in enumerate(fields):
                 if f.type == 'id':
                     r += htmltext('<td class="cell-id"><a href="%s%s">%s</a></td>') % (link, url_action,
diff --git a/wcs/forms/common.py b/wcs/forms/common.py
index 7280ea1..f166e80 100644
--- a/wcs/forms/common.py
+++ b/wcs/forms/common.py
@@ -497,20 +497,6 @@ class FormStatusPage(Directory):
         get_logger().info('form %s - id: %s - view status' % (self.formdef.name, self.filled.id))
         self.html_top('%s - %s' % (self.formdef.name, self.filled.id))
         r = TemplateIO(html=True)
-        if self.filled.receipt_time is not None:
-            tm = misc.localstrftime(self.filled.receipt_time)
-        else:
-            tm = '???'
-        r += htmltext("<p>")
-        r += _('The form has been recorded on %(date)s with the number %(number)s.') % {
-                'date': tm, 'number': self.filled.get_display_id()}
-        r += htmltext("</p>")
-
-        if self.filled.anonymised:
-            r += htmltext('<div class="infonotice">')
-            r += htmltext(_('This form has been anonymised on %(date)s.')) % {
-                    'date': self.filled.anonymised.strftime(misc.date_format())}
-            r += htmltext('</div>')
 
         r += htmltext(self.workflow_messages())
 
diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css
index 82d77c0..8822bfe 100644
--- a/wcs/qommon/static/css/dc2/admin.css
+++ b/wcs/qommon/static/css/dc2/admin.css
@@ -1230,6 +1230,40 @@ ul.apps {
 	margin-left: 1em;
 }
 
+p.current-level span,
+p.current-status span {
+	line-height: 40px;
+}
+
+p.current-level .item,
+p.current-status .item {
+	float: left;
+	display: inline-block;
+	width: 40px;
+	height: 40px;
+	border-radius: 20px;
+	border: 1px solid #aaa;
+	margin-right: 1ex;
+	margin-bottom: 1ex;
+}
+
+p.current-level .item {
+	border-radius: 0;
+}
+
+tr.criticality-level {
+	border-left-width: 5px;
+	border-left-style: solid;
+}
+
+div.bo-block ul.biglist.criticality-levels li {
+	border-left-width: 5px;
+}
+
+table#listing tr.criticality-level td:first-child {
+	border-left-width: 5px;
+	border-left-style: solid;
+}
 form div.page {
 	border: 1px solid #e4e4e4;
 	padding: 0;
diff --git a/wcs/qommon/static/js/biglist.js b/wcs/qommon/static/js/biglist.js
index b982cdd..8b2a464 100644
--- a/wcs/qommon/static/js/biglist.js
+++ b/wcs/qommon/static/js/biglist.js
@@ -9,6 +9,7 @@ $(document).ready(
             {
                 accept: 'biglistitem',
                 scroll: true,
+                helper: 'clone',
                 helperclass: 'sortHelper',
                 activeclass :     'sortableactive',
                 hoverclass :     'sortablehover',
diff --git a/wcs/sql.py b/wcs/sql.py
index 6414ec1..58f71c2 100644
--- a/wcs/sql.py
+++ b/wcs/sql.py
@@ -325,7 +325,8 @@ def do_formdef_tables(formdef, conn=None, cur=None, rebuild_views=False, rebuild
         'anonymised', 'workflow_roles', 'workflow_roles_array',
         'concerned_roles_array', 'tracking_code',
         'actions_roles_array', 'backoffice_submission',
-        'submission_context', 'submission_channel'])
+        'submission_context', 'submission_channel',
+        'criticality_level'])
 
     # migrations
     if not 'fts' in existing_fields:
@@ -360,6 +361,9 @@ def do_formdef_tables(formdef, conn=None, cur=None, rebuild_views=False, rebuild
     if not 'submission_channel' in existing_fields:
         cur.execute('''ALTER TABLE %s ADD COLUMN submission_channel varchar''' % table_name)
 
+    if not 'criticality_level' in existing_fields:
+        cur.execute('''ALTER TABLE %s ADD COLUMN criticality_level integer NOT NULL DEFAULT(0)''' % table_name)
+
     # add new fields
     for field in formdef.fields:
         assert field.id is not None
@@ -614,6 +618,13 @@ def do_views(formdef, conn, cur, rebuild_global_views=True):
                                 ', '.join(["'wf-%s'" % x.id for x in endpoint_status]),
                         '''is_at_endpoint'''))
 
+    # [CRITICALITY_1] Add criticality_level, computed relative to levels in
+    # the given workflow, so all higher criticalites are sorted first. This is
+    # reverted when loading the formdata back, in [CRITICALITY_2]
+    levels = len(formdef.workflow.criticality_levels or [0])
+    view_fields.append(('''(criticality_level - %d)''' % levels,
+                        '''criticality_level'''))
+
     view_fields.append(('''(SELECT MAX(time) FROM %s_evolutions '''
                         ''' WHERE %s.id = %s_evolutions.formdata_id)''' % (
                             (table_name, )*3),
@@ -684,6 +695,7 @@ def do_global_views(conn, cur):
     common_fields.append(('last_update_time', 'last_update_time'))
     common_fields.append(('formdef_name', 'formdef_name'))
     common_fields.append(('user_name', 'user_name'))
+    common_fields.append(('criticality_level', 'criticality_level'))
 
     union = ' UNION '.join(['''SELECT %s FROM %s''' % (
         ', '.join([y[1] for y in common_fields]), x) for x in view_names])
@@ -994,6 +1006,7 @@ class SqlFormData(SqlMixin, wcs.formdata.FormData):
         ('backoffice_submission', 'boolean'),
         ('submission_context', 'bytea'),
         ('submission_channel', 'varchar'),
+        ('criticality_level', 'int'),
     ]
 
     def __init__(self, id=None):
@@ -1088,6 +1101,7 @@ class SqlFormData(SqlMixin, wcs.formdata.FormData):
                 'backoffice_submission': self.backoffice_submission,
                 'submission_context': self.submission_context,
                 'submission_channel': self.submission_channel,
+                'criticality_level': self.criticality_level,
         }
         if self.receipt_time:
             sql_dict['receipt_time'] = datetime.datetime.fromtimestamp(time.mktime(self.receipt_time)),
@@ -1605,6 +1619,7 @@ class AnyFormData(SqlMixin):
         common_fields = get_view_fields(fake_formdef)
         cls.__table_static_fields = [(x[1], x[0]) for x in common_fields]
         cls.__table_static_fields.append(('last_update_time', 'timestamp'))
+        cls.__table_static_fields.append(('criticality_level', 'criticality_level'))
         return cls.__table_static_fields
 
     @classmethod
@@ -1625,6 +1640,10 @@ class AnyFormData(SqlMixin):
         for static_field, value in zip(cls._table_static_fields,
                                        tuple(row[:len(cls._table_static_fields)])):
             setattr(o, static_field[0], value)
+        # [CRITICALITY_2] transform criticality_level back to the expected
+        # range (see [CRITICALITY_1])
+        levels = len(formdef.workflow.criticality_levels or [0])
+        o.criticality_level = levels + o.criticality_level
         return o
 
 
@@ -1786,7 +1805,7 @@ def get_yearly_totals(period_start=None, period_end=None, criterias=None):
     return result
 
 
-SQL_LEVEL = 13
+SQL_LEVEL = 14
 
 def migrate_global_views(conn, cur):
     cur.execute('''SELECT COUNT(*) FROM information_schema.tables
@@ -1820,7 +1839,7 @@ def migrate():
         raise RuntimeError()
     if sql_level < 1: # 1: introduction of tracking_code table
         do_tracking_code_table()
-    if sql_level < 13:
+    if sql_level < 14:
         # 2: introduction of formdef_id in views
         # 5: add concerned_roles_array, is_at_endpoint and fts to views
         # 7: add backoffice_submission to tables
@@ -1829,6 +1848,7 @@ def migrate():
         # 10: add submission_channel to tables
         # 11: add formdef_name and user_name to views
         # 13: add backoffice_submission to views
+        # 14: add criticality_level to tables & views
         migrate_views(conn, cur)
     if sql_level < 12:
         # 3: introduction of _structured for user fields
diff --git a/wcs/wf/criticality.py b/wcs/wf/criticality.py
new file mode 100644
index 0000000..7d4afc5
--- /dev/null
+++ b/wcs/wf/criticality.py
@@ -0,0 +1,77 @@
+# w.c.s. - web application for online forms
+# Copyright (C) 2005-2016  Entr'ouvert
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+from quixote import get_publisher
+
+from wcs.qommon.form import SingleSelectWidget
+from wcs.workflows import WorkflowStatusItem, register_item_class
+
+MODE_INC = '1'
+MODE_DEC = '2'
+MODE_SET = '3'
+
+class ModifyCriticalityWorkflowStatusItem(WorkflowStatusItem):
+    description = N_('Modify Criticality')
+    key = 'modify_criticality'
+
+    mode = None
+    absolute_value = None
+
+    def get_parameters(self):
+        return ('mode', 'absolute_value')
+
+    @classmethod
+    def is_available(cls):
+        # TODO: if we had per-workflow availability we could show this action
+        # only on the workflow where criticality levels are set.
+        return get_publisher().has_site_option('workflow-criticality-levels')
+
+    def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):
+        if 'mode' in parameters:
+            form.add(SingleSelectWidget, '%smode' % prefix,
+                    title=_('Modification Mode'), value=self.mode,
+                    required=True,
+                    options=[
+                        (MODE_INC, _('Increase Level')),
+                        (MODE_DEC, _('Decrease Level')),
+                        (MODE_SET, _('Set Level'))],
+                    attrs={'data-dynamic-display-parent': 'true'})
+        if 'absolute_value' in parameters:
+            if self.parent.parent.criticality_levels:
+                options = [(str(i), x.name) for i, x in enumerate(self.parent.parent.criticality_levels)]
+            else:
+                options = [('0', '---')]
+            form.add(SingleSelectWidget, '%sabsolute_value' % prefix,
+                     title=_('Value'), value=self.absolute_value,
+                     options=options,
+                     attrs={
+                         'data-dynamic-display-child-of': '%smode' % prefix,
+                         'data-dynamic-display-value': _('Set Level'),
+                         }
+                     )
+
+    def perform(self, formdata):
+        levels = formdata.formdef.workflow.criticality_levels
+        current_level = formdata.criticality_level or 0
+        new_level = current_level
+        if self.mode == MODE_INC:
+            formdata.increase_criticality_level()
+        elif self.mode == MODE_DEC:
+            formdata.decrease_criticality_level()
+        elif self.mode == MODE_SET:
+            formdata.set_criticality_level(self.absolute_value)
+
+register_item_class(ModifyCriticalityWorkflowStatusItem)
diff --git a/wcs/workflows.py b/wcs/workflows.py
index 49f4338..2ea2d71 100644
--- a/wcs/workflows.py
+++ b/wcs/workflows.py
@@ -251,6 +251,7 @@ class Workflow(StorableObject):
     roles = None
     variables_formdef = None
     global_actions = None
+    criticality_levels = None
 
     last_modification_time = None
     last_modification_user_id = None
@@ -261,6 +262,7 @@ class Workflow(StorableObject):
         self.possible_status = []
         self.roles = {'_receiver': _('Recipient')}
         self.global_actions = []
+        self.criticality_levels = []
 
     def migrate(self):
         changed = False
@@ -279,13 +281,16 @@ class Workflow(StorableObject):
             self.store()
 
     def store(self):
-        must_update_endpoints = False
+        must_update_views = False
         if self.id:
             old_self = self.get(self.id, ignore_errors=True, ignore_migration=True)
             if old_self:
                 old_endpoints = set([x.id for x in old_self.get_endpoint_status()])
                 if old_endpoints != set([x.id for x in self.get_endpoint_status()]):
-                    must_update_endpoints = True
+                    must_update_views = True
+                old_criticality_levels = len(old_self.criticality_levels or [0])
+                if old_criticality_levels != len(self.criticality_levels or [0]):
+                    must_update_views = True
 
         self.last_modification_time = time.localtime()
         if get_request() and get_request().user:
@@ -298,8 +303,8 @@ class Workflow(StorableObject):
         # their views if endpoints have changed.
         for form in FormDef.select(lambda x: x.workflow_id == self.id, ignore_migration=True):
             form.data_class().rebuild_security()
-            if must_update_endpoints:
-                form.update_endpoints()
+            if must_update_views:
+                form.rebuild_views()
 
     def get(cls, id, ignore_errors=False, ignore_migration=False):
         if id == '_default':
@@ -452,6 +457,11 @@ class Workflow(StorableObject):
                 global_actions.append(action.export_to_xml(charset=charset,
                     include_id=include_id))
 
+        if self.criticality_levels:
+            criticality_levels = ET.SubElement(root, 'criticality_levels')
+            for level in self.criticality_levels:
+                criticality_levels.append(level.export_to_xml(charset=charset))
+
         if self.variables_formdef:
             variables = ET.SubElement(root, 'variables')
             formdef = ET.SubElement(variables, 'formdef')
@@ -516,6 +526,14 @@ class Workflow(StorableObject):
                 action_o.init_with_xml(action, charset, include_id=include_id)
                 workflow.global_actions.append(action_o)
 
+        workflow.criticality_levels = []
+        criticality_levels = tree.find('criticality_levels')
+        if criticality_levels is not None:
+            for level in criticality_levels:
+                level_o = WorkflowCriticalityLevel()
+                level_o.init_with_xml(level, charset)
+                workflow.criticality_levels.append(level_o)
+
         variables = tree.find('variables')
         if variables is not None:
             formdef = variables.find('formdef')
@@ -941,6 +959,31 @@ class WorkflowGlobalAction(object):
             trigger_o.init_with_xml(trigger, charset, include_id=include_id)
 
 
+class WorkflowCriticalityLevel(object):
+    id = None
+    name = None
+    colour = None
+
+    def __init__(self, name=None, colour=None):
+        self.name = name
+        self.colour = colour
+        self.id = str(random.randint(0, 100000))
+
+    def export_to_xml(self, charset, include_id=False):
+        level = ET.Element('criticality-level')
+        ET.SubElement(level, 'id').text = unicode(self.id, charset)
+        ET.SubElement(level, 'name').text = unicode(self.name, charset)
+        if self.colour:
+            ET.SubElement(level, 'colour').text = unicode(self.colour, charset)
+        return level
+
+    def init_with_xml(self, elem, charset, include_id=False):
+        self.id = elem.find('id').text.encode(charset)
+        self.name = elem.find('name').text.encode(charset)
+        if elem.find('colour') is not None:
+            self.colour = elem.find('colour').text.encode(charset)
+
+
 class WorkflowStatus(object):
     id = None
     name = None
@@ -1961,5 +2004,6 @@ def load_extra():
     import wf.anonymise
     import wf.export_to_model
     import wf.resubmit
+    import wf.criticality
 
 from wf.export_to_model import ExportToModel
-- 
2.7.0