添加对周次时间的具体显示

Author: t3573393

.gitignore

@@ -4,4 +4,6 @@ pg96_data/
 *.log
 mongo/
 *.sqlite
-upload/
+upload/
+wr_prd.sqlite
+*.pyc

deploy/app/__init__.py

@@ -7,7 +7,7 @@
 from flask_login import LoginManager
 from flask_sqlalchemy import SQLAlchemy
 from .json_encoder import JSONEncoder
-from utils import get_last_week_content
+from utils import get_last_week_content, get_week_days
 
 
 bootstrap = Bootstrap()
@@ -63,4 +63,5 @@ def create_app(config_file):
     app.json_encoder = JSONEncoder
 
     app.add_template_filter(get_last_week_content, 'get_last_week_content')
+    app.add_template_filter(get_week_days, 'get_week_days')
     return app

deploy/app/templates/report/read.html

@@ -14,6 +14,8 @@
         <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>
+		<a rel="tag" class="post-tag">{{_('Start')}}:{{ report.year | get_week_days(report.week_count,0) }}</a>
+		<a rel="tag" class="post-tag">{{_('End')}}:{{ report.year | get_week_days(report.week_count,1) }}</a>
         {{report.content|safe}}
 
         {% if report.is_of_current_week %}

deploy/app/templates/report/read_crew.html

@@ -26,6 +26,8 @@
         <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>
+		<a rel="tag" class="post-tag">{{_('Start')}}:{{ report.year | get_week_days(report.week_count,0) }}</a>
+		<a rel="tag" class="post-tag">{{_('End')}}:{{ report.year | get_week_days(report.week_count,1) }}</a>		
         <table class="table table-striped table-bordered table-hover model-list">
         <thead>
             <tr>

deploy/app/utils.py

@@ -72,4 +72,13 @@ def clean_html(html):
     cleaned = re.sub(r" ", " ", cleaned)
     cleaned = re.sub(r"  ", " ", cleaned)
     cleaned = re.sub(r"  ", " ", cleaned)
-    return cleaned.strip()
+    return cleaned.strip()
+	
+def get_week_days(year, week, index):
+    d = datetime.date(year, 1, 1)
+    if (d.weekday() > 3):
+        d = d + datetime.timedelta(7-d.weekday())
+    else:
+	    d = d - datetime.timedelta(d.weekday())
+    dlt = datetime.timedelta(days = (week - 1) * 7)
+    return (d + dlt, d + dlt + datetime.timedelta(days=6))[index]