diff --git a/lib/core/models/classes.dart b/lib/core/models/classes.dart index 807b0230e..dacb3e2cf 100644 --- a/lib/core/models/classes.dart +++ b/lib/core/models/classes.dart @@ -56,7 +56,7 @@ class ClassData { courseCode: json["course_code"] == null ? null : json["course_code"], units: (json["units"] as num?)?.toDouble(), courseLevel: json["course_level"] == null ? null : json["course_level"], - gradeOption: json["grade_option"] == null ? null : json["grade_option"], + gradeOption: json["grade_option"] ?? json["gradeOption"], grade: json["grade"] == null ? null : json["grade"], courseTitle: json["course_title"] == null ? null : json["course_title"], enrollmentStatus: json["enrollment_status"] == null ? null : json["enrollment_status"], diff --git a/lib/core/models/scheduled_class.dart b/lib/core/models/scheduled_class.dart index cc154f02f..5fd49ac41 100644 --- a/lib/core/models/scheduled_class.dart +++ b/lib/core/models/scheduled_class.dart @@ -22,16 +22,29 @@ class ScheduledClass { return dayCodes.isEmpty ? days : dayCodes.join(', '); } - String get gradeOption { - switch (course.gradeOption) { - case 'L': + String? get gradeOption { + final raw = course.gradeOption?.trim(); + if (raw == null || raw.isEmpty) return null; + switch (raw.toLowerCase()) { + case 'l': + case 'letter grade': return 'Letter Grade'; - case 'P': + case 'p': + case 'pn': + case 'pnp': + case 'pass/no pass': + case 'pass/not pass': return 'Pass/No Pass'; - case 'S': + case 's': + case 'su': + case 's/u': + case 'sat/unsat': + case 'satisfactory/unsatisfactory': return 'Sat/Unsat'; default: - return 'Other'; + // Surface the raw value instead of a misleading "Other" when the + // TSS API adds new grade-option codes. + return raw; } } } diff --git a/lib/ui/classes/classes_card.dart b/lib/ui/classes/classes_card.dart index beeb8dacf..2431f850b 100644 --- a/lib/ui/classes/classes_card.dart +++ b/lib/ui/classes/classes_card.dart @@ -87,7 +87,7 @@ class ClassScheduleCard extends StatelessWidget { buildLocationRow(context, section.room?.trim().isNotEmpty == true ? section.room!.trim() : 'TBD'), SizedBox(height: 8), // Evaluation Option: - buildGradeEvaluationRow(context, scheduledClass.gradeOption), + if (scheduledClass.gradeOption != null) buildGradeEvaluationRow(context, scheduledClass.gradeOption!), // "Last updated: A few seconds ago Padding( padding: const EdgeInsets.only(left: 4.0, top: 24.0), diff --git a/lib/ui/classes/classes_list.dart b/lib/ui/classes/classes_list.dart index e52112fc7..24e057ef5 100644 --- a/lib/ui/classes/classes_list.dart +++ b/lib/ui/classes/classes_list.dart @@ -166,7 +166,7 @@ class ClassList extends StatelessWidget { // Classroom Location: _detailRow(Icons.location_on_outlined, 'Location: ${_formatLocation(scheduledClass)}', detailStyle), // Evaluation Option: - if (!isMidterm) + if (!isMidterm && scheduledClass.gradeOption != null) _detailRow(Icons.check_box_outlined, 'Evaluation: ${scheduledClass.gradeOption}', detailStyle), ], ), diff --git a/test/core/models/scheduled_class_test.dart b/test/core/models/scheduled_class_test.dart new file mode 100644 index 000000000..978eadbba --- /dev/null +++ b/test/core/models/scheduled_class_test.dart @@ -0,0 +1,50 @@ +import 'package:campus_mobile_experimental/core/models/classes.dart'; +import 'package:campus_mobile_experimental/core/models/scheduled_class.dart'; +import 'package:flutter_test/flutter_test.dart'; + +ScheduledClass scheduledFromJson(Map courseJson) => + ScheduledClass(course: ClassData.fromJson(courseJson), section: SectionData()); + +void main() { + group('ScheduledClass.gradeOption', () { + test('maps the legacy single-letter codes', () { + expect(scheduledFromJson({'grade_option': 'L'}).gradeOption, 'Letter Grade'); + expect(scheduledFromJson({'grade_option': 'P'}).gradeOption, 'Pass/No Pass'); + expect(scheduledFromJson({'grade_option': 'S'}).gradeOption, 'Sat/Unsat'); + }); + + test('maps real MyAcademicHistory Title Case values', () { + expect(scheduledFromJson({'grade_option': 'Letter Grade'}).gradeOption, 'Letter Grade'); + expect(scheduledFromJson({'grade_option': 'Pass/No Pass'}).gradeOption, 'Pass/No Pass'); + expect(scheduledFromJson({'grade_option': 'Sat/Unsat'}).gradeOption, 'Sat/Unsat'); + expect(scheduledFromJson({'grade_option': 'Satisfactory/Unsatisfactory'}).gradeOption, 'Sat/Unsat'); + }); + + test('maps grade-option spellings case-insensitively', () { + expect(scheduledFromJson({'grade_option': 'letter grade'}).gradeOption, 'Letter Grade'); + expect(scheduledFromJson({'grade_option': 'pass/not pass'}).gradeOption, 'Pass/No Pass'); + expect(scheduledFromJson({'grade_option': 's/u'}).gradeOption, 'Sat/Unsat'); + }); + + test('passes unrecognized non-empty values through verbatim', () { + expect(scheduledFromJson({'grade_option': 'Z'}).gradeOption, 'Z'); + expect(scheduledFromJson({'grade_option': 'credit'}).gradeOption, 'credit'); + }); + + test('returns null when the value is missing, null, or blank', () { + expect(scheduledFromJson({}).gradeOption, isNull); + expect(scheduledFromJson({'grade_option': null}).gradeOption, isNull); + expect(scheduledFromJson({'grade_option': ' '}).gradeOption, isNull); + }); + }); + + group('ClassData.fromJson grade_option parsing', () { + test('reads snake_case payloads', () { + expect(ClassData.fromJson({'grade_option': 'Letter Grade'}).gradeOption, 'Letter Grade'); + }); + + test('falls back to camelCase payloads', () { + expect(ClassData.fromJson({'gradeOption': 'Pass/No Pass'}).gradeOption, 'Pass/No Pass'); + }); + }); +}