内网更新

Author: yuquant

LICENSE

@@ -1,5 +1,7 @@
 MIT License
 
+Copyright (c) 2017 Grey Li
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

README.md

@@ -1,5 +1,5 @@
 # 影像数据管理工具
-dicom数据队列下载工具,账号注册,下载任务提交到审批
+
 *医学影像科研数据管理更便捷*
 以下提供了三种部署方式
 ## 用pipenv构建
@@ -22,8 +22,7 @@ $ flask run
 ```
 pip install -r requirements.txt
 set FLASK_APP=datacenter
-flask initdb
-flask init
+flask forge
 ```
 
 ## docker 运行
@@ -32,10 +31,10 @@ flask init
 cd center
 docker build -t webenv:2.01 .
 ```
-运行,挂载目录必须是完整路径
+运行
 ```
 cd ..
-docker run -v ~/center:/app -p 8000:8000 -p 10001:10001 -i -t webenv:2.01 python run.py
+docker run -v /home/public/liuweipeng/datacenter2/center/:/app -v /home/pictures/WinShare/DcmData/:/app/downloads -v /etc/localtime:/etc/localtime:ro -p 8080:8000 -p 10002:10002 -i -t webenv:2.01 python run.py
 ```
 
 

datacenter/__init__.py

@@ -17,7 +17,8 @@
 from datacenter.blueprints.main import main_bp
 from datacenter.blueprints.user import user_bp
 from datacenter.extensions import bootstrap, db, login_manager, mail, dropzone, moment, whooshee, avatars, csrf, ckeditor
-from datacenter.models import Role, User, Permission, Tasks, StatusDict, AEDict
+from datacenter.models import Role, User, Photo, Tag, Follow, Notification, Comment, Collect, Permission
+from datacenter.models import Tasks, StatusDict, AEDict
 from datacenter.settings import config
 
 
@@ -63,7 +64,9 @@ def register_blueprints(app):
 def register_shell_context(app):
     @app.shell_context_processor
     def make_shell_context():
-        return dict(db=db, User=User)
+        return dict(db=db, User=User, Photo=Photo, Tag=Tag,
+                    Follow=Follow, Collect=Collect, Comment=Comment,
+                    Notification=Notification)
 
 
 def register_template_context(app):
@@ -118,17 +121,46 @@ def initdb(drop):
 
     @app.cli.command()
     def init():
-        """Initialize dict."""
+        """Initialize Albumy."""
         click.echo('Initializing the database...')
         db.create_all()
 
         click.echo('Initializing the roles and permissions...')
         Role.init_role()
 
+        click.echo('Done.')
+
+    @app.cli.command()
+    # @click.option('--user', default=10, help='Quantity of users, default is 10.')
+    # @click.option('--follow', default=30, help='Quantity of follows, default is 50.')
+    # @click.option('--photo', default=30, help='Quantity of photos, default is 500.')
+    # @click.option('--tag', default=20, help='Quantity of tags, default is 500.')
+    # @click.option('--collect', default=50, help='Quantity of collects, default is 500.')
+    # @click.option('--comment', default=100, help='Quantity of comments, default is 500.')
+    # def forge(user, follow, photo, tag, collect, comment):
+    # from datacenter.fakes import fake_admin, fake_comment, fake_follow, fake_photo, fake_tag, fake_user, fake_collect
+    def forge():
+        """Generate dict."""
+        db.drop_all()
+        db.create_all()
+
+        Role.init_role()
+        click.echo('Initialized the roles and permissions...')
         AEDict.init_aedict()
         click.echo('Initialized ae dict.')
         StatusDict.init_statusdict()
         click.echo('Initialized status dict.')
-        click.echo('Done.')
-
-
+        # fake_admin()
+        # click.echo('Generating %d users...' % user)
+        # fake_user(user)
+        # click.echo('Generating %d follows...' % follow)
+        # fake_follow(follow)
+        # click.echo('Generating %d tags...' % tag)
+        # fake_tag(tag)
+        # click.echo('Generating %d photos...' % photo)
+        # fake_photo(photo)
+        # click.echo('Generating %d collects...' % photo)
+        # fake_collect(collect)
+        # click.echo('Generating %d comments...' % comment)
+        # fake_comment(comment)
+        # click.echo('Done.')

datacenter/blueprints/admin.py

@@ -10,12 +10,30 @@
 from datacenter.decorators import admin_required, permission_required
 from datacenter.extensions import db
 from datacenter.forms.admin import EditProfileAdminForm
-from datacenter.models import Role, User,Tasks
+from datacenter.models import Role, User, Tag, Photo, Comment, Tasks
 from datacenter.utils import redirect_back
 
 admin_bp = Blueprint('admin', __name__)
 
 
+# @admin_bp.route('/')
+# @login_required
+# @permission_required('MODERATE')
+# def index():
+#     user_count = User.query.count()
+#     locked_user_count = User.query.filter_by(locked=True).count()
+#     blocked_user_count = User.query.filter_by(active=False).count()
+#     photo_count = Photo.query.count()
+#     reported_photos_count = Photo.query.filter(Photo.flag > 0).count()
+#     tag_count = Tag.query.count()
+#     comment_count = Comment.query.count()
+#     reported_comments_count = Comment.query.filter(Comment.flag > 0).count()
+#     return render_template('admin/index.html', user_count=user_count, photo_count=photo_count,
+#                            tag_count=tag_count, comment_count=comment_count, locked_user_count=locked_user_count,
+#                            blocked_user_count=blocked_user_count, reported_comments_count=reported_comments_count,
+#                            reported_photos_count=reported_photos_count)
+
+
 @admin_bp.route('/profile/<int:user_id>', methods=['GET', 'POST'])
 @login_required
 @admin_required
@@ -90,6 +108,17 @@ def unlock_user(user_id):
     return redirect_back()
 
 
+@admin_bp.route('/delete/tag/<int:tag_id>', methods=['GET', 'POST'])
+@login_required
+@permission_required('MODERATE')
+def delete_tag(tag_id):
+    tag = Tag.query.get_or_404(tag_id)
+    db.session.delete(tag)
+    db.session.commit()
+    flash('Tag deleted.', 'info')
+    return redirect_back()
+
+
 @admin_bp.route('/to_top/<int:task_id>', methods=['GET', 'POST'])
 @login_required
 @permission_required('MODERATE')
@@ -145,7 +174,7 @@ def reject(task_id):
 def manage_user():
     filter_rule = request.args.get('filter', 'all')  # 'all', 'locked', 'blocked', 'administrator', 'moderator'
     page = request.args.get('page', 1, type=int)
-    per_page = current_app.config['MANAGE_USER_PER_PAGE']
+    per_page = current_app.config['ALBUMY_MANAGE_USER_PER_PAGE']
     administrator = Role.query.filter_by(name='Administrator').first()
     moderator = Role.query.filter_by(name='Moderator').first()
 
@@ -165,6 +194,34 @@ def manage_user():
     return render_template('admin/manage_user.html', pagination=pagination, users=users)
 
 
+@admin_bp.route('/manage/photo', defaults={'order': 'by_flag'})
+@admin_bp.route('/manage/photo/<order>')
+@login_required
+@permission_required('MODERATE')
+def manage_photo(order):
+    page = request.args.get('page', 1, type=int)
+    per_page = current_app.config['ALBUMY_MANAGE_PHOTO_PER_PAGE']
+    order_rule = 'flag'
+    if order == 'by_time':
+        pagination = Photo.query.order_by(Photo.timestamp.desc()).paginate(page, per_page)
+        order_rule = 'time'
+    else:
+        pagination = Photo.query.order_by(Photo.flag.desc()).paginate(page, per_page)
+    photos = pagination.items
+    return render_template('admin/manage_photo.html', pagination=pagination, photos=photos, order_rule=order_rule)
+
+
+@admin_bp.route('/manage/tag')
+@login_required
+@permission_required('MODERATE')
+def manage_tag():
+    page = request.args.get('page', 1, type=int)
+    per_page = current_app.config['ALBUMY_MANAGE_TAG_PER_PAGE']
+    pagination = Tag.query.order_by(Tag.id.desc()).paginate(page, per_page)
+    tags = pagination.items
+    return render_template('admin/manage_tag.html', pagination=pagination, tags=tags)
+
+
 @admin_bp.route('/')
 @admin_bp.route('/manage/task')
 @login_required
@@ -180,3 +237,19 @@ def manage_task():
     tasks = pagination.items
     return render_template('admin/manage_task.html', pagination=pagination, tasks=tasks)
 
+
+@admin_bp.route('/manage/comment', defaults={'order': 'by_flag'})
+@admin_bp.route('/manage/comment/<order>')
+@login_required
+@permission_required('MODERATE')
+def manage_comment(order):
+    page = request.args.get('page', 1, type=int)
+    per_page = current_app.config['ALBUMY_MANAGE_COMMENT_PER_PAGE']
+    order_rule = 'flag'
+    if order == 'by_time':
+        pagination = Comment.query.order_by(Comment.timestamp.desc()).paginate(page, per_page)
+        order_rule = 'time'
+    else:
+        pagination = Comment.query.order_by(Comment.flag.desc()).paginate(page, per_page)
+    comments = pagination.items
+    return render_template('admin/manage_comment.html', pagination=pagination, comments=comments, order_rule=order_rule)

datacenter/blueprints/ajax.py

@@ -7,7 +7,8 @@
 from flask import render_template, jsonify, Blueprint
 from flask_login import current_user
 from sqlalchemy import and_
-from datacenter.models import Tasks, Patients
+from datacenter.models import User, Photo, Notification, Tasks, Patients
+from datacenter.notifications import push_collect_notification, push_follow_notification
 ajax_bp = Blueprint('ajax', __name__)
 
 
@@ -25,6 +26,90 @@ def notifications_count():
     return jsonify(count=count1)
 
 
+@ajax_bp.route('/profile/<int:user_id>')
+def get_profile(user_id):
+    user = User.query.get_or_404(user_id)
+    return render_template('main/profile_popup.html', user=user)
+
+
+@ajax_bp.route('/followers-count/<int:user_id>')
+def followers_count(user_id):
+    user = User.query.get_or_404(user_id)
+    count = user.followers.count() - 1  # minus user self
+    return jsonify(count=count)
+
+
+@ajax_bp.route('/<int:photo_id>/followers-count')
+def collectors_count(photo_id):
+    photo = Photo.query.get_or_404(photo_id)
+    count = len(photo.collectors)
+    return jsonify(count=count)
+
+
+@ajax_bp.route('/collect/<int:photo_id>', methods=['POST'])
+def collect(photo_id):
+    if not current_user.is_authenticated:
+        return jsonify(message='Login required.'), 403
+    if not current_user.confirmed:
+        return jsonify(message='Confirm account required.'), 400
+    if not current_user.can('COLLECT'):
+        return jsonify(message='No permission.'), 403
+
+    photo = Photo.query.get_or_404(photo_id)
+    if current_user.is_collecting(photo):
+        return jsonify(message='Already collected.'), 400
+
+    current_user.collect(photo)
+    if current_user != photo.author and photo.author.receive_collect_notification:
+        push_collect_notification(collector=current_user, photo_id=photo_id, receiver=photo.author)
+    return jsonify(message='Photo collected.')
+
+
+@ajax_bp.route('/uncollect/<int:photo_id>', methods=['POST'])
+def uncollect(photo_id):
+    if not current_user.is_authenticated:
+        return jsonify(message='Login required.'), 403
+
+    photo = Photo.query.get_or_404(photo_id)
+    if not current_user.is_collecting(photo):
+        return jsonify(message='Not collect yet.'), 400
+
+    current_user.uncollect(photo)
+    return jsonify(message='Collect canceled.')
+
+
+@ajax_bp.route('/follow/<username>', methods=['POST'])
+def follow(username):
+    if not current_user.is_authenticated:
+        return jsonify(message='Login required.'), 403
+    if not current_user.confirmed:
+        return jsonify(message='Confirm account required.'), 400
+    if not current_user.can('FOLLOW'):
+        return jsonify(message='No permission.'), 403
+
+    user = User.query.filter_by(username=username).first_or_404()
+    if current_user.is_following(user):
+        return jsonify(message='Already followed.'), 400
+
+    current_user.follow(user)
+    if user.receive_collect_notification:
+        push_follow_notification(follower=current_user, receiver=user)
+    return jsonify(message='User followed.')
+
+
+@ajax_bp.route('/unfollow/<username>', methods=['POST'])
+def unfollow(username):
+    if not current_user.is_authenticated:
+        return jsonify(message='Login required.'), 403
+
+    user = User.query.filter_by(username=username).first_or_404()
+    if not current_user.is_following(user):
+        return jsonify(message='Not follow yet.'), 400
+
+    current_user.unfollow(user)
+    return jsonify(message='Follow canceled.')
+
+
 @ajax_bp.route('/bar/', methods=['GET'])
 def bar():
     """
@@ -40,5 +125,6 @@ def bar():
         ratio = str(finished_count/count*100)
         ret = {'title': task.title, 'percent': ratio}
     # ret = {'title': 'biaoti', 'percent': '20'}
-    # print(ret)
-    return jsonify(ret)
+    # ret = app.config['BAR']
+    print(ret)
+    return jsonify(ret)