* merged commits from 'maxwell lou' by time '20131028_09:52';HEADmaster

* moved 'ValueKind' model from 'recommend/models' to 'indicator/models'
* added field 'type' for 'indicator.models.Indicator'
* added field 'kind' for 'indicator.models.IndicatorRecord',
  'InnateConfine'
* updated methods for models 'Indicator', 'IndicatorRecord',
  'InnateConfine'
* updated views and templates for 'apps/indicator'
* added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py'
* added 'type' field for 'indicator.models.Indicator' in
  'search_indexes.py'
* added a confirm step for 'EditHistoryData' page when delete a record

* removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir
* moved *.json to 'backup' dir
* removed 'apps/managers*.py'
* updated 'indicator/popup/IndexDesc.html'
* created dir 'apps/indicator/obsolete';
* moved 'indicator/forms.py' to dir 'obsolete';
* splitted views related forms.py from 'views.py', and placed in
  'obsolete/views_forms.py'

* loadded newest data into database
* cleaned pervious data files in 'backup' dir
* updated 'README.txt'; added a solution to a redis problem

* added field 'type' of 'indicator.models.Indicator';
  for filtering search results and only returning 'NORMAL_TYPE'

19 files changed, 0 insertions, 0 deletions

diff --git a/97suifangqa/apps/indicator/static/images/addicon.png b/97suifangqa/apps/indicator/static/images/addicon.png
index 6ebf5eb..96a2c65 100644
--- a/97suifangqa/apps/indicator/static/images/addicon.png
+++ b/97suifangqa/apps/indicator/static/images/addicon.png
diff --git a/97suifangqa/apps/indicator/static/images/cancel_edit.png b/97suifangqa/apps/indicator/static/images/cancel_edit.png
index 1cd9303..9b2530e 100644
--- a/97suifangqa/apps/indicator/static/images/cancel_edit.png
+++ b/97suifangqa/apps/indicator/static/images/cancel_edit.png
diff --git a/97suifangqa/apps/indicator/static/images/confirm_edit.png b/97suifangqa/apps/indicator/static/images/confirm_edit.png
index 31f2658..2702737 100644
--- a/97suifangqa/apps/indicator/static/images/confirm_edit.png
+++ b/97suifangqa/apps/indicator/static/images/confirm_edit.png
diff --git a/97suifangqa/apps/indicator/static/images/last_edit_data.png b/97suifangqa/apps/indicator/static/images/last_edit_data.png
index 7d13181..1e615fe 100644
--- a/97suifangqa/apps/indicator/static/images/last_edit_data.png
+++ b/97suifangqa/apps/indicator/static/images/last_edit_data.png
diff --git a/97suifangqa/apps/indicator/static/images/minusicon.png b/97suifangqa/apps/indicator/static/images/minusicon.png
index 997a034..42851ff 100644
--- a/97suifangqa/apps/indicator/static/images/minusicon.png
+++ b/97suifangqa/apps/indicator/static/images/minusicon.png
diff --git a/97suifangqa/apps/indicator/static/images/pen.png b/97suifangqa/apps/indicator/static/images/pen.png
index 18aafdf..09b855b 100644
--- a/97suifangqa/apps/indicator/static/images/pen.png
+++ b/97suifangqa/apps/indicator/static/images/pen.png
diff --git a/97suifangqa/apps/indicator/static/images/pen_large.png b/97suifangqa/apps/indicator/static/images/pen_large.png
index ec75b6b..779684c 100644
--- a/97suifangqa/apps/indicator/static/images/pen_large.png
+++ b/97suifangqa/apps/indicator/static/images/pen_large.png
diff --git a/97suifangqa/apps/indicator/static/images/search.png b/97suifangqa/apps/indicator/static/images/search.png
index 303f228..29ea9b9 100644
--- a/97suifangqa/apps/indicator/static/images/search.png
+++ b/97suifangqa/apps/indicator/static/images/search.png
diff --git a/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg b/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg
new file mode 100644
index 0000000..527f207
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg b/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg
new file mode 100644
index 0000000..6e76089
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/PT.jpg b/97suifangqa/apps/indicator/static/images/sheet/PT.jpg
new file mode 100644
index 0000000..6085e53
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/PT.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/gene.jpg b/97suifangqa/apps/indicator/static/images/sheet/gene.jpg
new file mode 100644
index 0000000..224c592
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/gene.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/两对半.jpg b/97suifangqa/apps/indicator/static/images/sheet/两对半.jpg
new file mode 100644
index 0000000..1f2c2bc
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/两对半.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/肝功能.jpg b/97suifangqa/apps/indicator/static/images/sheet/肝功能.jpg
new file mode 100644
index 0000000..fa1144c
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/肝功能.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/肝穿刺表格形式二1.jpg b/97suifangqa/apps/indicator/static/images/sheet/肝穿刺表格形式二1.jpg
new file mode 100644
index 0000000..3680408
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/肝穿刺表格形式二1.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/肝脏硬度.jpg b/97suifangqa/apps/indicator/static/images/sheet/肝脏硬度.jpg
new file mode 100644
index 0000000..3b1c8ee
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/肝脏硬度.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/血细胞.jpg b/97suifangqa/apps/indicator/static/images/sheet/血细胞.jpg
new file mode 100644
index 0000000..a87265b
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/血细胞.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/表格1.jpg b/97suifangqa/apps/indicator/static/images/sheet/表格1.jpg
new file mode 100644
index 0000000..de00072
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/表格1.jpg
diff --git a/97suifangqa/apps/indicator/static/images/sheet/表格5.jpg b/97suifangqa/apps/indicator/static/images/sheet/表格5.jpg
new file mode 100644
index 0000000..deaadc2
--- /dev/null
+++ b/97suifangqa/apps/indicator/static/images/sheet/表格5.jpg