gia
/
contentmatcher
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added user_id in rated_rated_today_by_status to try to fix a bug, also fixed no collection bug by changing the order of some if statements

master
janko 2022-10-29 19:50:51 +02:00
parent a8b42f0c90
commit 133da4c568
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sr_session.py
View File

@ -95,14 +95,17 @@ def list_of_new_cards_by_ids(user_id):
#TODO sus ker ni user id? #TODO sus ker ni user id?
def rated_today_by_staus (card_status): def rated_today_by_staus (card_status, user_id):
""" """
Returns number of cards rated today by user by status (new or due) Returns number of cards rated today by user by status (new or due)
""" """
dbsession = get_session() dbsession = get_session()
today = date.today() today = date.today()
ratings_today = dbsession.query(Rating).filter(Rating.rating_time == today) ratings_today = dbsession.query(Rating).filter(
Rating.rating_time == today,
Rating.user_id == user_id
)
n = 0 n = 0
d = 0 d = 0
for rating in ratings_today: for rating in ratings_today:
@ -145,21 +148,25 @@ def schedule_status(user_id):
max_new = int(user_settings["max_new"]) max_new = int(user_settings["max_new"])
max_due = int(user_settings["max_due"]) max_due = int(user_settings["max_due"])
rated_new = rated_today_by_staus("new") rated_new = rated_today_by_staus("new", user_id)
rated_due = rated_today_by_staus("due") rated_due = rated_today_by_staus("due", user_id)
scheduled_new = len(list_of_new_cards_by_ids(user_id)) scheduled_new = len(list_of_new_cards_by_ids(user_id))
scheduled_due = len(list_of_due_cards_by_ids(user_id))-scheduled_new #TODO ta problem je mogoče še kje... scheduled_due = len(list_of_due_cards_by_ids(user_id))-scheduled_new #TODO ta problem je mogoče še kje...
max_today_new = min(max_new, scheduled_new+rated_new) max_today_new = min(max_new, scheduled_new+rated_new)
max_today_due = min(max_due, scheduled_due+rated_due) max_today_due = min(max_due, scheduled_due+rated_due)
print("max_new_today", max_today_new)
print("max_due_today", max_today_due)
print("rated_due", rated_due)
print("rated_new", rated_new)
if rated_due+rated_new == 0: if max_today_due+max_today_new == rated_due+rated_new:
return "done"
elif rated_due+rated_new == 0:
return "start" return "start"
elif max_today_due+max_today_new > rated_due+rated_new: elif max_today_due+max_today_new > rated_due+rated_new:
return "continue" return "continue"
elif max_today_due+max_today_new == rated_due+rated_new:
return "done"
else: else:
raise Exception("Arithmetic problem with collection // rated too much?") raise Exception("Arithmetic problem with collection // rated too much?")
@ -215,8 +222,8 @@ def sr_session():
all_new = len(list_of_new_cards_by_ids(user_id)) all_new = len(list_of_new_cards_by_ids(user_id))
all_due = len(list_of_due_cards_by_ids(user_id)) all_due = len(list_of_due_cards_by_ids(user_id))
rated_today_new = rated_today_by_staus("new") rated_today_new = rated_today_by_staus("new", user_id)
rated_today_due = rated_today_by_staus("due") rated_today_due = rated_today_by_staus("due", user_id)
#checks if there are any new/due cards left for today and gets the next one. max can be more than all scheduled, min decides which is the limt. #checks if there are any new/due cards left for today and gets the next one. max can be more than all scheduled, min decides which is the limt.