diff --git a/data/users.py b/data/users.py index 40c1380..b74c10a 100644 --- a/data/users.py +++ b/data/users.py @@ -25,6 +25,7 @@ class User(SqlAlchemyBase, UserMixin): default=date.today()) role = sqlalchemy.Column(sqlalchemy.String, nullable=True) activity = sqlalchemy.Column(sqlalchemy.Date, nullable=True) + birthday = sqlalchemy.Column(sqlalchemy.Date, nullable=True) def check_password(self, password): return check_password_hash(self.password, password) diff --git a/forms/register.py b/forms/register.py index 2fac0e2..2e0d33b 100644 --- a/forms/register.py +++ b/forms/register.py @@ -1,6 +1,6 @@ from flask_wtf import FlaskForm from flask_wtf.file import FileAllowed -from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, IntegerField, TextAreaField +from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, DateField, TextAreaField from wtforms.validators import DataRequired @@ -9,7 +9,7 @@ class RegisterForm(FlaskForm): name = StringField('Имя', validators=[DataRequired()]) surname = StringField('Фамилия', validators=[DataRequired()]) login = StringField('Логин', validators=[DataRequired()]) - age = IntegerField('Возраст') + birthday = DateField('Дата рождения', validators=[DataRequired()]) about = TextAreaField('Расскажите о себе', default='') photo = FileField('Фото', validators=[FileAllowed(['jpg', 'png'], 'Images only!')]) password = PasswordField('Пароль', validators=[DataRequired()]) diff --git a/main.log b/main.log index 4fe5036..e69de29 100644 --- a/main.log +++ b/main.log @@ -1,24 +0,0 @@ -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 2 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 -WARNING:waitress.queue:Task queue depth is 1 diff --git a/main.py b/main.py index 3f595a2..555b011 100644 --- a/main.py +++ b/main.py @@ -124,7 +124,7 @@ def register(): session['ps'] = form.password.data return redirect( url_for('confirmation', photo=photo, name=form.name.data, surname=form.surname.data, login=form.login.data, - age=form.age.data, about=form.about.data, email=form.email.data, form=True)) + birthday=form.birthday.data, about=form.about.data, email=form.email.data, form=True)) return render_template('main/register.html', title='Регистрация', form=form, message='') @@ -137,7 +137,7 @@ def confirmation(): name=request.args.get('name'), surname=request.args.get('surname'), login=request.args.get('login'), - age=request.args.get('age'), + birthday=request.args.get('age'), about=request.args.get('about'), email=request.args.get('email'), password=session['ps'] @@ -168,7 +168,7 @@ def confirmation(): name=form.name.data, surname=form.surname.data, login=form.login.data, - age=form.age.data, + birthday=form.birthday.data, about=form.about.data, email=form.email.data, photo=session['photo'], @@ -179,7 +179,7 @@ def confirmation(): name=form.name.data, surname=form.surname.data, login=form.login.data, - age=form.age.data, + birthday=form.birthday.data, about=form.about.data, email=form.email.data, role='user', @@ -281,7 +281,7 @@ def safe_app_school_register(): return redirect( url_for('confirmation', photo=photo, name=form.name.data, surname=form.surname.data, login=form.login.data, - age=form.age.data, about=form.about.data, email=form.email.data, form=True, app_school=True)) + birthday=form.birthday.data, about=form.about.data, email=form.email.data, form=True, app_school=True)) return render_template('safe_app_school/register.html', title='Регистрация', form=form, message='') @@ -398,7 +398,7 @@ def edit_profile(logins): return redirect('/diary/confirmation') user.name = form.name.data user.surname = form.surname.data - user.age = form.age.data + user.birthday = form.birthday.data user.about = form.about.data if not ph_f and form.photo.data: photo = save_photo(form.photo.data, logins) @@ -420,7 +420,7 @@ def edit_profile(logins): form.name.data = current_user.name form.surname.data = current_user.surname form.login.data = logins - form.age.data = current_user.age + form.birthday.data = current_user.birthday form.about.data = current_user.about form.password.data = None form.password2.data = None @@ -963,7 +963,7 @@ def diary_onfirmation(): name=form.name.data, surname=form.surname.data, login=form.login.data, - age=form.age.data, + birthday=form.birthday.data, about=form.about.data, email=form.email.data, photo=photo, @@ -974,7 +974,7 @@ def diary_onfirmation(): name=form.name.data, surname=form.surname.data, login=form.login.data, - age=form.age.data, + birthday=form.birthday.data, about=form.about.data, email=form.email.data, role='user', diff --git a/templates/diary/edit_profile.html b/templates/diary/edit_profile.html index 7c2b2f6..66141b6 100644 --- a/templates/diary/edit_profile.html +++ b/templates/diary/edit_profile.html @@ -34,14 +34,14 @@ {% endfor %} -
{{ form.submit(type="submit", class="btn btn-primary", style="background-color:#38aaff") }}
diff --git a/templates/simple/simple_register.html b/templates/simple/simple_register.html index bda46f9..3fdc38a 100644 --- a/templates/simple/simple_register.html +++ b/templates/simple/simple_register.html @@ -21,56 +21,65 @@{{ form.submit(type="submit", class="btn btn-primary", style="background-color:#38aaff") }}