From c7cf6ad703e3e17e54c3a988208a81a53049da69 Mon Sep 17 00:00:00 2001 From: maikusobu <0939899928za.com@gmail.com> Date: Thu, 16 May 2024 16:06:25 +0700 Subject: [PATCH] feat: update feature --- src/main.ts | 13 ++++- src/renderer/router/index.ts | 7 ++- .../student-department/StudentDepartment.vue | 26 ++++++++- .../student/CourseRegistration.vue | 28 ++++++++++ .../student/components/CreateModal.vue | 1 + .../student/components/CreateRegistration.vue | 48 +++++++++++++++++ .../student/components/EditModal.vue | 5 ++ .../student/components/ListMajor.vue | 51 ++++++++++++++++++ .../student/components/ListOpenCourse.vue | 28 ++++++++++ .../student/components/Registration.vue | 45 ++++++++++++++++ .../student/components/Table.vue | 3 -- .../student/stores/registration.ts | 53 +++++++++++++++++++ .../student/stores/student.ts | 29 +++++++++- src/utils/resolveCurrentTerm.ts | 26 +++++++++ 14 files changed, 354 insertions(+), 9 deletions(-) create mode 100644 src/renderer/views/student-department/student/CourseRegistration.vue create mode 100644 src/renderer/views/student-department/student/components/CreateRegistration.vue create mode 100644 src/renderer/views/student-department/student/components/ListMajor.vue create mode 100644 src/renderer/views/student-department/student/components/ListOpenCourse.vue create mode 100644 src/renderer/views/student-department/student/components/Registration.vue create mode 100644 src/renderer/views/student-department/student/stores/registration.ts create mode 100644 src/utils/resolveCurrentTerm.ts diff --git a/src/main.ts b/src/main.ts index 079c76b..3db5372 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,4 @@ -import { app, BrowserWindow, ipcMain } from 'electron'; +import { app, BrowserWindow, ipcMain, screen } from 'electron'; import path from 'path'; import Store from 'electron-store'; import { updateElectronApp } from 'update-electron-app'; @@ -22,11 +22,20 @@ ipcMain.on('electron-store-clear', () => { store.clear(); }); const createWindow = () => { - // Create the browser window. + const { width, height } = screen.getPrimaryDisplay().workAreaSize; const mainWindow = new BrowserWindow({ webPreferences: { preload: path.join(__dirname, 'preload.js'), }, + width, + height, + minWidth: 800, + minHeight: 700, + maxWidth: width, + maxHeight: height, + movable: true, + resizable: true, + maximizable: true, autoHideMenuBar: process.env.NODE_ENV !== 'development', }); diff --git a/src/renderer/router/index.ts b/src/renderer/router/index.ts index 6b55cfd..e31a6af 100644 --- a/src/renderer/router/index.ts +++ b/src/renderer/router/index.ts @@ -8,7 +8,9 @@ import Course from '../views/training-department/course/Course.vue'; import StudentDepartment from '../views/student-department/StudentDepartment.vue'; import Student from '../views/student-department/student/Student.vue'; import Program from '../views/training-department/program/Program.vue'; +import CourseRegistration from '../views/student-department/student/CourseRegistration.vue'; import resolveDepartmentRoute from '../../utils/resolveDepartmentRoute'; + import getSession from '../../utils/getSession'; const routes: Array = [ @@ -56,7 +58,6 @@ const routes: Array = [ children: [], }, { - //cải thiện load khi cần thiết // path: '/student-department', // phòng công tác sinh viên component: StudentDepartment, children: [ @@ -64,6 +65,10 @@ const routes: Array = [ path: 'student', component: Student, }, + { + path: 'course-registration', + component: CourseRegistration, + }, ], }, ]; diff --git a/src/renderer/views/student-department/StudentDepartment.vue b/src/renderer/views/student-department/StudentDepartment.vue index 57dc87b..505a205 100644 --- a/src/renderer/views/student-department/StudentDepartment.vue +++ b/src/renderer/views/student-department/StudentDepartment.vue @@ -4,17 +4,41 @@ :routes="[ { name: 'bảng điều khiển', path: '/student-department' }, { name: 'Sinh viên', path: '/student-department/student' }, + { + name: 'Đăng ký môn học', + path: '/student-department/course-registration', + }, ]" title="phòng công tác sinh viên" />
- + + + +
diff --git a/src/renderer/views/student-department/student/CourseRegistration.vue b/src/renderer/views/student-department/student/CourseRegistration.vue new file mode 100644 index 0000000..aaa2cf2 --- /dev/null +++ b/src/renderer/views/student-department/student/CourseRegistration.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/renderer/views/student-department/student/components/CreateModal.vue b/src/renderer/views/student-department/student/components/CreateModal.vue index b24dc44..53f3064 100644 --- a/src/renderer/views/student-department/student/components/CreateModal.vue +++ b/src/renderer/views/student-department/student/components/CreateModal.vue @@ -63,6 +63,7 @@