From 42ce5e6fc8dc44576a1de156fb16e868cafd86b6 Mon Sep 17 00:00:00 2001 From: raiots Date: Fri, 26 Mar 2021 08:05:13 +0800 Subject: [PATCH] add: some note & analyse table on index.html --- apps/tasks/admin.py | 16 +++++--- apps/tasks/forms.py | 4 +- templates/tasks/about.html | 6 +-- templates/tasks/index.html | 84 +++++++++++++++++++------------------- 4 files changed, 60 insertions(+), 50 deletions(-) diff --git a/apps/tasks/admin.py b/apps/tasks/admin.py index 137f376..7ac0556 100644 --- a/apps/tasks/admin.py +++ b/apps/tasks/admin.py @@ -29,6 +29,7 @@ class TaskAdmin(admin.ModelAdmin): def get_changeform_initial_data(self, request): return {'department': request.user.department} + # 年度任务编辑界面仅显示本部门的任务属性 def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'task_property': kwargs["queryset"] = TaskProperty.objects.filter(own_department=request.user.department) @@ -55,6 +56,8 @@ class TaskAdmin(admin.ModelAdmin): class TodoAdmin(admin.ModelAdmin): + + # 工作包页面仅显示所属本部门的年度任务 def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'related_task': kwargs["queryset"] = models.Task.objects.filter(department=request.user.department) @@ -63,8 +66,8 @@ class TodoAdmin(admin.ModelAdmin): fieldsets = [ (None, { 'fields': [ - 'related_task', 'todo_topic', 'todo_note', 'deadline', 'duty_group', 'main_executor', 'sub_executor', 'predict_work', - 'evaluate_factor', + 'related_task', 'todo_topic', 'todo_note', 'deadline', 'duty_group', 'main_executor', 'sub_executor', + 'predict_work', 'evaluate_factor', ] }), @@ -75,9 +78,10 @@ class TodoAdmin(admin.ModelAdmin): list_display = ( 'todo_topic', 'deadline', + 'todo_note', 'task_id', + 'task_origin', 'lined_task', - # 'task_origin', # 'duty_department', 'duty_group', 'main_executor', @@ -91,7 +95,7 @@ class TodoAdmin(admin.ModelAdmin): list_filter = ('deadline',) list_display_links = ('todo_topic', 'deadline', ) date_hierarchy = 'deadline' - list_per_page = 20 + list_per_page = 70 # 目的是取消自动分页，好像有bug raw_id_fields = ("main_executor", "sub_executor") search_fields = ('todo_topic',) ordering = ('related_task', ) @@ -116,7 +120,9 @@ class TodoAdmin(admin.ModelAdmin): return obj.related_task lined_task.short_description = '任务名称' - +# TODO 增加承办人与协办人只显示本部门人员 +# TODO 任务编辑界面按部门显示 +# TODO 修复工作事项显示不下自动分页，取消自动分页 diff --git a/apps/tasks/forms.py b/apps/tasks/forms.py index 7b5d53c..8bc0116 100644 --- a/apps/tasks/forms.py +++ b/apps/tasks/forms.py @@ -11,4 +11,6 @@ class TodoForm(forms.ModelForm): model = Todo fields = ['maturity', 'real_work', 'complete_note'] labels ={'text': ''} - widgets = {'rows': '3'} \ No newline at end of file + widgets = {'rows': '3'} + + # TODO 数据不可为空 \ No newline at end of file diff --git a/templates/tasks/about.html b/templates/tasks/about.html index c43e1cc..5e6e098 100644 --- a/templates/tasks/about.html +++ b/templates/tasks/about.html @@ -211,17 +211,17 @@
diff --git a/templates/tasks/index.html b/templates/tasks/index.html index f83b085..217eb1f 100644 --- a/templates/tasks/index.html +++ b/templates/tasks/index.html @@ -85,48 +85,50 @@ {#
#} -{#
#} -{#
#} -{# #} -{#
#} -{#
#} -{#

Bar Chart

#} -{##} -{#
#} -{# #} -{# #} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{#
#} -{# #} -{#
#} -{#
#} -{# #} -{#
#} -{# #} -{#
#} -{# #} -{#
#} +
+
+ +
+
+

部门工作统计表

+ +
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+ +
+ +
-{#TODO 图表#} + {#
#} {# {% for point in points %}#} {# {{ point }}#} @@ -161,7 +163,7 @@ labels : [{% for user in users %}'{{ user }}', {% endfor %}], datasets: [ { - label : 'Digital Goods', + label : '承办任务', backgroundColor : 'rgba(60,141,188,0.9)', borderColor : 'rgba(60,141,188,0.8)', pointRadius : false, @@ -169,10 +171,10 @@ pointStrokeColor : 'rgba(60,141,188,1)', pointHighlightFill : '#fff', pointHighlightStroke: 'rgba(60,141,188,1)', - data : [28, 48, 40, 19, 86, 27, 90] + data : [{% for user in users %}'{{ user.main_executor.count }}', {% endfor %}] }, { - label : 'Electronics', + label : '协办任务', backgroundColor : 'rgba(210, 214, 222, 1)', borderColor : 'rgba(210, 214, 222, 1)', pointRadius : false, @@ -180,7 +182,7 @@ pointStrokeColor : '#c1c7d1', pointHighlightFill : '#fff', pointHighlightStroke: 'rgba(220,220,220,1)', - data : [65, 59, 80, 81, 56, 55, 40] + data : [{% for user in users %}'{{ user.sub_executor.count }}', {% endfor %}] }, ] }