1. 在 员工的页面中显示 两周的周报内容；2. 在 后台周报中 增加 周次的时间查询功能；3. 周报导出时候对 h5的页面格式进行转化；4. 修复填写周报之后未对上周周报进行保存的问题

Author: root

deploy/app/main/views.py

@@ -10,10 +10,9 @@
 from . import main
 from .. import admin, db
 from ..models import Permission, User, Role, Report, Department
-from ..utils import permission_required, is_allowed_file
+from ..utils import permission_required, is_allowed_file, clean_html
 from sqlalchemy.exc import OperationalError
 
-
 @main.route('/', methods=['GET', 'POST'])
 def index():
     # check if the database is initialized.
@@ -113,6 +112,7 @@ class ReportAdminView(WeeklyReportModelView):
     column_list = ('author', 'department', 'year', 'week_count', 'last_content',
                    'content', 'created_at')
     column_default_sort = ('created_at', True)
+    column_searchable_list = ('week_count',)
     form_columns = ['created_at', 'week_count', 'year', 'content']
     list_template = '/admin/model/report_list_template.html'
     can_edit = True
@@ -132,12 +132,43 @@ class ReportAdminView(WeeklyReportModelView):
 
     def date_format(view, value):
         return value.strftime('%Y-%m-%d')
+        
+    def author_format(v, c, m, p):
+        return str(m.author)
+        
+    def department_format(v, c, m, p):
+        return str(m.department)
+    
+    def format_last_content(v, c, m, p):
+    	  if m.last_content:
+           return clean_html(m.last_content)
+
+    	  return ''
+
+    def format_content(v, c, m, p):
+    	  if m.content:
+           return clean_html(m.content)
+
+    	  return ''
+    	  
+    def format_created_at(v, c, m, p):
+    	  return m.created_at.strftime('%Y-%m-%d')   	  
 
     REPORT_FORMATTERS = dict(typefmt.BASE_FORMATTERS)
     REPORT_FORMATTERS.update({
-            date: date_format
+            date: date_format,
         })
     column_type_formatters = REPORT_FORMATTERS
+    
+    EXPORT_REPORT_FORMATTERS = dict(typefmt.BASE_FORMATTERS)
+    EXPORT_REPORT_FORMATTERS.update({
+            "author": author_format,
+            "department": department_format,
+            "last_content": format_last_content,
+            "content": format_content,
+            "created_at":format_created_at,
+        })
+    column_formatters_export = EXPORT_REPORT_FORMATTERS
 
 
 admin.add_view(UserAdminView(User, db.session, name='用户'))

deploy/app/models.py

@@ -46,6 +46,9 @@ def insert_roles():
 
     def __str__(self):
         return self.name
+        
+    def __repr__(self):
+        return self.name        
 
 
 class Department(db.Model):
@@ -72,6 +75,9 @@ def delete_departments():
 
     def __str__(self):
         return self.name
+        
+    def __repr__(self):
+        return self.name        
 
 
 class User(db.Model, UserMixin):
@@ -134,6 +140,9 @@ def is_authenticated(self):
 
     def __str__(self):
         return self.username
+        
+    def __repr__(self):
+        return self.username        
 
 
 class AnonymousUser(AnonymousUserMixin):
@@ -195,6 +204,10 @@ def get_last_report(author_id, week_count):
     def __str__(self):
         return 'Posted by {} at {}'.format(
             User.query.get(self.author_id).email, self.created_at)
+            
+    def __repr__(self):
+        return 'Posted by {} at {}'.format(
+            User.query.get(self.author_id).email, self.created_at)            
 
 
 @login_manager.user_loader

deploy/app/report/views.py

@@ -39,6 +39,7 @@ def write():
         else:
             report = Report(
                 content=form.body.data.replace('<br>', ''),
+                last_content=form.last_content.data.replace('<br>', ''),
                 author_id=current_user.id,
                 week_count=get_week_count(),
                 year=datetime.today().year)

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

@@ -53,6 +53,7 @@
 
         {% if search_supported %}
         <li>
+        	  {{_('Week Count')}}
             {{ model_layout.search_form() }}
         </li>
         {% endif %}

deploy/app/templates/report/read_crew.html

@@ -26,7 +26,31 @@
         <a rel="tag" class="post-tag">{{_('Department')}}:{{ report.department.name }}</a>
         <a rel="tag" class="post-tag">{{_('Week Count')}}:{{ report.week_count }}</a>
         <a rel="tag" class="post-tag">{{_('Year')}}:{{ report.year }}</a>
-        {{report.content|safe}}
+        <table class="table table-striped table-bordered table-hover model-list">
+        <thead>
+            <tr>
+	              <th class="column-header col-last_content">
+	                  {{_('Last Week')}}
+	              </th>
+	              
+	              <th class="column-header col-content">
+	                  {{_('Current Week')}}
+	              </th>
+            </tr>
+        </thead>
+        <tbody><tr>
+                    <td class="col-last_content">
+                            {{report.last_content|safe}}
+                    </td>
+                
+                    <td class="col-content">
+                            {{report.content|safe}}
+                    </td>
+            
+        </tr>
+        </tbody>
+					</table>
+        
         <hr>
     </div>
     {% endfor %}

deploy/app/templates/report/write.html

@@ -14,6 +14,9 @@
 
 
 {% block page_content %}
+    <div class="alert alert-warning">
+        请注意填写周报的日期
+    </div>
     <h3>第{{ week_count }}周({{start_at}}至{{end_at}})工作周报</h3>
     <form class="form form-inline" method="post" role="form">
         {{ form.csrf_token }}

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

@@ -241,6 +241,7 @@ msgstr "点击重置密码"
 
 #: templates/report/read.html:15 templates/report/read_crew.html:28
 #: templates/report/read_department.html:26
+#: templates/admin/model/report_list_template.html:56
 msgid "Week Count"
 msgstr "周次"
 
@@ -256,3 +257,11 @@ msgstr "编辑"
 #: auth/views.py:25
 msgid "Account or password is wrong"
 msgstr "邮箱或密码错误"
+
+#: templates/report/read_crew.html:33
+msgid "Last Week"
+msgstr "上周"
+
+#: templates/report/read_crew.html:37
+msgid "Current Week"
+msgstr "本周"

deploy/app/utils.py

@@ -3,6 +3,7 @@
 from functools import wraps
 from flask import abort
 from flask_login import current_user
+import re
 
 
 def permission_required(permission):
@@ -48,3 +49,24 @@ def get_last_week_content(last_week_content):
     if content_index != -1:
     	return last_week_content[content_index+31:]
     return ""
+
+def clean_html(html):
+    """
+    Remove HTML markup from the given string.
+    :param html: the HTML string to be cleaned
+    :type html: str
+    :rtype: str
+    """
+
+    # First we remove inline JavaScript/CSS:
+    cleaned = re.sub(r"(?is)<(script|style).*?>.*?(</\1>)", "", html.strip())
+    # Then we remove html comments. This has to be done before removing regular
+    # tags since comments can contain '>' characters.
+    cleaned = re.sub(r"(?s)<!--(.*?)-->[\n]?", "", cleaned)
+    # Next we can remove the remaining tags:
+    cleaned = re.sub(r"(?s)<.*?>", " ", cleaned)
+    # Finally, we deal with whitespace
+    cleaned = re.sub(r"&nbsp;", " ", cleaned)
+    cleaned = re.sub(r"  ", " ", cleaned)
+    cleaned = re.sub(r"  ", " ", cleaned)
+    return cleaned.strip()

deploy/config.py

@@ -35,11 +35,10 @@
 )
 
 DEFAULT_CONTENT = "<p><strong>1、上周计划完成情况：</strong></p><ol><li></li></ol>" \
-                  "<p>&nbsp;<strong>2、计划外工作：</strong></p><ol><li></li></ol>" \
-                  "<p>&nbsp;<strong>3、协助运维工作： </strong></p><ol><li></li></ol>" \
-                  "<p>&nbsp;<strong>4、重要问题：</strong></p><ol><li></li></ol>" \
-                  "<p>&nbsp;<strong>5、持续未处理解决的事情：</strong></p><ol><li></li></ol>" \
-                  "<p>&nbsp;<strong id=\"next_week\">1、下周计划：</strong></p><ol><li></li></ol>"
+                  "<p>&nbsp;<strong>2、计划外工作（包含协助运维工作）：</strong></p><ol><li></li></ol>" \
+                  "<p>&nbsp;<strong>3、重要问题：</strong></p><ol><li></li></ol>" \
+                  "<p>&nbsp;<strong>4、持续未处理解决的事情：</strong></p><ol><li></li></ol>" \
+                  "<p>&nbsp;<strong id=\"next_week\">5、下周计划：</strong></p><ol><li></li></ol>"
 
 
 #SQLALCHEMY_DATABASE_URI = 'postgresql://postgres:postgres@db/wr_prd'