From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 30 Oct 2013 10:16:21 +0800 Subject: * merged commits from 'maxwell lou' by time '20131028_09:52'; * moved 'ValueKind' model from 'recommend/models' to 'indicator/models' * added field 'type' for 'indicator.models.Indicator' * added field 'kind' for 'indicator.models.IndicatorRecord', 'InnateConfine' * updated methods for models 'Indicator', 'IndicatorRecord', 'InnateConfine' * updated views and templates for 'apps/indicator' * added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py' * added 'type' field for 'indicator.models.Indicator' in 'search_indexes.py' * added a confirm step for 'EditHistoryData' page when delete a record * removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir * moved *.json to 'backup' dir * removed 'apps/managers*.py' * updated 'indicator/popup/IndexDesc.html' * created dir 'apps/indicator/obsolete'; * moved 'indicator/forms.py' to dir 'obsolete'; * splitted views related forms.py from 'views.py', and placed in 'obsolete/views_forms.py' * loadded newest data into database * cleaned pervious data files in 'backup' dir * updated 'README.txt'; added a solution to a redis problem * added field 'type' of 'indicator.models.Indicator'; for filtering search results and only returning 'NORMAL_TYPE' --- .../templates/indicator/NewDeleteIndex.html | 102 ++++++++++----------- .../templates/indicator/SheetDefault.html | 35 ++++--- .../indicator/templates/indicator/SideBar.html | 80 ++++++++++++---- .../apps/indicator/templates/indicator/index.html | 2 +- .../indicator/templates/indicator/nav-ribbon.html | 15 +++ .../templates/indicator/popup/DeleteCardTip.html | 2 +- .../templates/indicator/popup/EditHistoryData.html | 29 ++++-- .../templates/indicator/popup/IndexDesc.html | 19 +++- .../templates/indicator/show_indicator.html | 4 + .../indicator/templates/indicator/show_record.html | 4 + 10 files changed, 196 insertions(+), 96 deletions(-) create mode 100644 97suifangqa/apps/indicator/templates/indicator/nav-ribbon.html (limited to '97suifangqa/apps/indicator/templates') diff --git a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html index 24d8078..9651a93 100644 --- a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html +++ b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html @@ -3,7 +3,7 @@ {% load dict_get %} {% block title %} -指标状态 | 随访工具 | 97 随访 +指标状态 | 随访工具 | 医时代 {% endblock %} {% block css %} @@ -39,17 +39,17 @@
- - 6 + - username + isuifangqa
@@ -66,7 +66,7 @@
添加或删除关注指标
- +
@@ -77,7 +77,7 @@
所有指标
- + {% for cat in categories %}
{{ cat.name }} @@ -93,32 +93,32 @@
所有指标
-
A
-
B
-
C
-
D
-
E
-
F
-
G
-
H
-
I
-
J
-
K
-
L
-
M
-
N
-
O
-
P
-
Q
-
R
-
S
-
T
-
U
-
V
-
W
-
X
-
Y
-
Z
+
A
+
B
+
C
+
D
+
E
+
F
+
G
+
H
+
I
+
J
+
K
+
L
+
M
+
N
+
O
+
P
+
Q
+
R
+
S
+
T
+
U
+
V
+
W
+
X
+
Y
+
Z
{# display all indicators if in 'all' condition #} @@ -127,21 +127,21 @@
{# display all indicators by letter index #} {% for l in letters %} - {% with l_inds=indicators|dict_get:l %} - {% if l_inds|length >= 1 %} -
-
{{ l|upper }}
- {% for ind in l_inds %} -
-
{{ ind|dict_get:"name" }}
-
-
-
-
- {% endfor %} -
- {% endif %} - {% endwith %} + {% with l_inds=indicators|dict_get:l %} + {% if l_inds|length >= 1 %} +
+
{{ l|upper }}
+ {% for ind in l_inds %} +
+
{{ ind|dict_get:"name" }}
+
+
+
+
+ {% endfor %} +
+ {% endif %} + {% endwith %} {% endfor %} {# end: display all indicators #}
{% endif %} {# end: page_condition == all #} @@ -154,7 +154,7 @@
{{ selected_category.name }}
- 仿真化验单 + 仿真化验单
@@ -250,7 +250,7 @@
- 查看指标状态 + 完成并返回
{% endblock page %} diff --git a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html index 5a6659f..362083b 100644 --- a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html +++ b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html @@ -4,7 +4,7 @@ {% load divisible_by %} {% block title %} -指标状态 | 随访工具 | 97 随访 +指标状态 | 随访工具 | 医时代 {% endblock %} {% block css %} @@ -274,6 +274,9 @@ {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"PM_TYPE" %} {# PM_TYPE #} {# TODO #} + {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"KIND_TYPE" %} + {# KIND_TYPE #} + {# TODO #} {% else %} {# unknown TYPE #} {% endif %} {# end: DATA_TYPES #} @@ -289,17 +292,17 @@
- user_photo - 6 + - username - + isuifangqa +
@@ -308,7 +311,7 @@
-
指标状态
+
随访医学指标
{% comment %} @@ -397,14 +400,18 @@
+ {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"KIND_TYPE" %} + {# KIND_TYPE #} + TODO {% else %} {# UNKNOWN TYPE #} ERROR: unknown data type {% endif %}
-
{% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}
-
+
{% if ind|dict_get:"std_unit_symbol" %}{{ ind|dict_get:"std_unit_symbol" }}{% endif %}
+
+
@@ -435,7 +442,7 @@
了解该指标
-
仿真化验单
+
仿真化验单
详细历史记录
@@ -450,7 +457,7 @@ width参数为弹出层页面宽度+2， card_id参数为 "卡片id" {% endcomment %} - +
{% endfor %} {# end: indicators #} diff --git a/97suifangqa/apps/indicator/templates/indicator/SideBar.html b/97suifangqa/apps/indicator/templates/indicator/SideBar.html index 95ad4e9..a545c94 100644 --- a/97suifangqa/apps/indicator/templates/indicator/SideBar.html +++ b/97suifangqa/apps/indicator/templates/indicator/SideBar.html @@ -2,12 +2,13 @@ {% load static from staticfiles %} {% block title %} -边栏 | 随访工具 | 97 随访 +边栏 | 随访工具 | 医时代 {% endblock %} {% block css %} + {% endblock %} {% block scripts %} @@ -16,13 +17,32 @@ {% block page %}