diff --git a/README.md b/README.md index 81a9ec3..b0e224a 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,8 @@ python manage.py runserver ```shell git pull +python manage.py makemigrations +python manage.py migrate ``` --- diff --git a/WordReview/__init__.py b/WordReview/__init__.py index 063cd2c..6147e73 100644 --- a/WordReview/__init__.py +++ b/WordReview/__init__.py @@ -1,2 +1,6 @@ -import pymysql -pymysql.install_as_MySQLdb() +import config +if config.database_type == 'mysql': + import pymysql + pymysql.install_as_MySQLdb() +# import pymysql +# pymysql.install_as_MySQLdb() diff --git a/apps/review/src/init_db.py b/apps/review/src/init_db.py index dca0b35..d5ea204 100644 --- a/apps/review/src/init_db.py +++ b/apps/review/src/init_db.py @@ -1,6 +1,8 @@ from pandas import read_excel +# import pandas as pd import config +# read_excel = pd.read_excel # bookName = config.BOOK # 请用英文 # List_begin_num = config.begin_index # 或 1,看你的 List 是从 0 开始还是 1 开始 diff --git a/apps/review/templates/homepage.pug b/apps/review/templates/homepage.pug index 5748aeb..4547fad 100644 --- a/apps/review/templates/homepage.pug +++ b/apps/review/templates/homepage.pug @@ -42,6 +42,6 @@ div.container.flex-column | {{l.rate}}% {% endfor %} {% endfor %} - a(style="text-align:end;margin-top:30px" href="/calendar/") 我要导入新的单词书 + a(style="text-align:end;margin-top:30px" href="/import/") 我要导入新的单词书 {% endblock %} \ No newline at end of file diff --git a/apps/review/templates/import_db.pug b/apps/review/templates/import_db.pug index 51535a0..2ac5e72 100644 --- a/apps/review/templates/import_db.pug +++ b/apps/review/templates/import_db.pug @@ -1,8 +1,13 @@ {% extends "base.pug" %} {% block title %}导入数据库{% endblock %} {% block css %} -//- link(href="/static/css/calendar.css" rel="stylesheet") -script(src="/static/js/import_db.js") +script + | $(function () { + | $('#submit-btn').on('click', function (e) { + | //$('#submit-btn').addClass('d-none'); + | $('#wait').text('导入数据成功后将自动跳转') + | }) + | }) {% endblock %} {% block content %} @@ -10,7 +15,9 @@ script(src="/static/js/import_db.js") div.d-flex.container.justify-content-center.flex-column h3(style="margin-bottom:20px;text-align: center;") 导入数据库 {% if message %} - div.alert.alert-warning {{ message }} + div.alert.alert-warning + | 您的输入有问题😯 + | {{ message }} {% endif %} form(method="post" action='/import/')#pwdForm.d-flex.flex-column {% csrf_token %} diff --git a/apps/review/views.py b/apps/review/views.py index 507b120..6acf51c 100644 --- a/apps/review/views.py +++ b/apps/review/views.py @@ -254,7 +254,11 @@ def homepage(request): BOOK=BOOK).values_list('LIST')))]) list_info = [] for l in lists: - ld = BookList.objects.get(BOOK=BOOK, LIST=l) + try: + ld = BookList.objects.get(BOOK=BOOK, LIST=l) + except Exception as e: + print(l, e) + continue # total = sorted([int(i) for i in ld.review_word_counts.split(';')]) list_info.append({ 'i': l, diff --git a/config_sample.py b/config_sample.py index 073474e..b36a8da 100644 --- a/config_sample.py +++ b/config_sample.py @@ -8,24 +8,6 @@ database_type = 'sqlite' -# ====================================================== -# 新增数据库信息配置 -# ====================================================== - -# 初始化数据库时请使用 True,初始化后一定要改回 False!!! -# 初始化数据库时请使用 True,初始化后一定要改回 False!!! -# 初始化数据库时请使用 True,初始化后一定要改回 False!!! -init_db_mode = True # 初始化数据库时请使用 True,初始化后一定要改回 False!!! - -BOOK = 'CET6_green' # 单词本的名字(请用英文,不带空格) -BOOK_zh = '新东方六级绿皮书' # 单词本的中文名 -BOOK_abbr = 'G' # 单词本的缩写(用于日历显示,建议一个英文大写字符) -begin_index = 0 # 单词本 list、unit、index 的序号从 0 开始还是从 1 开始 - -# 单词数据的文件路径(建议使用绝对路径,若用相对路径请修改 -excel_path = '/file/path/to/excel.xlsx' - - # ====================================================== # 数据库使用配置 # (除非你知道你在干嘛,否则请勿修改下面代码) diff --git a/static/js/import_db.js b/static/js/import_db.js deleted file mode 100644 index e470841..0000000 --- a/static/js/import_db.js +++ /dev/null @@ -1,6 +0,0 @@ -$(function () { - $('#submit-btn').on('click', function (e) { - $('#submit-btn').addClass('d-none'); - $('#wait').text('导入数据库中,成功后将自动跳转') - }) -}) \ No newline at end of file diff --git a/static/js/review.js b/static/js/review.js index 170a223..16f3686 100644 --- a/static/js/review.js +++ b/static/js/review.js @@ -195,7 +195,9 @@ $(function () { w.panHistory += remember ? '1' : '0'; w.panTotalNum++; w.panRate = w.panForgetNum / w.panTotalNum; - w.note = $('#tmpl-note').val(); + if ($('#tmpl-note').val() != word) { + w.note = $('#tmpl-note').val(); + } // echarts 画图 currentHistoryX.push(wordCount);