minor modifictaions and extensions for the tum.sm project

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1936 fd906abe-77d9-0310-91a1-e0d9ade77398

composer/schema/browser/common.py

@@ -72,7 +72,7 @@ class BaseView(object):
     @Lazy
     def url(self):
         from zope.traversing.browser import absoluteURL
-        url = absoluteURL(self.context, self.request)
+        return absoluteURL(self.context, self.request)
 
     buttonActions = dict(
             submit_previous=getPreviousTemplate,

organize/browser/service.py

@@ -26,16 +26,27 @@ from zope import component
 from zope.cachedescriptors.property import Lazy
 
 from cybertools.organize.interfaces import IClientRegistrations, IRegistrationTemplate
-from cybertools.composer.schema.browser.common import BaseView
+from cybertools.composer.schema.browser.common import BaseView as SchemaBaseView
 from cybertools.composer.schema.interfaces import IClientFactory
 
 
-class ServiceManagerView(object):
+class BaseView(object):
 
     def __init__(self, context, request):
         self.context = context
         self.request = request
 
+    @Lazy
+    def url(self):
+        return self.getUrlForObject(self.context)
+
+    def getUrlForObject(self, obj):
+        from zope.traversing.browser import absoluteURL
+        return absoluteURL(obj, self.request)
+
+
+class ServiceManagerView(BaseView):
+
     def findRegistrationTemplate(self, service):
         """ Find a registration template that provides the registration
             for the service given.
@@ -46,18 +57,48 @@ class ServiceManagerView(object):
                 return tpl
         return None
 
+    def overview(self):
+        result = []
+        classific = []
+        category = None
+        maxLevel = 0
+        svcs = sorted(self.context.getServices(),
+                      key=lambda x: (x.getCategory(), x.getClassification()))
+        for svc in svcs:
+            cat = svc.getCategory()
+            if cat != category:
+                result.append(dict(isHeadline=True, title=cat, level=0))
+                category = cat
+                classific = []
+            clsf = svc.getClassification()
+            for idx, element in enumerate(clsf):
+                level = idx + 1
+                if (len(classific) <= idx or
+                        classific[idx].name != element.name):
+                    result.append(dict(isHeadline=True, title=element.title,
+                                       level=level))
+                    classific = clsf
+                if level > maxLevel:
+                    maxLevel = level
+            result.append(dict(isHeadline=False, level=maxLevel+1,
+                               title=svc.title or svc.getName(),
+                               object=svc))
+        return result
 
-class ServiceView(object):
 
-    def __init__(self, context, request):
+class ServiceView(BaseView):
-        self.context = context
-        self.request = request
 
     def getRegistrations(self):
         return self.context.registrations
 
+    def registrationUrl(self):
+        context = self.context
+        man = context.getManager()
+        tpl = ServiceManagerView(man, self.request).findRegistrationTemplate(context)
+        return self.getUrlForObject(tpl)
 
-class RegistrationTemplateView(BaseView):
+
+class RegistrationTemplateView(SchemaBaseView):
 
     @Lazy
     def services(self):

organize/interfaces.py

@@ -141,6 +141,8 @@ class IService(Interface):
     """ A service that clients may register with.
     """
 
+    title = Attribute('A descriptive but short title')
+
     description = schema.Text(
                 title=_(u'Description'),
                 description=_(u'A brief description of the item.'),

organize/service.py

@@ -29,6 +29,9 @@ from zope.component import adapts
 from zope.interface import implements
 from cybertools.composer.interfaces import IInstance
 from cybertools.composer.schema.interfaces import IClientManager, IClient
+from cybertools.stateful.definition import registerStatesDefinition
+from cybertools.stateful.definition import StatesDefinition
+from cybertools.stateful.definition import State, Transition
 from cybertools.util.jeep import Jeep
 from cybertools.util.randomname import generateName
 
@@ -87,11 +90,30 @@ class Service(object):
 
     registrationsFactory = OOBTree
 
-    def __init__(self, name=None, capacity=-1):
+    manager = None
-        self.name = name
+    category = None
+
+    def __init__(self, name=None, title=u'', capacity=-1, **kw):
+        self.name = self.__name__ = name
+        self.title = title
         self.capacity = capacity
         if self.registrationsFactory is not None:
             self.registrations = self.registrationsFactory()
+        self.classification = []
+        for k, v in kw.items():
+            setattr(self, k, v)
+
+    def getName(self):
+        return self.name
+
+    def getManager(self):
+        return self.manager
+
+    def getClassification(self):
+        return self.classification
+
+    def getCategory(self):
+        return self.category
 
     @property
     def token(self):
@@ -110,11 +132,12 @@ class Service(object):
         clientName = client.__name__
         if clientName in self.registrations:
             return self.registrations[clientName]
-        if self.availableCapacity:
         reg = Registration(client, self)
         self.registrations[clientName] = reg
         return reg
-        return None
+        #if self.availableCapacity:
+        # TODO: handle case when no capacity available -
+        #       probably on 'submit' transition; UI feedback?
 
     def unregister(self, client):
         clientName = client.__name__
@@ -188,6 +211,27 @@ class ClientRegistrations(object):
         return getattr(self.context, self.registrationsAttributeName, [])
 
 
+# registration states definition
+
+registerStatesDefinition(
+    StatesDefinition('organize.service.registration',
+        State('temporary', 'temporary', ('submit', 'cancel',)),
+        State('submitted', 'submitted', ('retract', 'setwaiting', 'confirm', 'reject',)),
+        State('cancelled', 'cancelled', ('submit',)),
+        State('retracted', 'retracted', ('submit',)),
+        State('waiting', 'waiting', ('retract', 'confirm', 'reject',)),
+        State('confirmed', 'confirmed', ('retract', 'reject',)),
+        State('rejected', 'rejected', ('retract', 'setwaiting', 'confirm',)),
+        Transition('cancel', 'Cancel registration', 'cancelled'),
+        Transition('submit', 'Submit registration', 'submitted'),
+        Transition('retract', 'Retract registration', 'retracted'),
+        Transition('setwaiting', 'Set on waiting list', 'waiting'),
+        Transition('confirm', 'Confirm registration', 'confirmed'),
+        Transition('reject', 'Reject registration', 'rejected'),
+        initialState='temporary',
+))
+
+
 # event handlers
 
 def clientRemoved(obj, event):

stateful/base.py

@@ -62,12 +62,12 @@ class Stateful(object):
 
 
 class StatefulAdapter(Stateful):
-    """ An adapter for persistent objects to make the stateful.
+    """ An adapter for persistent objects to make them stateful.
     """
 
     adapts(IPersistent)
 
-    statesAttributeName = '__states__'
+    statesAttributeName = '__stateful_states__'
 
     def __init__(self, context):
         self.context = context

stateful/definition.py

@@ -33,20 +33,24 @@ class State(object):
 
     implements(IState)
 
-    def __init__(self, name, title, transitions):
+    def __init__(self, name, title, transitions, **kw):
         self.name = self.__name__ = name
         self.title = title
         self.transitions = transitions
+        for k, v in kw.items():
+            setattr(self, k, v)
 
 
 class Transition(object):
 
     implements(ITransition)
 
-    def __init__(self, name, title, targetState):
+    def __init__(self, name, title, targetState, **kw):
         self.name = self.__name__ = name
         self.title = title
         self.targetState = targetState
+        for k, v in kw.items():
+            setattr(self, k, v)
 
 
 class StatesDefinition(object):

stateful/interfaces.py

@@ -60,7 +60,7 @@ class IStateful(Interface):
     def getAvailableTransitions():
         """ Return the transitions for this object that are available in
             the current state. The implementation of the returned transition
-            objects is not specified, they may be an action dictionaries or
+            objects is not specified, they may be action dictionaries or
             special Transition objects.
         """
 

util/jeep.py

@@ -122,3 +122,15 @@ class Jeep(object):
         if idx < 0:
             raise ValueError('list.index(x): x not in list')
         return idx
+
+
+class Term(object):
+    """ A simple name/title association that may be put in a jeep object.
+    """
+
+    def __init__(self, name, title, **kw):
+        self.name = self.__name__ = name
+        self.title = title
+        for k, v in kw.items():
+            setattr(self, k, v)
+