From 3ef1e03e4273544cce177ce7fa0e0ab75eded990 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 21 Aug 2013 07:55:06 +0800 Subject: med 'indicator/static/javascripts/load_card.js' to 'card_chart.js * set Highcharts global options in 'card_chart.js' * 'indicator/templates/indicator/SheetDefault.html': added js function 'chart_getdata_draw()' to draw chart for card * improved 'indicator.views.ajax_get_card_data_chart()' * implemented drawing chart for 'FLOAT_TYPE' and 'RANGE_TYPE' indicators * added datetime plugin 'momentjs': 'indicator/static/plugins/moment/', version 2.1.0 * 'indicator/templates/indicator/NewDeleteIndex.html': added link button to goto 'indicator_status' SheetDefault.html page * added option 'useHTML: true' for Highcharts; improved the display style of ylabels, if value >9999, then show in exponential notation * improved drawing of 'detail_chart', and the 'detail_card_info' * moved js global var to 'SheetDefault.html'; renamed var 'card_detail_id' to 'detail_card_id' * fixed js local variables problem; added 'var' keyword * added check of 'date' for 'indicator.models.IndicatorRecord' * ThickBox: removed param 'no1_title' from thickbox popup page's url placed the param 'card_id' before 'TB_iframe' * changed to use 'ANNOTATION_TYPES' for 'sciblog.models.BlogAnnotation' * improved 'indicator/templates/indicator/popup/IndexDesc.html' improved 'indicator.views.indicator_indexdesc()' * added 'sympy' to 'env/requirements.pip' TODO: * BlogAnnotation: 'get_absolute_url()' -> 'IndexDesc: go_library_btn' * detail_card_info: data table * Data input/edit form, and validate & submit * Highcharts xAxis labels problem ?? --- .../templates/indicator/NewDeleteIndex.html | 12 +- .../templates/indicator/SheetDefault.html | 224 ++++++++++++++++++--- .../templates/indicator/popup/IndexDesc.html | 73 ++++++- 3 files changed, 275 insertions(+), 34 deletions(-) (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 f4e9a18..f5e0ee8 100644 --- a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html +++ b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html @@ -51,6 +51,7 @@
+
@@ -64,6 +65,7 @@ {% endfor %}
+
@@ -124,7 +126,7 @@
{% endif %} {# end: page_condition == all #}
- + {# page_condition == "category" #} @@ -217,10 +219,16 @@
{% endfor %} + +
+ + + {% endblock page %} diff --git a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html index 88a8d82..834daa6 100644 --- a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html +++ b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html @@ -24,24 +24,198 @@ + + + - + - - - {% endblock %} @@ -71,7 +245,7 @@
{{ ind|dict_get:"ref_text" }} {{ ind|dict_get:"ref_value"|safe }} - {{ ind|dict_get:"std_unit_symbol" }} + {% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}
{% if ind|dict_get:"record_empty" %} {# vim: {{{ #} {# if no record, then hide 'last_edit_data' #} @@ -79,7 +253,7 @@
@@ -94,7 +268,7 @@
-
{{ ind|dict_get:"std_unit_symbol" }}
+
{% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}
@@ -111,8 +285,8 @@
- {{ ind|dict_get:"last_record"|dict_get:"value_str" }} - {{ ind|dict_get:"std_unit_symbol" }} + {{ ind|dict_get:"last_record"|dict_get:"value_str"|safe }} + {% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}
@@ -127,7 +301,7 @@
-
{{ ind|dict_get:"std_unit_symbol" }}
+
{% if ind|dict_get:"std_unit_symbol" %}({{ ind|dict_get:"std_unit_symbol" }}){% endif %}
@@ -142,11 +316,11 @@ -
+
{% endif %} {# end: record_empty; vim: }}} #}
- +
@@ -163,27 +337,31 @@ width参数为弹出层页面宽度+2, card_id参数为 "卡片id" {% endcomment %} - +
{% endfor %} {# end: indicators #}
-
乙肝病毒核算定量 (PCR)4
+
+
Indicator
+ +
- - + + +
- +
-
- - +
+ +
-
+
diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html b/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html index ad9f20d..1515436 100644 --- a/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html +++ b/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html @@ -15,22 +15,77 @@ {% endblock %} {% block scripts %} - + {% endblock %} {% block page %}
-
乙肝病毒核算定量(PCR)
+
+ {% if annotation_not_found %} + {{ indicator.name }} + {% else %} + {{ annotation.brief_content }} + {% endif %} +
-
- 乙型肝炎仍是全球最严重的公共卫生问题之一。乙型肝炎病毒核酸DNA是反映乙肝的感染状态和治疗效果的重要指标。HBV DNA的定量检测是目前通过国家认证临床PCR实验室的常规检测项目之一。 -

- 目前HBV的临床检测从传统的免疫学方法发展到分子生物学方法,这是科技水平的一个重大进步。分子生物学检测经历了早期的PCR凝胶电泳法、半定量法到现在的完全定量法,目前各种定量检测方法日趋成熟,国内以TAQMAN荧光基因探针技术为主流的多种检测试剂盒已开发出来。荧光基因探针PCR?目前HBV的临床检测从传统的免疫学方法发展到分子生物学方法,这是科技水平的一个重大进步。分子生物学检测经历了早期的PCR凝胶电泳法、半定量法到现在的完全定量法,目前各种定量检测方法日趋成熟,国内以TAQMAN荧光基因探针技术为主流的多种检测试剂盒已开发出来。荧光基因探针PCR? -
-
收藏该注释(已有 100 人收藏)
-
+
+ {% if annotation_not_found %} +
未找到与该指标相关的注释
+ {% else %} + {{ annotation.detail|safe }} + {% endif %} +
+
+ {% if is_collected %} + 点击取消收藏 (已有{{ collected_times }}人收藏) + {% else %} + 收藏该注释 (已有{{ collected_times }}人收藏) + {% endif %} +
+
+ +
{% endblock page %} -- cgit v1.2.2