Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions assets/flutter_i18n/en_US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ class_attendance:
ineligible: "ineligible"
eligible: "eligible"
warning: "warning"
table:
course_name: "Course Name"
status: "Status"
attendance_rate: "Rate"
check_in: "Check-in"
absence: "Absence"
required: "Required"
leave: "Leave(P/S/O)"
filter: "Filter"
filter_all: "All"
showing_count: "Showing {count}/{total} courses"
card:
time: "Attendances"
time_info: "{checkInCount} Checked / {absenceCount} Absences / {requiredCheckIn} Required"
Expand Down
11 changes: 11 additions & 0 deletions assets/flutter_i18n/zh_CN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ class_attendance:
ineligible: "取消"
eligible: "正常"
warning: "危险"
table:
course_name: "课程名称"
status: "状态"
attendance_rate: "到课率"
check_in: "签到"
absence: "缺勤"
required: "应签"
leave: "请假(事/病/公)"
filter: "筛选"
filter_all: "全部"
showing_count: "显示 {count}/{total} 门课程"
card:
time: "签到次数"
time_info: "{checkInCount} 已签 / {absenceCount} 缺勤 / {requiredCheckIn} 应签"
Expand Down
11 changes: 11 additions & 0 deletions assets/flutter_i18n/zh_TW.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ class_attendance:
ineligible: 取消
eligible: 正常
warning: 危險
table:
course_name: 課程名稱
status: 狀態
attendance_rate: 到課率
check_in: 簽到
absence: 缺勤
required: 應籤
leave: 請假(事/病/公)
filter: 篩選
filter_all: 全部
showing_count: 顯示 {count}/{total} 門課程
card:
time: 簽到次數
time_info: '{checkInCount} 已籤 / {absenceCount} 缺勤 / {requiredCheckIn} 應籤'
Expand Down
4 changes: 3 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ class _MyAppState extends State<MyApp> {
}

WidgetsBinding.instance.addPostFrameCallback((_) async {
double screenWidth = MediaQuery.of(context).size.width;
if (!mounted) return;
final screenWidth = PlatformDispatcher.instance.views.first.physicalSize.width /
PlatformDispatcher.instance.views.first.devicePixelRatio;
log.info("Screen width: $screenWidth.");
if (screenWidth < 480) {
log.info("Vertical vision mode disabled!");
Expand Down
20 changes: 20 additions & 0 deletions lib/model/xidian_ids/class_attendance.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,26 @@ class ClassAttendance {
this.clazzId,
this.cpi,
});

/// Calculate the attendance status based on total class times
/// Returns a translation key for the status
String getAttendanceStatus(int totalTimes) {
final timeToHaveError = (totalTimes / 4).floor();
final absenceNum = int.tryParse(absenceCount) ?? 0;
final attendanceRatio = double.tryParse(
attendanceRate.replaceAll(" %", ""),
);

if (attendanceRatio == null) {
return "class_attendance.course_state.unknown";
} else if (timeToHaveError < absenceNum) {
return "class_attendance.course_state.ineligible";
} else if (attendanceRatio >= 90.0 || timeToHaveError >= absenceNum) {
return "class_attendance.course_state.eligible";
} else {
return "class_attendance.course_state.warning";
}
}
}

@JsonSerializable(explicitToJson: true)
Expand Down
34 changes: 17 additions & 17 deletions lib/page/class_attendance/class_attandance_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:styled_widget/styled_widget.dart';
import 'package:watermeter/model/xidian_ids/class_attendance.dart';
import 'package:watermeter/page/class_attendance/class_attendance_detail.dart';
import 'package:watermeter/page/public_widget/context_extension.dart';
import 'package:watermeter/page/public_widget/both_side_sheet.dart';
import 'package:watermeter/page/public_widget/re_x_card.dart';

class CourseCard extends StatelessWidget {
Expand All @@ -20,20 +20,7 @@ class CourseCard extends StatelessWidget {
timeToHaveError = (totalTimes / 4).floor();
absenceNum = int.tryParse(course.absenceCount) ?? 0;
remainAbsenceNum = timeToHaveError - absenceNum;

double? attandanceRatio = double.tryParse(
course.attendanceRate.replaceAll(" %", ""),
);

if (attandanceRatio == null) {
attendanceStatus = "class_attendance.course_state.unknown";
} else if (timeToHaveError < absenceNum) {
attendanceStatus = "class_attendance.course_state.ineligible";
} else if (attandanceRatio >= 90.0 || timeToHaveError >= absenceNum) {
attendanceStatus = "class_attendance.course_state.eligible";
} else {
attendanceStatus = "class_attendance.course_state.warning";
}
attendanceStatus = course.getAttendanceStatus(totalTimes);
}

Widget _buildInfoRow(String label, String value) {
Expand Down Expand Up @@ -109,9 +96,22 @@ class CourseCard extends StatelessWidget {
],
),
).gestures(
onTap: () {
onTap: () async {
if (!attendanceStatus.contains("unknown")) {
context.push(ClassAttendanceDetailView(classAttendance: course));
await BothSideSheet.show(
context: context,
title: FlutterI18n.translate(
context,
"class_attendance.detail_title",
translationParams: {
"courseName": course.courseName,
},
),
child: ClassAttendanceDetailView(
classAttendance: course,
showAppBar: false,
),
);
}
},
);
Expand Down
197 changes: 107 additions & 90 deletions lib/page/class_attendance/class_attendance_detail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ import 'package:watermeter/repository/xidian_ids/learning_session.dart';

class ClassAttendanceDetailView extends StatefulWidget {
final ClassAttendance classAttendance;
final bool showAppBar;

const ClassAttendanceDetailView({super.key, required this.classAttendance});
const ClassAttendanceDetailView({
super.key,
required this.classAttendance,
this.showAppBar = true,
});

@override
State<ClassAttendanceDetailView> createState() =>
Expand Down Expand Up @@ -79,107 +84,119 @@ class _ClassAttendanceDetailViewState extends State<ClassAttendanceDetailView> {

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(
FlutterI18n.translate(
context,
"class_attendance.detail_title",
translationParams: {
"courseName": widget.classAttendance.courseName,
},
),
),
),
body: RefreshIndicator(
onRefresh: () async => _pagingController.refresh(),
child: PagingListener(
controller: _pagingController,
builder: (context, state, fetchNextPage) =>
PagedListView<int, ClassAttendanceDetail>.separated(
state: state,
fetchNextPage: fetchNextPage,
builderDelegate: PagedChildBuilderDelegate(
firstPageProgressIndicatorBuilder: (context) =>
const Center(child: CircularProgressIndicator()),
firstPageErrorIndicatorBuilder: (context) => ReloadWidget(
function: () async => _pagingController.refresh(),
errorStatus: _pagingController.error,
),
newPageProgressIndicatorBuilder: (context) {
return Row(
children: [
CircularProgressIndicator(),
Text("More to come"),
],
);
},
noItemsFoundIndicatorBuilder: (context) => EmptyListView(
text: FlutterI18n.translate(
context,
"class_attndance.no_attendance_record",
),
type: EmptyListViewType.rolling,
final body = RefreshIndicator(
onRefresh: () async => _pagingController.refresh(),
child: PagingListener(
controller: _pagingController,
builder: (context, state, fetchNextPage) =>
PagedListView<int, ClassAttendanceDetail>.separated(
state: state,
fetchNextPage: fetchNextPage,
builderDelegate: PagedChildBuilderDelegate(
firstPageProgressIndicatorBuilder: (context) =>
const Center(child: CircularProgressIndicator()),
firstPageErrorIndicatorBuilder: (context) => ReloadWidget(
function: () async => _pagingController.refresh(),
errorStatus: _pagingController.error,
),
newPageProgressIndicatorBuilder: (context) {
return Row(
children: [
const CircularProgressIndicator(),
const Text("More to come"),
],
);
},
noItemsFoundIndicatorBuilder: (context) => EmptyListView(
text: FlutterI18n.translate(
context,
"class_attndance.no_attendance_record",
),
noMoreItemsIndicatorBuilder: (context) =>
[
Icon(Icons.sentiment_very_satisfied, size: 32),
SizedBox(width: 8),
Text(
"That's all folks!",
style: Theme.of(context).textTheme.titleLarge,
),
]
.toRow(mainAxisAlignment: MainAxisAlignment.center)
.center()
.padding(vertical: 12),
type: EmptyListViewType.rolling,
),
noMoreItemsIndicatorBuilder: (context) =>
[
const Icon(Icons.sentiment_very_satisfied, size: 32),
const SizedBox(width: 8),
Text(
"That's all folks!",
style: Theme.of(context).textTheme.titleLarge,
),
]
.toRow(mainAxisAlignment: MainAxisAlignment.center)
.center()
.padding(vertical: 12),

itemBuilder: (context, item, index) => ReXCard(
title: Text(FlutterI18n.translate(context, item.signName)),
remaining: [
ReXCardRemaining(
FlutterI18n.translate(context, item.signStatus),
itemBuilder: (context, item, index) => ReXCard(
title: Text(FlutterI18n.translate(context, item.signName)),
remaining: [
ReXCardRemaining(
FlutterI18n.translate(context, item.signStatus),
),
],
bottomRow: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildInfoRow(
FlutterI18n.translate(
context,
"class_attendance.detail_card.creator_name",
),
item.creatorName,
),
],
bottomRow: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildInfoRow(
FlutterI18n.translate(
context,
"class_attendance.detail_card.creator_name",
),
item.creatorName,
_buildInfoRow(
FlutterI18n.translate(
context,
"class_attendance.detail_card.start_time",
),
item.starttime,
),
if (item.submittime != null)
_buildInfoRow(
FlutterI18n.translate(
context,
"class_attendance.detail_card.start_time",
"class_attendance.detail_card.summit_time",
),
item.starttime,
item.submittime!,
),
if (item.submittime != null)
_buildInfoRow(
FlutterI18n.translate(
context,
"class_attendance.detail_card.summit_time",
),
item.submittime!,
),
],
),
).constrained(maxWidth: sheetMaxWidth).center(),
),
separatorBuilder: (BuildContext context, int index) {
return const SizedBox(height: 4);
},
padding: const EdgeInsets.symmetric(
horizontal: 12.5,
vertical: 9.0,
),
],
),
).constrained(maxWidth: sheetMaxWidth).center(),
),
separatorBuilder: (BuildContext context, int index) {
return const SizedBox(height: 4);
},
padding: const EdgeInsets.symmetric(
horizontal: 12.5,
vertical: 9.0,
),
),
),
);

if (!widget.showAppBar) {
return SafeArea(
top: true,
bottom: false,
left: false,
right: false,
child: body,
);
}

return Scaffold(
appBar: AppBar(
title: Text(
FlutterI18n.translate(
context,
"class_attendance.detail_title",
translationParams: {
"courseName": widget.classAttendance.courseName,
},
),
),
),
body: body,
);
}
}
Loading