lp:~aelkner/schooltool/importer_fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:schooltool/1.7 at revision 2689

Gediminas Paulauskas (community): Approve on 2010-07-15

Diff: 1248 lines (+655/-131) (has conflicts)

13 files modified

CHANGES.txt (+6/-0)
src/schooltool/export/ftests/errant_data.txt (+192/-0)
src/schooltool/export/ftests/non_ascii.txt (+3/-3)
src/schooltool/export/ftests/test_all.py (+1/-1)
src/schooltool/export/importer.py (+390/-119)
src/schooltool/export/templates/import.pt (+3/-3)
src/schooltool/testing/analyze.py (+2/-1)
src/schooltool/testing/functional.py (+2/-1)
src/schooltool/timetable/__init__.py (+1/-0)
src/schooltool/timetable/browser/__init__.py (+14/-2)
src/schooltool/timetable/browser/templates/section-timetable-setup.pt (+5/-0)
src/schooltool/timetable/browser/tests/test_timetable.py (+31/-0)
src/schooltool/timetable/interfaces.py (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2698. By Alan Elkner <aelkner@ubuntu> on 2010-07-07

updated CHANGES.txt with TimeTable change

2697. By Alan Elkner <aelkner@ubuntu> on 2010-07-07

added consecutive_periods_as_one attrubute to TimeTable object for journal to use

2696. By Alan Elkner <aelkner@ubuntu> on 2010-07-06

fixed weekday timetable model handling and tests
reworked getters to have clearer validation and added int getters

2695. By Alan Elkner <aelkner@ubuntu> on 2010-07-03

added errant_groups.xls and tests

2694. By Alan Elkner <aelkner@ubuntu> on 2010-07-03

fixed row, col arguments in error() to match cell getters

2693. By Alan Elkner <aelkner@ubuntu> on 2010-07-02

added errant_sections.xls and tests

2692. By Alan Elkner <aelkner@ubuntu> on 2010-06-28

added errant_courses.xls and tests

2691. By Alan Elkner <aelkner@ubuntu> on 2010-06-28

added person tests for invalid numeric cells

2690. By Alan Elkner <aelkner@ubuntu> on 2010-06-28

added errant_persons.xls and tests

2689. By Alan Elkner <aelkner@ubuntu> on 2010-06-28

forgot to add xls file last commit.