From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 30 Oct 2013 10:16:21 +0800 Subject: * merged commits from 'maxwell lou' by time '20131028_09:52'; * 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' --- 97suifangqa/apps/indicator/static/images/addicon.png | Bin 707 -> 4339 bytes .../apps/indicator/static/images/cancel_edit.png | Bin 768 -> 4431 bytes .../apps/indicator/static/images/confirm_edit.png | Bin 647 -> 4475 bytes .../apps/indicator/static/images/last_edit_data.png | Bin 2057 -> 4748 bytes .../apps/indicator/static/images/minusicon.png | Bin 762 -> 4241 bytes 97suifangqa/apps/indicator/static/images/pen.png | Bin 3184 -> 4254 bytes .../apps/indicator/static/images/pen_large.png | Bin 1379 -> 4719 bytes 97suifangqa/apps/indicator/static/images/search.png | Bin 525 -> 4713 bytes .../apps/indicator/static/images/sheet/AFP.jpg | Bin 0 -> 70436 bytes .../apps/indicator/static/images/sheet/PCR.jpg | Bin 0 -> 68843 bytes 97suifangqa/apps/indicator/static/images/sheet/PT.jpg | Bin 0 -> 88070 bytes .../apps/indicator/static/images/sheet/gene.jpg | Bin 0 -> 88708 bytes .../sheet/\344\270\244\345\257\271\345\215\212.jpg" | Bin 0 -> 101053 bytes .../sheet/\350\202\235\345\212\237\350\203\275.jpg" | Bin 0 -> 179388 bytes ...\240\274\345\275\242\345\274\217\344\272\2141.jpg" | Bin 0 -> 143002 bytes ...0\202\235\350\204\217\347\241\254\345\272\246.jpg" | Bin 0 -> 208302 bytes .../sheet/\350\241\200\347\273\206\350\203\236.jpg" | Bin 0 -> 164684 bytes .../images/sheet/\350\241\250\346\240\2741.jpg" | Bin 0 -> 101067 bytes .../images/sheet/\350\241\250\346\240\2745.jpg" | Bin 0 -> 88284 bytes 19 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 97suifangqa/apps/indicator/static/images/sheet/AFP.jpg create mode 100644 97suifangqa/apps/indicator/static/images/sheet/PCR.jpg create mode 100644 97suifangqa/apps/indicator/static/images/sheet/PT.jpg create mode 100644 97suifangqa/apps/indicator/static/images/sheet/gene.jpg create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\344\270\244\345\257\271\345\215\212.jpg" create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\350\202\235\345\212\237\350\203\275.jpg" create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\350\202\235\347\251\277\345\210\272\350\241\250\346\240\274\345\275\242\345\274\217\344\272\2141.jpg" create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\350\202\235\350\204\217\347\241\254\345\272\246.jpg" create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\350\241\200\347\273\206\350\203\236.jpg" create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2741.jpg" create mode 100644 "97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2745.jpg" (limited to '97suifangqa/apps/indicator/static/images') diff --git a/97suifangqa/apps/indicator/static/images/addicon.png b/97suifangqa/apps/indicator/static/images/addicon.png index 6ebf5eb..96a2c65 100644 Binary files a/97suifangqa/apps/indicator/static/images/addicon.png and b/97suifangqa/apps/indicator/static/images/addicon.png differ diff --git a/97suifangqa/apps/indicator/static/images/cancel_edit.png b/97suifangqa/apps/indicator/static/images/cancel_edit.png index 1cd9303..9b2530e 100644 Binary files a/97suifangqa/apps/indicator/static/images/cancel_edit.png and b/97suifangqa/apps/indicator/static/images/cancel_edit.png differ diff --git a/97suifangqa/apps/indicator/static/images/confirm_edit.png b/97suifangqa/apps/indicator/static/images/confirm_edit.png index 31f2658..2702737 100644 Binary files a/97suifangqa/apps/indicator/static/images/confirm_edit.png and b/97suifangqa/apps/indicator/static/images/confirm_edit.png differ 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 Binary files a/97suifangqa/apps/indicator/static/images/last_edit_data.png and b/97suifangqa/apps/indicator/static/images/last_edit_data.png differ diff --git a/97suifangqa/apps/indicator/static/images/minusicon.png b/97suifangqa/apps/indicator/static/images/minusicon.png index 997a034..42851ff 100644 Binary files a/97suifangqa/apps/indicator/static/images/minusicon.png and b/97suifangqa/apps/indicator/static/images/minusicon.png differ diff --git a/97suifangqa/apps/indicator/static/images/pen.png b/97suifangqa/apps/indicator/static/images/pen.png index 18aafdf..09b855b 100644 Binary files a/97suifangqa/apps/indicator/static/images/pen.png and b/97suifangqa/apps/indicator/static/images/pen.png differ diff --git a/97suifangqa/apps/indicator/static/images/pen_large.png b/97suifangqa/apps/indicator/static/images/pen_large.png index ec75b6b..779684c 100644 Binary files a/97suifangqa/apps/indicator/static/images/pen_large.png and b/97suifangqa/apps/indicator/static/images/pen_large.png differ diff --git a/97suifangqa/apps/indicator/static/images/search.png b/97suifangqa/apps/indicator/static/images/search.png index 303f228..29ea9b9 100644 Binary files a/97suifangqa/apps/indicator/static/images/search.png and b/97suifangqa/apps/indicator/static/images/search.png differ 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 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/sheet/AFP.jpg differ 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 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/sheet/PCR.jpg differ 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 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/sheet/PT.jpg differ 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 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/sheet/gene.jpg differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\344\270\244\345\257\271\345\215\212.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\344\270\244\345\257\271\345\215\212.jpg" new file mode 100644 index 0000000..1f2c2bc Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\344\270\244\345\257\271\345\215\212.jpg" differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\345\212\237\350\203\275.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\345\212\237\350\203\275.jpg" new file mode 100644 index 0000000..fa1144c Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\345\212\237\350\203\275.jpg" differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\347\251\277\345\210\272\350\241\250\346\240\274\345\275\242\345\274\217\344\272\2141.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\347\251\277\345\210\272\350\241\250\346\240\274\345\275\242\345\274\217\344\272\2141.jpg" new file mode 100644 index 0000000..3680408 Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\347\251\277\345\210\272\350\241\250\346\240\274\345\275\242\345\274\217\344\272\2141.jpg" differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\350\204\217\347\241\254\345\272\246.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\350\204\217\347\241\254\345\272\246.jpg" new file mode 100644 index 0000000..3b1c8ee Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\350\202\235\350\204\217\347\241\254\345\272\246.jpg" differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\350\241\200\347\273\206\350\203\236.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\350\241\200\347\273\206\350\203\236.jpg" new file mode 100644 index 0000000..a87265b Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\350\241\200\347\273\206\350\203\236.jpg" differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2741.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2741.jpg" new file mode 100644 index 0000000..de00072 Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2741.jpg" differ diff --git "a/97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2745.jpg" "b/97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2745.jpg" new file mode 100644 index 0000000..deaadc2 Binary files /dev/null and "b/97suifangqa/apps/indicator/static/images/sheet/\350\241\250\346\240\2745.jpg" differ -- cgit v1.2.2