Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

361_fix_training_greeting_ui #378

Merged
merged 29 commits into from
Mar 6, 2024
Merged

Conversation

severus2293
Copy link
Collaborator

До:
до_greet
После:
после_greet

@severus2293 severus2293 linked an issue Jul 3, 2023 that may be closed by this pull request
@severus2293 severus2293 self-assigned this Jul 3, 2023
Copy link
Collaborator

@HadronCollider HadronCollider left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Чтобы не парсить полную строку описания набора критериев предлагаю сделать новый метод для формирования описания (и возможно обновить такой метод у критериев)
https://github.com/OSLL/web_speech_trainer/blob/eeb619048204e2c19d17422fc9693eeae540e061/app/routes/trainings.py#L177C61-L177C61

и передавать его в html как json-encoded, чтобы в JS получать готовый объект, с которым можно работать

"Критерий": t(self.name),
'Описание':t('проверяет, что в речи нет слов-паразитов, используются слова из списка {}').format(self.parameters['fillers']),
'Оценка':t('1, если слов-паразитов не больше {}, иначе 0').format(self.parameters['maximum_fillers_number']),
'Вес':''
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Вес" - не относится к описанию критериев, это часть конфигурации набора критериев, зачем он тут?

Comment on lines 129 to 150

page = 0
count = 10

try:
page = int(request.args.get('page', '0'))
except:
pass

try:
count = int(request.args.get('count', '10'))
except:
pass

authorized = check_auth() is not None
if not (check_admin() or (authorized and session.get('session_id') == username)):
return {}, 404
return render_template('show_all_trainings.html', username=username, full_name=full_name, is_admin="true" if check_admin() else 'false'), 200

raw_filters = request.args.getlist('f')
filters_string = '&'.join(raw_filters)

return render_template('show_all_trainings.html', username=username, filters=filters_string, is_admin="true" if check_admin() else 'false', page=str(page), count=str(count)), 200
Copy link
Collaborator

@HadronCollider HadronCollider Jul 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Откуда и для чего тут эти изменения? (не похоже на вашу задачу, но похоже на чужую)

@HadronCollider HadronCollider merged commit 05a6300 into master Mar 6, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

фикс ui на странице training_greeting/
2 participants