From 3f1d09f3b5b86157ccf9f47eef69a065be6153a4 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Thu, 22 Aug 2013 15:18:58 +0800 Subject: * added latest full package of 'jquery-ui' plugin, v1.10.3; * improved 'thickbox' plugin to use 'jquery-1.9.x'; * upgraded 'SheetDefault.html', 'NewDeleteIndex.html' and other pages to use 'jquery-1.9.x'; * improved 'IndexDesc.html' to deal with the problem of no related annotation found; * 'indicator.tools.get_record()' added param 'number', and updated the format of return data; * added 'get_num_record()' and 'get_num_record_std()' to 'indicator.tools'; * improved 'indicator.views.ajax_get_card_data_chart()', now can get data by 'num' or by 'date'; * improved 'indicator.views.ajax_get_card_data_table()', to provide the needed data requested from 'detail_card'; * improved js function 'chart_getdata_draw()' in 'SheetDefault.html'; * 'card_chart.js': renamed 'redraw_chart()' to 'detail_chart_getdata_draw()', and updated to get data by type; * updated 'table' of 'detail_card' in 'SheetDefault.html'; * improved js function 'get_card_data_table()' for providing and displaying record data in 'detail_card' table. TODO: * add/delete/edit record data --- .../templates/indicator/NewDeleteIndex.html | 4 - .../templates/indicator/SheetDefault.html | 100 ++++++++++++++------- .../indicator/templates/indicator/SideBar.html | 4 - .../templates/indicator/popup/DeleteCardTip.html | 4 - .../templates/indicator/popup/EditHistoryData.html | 4 - .../templates/indicator/popup/IndexDesc.html | 16 ++-- 6 files changed, 80 insertions(+), 52 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 f5e0ee8..515adcc 100644 --- a/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html +++ b/97suifangqa/apps/indicator/templates/indicator/NewDeleteIndex.html @@ -12,10 +12,6 @@ {% endblock %} -{% block jquery %} - -{% endblock %} - {% block scripts %} diff --git a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html index 834daa6..6b127d3 100644 --- a/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html +++ b/97suifangqa/apps/indicator/templates/indicator/SheetDefault.html @@ -9,18 +9,26 @@ {% block css %} + + + {% endblock %} -{% block jquery %} - -{% endblock %} - {% block scripts %} + + + + @@ -37,6 +45,8 @@ @@ -46,10 +56,14 @@ // default date format var mm_date_fmt = "YYYY-MM-DD"; // default to show 30 days' data - var data_range = 30; + var chart_range = 30; + // default to get 10 data point + var chart_dp_num = 10; + // default get chart data by number + var chart_getdata_type = "num"; var end_datetime = moment(); var begin_datetime = end_datetime.clone(); - begin_datetime.subtract('days', data_range); + begin_datetime.subtract('days', chart_range); var end_date_str = end_datetime.format(mm_date_fmt); var begin_date_str = begin_datetime.format(mm_date_fmt); @@ -61,33 +75,55 @@ var detail_card_id = "-1"; // track the id of card in detail (string) var detail_chart = null; var detail_chart_str = "detail_chart"; - var detail_chart_options = null; + var detail_chart_options_str = ""; var card_2_delete_id = "-1"; // track the id of card to be deleted (string) // regex to match float number in expoential notation var exp_regex = /^([+-]?)(\d\.\d+)[eE]\+?(-?)0*([1-9]+)$/; // get indicator records data and - // draw the chart - function chart_getdata_draw(chart_str, card_id, options, begin, end) { + // draw the chart {{{ + function chart_getdata_draw(chart_str, card_id, options_str, type, num, begin, end) { + type = type || "num"; // default get data by 'num' + num = num || ""; + begin = begin || ""; + end = end || ""; var time = moment().valueOf(); - $.ajax ({ + $.ajax({ type: 'get', url: indicator_url + 'ajax/get_card_data_chart', - data: 'card_id='+card_id + '&begin='+begin + '&end='+end + '&time='+time, + data: 'card_id='+card_id + '&type='+type + '&num='+num + '&begin='+begin + '&end='+end + '&time='+time, dataType: 'json', success: function (dataJson) { - // set data - var begin_dt = moment(begin); - var end_dt = moment(end); - options.xAxis.min = begin_dt.valueOf(); - options.xAxis.max = end_dt.valueOf(); - options.series[0].data = dataJson; - // draw the chart - // given 'chart_str' is the global var name of this chart - window[chart_str] = new Highcharts.Chart(options); + //console.log(dataJson); + if (dataJson.failed || dataJson.number_rsp == 0) { + // getdata failed or get no data + return false; + } + else { + var begin_dt = moment(dataJson.begin_rsp); + var end_dt = moment(dataJson.end_rsp); + if (dataJson.number_rsp == 1) { + // only one data point + // (3days) dp_date (4days) + begin_dt.subtract('days', 3); + end_dt.add('days', 4); + } + else { + var diff_days = end_dt.diff(begin_dt, 'days'); + var days_toadd = Math.floor(diff_days*0.10) + 1; + end_dt.add('days', days_toadd); + } + // set data + window[options_str].xAxis.min = begin_dt.valueOf(); + window[options_str].xAxis.max = end_dt.valueOf(); + window[options_str].series[0].data = dataJson.data; + // draw the chart + // given 'chart_str' is the global var name of this chart + window[chart_str] = new Highcharts.Chart(window[options_str]); + } }, }); - } + } // }}} {% for ind in indicators %} {% if not ind|dict_get:"record_empty" %} {# indicator has records #} @@ -147,8 +183,9 @@ $(document).ready(function() { chart_getdata_draw("chart_{{ ind|dict_get:"id" }}", {{ ind|dict_get:"id" }}, - options_chart_{{ ind|dict_get:"id" }}, - begin_date_str, end_date_str + "options_chart_{{ ind|dict_get:"id" }}", + chart_getdata_type, chart_dp_num, + null, null ); }); {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"RANGE_TYPE" %} @@ -202,8 +239,9 @@ $(document).ready(function() { chart_getdata_draw("chart_{{ ind|dict_get:"id" }}", {{ ind|dict_get:"id" }}, - options_chart_{{ ind|dict_get:"id" }}, - begin_date_str, end_date_str + "options_chart_{{ ind|dict_get:"id" }}", + chart_getdata_type, chart_dp_num, + null, null ); }); {% elif ind|dict_get:"dataType" == DATA_TYPES|dict_get:"FLOAT_RANGE_TYPE" %} @@ -320,7 +358,7 @@ {% endif %} {# end: record_empty; vim: }}} #}
-
了解该指标
+
了解该指标
仿真化验单
@@ -337,7 +375,7 @@ width参数为弹出层页面宽度+2， card_id参数为 "卡片id" {% endcomment %} - +
{% endfor %} {# end: indicators #} @@ -363,11 +401,11 @@
- +
- - - + + +
日期时间记录化验日期数据记录是否正常
diff --git a/97suifangqa/apps/indicator/templates/indicator/SideBar.html b/97suifangqa/apps/indicator/templates/indicator/SideBar.html index 710a8dd..b1e3b34 100644 --- a/97suifangqa/apps/indicator/templates/indicator/SideBar.html +++ b/97suifangqa/apps/indicator/templates/indicator/SideBar.html @@ -10,10 +10,6 @@ {% endblock %} -{% block jquery %} - -{% endblock %} - {% block scripts %} {% endblock %} diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html b/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html index c978f8a..4bdac43 100644 --- a/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html +++ b/97suifangqa/apps/indicator/templates/indicator/popup/DeleteCardTip.html @@ -10,10 +10,6 @@ {% endblock %} -{% block jquery %} - -{% endblock %} - {% block scripts %} {% endblock %} diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html b/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html index 2cf58d1..cc82336 100644 --- a/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html +++ b/97suifangqa/apps/indicator/templates/indicator/popup/EditHistoryData.html @@ -10,10 +10,6 @@ {% endblock %} -{% block jquery %} - -{% endblock %} - {% block scripts %} diff --git a/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html b/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html index 1515436..eb6fcdc 100644 --- a/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html +++ b/97suifangqa/apps/indicator/templates/indicator/popup/IndexDesc.html @@ -10,10 +10,6 @@ {% endblock %} -{% block jquery %} - -{% endblock %} - {% block scripts %} {% endblock %} -- cgit v1.2.2