Skip to content

Commit 229cf97

Browse files
committed
fix(attempt): change class error 10% fix
1 parent e34aa4a commit 229cf97

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ migrate_working_dir/
3232
.pub/
3333
/build/
3434
pubspec.lock
35+
android/app/build/
3536

3637
# Web related
3738
lib/generated_plugin_registrant.dart

lib/model/xidian_ids/classtable.dart

+11
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ class ClassDetail {
8080
other is ClassDetail &&
8181
other.runtimeType == runtimeType &&
8282
name == other.name;
83+
84+
@override
85+
String toString() {
86+
return "$name $code $number";
87+
}
8388
}
8489

8590
@JsonSerializable(explicitToJson: true)
@@ -116,6 +121,12 @@ class TimeArrangement {
116121
required this.start,
117122
required this.stop,
118123
});
124+
125+
@override
126+
String toString() {
127+
// TODO: implement toString
128+
return "$source $index $classroom $teacher";
129+
}
119130
}
120131

121132
@JsonSerializable(explicitToJson: true)

lib/page/classtable/class_table_view/class_table_view.dart

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:watermeter/page/classtable/class_table_view/classtable_date_row.
1313
import 'package:watermeter/page/classtable/classtable_constant.dart';
1414
import 'package:watermeter/page/classtable/classtable_state.dart';
1515
import 'package:watermeter/page/public_widget/public_widget.dart';
16+
import 'package:watermeter/repository/logger.dart';
1617
import 'package:watermeter/themes/color_seed.dart';
1718

1819
/// THe classtable view, the way the the classtable sheet rendered.
@@ -67,6 +68,7 @@ class _ClassTableViewState extends State<ClassTableView> {
6768
if (index != 0) {
6869
/// Fetch all class in this range.
6970
List<ClassOrgainzedData> events = [];
71+
7072
for (final i in classTableState.timeArrangement) {
7173
if (i.weekList.length > widget.index &&
7274
i.weekList[widget.index] &&

lib/repository/xidian_ids/ehall_classtable_session.dart

+8-3
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ class ClassTableFile extends EhallSession {
286286

287287
log.i(
288288
"[getClasstable][getFromWeb] "
289-
"Class change. Teacher changed? ${e.isTeacherChanged}.",
289+
"Class change. Teacher changed? ${e.isTeacherChanged}. timeArrangementIndex is $timeArrangementIndex",
290290
);
291291
for (int indexOriginalTimeArrangement
292292
in indexOriginalTimeArrangementList) {
293-
/// Seek for the change entry. Delete the classes moved away.
293+
/// Seek for the change entry. Delete the classes moved waay.
294294
log.i(
295295
"[getClasstable][getFromWeb] "
296296
"Original weeklist ${preliminaryData.timeArrangement[indexOriginalTimeArrangement].weekList} "
@@ -299,7 +299,7 @@ class ClassTableFile extends EhallSession {
299299
for (int i in e.originalAffectedWeeksList) {
300300
log.i(
301301
"[getClasstable][getFromWeb] "
302-
"$i ${preliminaryData.timeArrangement[indexOriginalTimeArrangement].weekList[i]}",
302+
"Week $i, status ${preliminaryData.timeArrangement[indexOriginalTimeArrangement].weekList[i]}.",
303303
);
304304
if (preliminaryData
305305
.timeArrangement[indexOriginalTimeArrangement].weekList[i]) {
@@ -316,6 +316,11 @@ class ClassTableFile extends EhallSession {
316316
);
317317
}
318318

319+
if (timeArrangementIndex == indexOriginalTimeArrangementList.first) {
320+
timeArrangementIndex = preliminaryData
321+
.timeArrangement[indexOriginalTimeArrangementList.first].index;
322+
}
323+
319324
log.i(
320325
"[getClasstable][getFromWeb] "
321326
"New week: ${e.newAffectedWeeks}, "

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: watermeter
22
description: Another personal data assistant for XDU.
33
publish_to: "none"
4-
version: 1.2.0+20
4+
version: 1.2.1+21
55

66
environment:
77
sdk: ">=3.0.0"

0 commit comments

Comments
 (0)