cleaned up the fixture information for courses and date_ranges

test/fixtures/courses.yml

@@ -1,118 +1,125 @@
-math7s:
-  name: Math 7S
-  teacher_id: 1069
-  term: t1
+english-t1-08:
+  teacher: teachera
+  term: t1-08
   grading_scale: s
   course_att_id: 1
+  course_master: english08
 
-math8hpf:
-  name: Math 8H
-  teacher_id: 1069
-  term: t1
-  grading_scale: pf
+english-t2-08:
+  teacher: teachera
+  term: t2-08
+  grading_scale: s
   course_att_id: 1
+  course_master: english08
 
-math8s-t1:
-  name: Math 8S
-  teacher_id: 1069
-  term: t1
+english-t3-08:
+  teacher: teachera
+  term: t3-08
   grading_scale: s
   course_att_id: 1
+  course_master: english08
 
-math8s-t2:
-  name: Math 8S
-  teacher_id: 1069
-  term: t2
+math-t1-08:
+  teacher: teachera
+  term: t1-08
   grading_scale: s
   course_att_id: 1
+  course_master: math08
 
-english-t1:
-  name: English
-  teacher_id: 1070
-  term: t1
+math-t2-08:
+  teacher: teachera
+  term: t2-08
   grading_scale: s
   course_att_id: 1
-
-english-t2:
-  name: English
-  teacher_id: 1070
-  term: t2
+  course_master: math08
+
+math-t3-08:
+  teacher: teachera
+  term: t3-08
   grading_scale: s
   course_att_id: 1
+  course_master: math08
 
-music-t1:
-  name: Music
-  teacher_id: 1070
-  term: t1
+math-t1-09:
+  teacher: teacherb
+  term: t1-09
   grading_scale: s
   course_att_id: 1
+  course_master: math09
 
-spelling-t1:
-  name: Spelling
-  teacher_id: 1070
-  term: t1
+math-t2-09:
+  teacher: teacherb
+  term: t2-09
   grading_scale: s
   course_att_id: 1
+  course_master: math09
 
-spelling-t2:
-  name: Spelling
-  teacher_id: 1070
-  term: t2
+math-t3-09:
+  teacher: teacherb
+  term: t3-09
   grading_scale: s
   course_att_id: 1
+  course_master: math09
 
-spelling-t3:
-  name: Spelling
-  teacher_id: 1070
-  term: t3
-  grading_scale: s
+music-t1-09:
+  teacher: teachera
+  term: t1-09
+  grading_scale: pf
   course_att_id: 1
+  course_master: music-09
 
-math-t3:
-  name: Math
-  teacher_id: 1070
-  term: t3
-  grading_scale: s
+music-t2-09:
+  teacher: teachera
+  term: t2-09
+  grading_scale: pf
+  course_att_id: 1
+  course_master: music-09
+
+music-t3-09:
+  teacher: teachera
+  term: t3-09
+  grading_scale: pf
   course_att_id: 1
+  course_master: music-09
 
-spelling-t4:
-  name: Spelling
-  teacher_id: 1070
-  term: t4
+spelling-t1-08:
+  teacher: teachera
+  term: t1-08
   grading_scale: s
   course_att_id: 1
+  course_master: spelling-08
 
-math-t4:
-  name: Math
-  teacher_id: 1070
-  term: t4
+spelling-t2-08:
+  teacher: teachera
+  term: t2-08
   grading_scale: s
   course_att_id: 1
+  course_master: spelling-08
 
-spelling-t5:
-  name: Spelling
-  teacher_id: 1070
-  term: t5
+spelling-t3-08:
+  teacher: teachera
+  term: t3-08
   grading_scale: s
   course_att_id: 1
+  course_master: spelling-08
 
-math-t5:
-  name: Math
-  teacher_id: 1070
-  term: t5
+spelling-t1-09:
+  teacher: teacherb
+  term: t1-09
   grading_scale: s
   course_att_id: 1
+  course_master: spelling-09
 
-spelling-t6:
-  name: Spelling
-  teacher_id: 1070
-  term: t6
+spelling-t2-09:
+  teacher: teacherb
+  term: t2-09
   grading_scale: s
   course_att_id: 1
+  course_master: spelling-09
 
-math-t6:
-  name: Math
-  teacher_id: 1070
-  term: t6
+spelling-t3-09:
+  teacher: teacherb
+  term: t3-09
   grading_scale: s
   course_att_id: 1
+  course_master: spelling-09

test/fixtures/date_ranges.yml

@@ -16,47 +16,47 @@ sy09:
   begin_date: 2008/08/01
   end_date: 2010/06/27
 
-t1:
+t1-08:
   type: Term
   name: GP1-08
   begin_date: 2008/08/01
   end_date: 2008/11/17
   school_year_id: 594005756
   active: true
 	
-t2:
+t2-08:
   type: Term
   name: GP2-08
   begin_date: 2008/11/17
   end_date: 2009/03/28
   school_year_id: 594005756
   active: true
 
-t3:
+t3-08:
   type: Term
   name: GP3-08
   begin_date: 2009/03/28
   end_date: 2009/06/28
   school_year_id: 594005756
   active: false
 
-t4:
+t1-09:
   type: Term
   name: GP1-09
   begin_date: 2009/08/01
   end_date: 2009/11/17
   school_year_id: 594005757
   active: true
 	
-t5:
+t2-09:
   type: Term
   name: GP2-09
   begin_date: 2009/11/17
   end_date: 2010/03/28
   school_year_id: 594005757
   active: true
 
-t6:
+t3-10:
   type: Term
   name: GP3-10
   begin_date: 2010/03/28