marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

Merge remote-tracking branch 'origin/mcy_new' into mcy_new

This commit is contained in:
machuanyu 2025-03-13 14:59:19 +08:00
parent 829ac8fbad 2f2395bfe2
commit a8d5be898e
2 changed files with 117 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
making_school_asignment_app/lib/common/utils/utils.dart
View File

@ -117,13 +117,36 @@ class Utils {
for (var stu in data.students) {
stu.kgtStu = kgt.where((w) => w.studentId == stu.studentId).toList();
stu.kgtStu!.sort((a, b) => num.parse(a.questionNo).compareTo(num.parse(b.questionNo)));
// stu.kgtStu!.sort((a, b) => num.parse(a.questionNo).compareTo(num.parse(b.questionNo)));
// stu.kgtStu!.sort((a, b) => num.parse(a.questionNo).compareTo(num.parse(b.questionNo)));
stu.kgtStu!.sort((a, b) {
try {
if (RegExp(r'^\d*\.?\d+$').hasMatch(a.questionNo) && RegExp(r'^\d*\.?\d+$').hasMatch(b.questionNo)) {
return num.parse(a.questionNo).compareTo(num.parse(b.questionNo));
} else {
throw Exception();
}
} catch (e) {
return a.questionNo.toLowerCase().compareTo(b.questionNo.toLowerCase());
}
});
stu.kgtOkCount = stu.kgtStu!.where((w) => w.state == 3).length;
stu.kgtErrorCount = stu.kgtStu!.where((w) => w.state == 2).length;
stu.kgtAnswerCount = stu.kgtStu!.where((w) => w.state != 0).length;
stu.zgtStu = zgt.where((w) => w.studentId == stu.studentId).toList();
stu.zgtStu!.sort((a, b) => num.parse(a.questionNo).compareTo(num.parse(b.questionNo)));
// stu.zgtStu!.sort((a, b) => num.parse(a.questionNo).compareTo(num.parse(b.questionNo)));
stu.zgtStu!.sort((a, b) {
try {
if (RegExp(r'^\d*\.?\d+$').hasMatch(a.questionNo) && RegExp(r'^\d*\.?\d+$').hasMatch(b.questionNo)) {
return num.parse(a.questionNo).compareTo(num.parse(b.questionNo));
} else {
throw Exception();
}
} catch (e) {
return a.questionNo.toLowerCase().compareTo(b.questionNo.toLowerCase());
}
});
//正确
stu.zgtOkCount = stu.zgtStu!.where((w) => w.state == 3).length;
//错误
@ -167,21 +190,20 @@ class Utils {
var stuDtls = data.dtls.where((w) => w.studentId == stu.studentId);
var secList = [];
for(var sec in stuDtls){
if(sec.useTime >= 1){
for (var sec in stuDtls) {
if (sec.useTime >= 1) {
var date = DateTime.parse(sec.lastAnswerTime!);
var lastSec =(date.difference(DateTime(1970)).inSeconds).floor();
var lastSec = (date.difference(DateTime(1970)).inSeconds).floor();
secList.add(lastSec);
secList.add(lastSec - sec.useTime);
}
}
secList.sort();
var maxSec = secList.isNotEmpty?secList.last:0;
var minSec = secList.isNotEmpty?secList.first:0;
var secTime = secList.isNotEmpty?maxSec-minSec:0;
var maxSec = secList.isNotEmpty ? secList.last : 0;
var minSec = secList.isNotEmpty ? secList.first : 0;
var secTime = secList.isNotEmpty ? maxSec - minSec : 0;
stu.ttlSec = second2HMS(secTime);
}
data.students.sort((a, b) {

16
making_school_asignment_app/lib/page/home_page/children/job_report/widget/knowledge_point.dart
View File

@ -14,7 +14,8 @@ class KnowledgePoint extends StatefulWidget {
final String className;
final String homeworkId;
final int subject;
KnowledgePoint({Key? key, required this.knowsList, required this.data, required this.className, required this.homeworkId,required this.subject}) : super(key: key);
const KnowledgePoint(
{super.key, required this.knowsList, required this.data, required this.className, required this.homeworkId, required this.subject});
@override
State<KnowledgePoint> createState() => _KnowledgePointState();
@ -23,7 +24,7 @@ class KnowledgePoint extends StatefulWidget {
class _KnowledgePointState extends State<KnowledgePoint> {
void goQuickCheckPersonalPath(studentId) {
if (studentId != null) {
Get.toNamed(Routes.studentPersonalPage, arguments: {'studentId': studentId, 'homeworkId': widget.homeworkId,'subject':widget.subject});
Get.toNamed(Routes.studentPersonalPage, arguments: {'studentId': studentId, 'homeworkId': widget.homeworkId, 'subject': widget.subject});
}
}
@ -208,7 +209,8 @@ class _KnowledgePointState extends State<KnowledgePoint> {
child: quickText('知识点掌握情况', color: const Color.fromRGBO(92, 92, 92, 1), size: 14.sp, fontWeight: FontWeight.bold),
),
Expanded(
child: widget.knowsList.isNotEmpty? ListView(
child: widget.knowsList.isNotEmpty
? ListView(
children: widget.knowsList.value.map((item) {
return Container(
margin: EdgeInsets.only(bottom: 15.h, left: 15.r, right: 15.r),
@ -252,8 +254,9 @@ class _KnowledgePointState extends State<KnowledgePoint> {
SizedBox(width: 10.w),
InkWell(
onTap: () {
List<Questions> ques =
widget.data.questions.where((w) => w.knows.indexWhere((k) => k.knowledgeId == item.knowledgeId) > -1).toList();
List<Questions> ques = widget.data.questions
.where((w) => w.knows.indexWhere((k) => k.knowledgeId == item.knowledgeId) > -1)
.toList();
List<Students> array2 = [...widget.data.students];
for (var stu in array2) {
stu.queDtls = widget.data.dtls
@ -290,7 +293,8 @@ class _KnowledgePointState extends State<KnowledgePoint> {
],
),
);
}).toList()): MyEmptyWidget(imgWidth: 100.r, imgHeight: 100.r, font: 8.sp),
}).toList())
: MyEmptyWidget(imgWidth: 100.r, imgHeight: 100.r, font: 8.sp),
),
],
));