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 ?? --- 97suifangqa/apps/indicator/static/javascripts/sheetdefault.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '97suifangqa/apps/indicator/static/javascripts/sheetdefault.js') diff --git a/97suifangqa/apps/indicator/static/javascripts/sheetdefault.js b/97suifangqa/apps/indicator/static/javascripts/sheetdefault.js index 55dfcd5..7b95631 100644 --- a/97suifangqa/apps/indicator/static/javascripts/sheetdefault.js +++ b/97suifangqa/apps/indicator/static/javascripts/sheetdefault.js @@ -1,5 +1,3 @@ -var card_2_delete_id; -var card_detail_id; $(document).ready(function(){ //不允许input框复制，减少验证粘帖的交互 $("input[type='text']").bind("paste", function(){ @@ -151,7 +149,7 @@ $(document).ready(function(){ }); //时间范围控制（开始时间<结束时间） - $("#search_start_date").datepicker({ + $("#search_begin_date").datepicker({ showOn: "both", buttonImage: static_url + "plugins/datepicker/images/calendar.png", buttonImageOnly: true, @@ -161,7 +159,7 @@ $(document).ready(function(){ }); $("#search_end_date").datepicker({ onClose: function( selectedDate ) { - $("#search_start_date").datepicker("option", "maxDate", selectedDate); + $("#search_begin_date").datepicker("option", "maxDate", selectedDate); } }); }); -- cgit v1.2.2