andrei/Moona
andrei/Moona
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлена ошибка вопросов

Browse Source
This commit is contained in:
Andrei 2022-05-09 00:49:06 +05:00
parent 9daa4d9f09
commit 6cb2bf47b6
1 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
main.py
View File

@ -133,27 +133,30 @@ def main_page():
emotion['is_like'] = 1 emotion['is_like'] = 1
emotion_you_like_that.append(emotion) emotion_you_like_that.append(emotion)
quest = session.query(Answer).filter(Answer.user == current_user.id).all() quest = session.query(Answer).filter(Answer.user == current_user.id).all()
days_reg = current_user.data_reg - datetime.date.today() try:
days_reg = abs(days_reg.days) + 1 days_reg = current_user.data_reg - datetime.date.today()
if quest: days_reg = abs(days_reg.days) + 1
post_quest = session.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all() if quest:
else: post_quest = session.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all()
post_quest = [] else:
while len(post_quest) < days_reg: post_quest = []
post_quest.append( while len(post_quest) < days_reg:
session.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first()) post_quest.append(
ans = [] session.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first())
for i in post_quest: ans = []
if i is not None: for i in post_quest:
ans_id = session.query(Answer).filter( if i is not None:
Answer.id_question == i.id and Answer.user.id == current_user.id).first() ans_id = session.query(Answer).filter(
if ans_id is not None: Answer.id_question == i.id and Answer.user.id == current_user.id).first()
ans.append(ans_id) if ans_id is not None:
post_quest = post_quest[::-1] ans.append(ans_id)
ans = ans[::-1] post_quest = post_quest[::-1]
ans2 = {} ans = ans[::-1]
for i in ans: ans2 = {}
ans2[i.id_question] = i for i in ans:
ans2[i.id_question] = i
except Exception:
ans2 = []
else: else:
you_like_that = [] you_like_that = []
emotion_you_like_that = None emotion_you_like_that = None
@ -663,27 +666,30 @@ def diary():
emotion['link'] = None emotion['link'] = None
lis_emotion.append(emotion) lis_emotion.append(emotion)
quest = db_sess.query(Answer).filter(Answer.user == current_user.id).all() quest = db_sess.query(Answer).filter(Answer.user == current_user.id).all()
days_reg = current_user.data_reg - datetime.date.today() try:
days_reg = abs(days_reg.days) + 1 days_reg = current_user.data_reg - datetime.date.today()
if quest: days_reg = abs(days_reg.days) + 1
post_quest = db_sess.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all() if quest:
else: post_quest = db_sess.query(Quest).filter(Quest.id.in_([i.id_question for i in quest])).all()
post_quest = [] else:
while len(post_quest) < days_reg: post_quest = []
post_quest.append( while len(post_quest) < days_reg:
db_sess.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first()) post_quest.append(
ans = [] db_sess.query(Quest).filter(Quest.id.notin_([i.id for i in post_quest])).first())
for i in post_quest: ans = []
if i is not None: for i in post_quest:
ans_id = db_sess.query(Answer).filter( if i is not None:
Answer.id_question == i.id and Answer.user.id == current_user.id).first() ans_id = db_sess.query(Answer).filter(
if ans_id is not None: Answer.id_question == i.id and Answer.user.id == current_user.id).first()
ans.append(ans_id) if ans_id is not None:
post_quest = post_quest[::-1] ans.append(ans_id)
ans = ans[::-1] post_quest = post_quest[::-1]
ans2 = {} ans = ans[::-1]
for i in ans: ans2 = {}
ans2[i.id_question] = i for i in ans:
ans2[i.id_question] = i
except Exception:
ans2 = []
else: else:
posts = None posts = None
post_quest = None post_quest = None