支持python2.X,sqlite,优化内网使用删除外网访问代码，添加上周周报保存和显示字段，修复登录的无提示问题

Author: root

deploy/app/__init__.py

@@ -7,6 +7,7 @@
 from flask_login import LoginManager
 from flask_sqlalchemy import SQLAlchemy
 from .json_encoder import JSONEncoder
+from utils import get_last_week_content
 
 
 bootstrap = Bootstrap()
@@ -60,4 +61,6 @@ def create_app(config_file):
 
     # lazy_gettext Json Error Fix
     app.json_encoder = JSONEncoder
+    
+    app.add_template_filter(get_last_week_content, 'get_last_week_content')
     return app

deploy/app/auth/forms.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from flask_babelex import lazy_gettext as _
 from flask_wtf import FlaskForm
 from wtforms.fields.html5 import EmailField

deploy/app/auth/views.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from flask import render_template, redirect, url_for, \
     flash, current_app, request
 from flask_babelex import lazy_gettext as _
@@ -17,11 +18,11 @@ def login():
         user = User.query.filter_by(email=form.email.data).first()
         if user and user.verify_password(form.password.data):
             login_user(user, form.remember_me.data)
-
             current_app.logger.info(
                 '{} login'.format(current_user.email))
-
             return redirect(url_for('main.index'))
+        else:
+            flash(_('Account or password is wrong'))
     return render_template('auth/login.html', form=form)
 
 

deploy/app/email.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from threading import Thread
 from flask import current_app, render_template
 from flask_mail import Message

deploy/app/main/errors.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from flask import render_template, current_app, request, redirect, url_for
 from flask_login import current_user
 from . import main

deploy/app/main/views.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from datetime import date
 from flask import request, Response, redirect, url_for, current_app
 from flask_admin.model import typefmt
@@ -106,20 +107,24 @@ class DepartmentAdminView(WeeklyReportModelView):
 
 
 class ReportAdminView(WeeklyReportModelView):
-    column_labels = dict(year='年份', week_count='周次',
-                         created_at='创建时间', content='内容',
-                         author='员工邮箱', department='部门')
-    column_list = ('author', 'department', 'year', 'week_count',
+    column_labels = dict(year=u'年份', week_count=u'周次',
+                         created_at=u'创建时间', last_content=u'上周计划', content=u'内容',
+                         author=u'员工', department=u'部门')
+    column_list = ('author', 'department', 'year', 'week_count', 'last_content',
                    'content', 'created_at')
     column_default_sort = ('created_at', True)
     form_columns = ['created_at', 'week_count', 'year', 'content']
     list_template = '/admin/model/report_list_template.html'
     can_edit = True
     can_export = True
+    export_types=['xls']
     form_widget_args = {
         'year': {
             'readonly': True
         },
+        'last_content': {
+            'readonly': True
+        },
         'created_at': {
             'readonly': True
         },

deploy/app/models.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from datetime import datetime
 from werkzeug.security import generate_password_hash, check_password_hash
 from flask import current_app
@@ -36,9 +37,9 @@ def insert_roles():
             'ADMINISTRATOR': 0xff,
         }
         for r in roles:
-            role = Role.query.filter_by(name=r).first()
+            role = Role.query.filter_by(name=unicode(r)).first()
             if role is None:
-                role = Role(name=r,
+                role = Role(name=unicode(r),
                             permissions=roles[r])
             db.session.add(role)
         db.session.commit()
@@ -56,10 +57,18 @@ class Department(db.Model):
     @staticmethod
     def insert_departments():
         for dept in current_app.config['DEPARTMENTS']:
-            if not Department.query.filter_by(name=dept).first():
-                dept = Department(name=dept)
-                db.session.add(dept)
-            db.session.commit()
+            if not Department.query.filter_by(name=unicode(dept)).first():
+			        dept = Department(name=unicode(dept))
+			        db.session.add(dept)
+        db.session.commit()
+        
+    @staticmethod
+    def delete_departments():
+        dept="1"
+        dept= Department.query.filter_by(name=unicode(dept)).first()
+        if dept:
+			     db.session.delete(dept)
+        db.session.commit()        
 
     def __str__(self):
         return self.name
@@ -124,7 +133,7 @@ def is_authenticated(self):
         return self.can(Permission.WRITE_REPORT)
 
     def __str__(self):
-        return self.email
+        return self.username
 
 
 class AnonymousUser(AnonymousUserMixin):
@@ -151,6 +160,7 @@ class Report(db.Model):
     created_at = db.Column(db.DateTime, index=True, default=datetime.now)
     author_id = db.Column(db.Integer, db.ForeignKey('users.id'))
     content = db.Column(db.Text)
+    last_content = db.Column(db.Text)
     week_count = db.Column(db.Integer)
     year = db.Column(db.Integer)
 
@@ -175,6 +185,12 @@ def is_of_last_week(self):
                 and self.year == get_last_week().year:
             return True
         return False
+        
+    @staticmethod
+    def get_last_report(author_id, week_count):
+        report = Report.query.filter_by(author_id=author_id,week_count=week_count).first()
+        if report:
+			      return report
 
     def __str__(self):
         return 'Posted by {} at {}'.format(
@@ -183,7 +199,7 @@ def __str__(self):
 
 @login_manager.user_loader
 def load_user(user_id):
-    assert type(user_id) == str
+    #assert type(user_id) == str
     return User.query.get(int(user_id))
 
 

deploy/app/report/forms.py

@@ -1,13 +1,15 @@
+#coding:utf-8
 from flask_babelex import lazy_gettext as _
 from flask_wtf import FlaskForm
 from wtforms.validators import DataRequired
-from wtforms import SubmitField, TextAreaField, SelectField
+from wtforms import SubmitField, TextAreaField, SelectField, HiddenField
 from wtforms.fields.html5 import DateField
 
 
 class WriteForm(FlaskForm):
     body = TextAreaField(_("This week's work content and plan of next week"),
                          validators=[DataRequired()])
+    last_content = HiddenField(_("This week's work content and plan of last week"))                         
     submit = SubmitField(_('Submit'))
 
 

deploy/app/report/views.py

@@ -1,3 +1,4 @@
+#coding:utf-8
 from flask import render_template, redirect,request, url_for, \
     current_app, flash, Markup
 from flask_babelex import lazy_gettext as _
@@ -10,21 +11,30 @@
 from ..email import send_email
 from ..models import Permission, User, Report, Department
 from ..utils import get_week_count, permission_required, get_this_monday, \
-    get_last_week, get_last_week_start_at, get_last_week_end_at
+    get_last_week, get_last_week_start_at, get_last_week_end_at, get_last_week_content
 
 
 @report.route('/write/', methods=['GET', 'POST'])
 @permission_required(Permission.WRITE_REPORT)
 def write():
     form = WriteForm()
+    last_content_display = ""
     report = Report.query.filter_by(
         author_id=current_user.id,
         week_count=get_week_count(),
         year=datetime.today().year
     ).first()
+    
+    last_report = Report.query.filter_by(
+        author_id=current_user.id,
+        week_count=get_week_count() - 1,
+        year=datetime.today().year
+    ).first()
+            
     if form.submit.data and form.validate_on_submit():
         if report:
             report.content = form.body.data.replace('<br>', '')
+            report.last_content = form.last_content.data.replace('<br>', '')
             db.session.add(report)
         else:
             report = Report(
@@ -45,27 +55,39 @@ def write():
         form.body.data = report.content
     else:
         form.body.data = current_app.config['DEFAULT_CONTENT']
+        
+    if last_report:
+        form.last_content.data = last_report.content
+        last_content_display = get_last_week_content(last_report.content)
 
     return render_template('report/write.html',
                            form=form,
                            week_count=get_week_count(),
                            start_at=get_this_monday(),
-                           end_at=get_this_monday()+timedelta(days=6))
+                           end_at=get_this_monday()+timedelta(days=6),
+                           last_content_display=last_content_display)
 
 
 @report.route('/write/last_week', methods=['GET', 'POST'])
 @permission_required(Permission.WRITE_REPORT)
 def write_last_week():
     form = WriteForm()
-
+    last_content_display = ""
+    
     report = Report.query.filter_by(
         author_id=current_user.id,
         week_count=get_week_count(get_last_week()),
         year=get_last_week().year).first()
+        
+    last_report = Report.query.filter_by(
+        author_id=current_user.id,
+        week_count=get_week_count(get_last_week()) - 1,
+        year=get_last_week().year).first()
 
     if form.submit.data and form.validate_on_submit():
         if report:
             report.content = form.body.data.replace('<br>', '')
+            report.last_content = form.last_content.data.replace('<br>', '')
         else:
             report = Report(
                 content=form.body.data.replace('<br>', ''),
@@ -85,11 +107,17 @@ def write_last_week():
         form.body.data = report.content
     else:
         form.body.data = current_app.config['DEFAULT_CONTENT']
+        
+    if last_report:
+        form.last_content.data = last_report.content
+        last_content_display = get_last_week_content(last_report.content)
+                
     return render_template('report/write.html',
                            form=form,
                            week_count=get_week_count(get_last_week()),
                            start_at=get_last_week_start_at(),
-                           end_at=get_last_week_end_at() - timedelta(days=1))
+                           end_at=get_last_week_end_at() - timedelta(days=1),
+                           last_content_display=last_content_display)
 
 
 @report.route('/read/', methods=['GET'])

deploy/app/static/wangEditor/js/wangEditor.min.js

@@ -143,6 +143,8 @@
                     {% else %}
                         {% if c=='content' %}
                             {{ get_value(row, c) |safe}}
+												{% elif c =='last_content'%}
+                            {{ get_value(row, c) |safe | get_last_week_content}}                                                    
                         {% else %}
                             {{ get_value(row, c) }}
                         {% endif %}

deploy/app/templates/admin/model/report_list_template.html

@@ -8,10 +8,10 @@
     <link href="{{url_for('static',filename='css/bootstrap.css')}}" rel="stylesheet">
     <!-- Theme CSS -->
     <link href="{{url_for('static',filename='css/style.css')}}" rel="stylesheet">
-    <!-- Custom Fonts -->
+    <!-- Custom Fonts
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
-    <link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">
+    <link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" rel="stylesheet" type="text/css">  -->
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>

deploy/app/templates/base.html

@@ -21,7 +21,10 @@
             {% endif %}
         </div>
         <div class="panel-body">
-        {% column_chart contrast %}
+            {% for key, value in contrast.iteritems() %}
+            <a>{{ key }}:</a>{{value}}
+            <br/>
+            {% endfor %}
         </div>
     </div>
 
@@ -54,6 +57,8 @@
 
 </div>
 
+{#
 {{ wtf.quick_form(form) }}
+#}
 
 {% endblock %}

deploy/app/templates/report/statistics_crew.html

@@ -19,8 +19,10 @@ <h3>第{{ week_count }}周({{start_at}}至{{end_at}})工作周报</h3>
         {{ form.csrf_token }}
         {{ form.hidden_tag() }}
         {{ wtf.form_errors(form, hiddens="only") }}
-
+         <h4>上周工作计划</h4>
+        {{ last_content_display|safe }}
         {{ form.body(class='wangEditor') }}
+        {{ form.last_content }}
         <hr style="height:10pt; visibility:hidden;" />
 
         {{ wtf.form_field(form.submit) }}

deploy/app/templates/report/write.html

@@ -108,27 +108,27 @@ msgstr "未知密码"
 msgid "Confirm New password"
 msgstr "确认新密码"
 
-#: auth/views.py:32
+#: auth/views.py:33
 msgid "You have been logged out"
 msgstr "您已注销"
 
-#: auth/views.py:57
+#: auth/views.py:61
 msgid "Successfully Registered, Please Login"
 msgstr "成功注册，请登录"
 
-#: auth/views.py:74
+#: auth/views.py:78
 msgid "Your password has been updated"
 msgstr "您的密码已更新"
 
-#: auth/views.py:91
+#: auth/views.py:95
 msgid "Your username has been updated"
 msgstr "您的用户名已更新"
 
-#: auth/views.py:118
+#: auth/views.py:122
 msgid "An email with instructions to reset your password has been sent to "
 msgstr "密码重置邮件已发送到您的邮箱　"
 
-#: auth/views.py:138
+#: auth/views.py:142
 msgid "Your password has been updated."
 msgstr "您的密码已更新"
 
@@ -253,3 +253,6 @@ msgstr "年份"
 msgid "Edit"
 msgstr "编辑"
 
+#: auth/views.py:25
+msgid "Account or password is wrong"
+msgstr "邮箱或密码错误"

deploy/app/translations/zh_Hans_CN/LC_MESSAGES/messages.po

@@ -1,3 +1,4 @@
+#coding:utf-8
 import datetime
 from functools import wraps
 from flask import abort
@@ -41,3 +42,9 @@ def get_last_week_start_at():
 
 def get_last_week_end_at():
     return get_this_monday()
+    
+def get_last_week_content(last_week_content):
+    content_index = last_week_content.find("next_week")
+    if content_index != -1:
+    	return last_week_content[content_index+31:]
+    return ""