diff --git a/web/app.py b/web/app.py index 0365b48..476e8dd 100644 --- a/web/app.py +++ b/web/app.py @@ -440,16 +440,17 @@ def create_app(): subject = db.Column(db.String(100), nullable=False, server_default='') text = db.Column(db.String(100), nullable=False, server_default='') date = db.Column(db.String(100), nullable=False, server_default='') + time = db.Column(db.DateTime()) class Misc(db.Model): __tablename__ = 'misc' id = db.Column(db.Integer(), primary_key=True) - field_1 = db.Column(db.String(100), nullable=False, server_default='') - field_2 = db.Column(db.String(100), nullable=False, server_default='') - field_3 = db.Column(db.String(100), nullable=False, server_default='') - int_1 = db.Column(db.Integer(), primary_key=False) - int_2 = db.Column(db.Integer(), primary_key=False) - int_3 = db.Column(db.Integer(), primary_key=False) + field_1 = db.Column(db.String(100), nullable=True, server_default='') + field_2 = db.Column(db.String(100), nullable=True, server_default='') + field_3 = db.Column(db.String(100), nullable=True, server_default='') + int_1 = db.Column(db.Integer(), primary_key=True) + int_2 = db.Column(db.Integer(), primary_key=True) + int_3 = db.Column(db.Integer(), primary_key=True) time = db.Column(db.DateTime()) @@ -1568,7 +1569,106 @@ def create_app(): @app.route('/news') #, methods=['POST', 'GET']) ## @login_required def view_news(): - content = 'news' + view_news = News.query.order_by(News.time.desc()).all() + #content = '''
+''' + article.subject + '''+ |
+
''' + article.date + ''' | +
''' + article.text + ''' | +
''' + #content = content + '''
''' + return render_template('flask_user_layout.html', markup_content = Markup(content)) + + @app.route('/add_news', methods=['POST', 'GET']) + @login_required + @roles_required('Admin') + def edit_news(): + if request.args.get('add') == 'new': + content = '''
Redirecting in 3 seconds.
+ ''' + news_add(request.form.get('subject'), request.form.get('time'), request.form.get('news')) + else: + content = ''' ++
+ +''' + return render_template('flask_user_layout.html', markup_content = Markup(content)) + + @app.route('/manage_news', methods=['POST', 'GET']) + @login_required + @roles_required('Admin') + def manage_news(): + view_news = News.query.order_by(News.time.desc()).all() + if request.args.get('delete'): + content = '''
Redirecting in 3 seconds.
+ ''' + news_delete(request.args.get('delete')) + + else: + content = ''' ++ +
+ +
Subject | +Date | +
Delete: ''' + a.subject + ''' | +''' + a.date + ''' | +
+''' return render_template('flask_user_layout.html', markup_content = Markup(content)) @app.route('/user_tg') @@ -2050,15 +2150,16 @@ def create_app(): def news_delete(_subject): del_n = News.query.filter_by(subject=_subject).all() - for i in flush_e: + for i in del_n: db.session.delete(i) db.session.commit() def news_add(_subject, _time, _news): - add_news = NewsPost( + add_news = News( subject = _subject, - time = _time, - text = _news + date = _time, + text = _news, + time = datetime.datetime.utcnow() ) db.session.add(add_news) db.session.commit() diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index c216e3d..f49ea71 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -74,6 +74,8 @@