Merge lp:~replaceafill/schooltool/flourish into lp:schooltool/flourish

[Douglas Cerna]

Some context about the change:

https://lists.launchpad.net/schooltool-developers/msg00354.html

Basically, I need integer validation for demographics in Cambodia. Then Justas suggested minium/maximum value constraints, so I implemented it too.

[lp:~replaceafill/schooltool/flourish]

3287. By Douglas Cerna on 2012-01-11

Set prompt for required demographics fields (LP: #898219)

3288. By Douglas Cerna on 2012-01-12

Fixed person edit view to show limited demographics fields (LP: #914609)

[Gediminas Paulauskas (menesis)]

Looks good, works.

review: Approve

[lp:~replaceafill/schooltool/flourish]

3289. By Douglas Cerna on 2012-01-13

Added integer demographic fields

=== modified file 'src/schooltool/basicperson/browser/demographics.py'
--- src/schooltool/basicperson/browser/demographics.py	2011-11-08 20:02:56 +0000
+++ src/schooltool/basicperson/browser/demographics.py	2012-01-09 21:27:26 +0000
@@ -40,7 +40,9 @@
 from schooltool.basicperson.demographics import DateFieldDescription
 from schooltool.basicperson.demographics import BoolFieldDescription
 from schooltool.basicperson.demographics import EnumFieldDescription
+from schooltool.basicperson.demographics import IntFieldDescription
 from schooltool.basicperson.interfaces import IEnumFieldDescription
+from schooltool.basicperson.interfaces import IIntFieldDescription
 from schooltool.basicperson.interfaces import IDemographicsFields
 from schooltool.basicperson.interfaces import IFieldDescription
 from schooltool.basicperson.interfaces import EnumValueList
@@ -232,6 +234,20 @@
         return fd
 
 
+class IntFieldDescriptionAddView(FieldDescriptionAddView):
+
+    fields = field.Fields(IIntFieldDescription).select('title', 'name',
+        'min_value', 'max_value', 'required', 'limit_keys')
+
+    def create(self, data):
+        fd = IntFieldDescription(data['title'],
+                                 str(data['name']),
+                                 data['required'])
+        form.applyChanges(self, fd, data)
+        self._fd = fd
+        return fd
+
+
 class FieldDescriptionEditView(form.EditForm):
     """Edit form for basic person."""
     form.extends(form.EditForm)
@@ -260,6 +276,12 @@
         'items', 'required', 'limit_keys')
 
 
+class IntFieldDescriptionEditView(FieldDescriptionEditView):
+
+    fields = field.Fields(IIntFieldDescription).select('title',
+        'min_value', 'max_value', 'required', 'limit_keys')
+
+
 class FieldDescriptionView(form.DisplayForm):
     """Display form for a field description."""
     template = ViewPageTemplateFile('templates/field_description_view.pt')
@@ -292,6 +314,12 @@
     fields = field.Fields(IEnumFieldDescription)
 
 
+class IntFieldDescriptionView(FieldDescriptionView):
+    """Display form for an int field description."""
+
+    fields = field.Fields(IIntFieldDescription)
+
+
 class FlourishDemographicsFieldsLinks(flourish.page.RefineLinksViewlet):
     """demographics fields add links viewlet."""
 
@@ -312,6 +340,7 @@
         'Text': _('Text'),
         'Bool': _('Yes/No'),
         'Description': _('Description'),
+        'Int': _('Integer'),
         }
 
     def table(self):
@@ -457,6 +486,11 @@
     pass
 
 
+class FlourishIntFieldDescriptionAddView(FlourishFieldDescriptionAddView,
+                                         IntFieldDescriptionAddView):
+    pass
+
+
 class FlourishFieldDescriptionEditView(flourish.form.Form,
                                        FieldDescriptionEditView):
 
@@ -502,6 +536,12 @@
         EnumFieldDescriptionEditView.update(self)
 
 
+class FlourishIntFieldDescriptionEditView(FlourishFieldDescriptionEditView, IntFieldDescriptionEditView):
+
+    def update(self):
+        IntFieldDescriptionEditView.update(self)
+
+
 class FlourishTextFieldDescriptionView(flourish.page.Page, TextFieldDescriptionView):
 
     def update(self):
@@ -532,3 +572,8 @@
     def update(self):
         EnumFieldDescriptionView.update(self)
 
+
+class FlourishIntFieldDescriptionView(flourish.page.Page, IntFieldDescriptionView):
+
+    def update(self):
+        IntFieldDescriptionView.update(self)

=== modified file 'src/schooltool/basicperson/browser/flourish.zcml'
--- src/schooltool/basicperson/browser/flourish.zcml	2011-10-28 05:14:33 +0000
+++ src/schooltool/basicperson/browser/flourish.zcml	2012-01-09 21:27:26 +0000
@@ -346,6 +346,16 @@
         />
 
     <flourish:viewlet
+        name="addInt.html"
+        after="addText.html"
+        before="addDescription.html"
+        title="Integer Field"
+        class="schooltool.skin.flourish.page.LinkViewlet"
+        manager="schooltool.basicperson.browser.demographics.FlourishDemographicsFieldsLinks"
+        permission="schooltool.edit"
+        />
+
+    <flourish:viewlet
         name="reorder.html"
         title="Reorder or Delete Fields"
         class="schooltool.skin.flourish.page.LinkViewlet"
@@ -398,6 +408,15 @@
        subtitle="New Selection List Field"
        />
 
+    <flourish:page
+       name="addInt.html"
+       for="schooltool.basicperson.interfaces.IDemographicsFields"
+       class="schooltool.basicperson.browser.demographics.FlourishIntFieldDescriptionAddView"
+       content_template="templates/z3c_form_edit.pt"
+       permission="schooltool.edit"
+       subtitle="New Integer Field"
+       />
+
     <flourish:breadcrumb
         for="schooltool.basicperson.interfaces.IDemographicsFields"
         view="schooltool.basicperson.browser.demographics.FlourishFieldDescriptionEditView"
@@ -457,6 +476,14 @@
        />
 
     <flourish:page
+       name="edit.html"
+       for="schooltool.basicperson.demographics.IntFieldDescription"
+       class="schooltool.basicperson.browser.demographics.FlourishIntFieldDescriptionEditView"
+       content_template="templates/z3c_form_edit.pt"
+       permission="schooltool.edit"
+       />
+
+    <flourish:page
        name="index.html"
        for="schooltool.basicperson.demographics.TextFieldDescription"
        class="schooltool.basicperson.browser.demographics.FlourishTextFieldDescriptionView"
@@ -500,6 +527,16 @@
        permission="schooltool.view"
        title="View"
        />
+
+    <flourish:page
+       name="index.html"
+       for="schooltool.basicperson.demographics.IntFieldDescription"
+       class="schooltool.basicperson.browser.demographics.FlourishIntFieldDescriptionView"
+       content_template="templates/z3c_form_display.pt"
+       permission="schooltool.view"
+       title="View"
+       />
+
   </configure>
 
   <!-- Viewlet Mangers -->

=== modified file 'src/schooltool/basicperson/configure.zcml'
--- src/schooltool/basicperson/configure.zcml	2011-08-10 12:42:42 +0000
+++ src/schooltool/basicperson/configure.zcml	2012-01-09 21:27:26 +0000
@@ -73,6 +73,13 @@
              set_schema="schooltool.basicperson.interfaces.IEnumFieldDescription" />
   </class>
 
+  <class class=".demographics.IntFieldDescription">
+    <allow interface="zope.location.interfaces.ILocation" />
+    <allow interface="schooltool.basicperson.interfaces.IIntFieldDescription" />
+    <require permission="schooltool.edit"
+             set_schema="schooltool.basicperson.interfaces.IIntFieldDescription" />
+  </class>
+
   <adapter
      factory=".person.BasicPersonCalendarCrowd"
      provides="schooltool.app.interfaces.ICalendarParentCrowd"

=== modified file 'src/schooltool/basicperson/demographics.py'
--- src/schooltool/basicperson/demographics.py	2011-11-20 20:21:57 +0000
+++ src/schooltool/basicperson/demographics.py	2012-01-09 21:27:26 +0000
@@ -25,6 +25,7 @@
 from zope.schema._field import Choice
 from zope.schema._field import Date
 from zope.schema import TextLine, Bool
+from zope.schema import Int
 from zope.location.location import Location
 from zope.location.location import locate
 from zope.html.field import HtmlFragment
@@ -43,6 +44,7 @@
 from schooltool.app.app import InitBase, StartUpBase
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.basicperson.interfaces import IEnumFieldDescription
+from schooltool.basicperson.interfaces import IIntFieldDescription
 from schooltool.basicperson.interfaces import IDemographicsFields
 from schooltool.basicperson.interfaces import IBasicPerson
 from schooltool.basicperson.interfaces import IDemographics
@@ -238,3 +240,15 @@
     def makeField(self):
         return self.setUpField(HtmlFragment(title=unicode(self.title)))
 
+
+class IntFieldDescription(FieldDescription):
+
+    implements(IIntFieldDescription)
+
+    min_value = None
+    max_value = None
+
+    def makeField(self):
+        return self.setUpField(Int(title=unicode(self.title),
+                                   min=self.min_value,
+                                   max=self.max_value))

=== modified file 'src/schooltool/basicperson/interfaces.py'
--- src/schooltool/basicperson/interfaces.py	2011-11-22 23:59:23 +0000
+++ src/schooltool/basicperson/interfaces.py	2012-01-09 21:27:26 +0000
@@ -21,7 +21,7 @@
 """
 from zope.container.interfaces import IContainer
 from zope.container.interfaces import IOrderedContainer
-from zope.schema import Date, Choice, TextLine, Bool, List
+from zope.schema import Date, Choice, TextLine, Bool, List, Int
 from zope.configuration.fields import PythonIdentifier
 from zope.interface import Interface, Attribute
 
@@ -166,6 +166,18 @@
                          "as a menu in forms."))
 
 
+class IIntFieldDescription(IFieldDescription):
+    """Integer demographics field."""
+
+    min_value = Int(
+        title=_(u'Minimum value'),
+        required=False)
+
+    max_value = Int(
+        title=_(u'Maximum value'),
+        required=False)
+
+
 class IFieldFilterVocabulary(IVocabularyTokenized):
     """Marker interface for vocabularies that give keys that are used
     to filder demographics fields for the context.

=== modified file 'src/schooltool/basicperson/tests/test_demographics.py'
--- src/schooltool/basicperson/tests/test_demographics.py	2011-01-14 06:50:22 +0000
+++ src/schooltool/basicperson/tests/test_demographics.py	2012-01-09 21:27:26 +0000
@@ -28,6 +28,7 @@
 from schooltool.basicperson.interfaces import IDemographicsFields
 from schooltool.basicperson.demographics import DateFieldDescription
 from schooltool.basicperson.demographics import EnumFieldDescription
+from schooltool.basicperson.demographics import IntFieldDescription
 from schooltool.basicperson.demographics import setUpDefaultDemographics
 from schooltool.basicperson.demographics import IDemographicsForm
 from schooltool.basicperson.demographics import TextFieldDescription
@@ -227,6 +228,40 @@
     """
 
 
+def doctest_IntFieldDescription():
+    """Tests for IntFieldDescription
+
+    Int field description is a class that defines minimum and maximum
+    values for an integer field shown in person add/edit form.
+
+       >>> fd = IntFieldDescription("tablets", "Tablets")
+       >>> fd.min_value = 2
+       >>> fd.max_value = 3
+       >>> fields = fd.makeField()
+       >>> len(fields)
+       1
+
+       >>> field = fields['tablets']
+       >>> field
+       <Field 'tablets'>
+
+       >>> field.interface
+       <InterfaceClass schooltool.basicperson.demographics.IDemographicsForm>
+
+       >>> field.field
+       <zope.schema._bootstrapfields.Int object at ...>
+
+       >>> field.__name__
+       'tablets'
+
+       >>> field.field.min
+       2
+       >>> field.field.max
+       3
+
+    """
+
+
 def doctest_TextFieldDescription():
     """Tests for TextFieldDescription