forked from mrlan/EnglishPal
Resolve merge conflict
commit
ef786795e2
|
|
@ -32,17 +32,17 @@ def get_article_body(s):
|
|||
return '\n'.join(lst)
|
||||
|
||||
|
||||
def get_today_article(user_word_list, existing_articles):
|
||||
def get_today_article(user_word_list, had_read_articles):
|
||||
rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
|
||||
if existing_articles is None:
|
||||
existing_articles = {
|
||||
if had_read_articles is None:
|
||||
had_read_articles = {
|
||||
"index" : 0, # 为 article_ids 的索引
|
||||
"article_ids": [] # 之前显示文章的id列表，越后越新
|
||||
}
|
||||
if existing_articles["index"] > len(existing_articles["article_ids"])-1:
|
||||
if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章，因此查找所有的文章
|
||||
rq.instructions("SELECT * FROM article")
|
||||
else:
|
||||
rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles["article_ids"][existing_articles["index"]]))
|
||||
else: # 生成阅读过的文章，因此查询指定 article_id 的文章
|
||||
rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]]))
|
||||
rq.do()
|
||||
result = rq.get_results()
|
||||
random.shuffle(result)
|
||||
|
|
@ -53,25 +53,33 @@ def get_today_article(user_word_list, existing_articles):
|
|||
d3 = get_difficulty_level(d1, d2)
|
||||
|
||||
d = None
|
||||
result_of_generate_article = "not found"
|
||||
d_user = load_freq_history(user_word_list)
|
||||
user_level = user_difficulty_level(d_user, d3) # more consideration as user's behaviour is dynamic. Time factor should be considered.
|
||||
text_level = 0
|
||||
if existing_articles["index"] > len(existing_articles["article_ids"])-1: # 下一篇
|
||||
flag_get_article = False
|
||||
for reading in result:
|
||||
text_level = text_difficulty_level(reading['text'], d3)
|
||||
factor = random.gauss(0.8,
|
||||
0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
|
||||
if reading['article_id'] not in existing_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平
|
||||
d = reading
|
||||
existing_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行
|
||||
flag_get_article = True
|
||||
break
|
||||
if not flag_get_article:
|
||||
existing_articles["index"] -= 1
|
||||
else: # 上一篇
|
||||
if had_read_articles["index"] > len(had_read_articles["article_ids"])-1: # 生成新的文章
|
||||
amount_of_had_read_articles = len(had_read_articles["article_ids"])
|
||||
amount_of_existing_articles = result.__len__()
|
||||
if amount_of_had_read_articles == amount_of_existing_articles: # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
|
||||
result_of_generate_article = "had read all articles"
|
||||
else:
|
||||
for k in range(3): # 最多尝试3次
|
||||
for reading in result:
|
||||
text_level = text_difficulty_level(reading['text'], d3)
|
||||
factor = random.gauss(0.8, 0.1) # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
|
||||
if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor): # 新的文章之前没有出现过且符合一定范围的水平
|
||||
d = reading
|
||||
had_read_articles["article_ids"].append(d['article_id']) # 列表添加新的文章id；下面进行
|
||||
result_of_generate_article = "found"
|
||||
break
|
||||
if result_of_generate_article == "found": # 用于成功找到文章后及时退出外层循环
|
||||
break
|
||||
if result_of_generate_article != "found": # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”）
|
||||
had_read_articles["article_ids"].append('null')
|
||||
else: # 生成已经阅读过的文章
|
||||
d = random.choice(result)
|
||||
text_level = text_difficulty_level(d['text'], d3)
|
||||
result_of_generate_article = "found"
|
||||
|
||||
today_article = None
|
||||
if d:
|
||||
|
|
@ -86,7 +94,7 @@ def get_today_article(user_word_list, existing_articles):
|
|||
"answer": get_answer_part(d['question'])
|
||||
}
|
||||
|
||||
return existing_articles, today_article
|
||||
return had_read_articles, today_article, result_of_generate_article
|
||||
|
||||
|
||||
def load_freq_history(path):
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ def signup():
|
|||
session[username] = username
|
||||
session['username'] = username
|
||||
session['expiry_date'] = get_expiry_date(username)
|
||||
session['existing_articles'] = None
|
||||
session['had_read_articles'] = None
|
||||
return jsonify({'status': '2'})
|
||||
else:
|
||||
return jsonify({'status': '1'})
|
||||
|
|
@ -66,7 +66,7 @@ def login():
|
|||
session['username'] = username
|
||||
user_expiry_date = get_expiry_date(username)
|
||||
session['expiry_date'] = user_expiry_date
|
||||
session['existing_articles'] = None
|
||||
session['had_read_articles'] = None
|
||||
return jsonify({'status': '1'})
|
||||
else:
|
||||
return jsonify({'status': '0'})
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# 全局引入的css文件地址
|
||||
css:
|
||||
item:
|
||||
- static/css/bootstrap.css
|
||||
- ../static/css/bootstrap.css
|
||||
|
||||
# 全局引入的js文件地址
|
||||
js:
|
||||
head: # 在页面加载之前加载
|
||||
- static/js/jquery.js
|
||||
- static/js/word_operation.js
|
||||
- ../static/js/jquery.js
|
||||
- ../static/js/word_operation.js
|
||||
bottom: # 在页面加载完之后加载
|
||||
- static/js/fillword.js
|
||||
- static/js/highlight.js
|
||||
- ../static/js/fillword.js
|
||||
- ../static/js/highlight.js
|
||||
|
||||
# 高亮样式，目前仅支持修改颜色
|
||||
highlight:
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
alert('无法通过验证。');
|
||||
window.location.href = "/login";
|
||||
} else if (response.status === '1') {
|
||||
window.location.href = "/"+username;
|
||||
window.location.href = "/"+username+"/userpage";
|
||||
}
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<input type="password" placeholder="新密码" class="new-password" name="new-password" id="new-password"/>
|
||||
<input type="password" placeholder="确认新密码" class="re-new-password" name="re-new-password" id="re-new-password"/>
|
||||
<button id="submit" class="btn" onclick="reset()">提交</button>
|
||||
<button class="btn" onclick="window.location.href='/{{ username }}'">放弃修改</button>
|
||||
<button class="btn" onclick="window.location.href='/{{ username }}/userpage'">放弃修改</button>
|
||||
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -35,7 +35,7 @@ You're logged in already! <a href="/logout">Logout</a>.
|
|||
} else if (response.status === '2') {
|
||||
let f = confirm("恭喜，你已成功注册，你的用户名是"+username+'.\n点击“确认”开始使用，或点击“取消”返回首页');
|
||||
if (f) {
|
||||
window.location.href = '/'+username;
|
||||
window.location.href = '/'+username+'/userpage';
|
||||
} else {
|
||||
window.location.href = '/';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,24 +37,28 @@
|
|||
<body>
|
||||
<div class="container-fluid">
|
||||
<p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
|
||||
|
||||
{% if username == admin_name %}
|
||||
<a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
|
||||
{% endif %}
|
||||
<a class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
|
||||
<a id="quit" class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
|
||||
<a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
|
||||
|
||||
</p>
|
||||
{# {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #}
|
||||
{# <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
|
||||
{# {% endfor %}#}
|
||||
|
||||
<a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
|
||||
{% if session.get('existing_articles') != None and session.get('existing_articles')["index"] !=0 %}
|
||||
<a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
|
||||
{% if result_of_generate_article != "had read all articles" %}
|
||||
<a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
|
||||
{% endif %}
|
||||
{% if session.get('had_read_articles') and session.get('had_read_articles')['index']>0 %}
|
||||
<a id="pre_btn" class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
|
||||
{% endif %}
|
||||
|
||||
<p><b>阅读文章并回答问题</b></p>
|
||||
<div id="text-content">
|
||||
{% if today_article %}
|
||||
{% if result_of_generate_article == 'found' %}
|
||||
<div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success">{{ today_article["user_level"] }}</span> and we have chosen an article with a difficulty level of <span class="badge bg-success">{{ today_article["text_level"] }}</span> for you.</div>
|
||||
<p class="text-muted">Article added on: {{ today_article["date"] }}</p><br/>
|
||||
<div class="p-3 mb-2 bg-light text-dark"><br/>
|
||||
|
|
@ -74,10 +78,14 @@
|
|||
<button onclick="toggle_visibility('answer');">ANSWER</button>
|
||||
<div id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
|
||||
</div>
|
||||
{% else %}
|
||||
{% elif result_of_generate_article == "not found" %}
|
||||
<div class="alert alert-success" role="alert">
|
||||
<p class="text-muted"><span class="badge bg-success">Notes:</span><br>No article is currently available for you. You can try again a few times or mark new words in the passage to improve your level.</p>
|
||||
</div>
|
||||
{% elif result_of_generate_article == "had read all articles" %}
|
||||
<div class="alert alert-success" role="alert">
|
||||
<p class="text-muted"><span class="badge bg-success">Notes:</span><br>You've read all the articles.</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
|
@ -93,7 +101,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
|
||||
<form method="post" action="/{{ username }}">
|
||||
<form method="post" action="/{{ username }}/userpage">
|
||||
<textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
|
||||
<input type="submit" value="把生词加入我的生词库"/>
|
||||
<input type="reset" value="清除"/>
|
||||
|
|
|
|||
|
|
@ -30,9 +30,12 @@ def user_reset(username):
|
|||
:return: 返回页面内容
|
||||
'''
|
||||
if request.method == 'GET':
|
||||
existing_articles = session.get("existing_articles")
|
||||
existing_articles["index"] += 1
|
||||
session["existing_articles"] = existing_articles
|
||||
had_read_articles = session.get("had_read_articles")
|
||||
if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来,无需index+=1
|
||||
had_read_articles['article_ids'].pop()
|
||||
else: # 当前不为“null”，直接 index+=1
|
||||
had_read_articles["index"] += 1
|
||||
session["had_read_articles"] = had_read_articles
|
||||
return redirect(url_for('user_bp.userpage', username=username))
|
||||
else:
|
||||
return 'Under construction'
|
||||
|
|
@ -45,9 +48,11 @@ def user_back(username):
|
|||
:return: 返回页面内容
|
||||
'''
|
||||
if request.method == 'GET':
|
||||
existing_articles = session.get("existing_articles")
|
||||
existing_articles["index"] -= 1
|
||||
session["existing_articles"] = existing_articles
|
||||
had_read_articles = session.get("had_read_articles")
|
||||
had_read_articles["index"] -= 1 # 上一篇，index-=1
|
||||
if had_read_articles['article_ids'][-1] == "null": # 如果当前还是“null”，则将“null”pop出来
|
||||
had_read_articles['article_ids'].pop()
|
||||
session["had_read_articles"] = had_read_articles
|
||||
return redirect(url_for('user_bp.userpage', username=username))
|
||||
|
||||
|
||||
|
|
@ -97,7 +102,7 @@ def deleteword(username, word):
|
|||
return "success"
|
||||
|
||||
|
||||
@userService.route("/<username>", methods=['GET', 'POST'])
|
||||
@userService.route("/<username>/userpage", methods=['GET', 'POST'])
|
||||
def userpage(username):
|
||||
'''
|
||||
用户界面
|
||||
|
|
@ -134,8 +139,8 @@ def userpage(username):
|
|||
words = ''
|
||||
for x in lst3:
|
||||
words += x[0] + ' '
|
||||
existing_articles, today_article = get_today_article(user_freq_record, session.get('existing_articles'))
|
||||
session['existing_articles'] = existing_articles
|
||||
had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles'))
|
||||
session['had_read_articles'] = had_read_articles
|
||||
# 通过 today_article，加载前端的显示页面
|
||||
return render_template('userpage_get.html',
|
||||
admin_name=ADMIN_NAME,
|
||||
|
|
@ -143,6 +148,7 @@ def userpage(username):
|
|||
session=session,
|
||||
# flashed_messages=get_flashed_messages(), 仅有删除单词的时候使用到flash，而删除单词是异步执行，这里的信息提示是同步执行，所以就没有存在的必要了
|
||||
today_article=today_article,
|
||||
result_of_generate_article=result_of_generate_article,
|
||||
d_len=len(d),
|
||||
lst3=lst3,
|
||||
yml=Yaml.yml,
|
||||
|
|
|
|||
Loading…
Reference in New Issue