Merge lp:~replaceafill/schooltool/schooltool_1.4 into lp:schooltool/1.4

[Douglas Cerna]

[Gediminas Paulauskas (menesis)]

I have merged schooltool_1.5 branch into 1.4, too

Unmerged revisions

2726. By Douglas Cerna on 2011-08-30

Updated schema manager

2725. By Douglas Cerna on 2011-08-30

Allowed non-integer values for course credits (https://bugs.launchpad.net/bugs/488376)
Add School Year copies all course attributes (https://bugs.launchpad.net/bugs/785994)

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2010-11-30 19:32:38 +0000
+++ CHANGES.txt	2011-09-01 04:44:43 +0000
@@ -5,7 +5,8 @@
 1.4.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Allowed non-integer values for course credits (https://bugs.launchpad.net/bugs/488376)
+- Add School Year copies all course attributes (https://bugs.launchpad.net/bugs/785994)
 
 
 1.4.3 (2010-11-23)

=== modified file 'src/schooltool/course/browser/ftests/new_schoolyear.txt'
--- src/schooltool/course/browser/ftests/new_schoolyear.txt	2010-05-26 12:35:03 +0000
+++ src/schooltool/course/browser/ftests/new_schoolyear.txt	2011-09-01 04:44:43 +0000
@@ -32,11 +32,15 @@
     >>> manager.getLink('New Course').click()
     >>> manager.getControl('Title').value = 'History 5'
     >>> manager.getControl('Description').value = 'History course for fifth-graders'
+    >>> manager.getControl('Course ID').value = 'history-local'
+    >>> manager.getControl('Government ID').value = 'history-gov'
+    >>> manager.getControl('Credits').value = '5'
     >>> manager.getControl('Add').click()
 
     >>> manager.getLink('New Course').click()
     >>> manager.getControl('Title').value = 'English 6'
-    >>> manager.getControl('Description').value = 'History course for sixth-graders'
+    >>> manager.getControl('Description').value = 'English course for sixth-graders'
+    >>> manager.getControl('Credits').value = '0.5'
     >>> manager.getControl('Add').click()
 
 The couses are there now:
@@ -73,3 +77,33 @@
     <div class="course">
       <input type="checkbox" name="delete.history-5" /><a href="http://localhost/schoolyears/2006-2007/courses/history-5">History 5</a>
     </div>
+
+Let's check that all the course attributes were copied:
+
+    >>> manager.getLink('History 5').click()
+    >>> manager.printQuery('id("course-view")/p[@class="description"]/text()')
+    History course for fifth-graders
+    >>> manager.printQuery('id("course-view")/div[@class="info-block"][1]/p')
+    <p>
+      Course ID:
+      history-local
+    </p>
+    <p>
+      Government ID:
+      history-gov
+    </p>
+    <p>
+      Credits:
+      5
+    </p>
+
+    >>> manager.getLink('2006-2007').click()
+    >>> manager.getLink('Courses').click()
+    >>> manager.getLink('English 6').click()
+    >>> manager.printQuery('id("course-view")/p[@class="description"]/text()')
+    English course for sixth-graders
+    >>> manager.printQuery('id("course-view")/div[@class="info-block"][1]/p')
+    <p>
+      Credits:
+      0.5
+    </p>

=== modified file 'src/schooltool/course/browser/ftests/sections_and_courses.txt'
--- src/schooltool/course/browser/ftests/sections_and_courses.txt	2010-04-08 06:59:12 +0000
+++ src/schooltool/course/browser/ftests/sections_and_courses.txt	2011-09-01 04:44:43 +0000
@@ -69,7 +69,7 @@
     >>> manager.getControl('Description').value = "English course description"
     >>> manager.getControl('Course ID').value = "english"
     >>> manager.getControl('Government ID').value = "english101"
-    >>> manager.getControl('Credits').value = "4"
+    >>> manager.getControl('Credits').value = "4.5"
     >>> manager.getControl('Add').click()
 
 Now let's add some sections for our courses:
@@ -92,7 +92,7 @@
     </p>
     <p>
       Credits:
-      4
+      4.5
     </p>
 
     >>> manager.getLink('New Section').click()

=== modified file 'src/schooltool/course/interfaces.py'
--- src/schooltool/course/interfaces.py	2010-01-19 12:09:22 +0000
+++ src/schooltool/course/interfaces.py	2011-09-01 04:44:43 +0000
@@ -55,7 +55,7 @@
         required=False,
         description=_("Course identifier used by the government."))
 
-    credits = zope.schema.Int(
+    credits = zope.schema.Decimal(
         title=_("Credits"),
         required=False,
         description=_("Amount of credits for this course."))

=== modified file 'src/schooltool/generations/__init__.py'
--- src/schooltool/generations/__init__.py	2010-11-15 16:44:54 +0000
+++ src/schooltool/generations/__init__.py	2011-09-01 04:44:43 +0000
@@ -25,6 +25,6 @@
 from zope.app.generations.generations import SchemaManager
 
 schemaManager = SchemaManager(
-    minimum_generation=34,
-    generation=34,
+    minimum_generation=35,
+    generation=35,
     package_name='schooltool.generations')

=== added file 'src/schooltool/generations/evolve35.py'
--- src/schooltool/generations/evolve35.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/generations/evolve35.py	2011-09-01 04:44:43 +0000
@@ -0,0 +1,39 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2011 Shuttleworth Foundation
+#
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+"""
+Upgrade SchoolTool to generation 35.
+
+Changes course credits attribute from integer to decimal values.
+"""
+
+from decimal import Decimal
+
+from zope.app.generations.utility import findObjectsProviding
+from zope.app.publication.zopepublication import ZopePublication
+
+from schooltool.course.interfaces import ICourse
+
+
+def evolve(context):
+    root = context.connection.root().get(ZopePublication.root_name, None)
+
+    courses = findObjectsProviding(root, ICourse)
+    for course in courses:
+        if getattr(course, 'credits', None) is not None:
+            course.credits = Decimal(course.credits)

=== added file 'src/schooltool/generations/tests/test_evolve35.py'
--- src/schooltool/generations/tests/test_evolve35.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/generations/tests/test_evolve35.py	2011-09-01 04:44:43 +0000
@@ -0,0 +1,106 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2008 Shuttleworth Foundation
+#
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+"""
+Unit tests for schooltool.generations.evolve35
+"""
+import unittest
+import doctest
+
+from zope.app.testing import setup
+from zope.interface import implements
+from zope.container.contained import Contained
+from zope.container.btree import BTreeContainer
+
+from schooltool.relationship.tests import setUpRelationships
+from schooltool.generations.tests import ContextStub
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.course.interfaces import ICourse
+
+
+class AppStub(BTreeContainer):
+    implements(ISchoolToolApplication)
+
+
+class CourseStub(Contained):
+    implements(ICourse)
+    credits = None
+
+    def __repr__(self):
+        return '<CourseStub(__name__="%s", credits="%r")>' % (
+            self.__name__, self.credits)
+
+
+def doctest_evolve35():
+    """Evolution to generation 35.
+
+        >>> context = ContextStub()
+        >>> context.root_folder['app'] = app = AppStub()
+
+    Set up courses with integer credits:
+
+        >>> courses = app['courses'] = BTreeContainer()
+        >>> courses['c1'] = CourseStub()
+        >>> courses['c1'].credits = 5
+        >>> courses['c2'] = CourseStub()
+        >>> courses['c3'] = CourseStub()
+        >>> courses['c3'].credits = 10
+        >>> courses['c4'] = CourseStub()
+        >>> courses['c4'].credits = 0
+        >>> list(courses.values())
+        [<CourseStub(__name__="c1", credits="5")>,
+         <CourseStub(__name__="c2", credits="None")>,
+         <CourseStub(__name__="c3", credits="10")>,
+         <CourseStub(__name__="c4", credits="0")>]
+
+    Let's evolve now.
+
+        >>> from schooltool.generations.evolve35 import evolve
+        >>> evolve(context)
+
+    Course credits are now updated to Decimal values.
+
+        >>> list(courses.values())
+        [<CourseStub(__name__="c1", credits="Decimal('5')")>,
+         <CourseStub(__name__="c2", credits="None")>,
+         <CourseStub(__name__="c3", credits="Decimal('10')")>,
+         <CourseStub(__name__="c4", credits="Decimal('0')")>]
+
+    """
+
+
+def setUp(test):
+    setup.placelessSetUp()
+    setup.setUpAnnotations()
+    setUpRelationships()
+
+
+def tearDown(test):
+    setup.placelessTearDown()
+
+
+def test_suite():
+    optionflags = (doctest.ELLIPSIS |
+                   doctest.NORMALIZE_WHITESPACE |
+                   doctest.REPORT_ONLY_FIRST_FAILURE)
+    return doctest.DocTestSuite(setUp=setUp, tearDown=tearDown,
+                                optionflags=optionflags)
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')

=== modified file 'src/schooltool/schoolyear/browser/schoolyear.py'
--- src/schooltool/schoolyear/browser/schoolyear.py	2010-09-15 13:52:08 +0000
+++ src/schooltool/schoolyear/browser/schoolyear.py	2011-09-01 04:44:43 +0000
@@ -223,7 +223,10 @@
         oldCourses = ICourseContainer(self.activeSchoolyear)
         newCourses = ICourseContainer(self.newSchoolyear)
         for id, course in oldCourses.items():
-            newCourses[course.__name__] = Course(course.title, course.description)
+            newCourses[course.__name__] = new_course = Course(course.title, course.description)
+            new_course.course_id = course.course_id
+            new_course.government_id = course.government_id
+            new_course.credits = course.credits
 
     def importAllTimetables(self):
         if not self.shouldImportAllTimetables():