Perf: calculate gpa of selected score info

PeiPei233 · Apr 10, 2024 · 1d87336 · 1d87336
1 parent 7bd1c34
commit 1d87336
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 33 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "zju-learning-assistant",
-    "version": "0.3.3"
+    "version": "0.3.4"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/Home.jsx b/src/Home.jsx
@@ -188,7 +188,7 @@ export default function Home({ setIsLogin, setAutoLoginUsername, setAutoLoginPas
           if (item.end_time) {
             const key = `${item.course_id}-${item.id}-${item.end_time}`
             const diffTime = dayjs(item.end_time).diff(dayjs(), 'minute')
-            if (!notifiedTodo.current[key] && diffTime <= 60 && diffTime > 0 ) {
+            if (!notifiedTodo.current[key] && diffTime <= 60 && diffTime > 0) {
               let permissionGranted = await isPermissionGranted();
               if (!permissionGranted) {
                 const permission = await requestPermission();
@@ -339,7 +339,6 @@ export default function Home({ setIsLogin, setAutoLoginUsername, setAutoLoginPas
     }
   }
 
-
   const updatePath = () => {
     dialog.open({
       directory: true,
@@ -366,7 +365,6 @@ export default function Home({ setIsLogin, setAutoLoginUsername, setAutoLoginPas
     })
   }
 
-
   const updateUploadList = () => {
     let courses = courseList.filter((item) => selectedCourseKeys.includes(item.id))
     // console.log(courses)
@@ -567,7 +565,7 @@ export default function Home({ setIsLogin, setAutoLoginUsername, setAutoLoginPas
                   }}
                 />
               </Tooltip>
-              <Tooltip title='全部删除'>
+              <Tooltip title='清空下载列表'>
                 <Button
                   type='text'
                   icon={<DeleteOutlined />}

diff --git a/src/Learning.jsx b/src/Learning.jsx
@@ -159,16 +159,6 @@ export default function Learning({
   const filterOption = (input, option) =>
     (option?.label ?? '').toLowerCase().includes(input.toLowerCase());
 
-  const onSelectChange = (newSelectedRowKeys) => {
-    // console.log('selectedRowKeys changed: ', newSelectedRowKeys);
-    setSelectedCourseKeys(newSelectedRowKeys)
-  };
-
-  const onUploadSelectChange = (newSelectedRowKeys) => {
-    // console.log('selectedRowKeys changed: ', newSelectedRowKeys);
-    setSelectedUploadKeys(newSelectedRowKeys)
-  }
-
   const uploadColumns = [
     {
       title: '课程名称',
@@ -260,7 +250,7 @@ export default function Learning({
           <SearchTable
             rowSelection={{
               selectedRowKeys: selectedCourseKeys,
-              onChange: onSelectChange,
+              onChange: setSelectedCourseKeys,
             }}
             columns={courseColumns}
             dataSource={selectedCourses}
@@ -277,7 +267,7 @@ export default function Learning({
           <SearchTable
             rowSelection={{
               selectedRowKeys: selectedUploadKeys,
-              onChange: onUploadSelectChange,
+              onChange: setSelectedUploadKeys,
             }}
             rowKey='reference_id'
             columns={uploadColumns}

diff --git a/src/Score.jsx b/src/Score.jsx
@@ -1,4 +1,4 @@
-import { useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import { Button, Card, App, Typography, Input, Switch, Tooltip } from 'antd';
 import { SyncOutlined } from '@ant-design/icons';
 import SearchTable from './SearchTable'
@@ -22,6 +22,10 @@ export default function Score({
 
   const { message, modal, notification } = App.useApp()
 
+  const [selectedXkkh, setSelectedXkkh] = useState([])
+  const [selectedTotalGp, setSelectedTotalGp] = useState(0)
+  const [selectedTotalCredit, setSelectedTotalCredit] = useState(0)
+
   useEffect(() => {
     handleSync()
   }, [])
@@ -82,17 +86,31 @@ export default function Score({
     },
   ]
 
+  const onSelectChange = (selectedRowKeys, selectedRows) => {
+    setSelectedXkkh(selectedRowKeys)
+    let totalGp = 0
+    let totalCredit = 0
+    selectedRows.forEach(row => {
+      if (row.cj !== '合格' && row.cj !== '不合格' && row.cj !== '弃修') {
+        totalGp += parseFloat(row.jd) * parseFloat(row.xf)
+        totalCredit += parseFloat(row.xf)
+      }
+    })
+    setSelectedTotalGp(totalGp)
+    setSelectedTotalCredit(totalCredit)
+  }
+
   return (
     <div style={{ margin: 20 }}>
-      <Card bodyStyle={{ padding: 15 }}>
+      <Card styles={{ body: { padding: 15 } }}>
         <div style={{
           display: 'flex',
           justifyContent: 'space-between',
           alignItems: 'center',
         }} >
           <div style={{ display: 'flex', alignItems: 'center', flexDirection: 'row' }}>
             <Text style={{ minWidth: 115 }}>自动同步并提醒：</Text>
-            <Tooltip title={notify ? '成绩推送已开启，将自动同步最新成绩并在成绩更新时提醒' : '成绩推送已关闭'}>
+            <Tooltip title={notify ? '成绩推送已开启，将自动同步最新成绩并在成绩更新时提醒' : '成绩推送已关闭，开启后将自动同步最新成绩并在成绩更新时提醒'}>
               <Switch loading={loading} checked={notify} onChange={handleSwitch} />
             </Tooltip>
           </div>
@@ -102,16 +120,23 @@ export default function Score({
         </div>
       </Card>
       <SearchTable
+        rowSelection={{
+          selectedRowKeys: selectedXkkh,
+          onChange: onSelectChange,
+        }}
         columns={columns}
         dataSource={score}
         rowKey='xkkh'
         pagination={false}
         scroll={{ y: 'calc(100vh - 255px)' }}
         size='small'
         bordered
-        footer={() => `最后同步时间：${lastSync ? lastSync : '未同步'}，共 ${score.length} 条记录，总绩点 ${(
-          totalCredit === 0 ? 0 : totalGp / totalCredit
-        ).toFixed(2)}，总学分 ${totalCredit.toFixed(2)}`}
+        footer={() => selectedXkkh.length ? `最后同步时间：${lastSync ? lastSync : '未同步'}，已选 ${selectedXkkh.length} 条记录，已选总绩点 ${(
+          selectedTotalCredit === 0 ? 0 : selectedTotalGp / selectedTotalCredit
+        ).toFixed(2)}，已选总学分 ${selectedTotalCredit.toFixed(2)}` :
+          `最后同步时间：${lastSync ? lastSync : '未同步'}，共 ${score.length} 条记录，总绩点 ${(
+            totalCredit === 0 ? 0 : totalGp / totalCredit
+          ).toFixed(2)}，总学分 ${totalCredit.toFixed(2)}`}
         style={{ marginTop: 20 }}
         loading={loading}
       />

diff --git a/src/SearchTable.jsx b/src/SearchTable.jsx
@@ -3,7 +3,7 @@ import { Button, Table, Input, Space } from 'antd';
 import { SearchOutlined } from '@ant-design/icons';
 import Highlighter from 'react-highlight-words';
 
-const SearchTable = ({ columns, dataSource, loading, pagination, scroll, size, bordered, footer, title, rowSelection, rowKey, onSelectChange, selectedRowKeys, style }) => {
+const SearchTable = ({ columns, dataSource, loading, pagination, scroll, size, bordered, footer, title, rowSelection, rowKey, style }) => {
     const [searchText, setSearchText] = useState('')
     const [searchedColumn, setSearchedColumn] = useState('')
     const searchInput = useRef(null)
@@ -134,8 +134,6 @@ const SearchTable = ({ columns, dataSource, loading, pagination, scroll, size, b
         bordered={bordered}
         footer={footer}
         title={title}
-        onSelectChange={onSelectChange}
-        selectedRowKeys={selectedRowKeys}
         style={style}
     />
 }

diff --git a/src/utils.ts b/src/utils.ts
@@ -29,16 +29,16 @@ export function convertUrlsToMarkdown(text: string): string {
     let placeholders: string[] = [];
     let currentIndex = 0;
     let newText = text.replace(markdownLinkRegex, (match) => {
-      placeholders.push(match);
-      return `<<${currentIndex++}>>`;
+        placeholders.push(match);
+        return `<<${currentIndex++}>>`;
     });
-  
+
     const urlRegex = /http[s]?:\/\/[^\s\[\]()]+/g;
     newText = newText.replace(urlRegex, (match) => `[${match}](${match})`);
-  
+
     placeholders.forEach((placeholder, index) => {
-      newText = newText.replace(`<<${index}>>`, placeholder);
+        newText = newText.replace(`<<${index}>>`, placeholder);
     });
-  
+
     return newText;
-  }
+}