Skip to content
This repository has been archived by the owner on Apr 25, 2022. It is now read-only.

Commit

Permalink
refactor(timetable): rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@CCXXXI
CCXXXI committed Oct 23, 2021
1 parent 0091211 commit c9989a5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions lib/timetable/ecnu/ecnu_logic.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class EcnuLogic extends GetxController with L {

void getTable() async {
final r0 = await dio.get(Url.ids);
final ids = parseIds(r0.data);
final ids = getIds(r0.data);

final r1 = await dio.post(
Url.table,
Expand All @@ -218,19 +218,19 @@ class EcnuLogic extends GetxController with L {
final js = document.querySelectorAll('script[language]').last.text;
courses
..clear()
..addAll(parseCourses(js!));
..addAll(getCourses(js!));
table.value = courses.toMap().toString();
}

static String parseIds(String data) =>
static String getIds(String data) =>
RegExp(r'bg\.form\.addInput\(form,"ids","(.*)"\);')
.firstMatch(data)!
.group(1)!;

/// 2018-2019学年度上学期为705，每向前/向后一个学期就增加/减少32
static int semId(int year, int sem) => 705 + (year - 2018) * 96 + sem * 32;

static List<Course> parseCourses(String js) {
static List<Course> getCourses(String js) {
final newCourse = RegExp('TaskActivity'
r'\('
'"(?<teacherId>.*)",'
Expand Down
12 changes: 6 additions & 6 deletions test/timetable/ecnu/ecnu_logic_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ void main() {
expect(EcnuLogic.semId(2017, 2), 705 - 32);
});

test('parseIds', () {
test('getIds', () {
expect(
EcnuLogic.parseIds('''
EcnuLogic.getIds('''
function searchTable(){
if(jQuery("#courseTableType").val()=="std"){
bg.form.addInput(form,"ids","123456");
Expand All @@ -57,15 +57,15 @@ void main() {
);
});

test('parseCourses', () {
final r = EcnuLogic.parseCourses(coursesJs);
test('getCourses', () {
final r = EcnuLogic.getCourses(coursesJs);
courses.addAll(r);
expect(courses, isNotEmpty);
expect(
Course.fromJson(courses.getAt(0)!.toJson()).toJson(),
r.first.toJson(),
);
expect(courses.toMap().toString(), res);
expect(courses.toMap().toString(), coursesResult);
});
}

Expand Down Expand Up @@ -125,5 +125,5 @@ const coursesJs = '''
table0.marshalTable(2,1,18);
fillTable(table0,7,14,0);
''';
const res =
const coursesResult =
'{0: {teacherId: 76694, teacherName: 赵慧, courseId: 340936, courseCode: SOFT0031132992, courseNo: 01, courseName: 非关系型数据存储技术及其应用, roomId: 2375, roomName: 教书院226, weeks: [false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 3, unit: 2}, {weekday: 3, unit: 3}]}, 1: {teacherId: 76646, teacherName: 姜宁康, courseId: 302608, courseCode: SOFT0031131018, courseNo: 01, courseName: 面向对象分析和设计实践, roomId: 5036, roomName: 理科大楼B517, weeks: [false, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 1, unit: 5}, {weekday: 1, unit: 6}]}, 2: {teacherId: 76646, teacherName: 姜宁康, courseId: 292975, courseCode: SOFT0031131073, courseNo: 01, courseName: 面向对象分析和设计, roomId: 2375, roomName: 教书院226, weeks: [false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 1, unit: 0}, {weekday: 1, unit: 1}]}, 3: {teacherId: 76848, teacherName: 羊丹平, courseId: 340398, courseCode: MATH0031112991, courseNo: 02, courseName: 逻辑·推理·证明, roomId: 2370, roomName: 教书院218, weeks: [false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 0, unit: 10}, {weekday: 0, unit: 11}, {weekday: 0, unit: 12}]}, 4: {teacherId: 76447, teacherName: 应琼, courseId: 343774, courseCode: COEN0031162002, courseNo: 04, courseName: 中西文化比较, roomId: 2377, roomName: 教书院302, weeks: [false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 4, unit: 2}, {weekday: 4, unit: 3}]}, 5: {teacherId: 76743, teacherName: 赵世忠, courseId: 295546, courseCode: SOFT0031132019, courseNo: 01, courseName: 数学建模, roomId: 2370, roomName: 教书院218, weeks: [false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 0, unit: 7}, {weekday: 0, unit: 8}]}, 6: {teacherId: 76663, teacherName: 孙海英, courseId: 331020, courseCode: SOFT0031132228, courseNo: 01, courseName: 软件测试和验证, roomId: 2609, roomName: 理科大楼B226, weeks: [false, true, true, true, true, true, true, false, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 1, unit: 2}, {weekday: 1, unit: 3}]}, 7: {teacherId: 24935984, teacherName: 程鹏, courseId: 334873, courseCode: SOFT0031132231, courseNo: 01, courseName: 算法设计与分析, roomId: 2370, roomName: 教书院218, weeks: [false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: , periods: [{weekday: 3, unit: 5}, {weekday: 3, unit: 6}]}, 8: {teacherId: 76663, teacherName: 孙海英, courseId: 331020, courseCode: SOFT0031132228, courseNo: 01, courseName: 软件测试和验证, roomId: , roomName: , weeks: [false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false], taskId: null, expLessonGroupId: , expLessonGroupIndexNo: , remark: , specialRoom: 理科楼B226, periods: [{weekday: 0, unit: 0}, {weekday: 0, unit: 1}]}}';

0 comments on commit c9989a5

Please sign in to comment.