workflow: simplify

Author: nicolasderam

TODO

@@ -12,7 +12,6 @@
 - Add online demo for goodforms
 - Check XXX / FIXME / TODO on code
 - Update copyrights
-- Fix workflow
 - Fix display form main view (multipages...)
 - Add better ODS samples into data/
 - Fix company field in User class

application.py

@@ -40,7 +40,7 @@
 from form import Form, Forms
 from form_views import Forms_View
 from model import FormModel
-from workflow import EMPTY, PENDING, FINISHED
+from workflow import NOT_REGISTERED, EMPTY, PENDING, FINISHED
 
 
 class Application(Folder):
@@ -117,7 +117,7 @@ def get_stats(self):
                 if user.get_value('password') is None:
                     stats['unconfirmed_users'] += 1
                 else:
-                    state = form.get_workflow_state()
+                    state = form.get_value('form_state')
                     if state == EMPTY:
                         stats['empty_forms'] += 1
                     elif state == PENDING:
@@ -155,7 +155,8 @@ def subscribe_user(self, user):
         # Add the form
         if self.get_resource(username, soft=True) is None:
             self.make_resource(username, Form,
-                    title={'en': user.get_title()})
+                    title={'en': user.get_title()},
+                    form_state=NOT_REGISTERED)
 
 
     # Views

form.py

@@ -120,8 +120,7 @@ class Form(Folder):
 
     # Fields
     data = File_Field(title=MSG(u'Form'), class_handler=FormHandler)
-    form_state = Text_Field(title=MSG(u'State'), indexed=True, stored=True)
-    workflow = WorkflowState_Field
+    form_state = WorkflowState_Field()
 
     def init_resource(self, *args, **kw):
         # Proxy
@@ -295,13 +294,8 @@ def get_form_title(self):
 
     ######################################################################
     # Security
-    def get_workflow_state(self):
-        # FIXME
-        return 'pending'
-
-
     def is_ready(self):
-        return self.get_workflow_state() == FINISHED
+        return self.get_value('form_state') == FINISHED
 
 
     def is_first_time(self):
@@ -493,7 +487,7 @@ class Forms(Folder):
 
     class_id = 'forms'
     class_title = MSG(u"Form answers")
-    class_views = ['view', 'new_resource', 'export']
+    class_views = ['view', 'export']
     class_icon_css = 'fa-user'
 
     def get_document_types(self):
@@ -549,5 +543,4 @@ def get_controls(self):
 
     # Views
     view = Forms_View
-    new_resource = NewResource_Local(title=MSG(u'Create an answer to form'))
     export = Forms_Export

form_views.py

@@ -41,6 +41,7 @@
 from workflow import WorkflowState, NOT_REGISTERED, PENDING, FINISHED, EXPORTED
 from customization import custom_flag
 from rw import ODSWriter, XLSWriter
+from workflow import NOT_REGISTERED, EMPTY, PENDING, FINISHED, EXPORTED
 
 # Messages
 MSG_APPLICATION_TITLE = MSG(u'<span class="application-title">Title of your application:</span> {title}', format='replace_html')
@@ -217,8 +218,10 @@ def raw_action(self, resource, context, form):
         context.database.change_resource(resource)
         # Transmit list of errors when returning GET
         context.message = MSG_SAVED
-        # if resource.get_workflow_state() == EMPTY:
-        resource.set_workflow_state(PENDING)
+        # Update form state
+        if resource.get_value('form_state') == EMPTY:
+            resource.set_value('form_state', PENDING)
+
 
     def action(self, resource, context, form):
         schema, pages = resource.get_schema_pages()
@@ -370,9 +373,9 @@ def action(self, resource, context, form):
             context.message = messages
         else:
             context.message = MSG_SAVED
-        # FIXME
-        # if resource.get_workflow_state() == EMPTY:
-        #resource.set_workflow_state(PENDING)
+        # Update form state
+        if resource.get_value('form_state') == EMPTY:
+            resource.set_value('form_state', PENDING)
 
 
 
@@ -449,9 +452,8 @@ def get_namespace(self, resource, context):
         is_allowed_to_export = True
         namespace['is_allowed_to_export'] = is_allowed_to_export
         # State
-        namespace['statename'] = statename = resource.get_workflow_state()
-        namespace['form_state'] = WorkflowState.get_value(
-                resource.get_workflow_state())
+        namespace['statename'] = statename = resource.get_value('form_state')
+        namespace['form_state'] = resource.get_value_title('form_state')
         # Transitions
         namespace['can_send'] = statename == PENDING and not errors
         namespace['can_export'] = is_allowed_to_export and not errors
@@ -465,7 +467,7 @@ def get_namespace(self, resource, context):
     def action_send(self, resource, context, form):
         """Ce qu'il faut faire quand le formulaire est soumis.
         """
-        resource.set_workflow_state(FINISHED)
+        resource.set_value('form_state', FINISHED)
 
         # Notification e-mail
         application = resource.parent
@@ -502,7 +504,7 @@ def action_send(self, resource, context, form):
     def action_export(self, resource, context, form):
         """Ce qu'il faut faire quand le formulaire est exporté.
         """
-        resource.set_workflow_state(EXPORTED)
+        resource.set_value('form_state', EXPORTED)
 
         # XXX
         context.commit = False
@@ -623,7 +625,7 @@ def action_export(self, resource, context, form, writer_cls=ODSWriter):
                             and user.get_value('password') is None):
                         state = NOT_REGISTERED
                     else:
-                        state = item_brain.workflow_state
+                        state = item_brain.form_state
                     value = WorkflowState.get_value(state)
                 else:
                     value = self.get_item_value(resource, context, item,
@@ -671,7 +673,7 @@ class Forms_Export(BaseView):
     def GET(self, resource, context):
         app = resource.parent
         for form in app.get_forms():
-            state = form.get_workflow_state()
+            state = form.get_value('form_state')
             if state != 'private':
                 break
         else:
@@ -723,7 +725,7 @@ def GET(self, resource, context):
                 email = ""
                 firstname = ""
                 lastname = form.name
-            state = WorkflowState.get_value(form.get_workflow_state())
+            state = form.get_value_title('form_state')
             state = state.gettext()
             row = [form.name, firstname, lastname, email, state]
             handler = form.get_value('data')

formpage.py

@@ -183,7 +183,7 @@ def get_namespace(self, form, view, context, skip_print=False,
         # Lecture seule ?
         root = self.get_resource('/')
         if not skip_print and not root.is_allowed_to_edit(context.user, form):
-            state = form.get_workflow_state()
+            state = form.get_value('form_state')
             if state in (FINISHED, EXPORTED):
                 readonly = True
         # 0005160: affiche les champs même en lecture seule

workflow.py

@@ -34,6 +34,7 @@
 
 class WorkflowState(Enumerate):
 
+    default = NOT_REGISTERED
     options = [
         {'name': NOT_REGISTERED, 'value': MSG(u"Not Registered")},
         {'name': EMPTY, 'value': MSG(u"Empty")},
@@ -46,5 +47,7 @@ class WorkflowState(Enumerate):
 
 class WorkflowState_Field(Select_Field):
 
-    title = MSG(u'WF State')
+    title = MSG(u'State')
     datatype = WorkflowState
+    indexed = True
+    stored = True