From 3ef1e03e4273544cce177ce7fa0e0ab75eded990 Mon Sep 17 00:00:00 2001
From: Alvin Li <liweitianux@gmail.com>
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 ??
---
 .../apps/indicator/fixtures/initial_data.json      | 83 +++++++++++++++++++---
 1 file changed, 74 insertions(+), 9 deletions(-)

(limited to '97suifangqa/apps/indicator/fixtures')

diff --git a/97suifangqa/apps/indicator/fixtures/initial_data.json b/97suifangqa/apps/indicator/fixtures/initial_data.json
index 07aeaaa..1c18457 100644
--- a/97suifangqa/apps/indicator/fixtures/initial_data.json
+++ b/97suifangqa/apps/indicator/fixtures/initial_data.json
@@ -97,11 +97,11 @@
         "model": "indicator.indicator",
         "fields": {
             "addByUser": 1,
-            "name": "\u5b9a1",
+            "name": "\u5b9a\u503c1",
             "dataType": "FL",
-            "pinyin": "ding-1",
+            "pinyin": "ding-zhi-1",
             "helpText": "\u6d6e\u70b9\u578b",
-            "englishName": "indicator1",
+            "englishName": "float1",
             "categories": [
                 1
             ],
@@ -145,12 +145,14 @@
         "pk": 1,
         "model": "indicator.userindicator",
         "fields": {
+            "followedHistories": [
+                4
+            ],
             "followedIndicators": [
                 3,
                 1,
                 2
             ],
-            "followedHistories": [],
             "user": 1
         }
     },
@@ -158,8 +160,8 @@
         "pk": 2,
         "model": "indicator.userindicator",
         "fields": {
-            "followedIndicators": [],
             "followedHistories": [],
+            "followedIndicators": [],
             "user": 2
         }
     },
@@ -184,10 +186,10 @@
         "model": "indicator.indicatorrecord",
         "fields": {
             "indicator": 1,
-            "notes": "\r\n\u8bb0\u5f55",
+            "notes": "\u8bb0\u5f552",
             "created_at": "2013-08-09T10:53:15.927Z",
-            "updated_at": "2013-08-16T16:23:33.798Z",
-            "value": "50",
+            "updated_at": "2013-08-18T13:35:03.065Z",
+            "value": "100",
             "val_min": null,
             "user": 1,
             "date": "2013-08-09",
@@ -195,6 +197,54 @@
             "unit": 1
         }
     },
+    {
+        "pk": 4,
+        "model": "indicator.indicatorrecord",
+        "fields": {
+            "indicator": 1,
+            "notes": "",
+            "created_at": "2013-08-18T13:33:20.569Z",
+            "updated_at": "2013-08-18T13:33:20.569Z",
+            "value": "150",
+            "val_min": null,
+            "user": 1,
+            "date": "2013-08-15",
+            "val_max": null,
+            "unit": 1
+        }
+    },
+    {
+        "pk": 6,
+        "model": "indicator.indicatorrecord",
+        "fields": {
+            "indicator": 2,
+            "notes": "",
+            "created_at": "2013-08-18T13:46:26.511Z",
+            "updated_at": "2013-08-18T13:46:26.511Z",
+            "value": "",
+            "val_min": 10000.0,
+            "user": 1,
+            "date": "2013-08-05",
+            "val_max": 23000.0,
+            "unit": 3
+        }
+    },
+    {
+        "pk": 5,
+        "model": "indicator.indicatorrecord",
+        "fields": {
+            "indicator": 2,
+            "notes": "",
+            "created_at": "2013-08-18T13:37:41.124Z",
+            "updated_at": "2013-08-18T13:37:41.125Z",
+            "value": "",
+            "val_min": 15000.0,
+            "user": 1,
+            "date": "2013-08-10",
+            "val_max": 25000.0,
+            "unit": 3
+        }
+    },
     {
         "pk": 3,
         "model": "indicator.indicatorrecord",
@@ -338,6 +388,21 @@
             "math_min": null
         }
     },
+    {
+        "pk": 4,
+        "model": "indicator.innateconfine",
+        "fields": {
+            "math_max": 15000.0,
+            "indicator": 4,
+            "human_max": 10000.0,
+            "description": "float type",
+            "val_norm": "",
+            "addByUser": 1,
+            "human_min": 500.0,
+            "unit": 4,
+            "math_min": 0.0
+        }
+    },
     {
         "pk": 1,
         "model": "indicator.relatedindicator",
@@ -403,4 +468,4 @@
             "objectType": "BL"
         }
     }
-]
+]
\ No newline at end of file
-- 
cgit v1.2.2