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

Merge branch 'new_main' into mcy_new 

# Conflicts:
#	making_school_asignment_app/lib/routes/app_pages.dart
#	making_school_asignment_app/lib/routes/app_routes.dart
This commit is contained in:
machuanyu 2024-05-30 09:49:54 +08:00
parent 55e5a24091 e3f0ec4130
commit b7e083feaf
6 changed files with 101 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart
View File

@ -26,6 +26,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
@override
Widget build(BuildContext context) {
String homeworkId = state.homeworkId.value;
return Scaffold(
backgroundColor: const Color.fromRGBO(245, 245, 245, 1),
appBar: AppBar(
@ -79,6 +80,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
itemBuilder: (context, index) {
AnnotatedClass item = state.classList[index];
return AnnotateItem(
homeworkId: homeworkId,
item: item,
font: 8.sp,
name: state.name.value,
@ -91,6 +93,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
itemBuilder: (context, index) {
AnnotatedClass item = state.classList[index];
return AnnotateItem(
homeworkId: homeworkId,
item: item,
font: 12.sp,
name: state.name.value,

11
making_school_asignment_app/lib/page/home_page/children/annotate_class/widget/annotate_item.dart
View File

@ -12,11 +12,12 @@ import 'package:making_school_asignment_app/page/home_page/widget/progress_bar.d
import 'package:making_school_asignment_app/routes/app_pages.dart';
class AnnotateItem extends StatefulWidget {
final String homeworkId;
final AnnotatedClass item;
final double font;
final String name;
final AnnotateClassLogic logic;
const AnnotateItem({Key? key, required this.item, required this.font, required this.name, required this.logic}) : super(key: key);
const AnnotateItem({super.key, required this.homeworkId, required this.item, required this.font, required this.name, required this.logic});
@override
State<AnnotateItem> createState() => _AnnotateItemState();
@ -197,7 +198,7 @@ class _AnnotateItemState extends State<AnnotateItem> {
},
child: Container(
alignment: Alignment.center,
child: quickText('数据快查', color: Color.fromRGBO(118, 118, 118, 1), size: widget.font),
child: quickText('数据快查', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font),
),
),
),
@ -209,14 +210,16 @@ class _AnnotateItemState extends State<AnnotateItem> {
},
child: Container(
alignment: Alignment.center,
child: quickText('查看报告', color: Color.fromRGBO(118, 118, 118, 1), size: widget.font),
child: quickText('查看报告', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font),
),
)),
]
: [
Expanded(
child: InkWell(
onTap: () {},
onTap: () {
Get.toNamed(Routes.reviewHomework, arguments: {'homeworkId': widget.homeworkId, 'homeworkName': widget.name});
},
child: Container(
alignment: Alignment.center,
child: quickText('批阅', color: const Color.fromRGBO(118, 118, 118, 1), size: widget.font),

37
making_school_asignment_app/lib/page/home_page/children/homework_review/configuration_files/index.dart Normal file
View File

@ -0,0 +1,37 @@
import 'package:get/get.dart';
import 'package:making_school_asignment_app/common/mixins/request_tool_mixin.dart';
class HomeworkReviewState {
HomeworkReviewState();
late String homeworkId;
late String homeworkName;
// late String dateEnd = '';
// late int knowledgeId = 0;
// late RxList<KnowledgeReportDetail> dataList = RxList();
// late RxList<Students> studentList = RxList();
// late RxString knowledgeName = ''.obs;
}
class HomeworkReviewBinding extends Bindings {
@override
void dependencies() => Get.lazyPut(() => HomeworkReviewLogic());
}
class HomeworkReviewLogic extends GetxController with RequestToolMixin {
final HomeworkReviewState state = HomeworkReviewState();
@override
void onInit() {
super.onInit();
state.homeworkId = Get.arguments['homeworkId'];
state.homeworkName = Get.arguments['homeworkName'];
getList();
}
void getList() async {
// List<KnowledgeReportDetail> data = await getClient().getKnowledgeReportDetail(state.dateStart, state.dateEnd, state.knowledgeId);
// state.dataList.value = data;
// EasyLoading.dismiss();
}
}

27
making_school_asignment_app/lib/page/home_page/children/homework_review/index.dart Normal file
View File

@ -0,0 +1,27 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:making_school_asignment_app/page/global_widget/my_text.dart';
import 'configuration_files/index.dart';
class HomeworkReview extends StatefulWidget {
const HomeworkReview({super.key});
@override
State<HomeworkReview> createState() => _HomeworkReviewState();
}
class _HomeworkReviewState extends State<HomeworkReview> {
final logic = Get.find<HomeworkReviewLogic>();
final sateData = Get.find<HomeworkReviewLogic>().state;
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: quickText(sateData.homeworkName),
),
body: Container(),
);
}
}

23
making_school_asignment_app/lib/routes/app_pages.dart
View File

@ -1,3 +1,5 @@
import 'dart:math';
import 'package:get/get.dart';
import 'package:making_school_asignment_app/page/global_widget/other_page.dart';
import 'package:making_school_asignment_app/page/global_widget/start_page.dart';
@ -7,6 +9,8 @@ import 'package:making_school_asignment_app/page/home_page/children/answer_traje
import 'package:making_school_asignment_app/page/home_page/children/answer_trajectory/answer_trajectory_view.dart';
import 'package:making_school_asignment_app/page/home_page/children/class_student/class_student_binding.dart';
import 'package:making_school_asignment_app/page/home_page/children/class_student/class_student_view.dart';
import 'package:making_school_asignment_app/page/home_page/children/homework_review/configuration_files/index.dart';
import 'package:making_school_asignment_app/page/home_page/children/homework_review/index.dart';
import 'package:making_school_asignment_app/page/home_page/children/job_report/job_report_binding.dart';
import 'package:making_school_asignment_app/page/home_page/children/job_report/job_report_view.dart';
import 'package:making_school_asignment_app/page/home_page/children/knowledge_points_grasp/knowledge_points_grasp_binding.dart';
@ -78,6 +82,25 @@ abstract class AppPages {
binding: KnowledgePointsGraspDetailBinding(),
transition: Transition.noTransition),
GetPage(name: Routes.answerTrajectoryPage, page: () => const AnswerTrajectoryPage(), binding: AnswerTrajectoryBinding(), transition: Transition.noTransition),
// 批阅主页（作业、考试）
GetPage(name: Routes.reviewHomework, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()),
GetPage(name: Routes.reviewExam, page: () => const HomeworkReview(), binding: HomeworkReviewBinding(), transition: getTransition()),
];
}
/// 获取页面随机跳转
Transition getTransition() {
try {
List<Transition> transitions = Transition.values;
return transitions[getRandomNumbers(0, transitions.length - 1)];
} catch (e) {
return getTransition();
}
}
/// 获取指定范围的随机数
int getRandomNumbers(int minNumber, int maxNumber) {
int next(int min, int max) => min + Random().nextInt(max - min);
return next(minNumber, maxNumber);
}

4
making_school_asignment_app/lib/routes/app_routes.dart
View File

@ -19,4 +19,8 @@ abstract class Routes {
static const knowledgePointsGraspPage = '/knowledgePointsGraspPage';
static const knowledgePointsGraspDetailPage = '/knowledgePointsGraspDetailPage';
static const answerTrajectoryPage = '/answerTrajectoryPage';
// 批阅主页
static const reviewHomework = '/review/reviewHomework'; // 作业批阅
static const reviewExam = '/review/reviewExam'; // 考试批阅
}