* improved 'indicator.views.follow_indicator()',

  renamed to 'indicator_fanduf()' due to name conflict
* finished 'search' function for page indicator NewDeleteIndex.html
* added 'apps/utils/search_tools.py': some tools to process search results
* renamed 'sciblog/templatetags/tools.py' to 'get_range.py'
* added 'format_data()' to indicator.tools': to format data of
  record/confine, make it properly display in html page;
* 'indicator/javascripts/new_delete_index.js':
  added global 'var added_indexes_id' to track the already added indexes
* added 'indicator/templatetags/divisible_by.py' filter to check
  if a number can be extactly divide by another number;
* fixed the 'index_card_fir/index_card_sec' problem of
  'act_card_container' of page 'SheetDefault.html'
* indicator/static/css/new_delete_index.css:
  added 'index_search_error' and 'index_error'

* fixed 'unit.dump' problems in 'indicator.models'
* 'indicator.tools':
  o added 'RI_TYPES', 'RI_WEIGHTS'
  o added 'type' in the return value of 'calc_indicator_weight()'
    and 'recommend_indicator()'
* added field 'followedHistories' in 'indicator.models.UserIndicator'
* moved 'follow_indicator()' and 'unfollow_indicator()' from
  'indicator.views' to 'indicator.tools'

TODO:
* highcharts: draw chart for indicator records;
* add/edit data, and submit (page format design)
* followed indicator submit buttion

1 files changed, 151 insertions, 52 deletions

diff --git a/97suifangqa/apps/indicator/fixtures/initial_data.json b/97suifangqa/apps/indicator/fixtures/initial_data.json
index 25d6c73..07aeaaa 100644
--- a/97suifangqa/apps/indicator/fixtures/initial_data.json
+++ b/97suifangqa/apps/indicator/fixtures/initial_data.json
@@ -1,24 +1,79 @@
 [
     {
-        "pk": 1,
+        "pk": 4,
+        "model": "indicator.indicatorcategory",
+        "fields": {
+            "pinyin": "gan-chuan-ci",
+            "englishName": "Liver Puncture",
+            "addByUser": 1,
+            "name": "\u809d\u7a7f\u523a",
+            "description": "\u809d\u7a7f\u523a"
+        }
+    },
+    {
+        "pk": 3,
+        "model": "indicator.indicatorcategory",
+        "fields": {
+            "pinyin": "gan-gong-neng",
+            "englishName": "Liver Function",
+            "addByUser": 1,
+            "name": "\u809d\u529f\u80fd",
+            "description": "\u809d\u529f\u80fd"
+        }
+    },
+    {
+        "pk": 5,
+        "model": "indicator.indicatorcategory",
+        "fields": {
+            "pinyin": "lei-bie-5",
+            "englishName": "category5",
+            "addByUser": 1,
+            "name": "\u7c7b\u522b5",
+            "description": "\u7c7b\u522b5\r\n\u6d4b\u8bd5"
+        }
+    },
+    {
+        "pk": 6,
         "model": "indicator.indicatorcategory",
         "fields": {
-            "pinyin": "lei-bie-1",
-            "englishName": "category1",
+            "pinyin": "lei-bie-6",
+            "englishName": "category6",
             "addByUser": 1,
-            "name": "\u7c7b\u522b1",
-            "description": "\u6307\u6807\u7c7b\u522b1\r\n\r\n\u4fee\u65391\uff08\u6d4b\u8bd5\uff09"
+            "name": "\u7c7b\u522b6",
+            "description": "\u7c7b\u522b6\r\n\r\n\u6d4b\u8bd5"
+        }
+    },
+    {
+        "pk": 7,
+        "model": "indicator.indicatorcategory",
+        "fields": {
+            "pinyin": "lei-bie-7",
+            "englishName": "category7",
+            "addByUser": 1,
+            "name": "\u7c7b\u522b7",
+            "description": "\u7c7b\u522b7\r\n\r\n\u6d4b\u8bd5"
         }
     },
     {
         "pk": 2,
         "model": "indicator.indicatorcategory",
         "fields": {
-            "pinyin": "lei-bie-2",
-            "englishName": "category2",
+            "pinyin": "liang-dui-ban",
+            "englishName": "TODO",
             "addByUser": 1,
-            "name": "\u7c7b\u522b2",
-            "description": "\u7c7b\u522b2\r\n\r\nadd_edit_category() \u6dfb\u52a0"
+            "name": "\u4e24\u5bf9\u534a",
+            "description": "\u4e59\u809d\u4e24\u5bf9\u534a"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "indicator.indicatorcategory",
+        "fields": {
+            "pinyin": "xie-chang-gui",
+            "englishName": "Blood Routine",
+            "addByUser": 1,
+            "name": "\u8840\u5e38\u89c4",
+            "description": "\u8840\u5e38\u89c4"
         }
     },
     {
@@ -27,14 +82,30 @@
         "fields": {
             "addByUser": 1,
             "name": "\u6d4b\u8bd51",
-            "dataType": "FL",
+            "dataType": "PM",
             "pinyin": "ce-shi-1",
             "helpText": "\u5e2e\u52a9 help",
             "englishName": "test1",
             "categories": [
+                2
+            ],
+            "description": "forms \u6d4b\u8bd51\r\npm type"
+        }
+    },
+    {
+        "pk": 1,
+        "model": "indicator.indicator",
+        "fields": {
+            "addByUser": 1,
+            "name": "\u5b9a1",
+            "dataType": "FL",
+            "pinyin": "ding-1",
+            "helpText": "\u6d6e\u70b9\u578b",
+            "englishName": "indicator1",
+            "categories": [
                 1
             ],
-            "description": "forms \u6d4b\u8bd51"
+            "description": "\u5b9a\u503c1\r\n\r\n\u6d6e\u70b9\u578b\u6570\u636e"
         }
     },
     {
@@ -42,12 +113,13 @@
         "model": "indicator.indicator",
         "fields": {
             "addByUser": 1,
-            "name": "\u5b9a\u503c1",
+            "name": "\u5b9a\u503c2",
             "dataType": "FL",
-            "pinyin": "ding-zhi-1",
+            "pinyin": "ding-zhi-2",
             "helpText": "\u6d6e\u70b9\u5b9a\u503c",
-            "englishName": "float1",
+            "englishName": "float2",
             "categories": [
+                2,
                 1
             ],
             "description": "float type"
@@ -71,28 +143,24 @@
     },
     {
         "pk": 1,
-        "model": "indicator.indicator",
+        "model": "indicator.userindicator",
         "fields": {
-            "addByUser": 1,
-            "name": "\u6307\u68071",
-            "dataType": "FL",
-            "pinyin": "zhi-biao-1",
-            "helpText": "\u6d6e\u70b9\u578b",
-            "englishName": "indicator1",
-            "categories": [
-                1
+            "followedIndicators": [
+                3,
+                1,
+                2
             ],
-            "description": "\u6307\u68071\r\n\r\n\u6d6e\u70b9\u578b\u6570\u636e"
+            "followedHistories": [],
+            "user": 1
         }
     },
     {
-        "pk": 1,
+        "pk": 2,
         "model": "indicator.userindicator",
         "fields": {
-            "followedIndicators": [
-                4
-            ],
-            "user": 1
+            "followedIndicators": [],
+            "followedHistories": [],
+            "user": 2
         }
     },
     {
@@ -101,8 +169,8 @@
         "fields": {
             "indicator": 1,
             "notes": "\u6307\u68071\r\n\u7b2c1\u6761\u8bb0\u5f55",
-            "created_at": "2013-08-05T15:48:00.035",
-            "updated_at": "2013-08-05T15:50:00.326",
+            "created_at": "2013-08-05T15:48:00.035Z",
+            "updated_at": "2013-08-05T15:50:00.326Z",
             "value": "250",
             "val_min": null,
             "user": 1,
@@ -116,23 +184,39 @@
         "model": "indicator.indicatorrecord",
         "fields": {
             "indicator": 1,
-            "notes": "test\r\n\u8bb0\u5f55",
-            "created_at": "2013-08-09T10:53:15.927",
-            "updated_at": "2013-08-10T00:30:09.336",
+            "notes": "\r\n\u8bb0\u5f55",
+            "created_at": "2013-08-09T10:53:15.927Z",
+            "updated_at": "2013-08-16T16:23:33.798Z",
             "value": "50",
             "val_min": null,
-            "user": 2,
+            "user": 1,
             "date": "2013-08-09",
             "val_max": null,
             "unit": 1
         }
     },
     {
+        "pk": 3,
+        "model": "indicator.indicatorrecord",
+        "fields": {
+            "indicator": 3,
+            "notes": "pm type\r\nrecord 1",
+            "created_at": "2013-08-16T16:07:00.547Z",
+            "updated_at": "2013-08-16T16:07:00.547Z",
+            "value": "+",
+            "val_min": null,
+            "user": 1,
+            "date": "2013-08-17",
+            "val_max": null,
+            "unit": null
+        }
+    },
+    {
         "pk": 1,
         "model": "indicator.recordhistory",
         "fields": {
             "val_min_bak": null,
-            "created_at": "2013-08-05T16:07:01.832",
+            "created_at": "2013-08-05T16:07:01.832Z",
             "indicatorRecord": 1,
             "reason": "\u6d4b\u8bd5\r\nadmin\u754c\u9762\u76f4\u63a5\u4fee\u6539",
             "unit_bak": 1,
@@ -147,7 +231,7 @@
         "model": "indicator.recordhistory",
         "fields": {
             "val_min_bak": null,
-            "created_at": "2013-08-10T11:40:23.170",
+            "created_at": "2013-08-10T11:40:23.170Z",
             "indicatorRecord": 1,
             "reason": "\u6d4b\u8bd5\u4fee\u6539",
             "unit_bak": 1,
@@ -228,15 +312,30 @@
         "pk": 2,
         "model": "indicator.innateconfine",
         "fields": {
-            "math_max": 800.0,
+            "math_max": 80000.0,
             "indicator": 2,
-            "human_max": 500.0,
+            "human_max": 50000.0,
             "description": "\u6307\u6807\r\n\r\n\u6570\u636e\u7c7b\u578b\uff1a\u8303\u56f4\u578b\r\n\r\n\u6570\u636e\u8303\u56f4",
             "val_norm": "",
             "addByUser": 1,
-            "human_min": 50.0,
+            "human_min": 10000.0,
             "unit": 3,
-            "math_min": 0.0
+            "math_min": 5000.0
+        }
+    },
+    {
+        "pk": 3,
+        "model": "indicator.innateconfine",
+        "fields": {
+            "math_max": null,
+            "indicator": 3,
+            "human_max": null,
+            "description": "pm type",
+            "val_norm": "+",
+            "addByUser": 1,
+            "human_min": null,
+            "unit": null,
+            "math_min": null
         }
     },
     {
@@ -245,8 +344,8 @@
         "fields": {
             "indicator": 1,
             "weight": 5.9,
-            "created_at": "2013-08-10T22:40:00.035",
-            "updated_at": "2013-08-10T22:40:00.326",
+            "created_at": "2013-08-10T22:40:00.035Z",
+            "updated_at": "2013-08-10T22:40:00.326Z",
             "blog": null,
             "annotation": 2,
             "objectType": "AN"
@@ -258,8 +357,8 @@
         "fields": {
             "indicator": 1,
             "weight": 8.0,
-            "created_at": "2013-08-11T00:56:08.080",
-            "updated_at": "2013-08-11T00:56:08.080",
+            "created_at": "2013-08-11T00:56:08.080Z",
+            "updated_at": "2013-08-11T00:56:08.080Z",
             "blog": null,
             "annotation": 1,
             "objectType": "AN"
@@ -271,8 +370,8 @@
         "fields": {
             "indicator": 2,
             "weight": 8.3,
-            "created_at": "2013-08-10T22:50:00.035",
-            "updated_at": "2013-08-10T22:50:00.326",
+            "created_at": "2013-08-10T22:50:00.035Z",
+            "updated_at": "2013-08-10T22:50:00.326Z",
             "blog": 3,
             "annotation": null,
             "objectType": "BL"
@@ -284,8 +383,8 @@
         "fields": {
             "indicator": 1,
             "weight": 4.0,
-            "created_at": "2013-08-11T00:56:49.463",
-            "updated_at": "2013-08-11T00:56:49.463",
+            "created_at": "2013-08-11T00:56:49.463Z",
+            "updated_at": "2013-08-11T00:56:49.463Z",
             "blog": 1,
             "annotation": null,
             "objectType": "BL"
@@ -297,11 +396,11 @@
         "fields": {
             "indicator": 1,
             "weight": 6.0,
-            "created_at": "2013-08-11T00:57:23.067",
-            "updated_at": "2013-08-11T00:57:23.067",
+            "created_at": "2013-08-11T00:57:23.067Z",
+            "updated_at": "2013-08-11T00:57:23.067Z",
             "blog": 3,
             "annotation": null,
             "objectType": "BL"
         }
     }
-]
\ No newline at end of file
+]