From 7b741477c3b2b3e48a2ac18243f416de470adbee Mon Sep 17 00:00:00 2001 From: Hongyuan Ma Date: Wed, 16 May 2018 18:53:56 +0800 Subject: [PATCH] modify filter component --- .../src/component/result-filter/index.jsx | 229 ++++++++++-------- front-end/src/page/Status/index.jsx | 2 +- front-end/src/page/Status/index.scss | 28 --- web/db_tools/import_user_data.py | 2 +- 4 files changed, 124 insertions(+), 137 deletions(-) diff --git a/front-end/src/component/result-filter/index.jsx b/front-end/src/component/result-filter/index.jsx index d146885..e5e57c7 100644 --- a/front-end/src/component/result-filter/index.jsx +++ b/front-end/src/component/result-filter/index.jsx @@ -5,14 +5,30 @@ import './index.css'; class ResultFilter extends React.Component { constructor(props) { super(props); + + this.state = { + selected: { + 'date': 'all', + }, + isClear: false + }; } + handleClick() { console.log('clicked!!', this); var self = this; $(self).nextAll().eq(0).collapse("collapse"); } + applyButtonClick() { + //todo + } + + clearButtonClick() { + //todo + } + render() { return (
@@ -26,7 +42,7 @@ class ResultFilter extends React.Component {
-- -
-
-
+
+
Advanced Tables
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + -
-
-
-
diff --git a/front-end/src/page/Status/index.jsx b/front-end/src/page/Status/index.jsx index 5ad72fd..a60fe2a 100644 --- a/front-end/src/page/Status/index.jsx +++ b/front-end/src/page/Status/index.jsx @@ -11,7 +11,7 @@ class Status extends React.Component{ Shown here is the latest status of each farm member for each branch it has reported on in the last 30 days. Use the farm member link for history of that member on the relevant branch.

- {/**/} +
) } diff --git a/front-end/src/page/Status/index.scss b/front-end/src/page/Status/index.scss index e0e39cb..e69de29 100644 --- a/front-end/src/page/Status/index.scss +++ b/front-end/src/page/Status/index.scss @@ -1,28 +0,0 @@ -.color-box{ - display: block; - height: 160px; - text-align: center; - padding: 20px 0; - opacity: .9; - transition: all .3s; - &:hover{ - text-decoration: none; - color: #555; - opacity: 1; - transform: scale(1.08); - } - &:focus{ - text-decoration: none; - } - .count{ - font-size: 50px; - height: 80px; - line-height: 80px; - } - .desc{ - font-size: 18px; - .fa{ - margin-right: 5px; - } - } -} diff --git a/web/db_tools/import_user_data.py b/web/db_tools/import_user_data.py index 94e189b..db2934b 100644 --- a/web/db_tools/import_user_data.py +++ b/web/db_tools/import_user_data.py @@ -10,7 +10,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PerfFarm.settings") import django django.setup() -from users.models import UserProfile +from apps.users.models import UserProfile from db_tools.data.user_date import row_data from django.contrib.auth.hashers import make_password -- 2.39.5