Skip to content

Commit

Permalink
Merge pull request #51 from uw-it-aca/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@ezturner
ezturner committed Nov 14, 2017
2 parents d89bd48 + 517b5cb commit c109e83
Show file tree
Hide file tree
Showing 9 changed files with 370 additions and 1 deletion.
1 change: 1 addition & 0 deletions uw_sws/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ def json_data(self):
return {
'uwnetid': self.uwnetid,
'uwregid': self.uwregid,
'email': self.email,
'first_name': self.first_name,
'last_name': self.last_name,
'student_name': self.student_name,
Expand Down
248 changes: 248 additions & 0 deletions uw_sws/resources/sws/file/student/v5/course/2017_autumn_EDC%26I_552/A.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
{
"AddCodeRequired": true,
"Auditors": 0,
"ClassWebsiteUrl": null,
"Course": {
"CourseNumber": "552",
"CurriculumAbbreviation": "EDC&I",
"Href": "/student/v5/course/2017,autumn,EDC%26I,552.json",
"Quarter": "autumn",
"Year": 2017
},
"CourseCampus": "Seattle",
"CourseDescription": "Provides a foundation in coaching, mentoring, and other forms of peer-driven professional development in educational settings, grounded within research on adult professional learning and socio-cultural theories.",
"CourseHasVariableContent": false,
"CourseTitle": "COACH MENTOR ADULTS",
"CourseTitleLong": "COACHING AND MENTORING ADULT LEARNERS",
"CreditControl": "fixed credit",
"CurrentEnrollment": 26,
"Curriculum": {
"CollegeName": "EDUCATION",
"DepartmentAbbreviation": "EDUC",
"TimeScheduleLinkAbbreviation": "edci"
},
"DeleteFlag": "active",
"DistanceLearning": true,
"DistanceLearningType": {
"Code": "3",
"Description": "Internet"
},
"DuplicateEnrollmentAllowed": false,
"EndDate": "",
"EnrollmentRestrictions": true,
"FeeAmount": "",
"FeeBudget": "",
"FeeType": "",
"FinalExam": {
"Building": null,
"Date": "",
"EndTime": "",
"FinalExamBuilding": {
"Href": ""
},
"MeetingStatus": null,
"RoomNumber": null,
"StartTime": ""
},
"FinancialAidEligible": true,
"FinancialAidEligibleDisplay": "",
"GeneralEducationRequirements": {
"Diversity": false,
"EnglishComposition": false,
"IndividualsAndSocieties": false,
"NaturalWorld": false,
"QuantitativeAndSymbolicReasoning": false,
"VisualLiteraryAndPerformingArts": false,
"Writing": false
},
"GradeSubmissionDelegates": [
{
"DelegateLevel": "department",
"Person": {
"Href": "/student/v5/person/A9D2DDFA6A7D11D5A4AE0004AC494FFE.json",
"Name": "James Faculty",
"RegID": "A9D2DDFA6A7D11D5A4AE0004AC494FFE"
}
},
{
"DelegateLevel": "curriculum",
"Person": {
"Href": "/student/v5/person/12345678901234567890123456789012.json",
"Name": "Bill Teacher",
"RegID": "12345678901234567890123456789012"
}
}
],
"GradingSystem": "standard",
"HonorsCourse": false,
"IndependentStudy": false,
"InstituteName": "",
"IsIndependentStart": false,
"JointSections": [],
"LMSOwnership": null,
"LimitEstimateEnrollment": 35,
"LimitEstimateEnrollmentIndicator": "limit",
"LinkedSectionTypes": [],
"MaximumCredit": "",
"MaximumTermCredit": "",
"Meetings": [
{
"Building": "*",
"BuildingToBeArranged": true,
"DaysOfWeek": {
"Days": [],
"Text": "to be arranged"
},
"DaysOfWeekToBeArranged": true,
"EndTime": "",
"Instructors": [
{
"FacultySequenceNumber": "",
"GradeRoster": {
"Href": "/student/v5/graderoster/2017,autumn,EDC%26I,552,A,FBB38FE46A7C11D5A4AE0004AC494FFE"
},
"PercentInvolve": "100",
"Person": {
"Href": "/student/v5/person/FBB38FE46A7C11D5A4AE0004AC494FFE.json",
"Name": "Bill Seattle",
"RegID": "FBB38FE46A7C11D5A4AE0004AC494FFE"
},
"TSPrint": true
}
],
"Meeting": {
"Href": ""
},
"MeetingIndex": "1",
"MeetingType": "lecture",
"RoomNumber": "*",
"RoomToBeArranged": true,
"StartTime": ""
}
],
"Metadata": "SectionSourceKey=SDB;",
"MinimumTermCredit": "3.0",
"OnlineLearningType": {
"Code": "10",
"Description": "Online Learning - Completely online"
},
"PrimaryLMS": null,
"PrimarySection": {
"CourseNumber": "552",
"CurriculumAbbreviation": "EDC&I",
"Href": "/student/v5/course/2017,autumn,EDC%26I,552/A.json",
"Quarter": "autumn",
"SectionID": "A",
"Year": 2017
},
"Registrations": {
"ChangedSinceDate": "",
"CourseNumber": "552",
"CurriculumAbbreviation": "EDC&I",
"Href": "/student/v5/registration.json?year=2017&quarter=autumn&curriculum_abbreviation=EDC%26I&course_number=552&section_id=A&reg_id=&is_active=True&instructor_reg_id=&verbose=False&changed_since_date=&transcriptable_course=&page_start=&page_size=",
"InstructorRegID": null,
"IsActive": true,
"PageSize": "",
"PageStart": "",
"Quarter": "autumn",
"RegID": null,
"SectionID": "A",
"TranscriptableCourse": "",
"Verbose": false,
"Year": 2017
},
"RepositoryTimeStamp": "9/27/2017 8:44:02 AM",
"ResearchCredit": false,
"RoomCapacity": 0,
"SLN": "14049",
"SameVariableContentAs": [],
"SecondaryGradingOption": false,
"SectionID": "A",
"SectionType": "lecture",
"SelfRegistrationAllowed": true,
"ServiceLearning": false,
"StartDate": "",
"StudentCreditHours": " 78.0",
"SummerTerm": "",
"Term": {
"Href": "/student/v5/term/2017,autumn.json",
"Quarter": "autumn",
"Year": 2017
},
"TimeScheduleComments": {
"CollegeComments": {
"Lines": []
},
"CourseComments": {
"Lines": []
},
"CurriculumComments": {
"Lines": []
},
"DepartmentComments": {
"Lines": []
},
"InstituteComments": {
"Lines": []
},
"SectionComments": {
"Lines": [
{
"Text": "\"COACHING AND MENTORING"
},
{
"Text": "ADULT LEARNERS.\""
},
{
"Text": "ONLINE COURSE (USED TO BE EDC&I"
},
{
"Text": "505"
},
{
"Text": "NO ADD CODES REQUIRED IN PERIODS"
},
{
"Text": "1 AND 2 FOR COLLEGE OF ED GRAD"
},
{
"Text": "STUD"
},
{
"Text": "FOR PERIOD 3 ADD CODES/QUESTIONS,"
},
{
"Text": "E-MAIL EDCODES@UW.EDU. INCLUDE"
},
{
"Text": "NAME,STUDENT NUMBER, COURSE"
},
{
"Text": "TITLE, NUMBER &"
},
{
"Text": "SLN."
}
]
},
"TimeScheduleGeneratedComments": {
"Lines": [
{
"Text": "Distance Learning - Internet"
},
{
"Text": "Add Code required Period 3 (beginning 9/27/2017)"
},
{
"Text": "Grads only"
},
{
"Text": "Only majors from EDUC College Period 1 (5/5/2017-6/18/2017)"
},
{
"Text": "Only majors from EDUC College Period 2 (6/19/2017-9/26/2017)"
}
]
}
}
}
107 changes: 107 additions & 0 deletions ...rbose_true_year_2017_quarter_autumn_is_active_true_section_id_A_transcriptable_course_all
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"Current": {
"ChangedSinceDate": "",
"CourseNumber": "552",
"CurriculumAbbreviation": "EDC&I",
"Href": "/student/v5/registration.json?year=2017&quarter=autumn&curriculum_abbreviation=EDC%26I&course_number=552&section_id=AA&reg_id=&is_active=&instructor_reg_id=&verbose=true&changed_since_date=&transcriptable_course=all&page_start=&page_size=10",
"InstructorRegID": "",
"IsActive": false,
"PageSize": "10",
"PageStart": null,
"Quarter": "autumn",
"RegID": null,
"SectionID": "A",
"TranscriptableCourse": "all",
"Verbose": true,
"Year": 2017
},
"Next": null,
"PageSize": "10",
"PageStart": null,
"Previous": null,
"Registrations": [
{
"AccessDateRangeEnd": "12/23/2017",
"AccessDateRangeStart": "09/13/2017",
"Auditor": false,
"Credits": "3",
"DuplicateCode": "",
"EducationUnitType": null,
"EndDate": "12/08/2017",
"FeeBaseType": "Course taken on fee basis",
"Grade": "X",
"GradeDate": "",
"GradeDocumentID": "",
"GradingSystem": null,
"HonorsCourse": false,
"Href": "/student/v5/registration/2017,autumn,EDC%26I,552,A,9136CCB8F66711D5BE060004AC494FFE,A.json",
"Instructor": null,
"IsActive": true,
"IsCredit": true,
"IsIndependentStart": false,
"Metadata": "RegistrationSourceLocation=SDB_EOS;",
"Person": {
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494FFE.json",
"Name": "Inter Student",
"RegID": "9136CCB8F66711D5BE060004AC494FFE"
},
"RepeatCourse": false,
"RepositoryTimeStamp": "9/6/2017 11:24:14 AM",
"RequestDate": "2017-09-06",
"RequestStatus": "ADDED TO CLASS",
"Section": {
"CourseNumber": "552",
"CurriculumAbbreviation": "EDC&I",
"Href": "/student/v5/course/2017,autumn,EDC%26I,552/A.json",
"Quarter": "autumn",
"SectionID": "A",
"Year": 2017
},
"StartDate": "09/27/2017",
"VariableCredit": false,
"WritingCourse": false
},
{
"AccessDateRangeEnd": "",
"AccessDateRangeStart": "",
"Auditor": false,
"Credits": "3",
"DuplicateCode": "",
"EducationUnitType": null,
"EndDate": "",
"FeeBaseType": "",
"Grade": "X",
"GradeDate": "",
"GradeDocumentID": "",
"GradingSystem": null,
"HonorsCourse": false,
"Href": "/student/v5/registration/2017,autumn,EDC%26I,552,A,9136CCB8F66711D5BE060004AC494FFE,.json",
"Instructor": null,
"IsActive": true,
"IsCredit": true,
"IsIndependentStart": false,
"Metadata": "RegistrationSourceLocation=SDB;",
"Person": {
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494FFE.json",
"Name": "Average Student",
"RegID": "9136CCB8F66711D5BE060004AC494FFE"
},
"RepeatCourse": false,
"RepositoryTimeStamp": "8/23/2017 8:24:22 AM",
"RequestDate": "2017-07-14",
"RequestStatus": "ADDED TO CLASS",
"Section": {
"CourseNumber": "552",
"CurriculumAbbreviation": "EDC&I",
"Href": "/student/v5/course/2017,autumn,EDC%26I,552/A.json",
"Quarter": "autumn",
"SectionID": "A",
"Year": 2017
},
"StartDate": "",
"VariableCredit": false,
"WritingCourse": false
}
],
"TotalCount": 2
}
1 change: 1 addition & 0 deletions uw_sws/resources/sws/file/student/v5/term/2017_autumn.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ATermLastDay":null,"AcademicCatalog":"2015-08-01","BTermFirstDay":null,"CensusDay":"2017-10-06","FifthDay":"2017-10-03","FinancialAidYear":null,"FirstDay":"2017-09-27","FirstDayMedSchool":"2017-09-05","GradeSubmissionDeadline":"2017-12-19T17:00:00","GradingPeriodClose":"2018-01-03T17:00:00","GradingPeriodOpen":"2017-11-20T08:00:00","GradingPeriodOpenATerm":null,"LastAddDay":"2017-10-17","LastAddDayATerm":null,"LastAddDayBTerm":null,"LastDayOfClasses":"2017-12-08","LastDropDay":"2017-11-14","LastDropDayATerm":null,"LastDropDayBTerm":null,"LastDropDayNotRecorded":"2017-10-10","LastDropDayNotRecordedATerm":null,"LastDropDayNotRecordedBTerm":null,"LastFinalExamDay":"2017-12-15","Metadata":"TermSourceKey=SDB;","NextTerm":{"Href":"\/student\/v5\/term\/2018,winter.json","Quarter":"winter","Year":2018},"PreviousTerm":{"Href":"\/student\/v5\/term\/2017,summer.json","Quarter":"summer","Year":2017},"Quarter":"autumn","RegistrationPeriods":[{"EndDate":"2017-06-18","StartDate":"2017-05-05"},{"EndDate":"2017-09-26","StartDate":"2017-06-19"},{"EndDate":"2017-10-03","StartDate":"2017-09-27"}],"RegistrationServicesStart":"2017-04-28","RepositoryTimeStamp":"5\/31\/2017 12:53:42 PM","StudentAccountStart":null,"TimeScheduleConstruction":{"Bothell":false,"Seattle":false,"Tacoma":false},"TimeSchedulePublished":{"Bothell":true,"Seattle":true,"Tacoma":true},"Year":2017}
1 change: 1 addition & 0 deletions uw_sws/resources/sws/file/student/v5/term/2017_spring.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ATermLastDay":null,"AcademicCatalog":"2015-08-01","BTermFirstDay":null,"CensusDay":"2017-04-07","FifthDay":"2017-03-31","FinancialAidYear":null,"FirstDay":"2017-03-27","FirstDayMedSchool":null,"GradeSubmissionDeadline":"2017-06-13T17:00:00","GradingPeriodClose":"2017-06-28T17:00:00","GradingPeriodOpen":"2017-05-22T08:00:00","GradingPeriodOpenATerm":null,"LastAddDay":"2017-04-16","LastAddDayATerm":null,"LastAddDayBTerm":null,"LastDayOfClasses":"2017-06-02","LastDropDay":"2017-05-14","LastDropDayATerm":null,"LastDropDayBTerm":null,"LastDropDayNotRecorded":"2017-04-09","LastDropDayNotRecordedATerm":null,"LastDropDayNotRecordedBTerm":null,"LastFinalExamDay":"2017-06-09","Metadata":"TermSourceKey=SDB;","NextTerm":{"Href":"\/student\/v5\/term\/2017,summer.json","Quarter":"summer","Year":2017},"PreviousTerm":{"Href":"\/student\/v5\/term\/2017,winter.json","Quarter":"winter","Year":2017},"Quarter":"spring","RegistrationPeriods":[{"EndDate":"2017-02-26","StartDate":"2017-02-10"},{"EndDate":"2017-03-26","StartDate":"2017-02-27"},{"EndDate":"2017-04-02","StartDate":"2017-03-27"}],"RegistrationServicesStart":"2017-02-03","RepositoryTimeStamp":"6\/17\/2017 7:15:13 AM","StudentAccountStart":null,"TimeScheduleConstruction":{"Bothell":false,"Seattle":false,"Tacoma":false},"TimeSchedulePublished":{"Bothell":true,"Seattle":true,"Tacoma":true},"Year":2017}
1 change: 1 addition & 0 deletions uw_sws/resources/sws/file/student/v5/term/2017_summer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ATermLastDay":"2017-07-19","AcademicCatalog":"2015-08-01","BTermFirstDay":"2017-07-20","CensusDay":"2017-06-30","FifthDay":"2017-06-23","FinancialAidYear":null,"FirstDay":"2017-06-19","FirstDayMedSchool":null,"GradeSubmissionDeadline":"2017-08-22T17:00:00","GradingPeriodClose":"2017-09-06T17:00:00","GradingPeriodOpen":"2017-08-11T08:00:00","GradingPeriodOpenATerm":"2017-07-13T08:00:00","LastAddDay":"2017-07-09","LastAddDayATerm":"2017-07-09","LastAddDayBTerm":"2017-07-26","LastDayOfClasses":"2017-08-18","LastDropDay":"2017-08-06","LastDropDayATerm":"2017-07-09","LastDropDayBTerm":"2017-08-09","LastDropDayNotRecorded":"2017-07-02","LastDropDayNotRecordedATerm":"2017-06-25","LastDropDayNotRecordedBTerm":"2017-07-26","LastFinalExamDay":"2017-08-18","Metadata":"TermSourceKey=SDB;","NextTerm":{"Href":"\/student\/v5\/term\/2017,autumn.json","Quarter":"autumn","Year":2017},"PreviousTerm":{"Href":"\/student\/v5\/term\/2017,spring.json","Quarter":"spring","Year":2017},"Quarter":"summer","RegistrationPeriods":[{"EndDate":"2017-05-17","StartDate":"2017-04-10"},{"EndDate":"2017-06-18","StartDate":"2017-05-18"},{"EndDate":"2017-06-25","StartDate":"2017-06-19"}],"RegistrationServicesStart":"2017-04-03","RepositoryTimeStamp":"9\/8\/2017 7:15:37 AM","StudentAccountStart":null,"TimeScheduleConstruction":{"Bothell":false,"Seattle":false,"Tacoma":false},"TimeSchedulePublished":{"Bothell":true,"Seattle":true,"Tacoma":true},"Year":2017}
1 change: 1 addition & 0 deletions uw_sws/resources/sws/file/student/v5/term/2017_winter.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ATermLastDay":null,"AcademicCatalog":"2015-08-01","BTermFirstDay":null,"CensusDay":"2017-01-13","FifthDay":"2017-01-09","FinancialAidYear":null,"FirstDay":"2017-01-03","FirstDayMedSchool":null,"GradeSubmissionDeadline":"2017-03-21T17:00:00","GradingPeriodClose":"2017-04-05T17:00:00","GradingPeriodOpen":"2017-02-27T08:00:00","GradingPeriodOpenATerm":null,"LastAddDay":"2017-01-23","LastAddDayATerm":null,"LastAddDayBTerm":null,"LastDayOfClasses":"2017-03-10","LastDropDay":"2017-02-20","LastDropDayATerm":null,"LastDropDayBTerm":null,"LastDropDayNotRecorded":"2017-01-16","LastDropDayNotRecordedATerm":null,"LastDropDayNotRecordedBTerm":null,"LastFinalExamDay":"2017-03-17","Metadata":"TermSourceKey=SDB;","NextTerm":{"Href":"\/student\/v5\/term\/2017,spring.json","Quarter":"spring","Year":2017},"PreviousTerm":{"Href":"\/student\/v5\/term\/2016,autumn.json","Quarter":"autumn","Year":2016},"Quarter":"winter","RegistrationPeriods":[{"EndDate":"2016-11-20","StartDate":"2016-11-04"},{"EndDate":"2017-01-02","StartDate":"2016-11-21"},{"EndDate":"2017-01-09","StartDate":"2017-01-03"}],"RegistrationServicesStart":"2016-10-28","RepositoryTimeStamp":"3\/25\/2017 7:15:31 AM","StudentAccountStart":null,"TimeScheduleConstruction":{"Bothell":false,"Seattle":false,"Tacoma":false},"TimeSchedulePublished":{"Bothell":true,"Seattle":true,"Tacoma":true},"Year":2017}
5 changes: 4 additions & 1 deletion uw_sws/tests/test_person.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ def test_person_jinter(self):
self.assertEquals(data.permanent_address.state, "Mumbai")
self.assertEquals(data.permanent_address.zip_code, "")


def test_person_none(self):
data = get_person_by_regid("00000000000000000000000000000001")
self.assertEquals(data.uwnetid, "none")
Expand All @@ -97,3 +96,7 @@ def test_person_none(self):
self.assertEquals(data.local_address, None)
self.assertEquals(data.permanent_phone, None)
self.assertEquals(data.permanent_address, None)

def test_json_datat(self):
data = get_person_by_regid("9136CCB8F66711D5BE060004AC494FFE")
self.assertEquals(data.json_data()['email'], "javerage@u.washington.edu")

0 comments on commit c109e83

Please sign in to comment.