diff --git a/public/js/admin_bundle.js b/public/js/admin_bundle.js
index 976098c..e6a0ba2 100644
--- a/public/js/admin_bundle.js
+++ b/public/js/admin_bundle.js
@@ -63,7 +63,7 @@
/******/ __webpack_require__.p = "";
/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 1133);
+/******/ return __webpack_require__(__webpack_require__.s = 1137);
/******/ })
/************************************************************************/
/******/ ([
@@ -2083,7 +2083,7 @@ function loadLocale(name) {
module && module.exports) {
try {
oldLocale = globalLocale._abbr;
- __webpack_require__(1109)("./" + name);
+ __webpack_require__(1113)("./" + name);
// because defineLocale currently also sets the global locale, we
// want to undo that for lazy loaded locales
getSetGlobalLocale(oldLocale);
@@ -4806,7 +4806,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "HeaderContent", function() { return __WEBPACK_IMPORTED_MODULE_45__elements_Header_HeaderContent__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__elements_Header_HeaderSubheader__ = __webpack_require__(394);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "HeaderSubheader", function() { return __WEBPACK_IMPORTED_MODULE_46__elements_Header_HeaderSubheader__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__elements_Icon__ = __webpack_require__(23);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Icon", function() { return __WEBPACK_IMPORTED_MODULE_47__elements_Icon__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__elements_Icon_IconGroup__ = __webpack_require__(395);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IconGroup", function() { return __WEBPACK_IMPORTED_MODULE_48__elements_Icon_IconGroup__["a"]; });
@@ -5833,16 +5833,6 @@ module.exports = map;
/***/ }),
/* 22 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Icon__ = __webpack_require__(140);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __WEBPACK_IMPORTED_MODULE_0__Icon__["a"]; });
-
-
-
-/***/ }),
-/* 23 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -6711,6 +6701,16 @@ var clear_dashboard = exports.clear_dashboard = function clear_dashboard() {
};
};
+/***/ }),
+/* 23 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Icon__ = __webpack_require__(140);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __WEBPACK_IMPORTED_MODULE_0__Icon__["a"]; });
+
+
+
/***/ }),
/* 24 */
/***/ (function(module, exports, __webpack_require__) {
@@ -13634,7 +13634,7 @@ module.exports = setInnerHTML;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(23);
@@ -14137,10 +14137,54 @@ if ("development" !== 'production' && typeof isCrushed.name === 'string' && isCr
"use strict";
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+/**
+ *
+ * @param {string} str source string
+ * @param {number} lng target length
+ * @param {number} arrow add padding to start/end -1 > start , 1 > end
+ * @param {string} txt padding string
+ * @return {string}
+ */
+var padding = exports.padding = function padding(str) {
+ var lng = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+ var arrow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
+ var txt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '0';
+
+ if (typeof str != 'string') str = str.toString();
+ if (typeof txt != 'string') txt = txt.toString();
+ if (!isFinite(lng) || lng <= 0) return str;
+ if (str.length < lng) return padding(arrow < 0 ? '' + txt + str : '' + str + txt, lng, arrow, txt);
+ return str;
+};
+
+/**
+ *
+ * @param {*} timestamp timestamp string or number
+ * @param {bool} showSec show second flag
+ * @return {string}
+ */
+var convertTime = exports.convertTime = function convertTime(timestamp) {
+ var showSec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+ timestamp = padding(timestamp, 13, 1, '0');
+ var d = new Date(parseInt(timestamp));
+ return d.getFullYear() + '-' + padding(d.getMonth() + 1, 2) + '-' + padding(d.getDate(), 2) + ' ' + padding(d.getHours(), 2) + ':' + padding(d.getMinutes(), 2) + (showSec ? ':' + padding(d.getSeconds(), 2) : '');
+};
+
+/***/ }),
+/* 148 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
exports.__esModule = true;
exports.createPath = exports.parsePath = exports.getQueryStringValueFromPath = exports.stripQueryStringValueFromPath = exports.addQueryStringValueToPath = undefined;
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
@@ -14238,7 +14282,7 @@ var createPath = exports.createPath = function createPath(location) {
};
/***/ }),
-/* 148 */
+/* 149 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -14330,7 +14374,7 @@ function createRoutes(routes) {
}
/***/ }),
-/* 149 */
+/* 150 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -14397,7 +14441,7 @@ module.exports = warning;
/***/ }),
-/* 150 */
+/* 151 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -14406,50 +14450,6 @@ module.exports = warning;
module.exports = __webpack_require__(746);
-/***/ }),
-/* 151 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-/**
- *
- * @param {string} str source string
- * @param {number} lng target length
- * @param {number} arrow add padding to start/end -1 > start , 1 > end
- * @param {string} txt padding string
- * @return {string}
- */
-var padding = exports.padding = function padding(str) {
- var lng = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
- var arrow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
- var txt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '0';
-
- if (typeof str != 'string') str = str.toString();
- if (typeof txt != 'string') txt = txt.toString();
- if (!isFinite(lng) || lng <= 0) return str;
- if (str.length < lng) return padding(arrow < 0 ? '' + txt + str : '' + str + txt, lng, arrow, txt);
- return str;
-};
-
-/**
- *
- * @param {*} timestamp timestamp string or number
- * @param {bool} showSec show second flag
- * @return {string}
- */
-var convertTime = exports.convertTime = function convertTime(timestamp) {
- var showSec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
- timestamp = padding(timestamp, 13, 1, '0');
- var d = new Date(parseInt(timestamp));
- return d.getFullYear() + '-' + padding(d.getMonth() + 1, 2) + '-' + padding(d.getDate(), 2) + ' ' + padding(d.getHours(), 2) + ':' + padding(d.getMinutes(), 2) + (showSec ? ':' + padding(d.getSeconds(), 2) : '');
-};
-
/***/ }),
/* 152 */
/***/ (function(module, exports, __webpack_require__) {
@@ -19084,7 +19084,7 @@ FeedExtra._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -19169,7 +19169,7 @@ FeedLabel._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -19797,11 +19797,11 @@ var _invariant = __webpack_require__(48);
var _invariant2 = _interopRequireDefault(_invariant);
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
var _Actions = __webpack_require__(452);
@@ -19887,7 +19887,7 @@ var locationsAreEqual = exports.locationsAreEqual = function locationsAreEqual(a
var assign = __webpack_require__(1016),
moment = __webpack_require__(5),
React = __webpack_require__(0),
- CalendarContainer = __webpack_require__(1111)
+ CalendarContainer = __webpack_require__(1115)
;
var TYPES = React.PropTypes;
@@ -20571,7 +20571,7 @@ function formatPattern(pattern, params) {
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_warning__ = __webpack_require__(149);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_warning__ = __webpack_require__(150);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_warning___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_warning__);
/* harmony export (immutable) */ __webpack_exports__["a"] = routerWarning;
/* unused harmony export _resetWarned */
@@ -20608,40 +20608,40 @@ function _resetWarned() {
"use strict";
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Router__ = __webpack_require__(1120);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Router__ = __webpack_require__(1124);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Router", function() { return __WEBPACK_IMPORTED_MODULE_0__Router__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Link__ = __webpack_require__(1017);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Link", function() { return __WEBPACK_IMPORTED_MODULE_1__Link__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__IndexLink__ = __webpack_require__(1116);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__IndexLink__ = __webpack_require__(1120);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IndexLink", function() { return __WEBPACK_IMPORTED_MODULE_2__IndexLink__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__withRouter__ = __webpack_require__(1131);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__withRouter__ = __webpack_require__(1135);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "withRouter", function() { return __WEBPACK_IMPORTED_MODULE_3__withRouter__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__IndexRedirect__ = __webpack_require__(1117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__IndexRedirect__ = __webpack_require__(1121);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IndexRedirect", function() { return __WEBPACK_IMPORTED_MODULE_4__IndexRedirect__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__IndexRoute__ = __webpack_require__(1118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__IndexRoute__ = __webpack_require__(1122);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IndexRoute", function() { return __WEBPACK_IMPORTED_MODULE_5__IndexRoute__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__Redirect__ = __webpack_require__(1019);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Redirect", function() { return __WEBPACK_IMPORTED_MODULE_6__Redirect__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__Route__ = __webpack_require__(1119);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__Route__ = __webpack_require__(1123);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Route", function() { return __WEBPACK_IMPORTED_MODULE_7__Route__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__RouteUtils__ = __webpack_require__(149);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "createRoutes", function() { return __WEBPACK_IMPORTED_MODULE_8__RouteUtils__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__RouterContext__ = __webpack_require__(815);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "RouterContext", function() { return __WEBPACK_IMPORTED_MODULE_9__RouterContext__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__PropTypes__ = __webpack_require__(814);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "locationShape", function() { return __WEBPACK_IMPORTED_MODULE_10__PropTypes__["a"]; });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "routerShape", function() { return __WEBPACK_IMPORTED_MODULE_10__PropTypes__["b"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__match__ = __webpack_require__(1129);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__match__ = __webpack_require__(1133);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "match", function() { return __WEBPACK_IMPORTED_MODULE_11__match__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__useRouterHistory__ = __webpack_require__(1024);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "useRouterHistory", function() { return __WEBPACK_IMPORTED_MODULE_12__useRouterHistory__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__PatternUtils__ = __webpack_require__(246);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "formatPattern", function() { return __WEBPACK_IMPORTED_MODULE_13__PatternUtils__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__applyRouterMiddleware__ = __webpack_require__(1122);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__applyRouterMiddleware__ = __webpack_require__(1126);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "applyRouterMiddleware", function() { return __WEBPACK_IMPORTED_MODULE_14__applyRouterMiddleware__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__browserHistory__ = __webpack_require__(1123);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__browserHistory__ = __webpack_require__(1127);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "browserHistory", function() { return __WEBPACK_IMPORTED_MODULE_15__browserHistory__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__hashHistory__ = __webpack_require__(1127);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__hashHistory__ = __webpack_require__(1131);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "hashHistory", function() { return __WEBPACK_IMPORTED_MODULE_16__hashHistory__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__createMemoryHistory__ = __webpack_require__(1021);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "createMemoryHistory", function() { return __WEBPACK_IMPORTED_MODULE_17__createMemoryHistory__["a"]; });
@@ -26928,7 +26928,7 @@ function warning(message) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -27889,7 +27889,7 @@ MenuHeader._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
@@ -30087,7 +30087,7 @@ SegmentGroup._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__StepContent__ = __webpack_require__(405);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__StepDescription__ = __webpack_require__(225);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__StepGroup__ = __webpack_require__(406);
@@ -30800,7 +30800,7 @@ DropdownDivider._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -30885,7 +30885,7 @@ DropdownHeader._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Flag__ = __webpack_require__(392);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__elements_Image__ = __webpack_require__(78);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__elements_Label__ = __webpack_require__(141);
@@ -34250,7 +34250,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
function setupBinding(root, factory) {
if (true) {
// AMD. Register as an anonymous module.
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(0),__webpack_require__(150)], __WEBPACK_AMD_DEFINE_RESULT__ = function(React, ReactDom) {
+ !(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(0),__webpack_require__(151)], __WEBPACK_AMD_DEFINE_RESULT__ = function(React, ReactDom) {
return factory(root, React, ReactDom);
}.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
@@ -34522,7 +34522,7 @@ var _Dialog = __webpack_require__(458);
var _Dialog2 = _interopRequireDefault(_Dialog);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -37101,7 +37101,7 @@ var _DOMUtils = __webpack_require__(453);
var _DOMStateStorage = __webpack_require__(905);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
var _ExecutionEnvironment = __webpack_require__(537);
@@ -37208,9 +37208,9 @@ var canUseDOM = exports.canUseDOM = !!(typeof window !== 'undefined' && window.d
exports.__esModule = true;
-var _AsyncUtils = __webpack_require__(1103);
+var _AsyncUtils = __webpack_require__(1107);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
var _runTransitionHook = __webpack_require__(539);
@@ -37390,7 +37390,7 @@ exports.default = createHistory;
exports.__esModule = true;
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
@@ -56500,9 +56500,9 @@ var locationShape = shape({
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_invariant___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_invariant__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_react__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__getRouteParams__ = __webpack_require__(1126);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__getRouteParams__ = __webpack_require__(1130);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ContextUtils__ = __webpack_require__(813);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(149);
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -59147,7 +59147,7 @@ Confirm.handledProps = ['cancelButton', 'confirmButton', 'content', 'header', 'o
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_lodash_invoke___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_lodash_invoke__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6_react__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react_dom__ = __webpack_require__(150);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react_dom__ = __webpack_require__(151);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react_dom___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react_dom__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
@@ -60730,7 +60730,7 @@ Menu.handledProps = ['activeIndex', 'as', 'attached', 'borderless', 'children',
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__MessageContent__ = __webpack_require__(381);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__MessageHeader__ = __webpack_require__(382);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__MessageList__ = __webpack_require__(383);
@@ -61401,7 +61401,7 @@ Flag.create = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__lib__["i" /* cr
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__elements_Image__ = __webpack_require__(78);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__HeaderSubheader__ = __webpack_require__(394);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__HeaderContent__ = __webpack_require__(393);
@@ -61586,7 +61586,7 @@ Header.Subheader = __WEBPACK_IMPORTED_MODULE_8__HeaderSubheader__["a" /* default
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12_classnames___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_12_classnames__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__lib__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__elements_Button__ = __webpack_require__(220);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__elements_Label__ = __webpack_require__(141);
/* unused harmony export htmlInputPropNames */
@@ -64134,7 +64134,7 @@ var objectDiff = function objectDiff(source, target) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_14_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__AccordionContent__ = __webpack_require__(409);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__AccordionTitle__ = __webpack_require__(410);
@@ -64842,7 +64842,7 @@ Dimmer.create = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_8__lib__["i" /*
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_27_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__elements_Label__ = __webpack_require__(141);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__DropdownDivider__ = __webpack_require__(413);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__DropdownItem__ = __webpack_require__(415);
@@ -66108,7 +66108,7 @@ Dropdown.handledProps = ['additionLabel', 'additionPosition', 'allowAdditions',
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(23);
@@ -66331,7 +66331,7 @@ Embed.handledProps = ['active', 'as', 'aspectRatio', 'autoplay', 'brandedUI', 'c
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__addons_Portal__ = __webpack_require__(138);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__ModalHeader__ = __webpack_require__(420);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__ModalContent__ = __webpack_require__(418);
@@ -68751,7 +68751,7 @@ function symbolObservablePonyfill(root) {
exports.__esModule = true;
exports.readState = exports.saveState = undefined;
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
@@ -68847,7 +68847,7 @@ var _runTransitionHook = __webpack_require__(539);
var _runTransitionHook2 = _interopRequireDefault(_runTransitionHook);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -68958,7 +68958,7 @@ exports.__esModule = true;
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var _queryString = __webpack_require__(1110);
+var _queryString = __webpack_require__(1114);
var _runTransitionHook = __webpack_require__(539);
@@ -68966,7 +68966,7 @@ var _runTransitionHook2 = _interopRequireDefault(_runTransitionHook);
var _LocationUtils = __webpack_require__(244);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -79635,7 +79635,7 @@ function isPromise(obj) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_invariant__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_invariant___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_invariant__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__RouteUtils__ = __webpack_require__(149);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__PatternUtils__ = __webpack_require__(246);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__InternalPropTypes__ = __webpack_require__(357);
@@ -79766,7 +79766,7 @@ function assignRouterState(router, _ref) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_useQueries___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_history_lib_useQueries__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_history_lib_useBasename__ = __webpack_require__(906);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_history_lib_useBasename___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_history_lib_useBasename__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory__ = __webpack_require__(1108);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory__ = __webpack_require__(1112);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_history_lib_createMemoryHistory__);
/* harmony export (immutable) */ __webpack_exports__["a"] = createMemoryHistory;
@@ -79807,11 +79807,11 @@ var canUseDOM = !!(typeof window !== 'undefined' && window.document && window.do
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__routerWarning__ = __webpack_require__(247);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__computeChangedRoutes__ = __webpack_require__(1124);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__TransitionUtils__ = __webpack_require__(1121);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__isActive__ = __webpack_require__(1128);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__getComponents__ = __webpack_require__(1125);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__matchRoutes__ = __webpack_require__(1130);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__computeChangedRoutes__ = __webpack_require__(1128);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__TransitionUtils__ = __webpack_require__(1125);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__isActive__ = __webpack_require__(1132);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__getComponents__ = __webpack_require__(1129);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__matchRoutes__ = __webpack_require__(1134);
/* harmony export (immutable) */ __webpack_exports__["a"] = createTransitionManager;
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -80103,67 +80103,67 @@ var _react2 = _interopRequireDefault(_react);
var _reactRouter = __webpack_require__(248);
-var _AdminPage = __webpack_require__(1100);
+var _AdminPage = __webpack_require__(1104);
var _AdminPage2 = _interopRequireDefault(_AdminPage);
-var _SystemInfo = __webpack_require__(1097);
+var _SystemInfo = __webpack_require__(1100);
var _SystemInfo2 = _interopRequireDefault(_SystemInfo);
-var _UserList = __webpack_require__(1098);
+var _UserList = __webpack_require__(1101);
var _UserList2 = _interopRequireDefault(_UserList);
-var _DIO = __webpack_require__(1087);
+var _DIO = __webpack_require__(1090);
var _DIO2 = _interopRequireDefault(_DIO);
-var _Log = __webpack_require__(1092);
+var _Log = __webpack_require__(1095);
var _Log2 = _interopRequireDefault(_Log);
-var _LeOne = __webpack_require__(1091);
+var _LeOne = __webpack_require__(1094);
var _LeOne2 = _interopRequireDefault(_LeOne);
-var _IOGroup = __webpack_require__(1089);
+var _IOGroup = __webpack_require__(1092);
var _IOGroup2 = _interopRequireDefault(_IOGroup);
-var _IOCmd = __webpack_require__(1088);
+var _IOCmd = __webpack_require__(1091);
var _IOCmd2 = _interopRequireDefault(_IOCmd);
-var _Schedule = __webpack_require__(1096);
+var _Schedule = __webpack_require__(1099);
var _Schedule2 = _interopRequireDefault(_Schedule);
-var _Modbus = __webpack_require__(1093);
+var _Modbus = __webpack_require__(1096);
var _Modbus2 = _interopRequireDefault(_Modbus);
-var _ModbusCmd = __webpack_require__(1094);
+var _ModbusCmd = __webpack_require__(1097);
var _ModbusCmd2 = _interopRequireDefault(_ModbusCmd);
-var _ModbusLog = __webpack_require__(1095);
+var _ModbusLog = __webpack_require__(1098);
var _ModbusLog2 = _interopRequireDefault(_ModbusLog);
-var _ActionLink = __webpack_require__(1085);
+var _ActionLink = __webpack_require__(1088);
var _ActionLink2 = _interopRequireDefault(_ActionLink);
-var _ActionLinkAdd = __webpack_require__(1086);
+var _ActionLinkAdd = __webpack_require__(1089);
var _ActionLinkAdd2 = _interopRequireDefault(_ActionLinkAdd);
-var _IPCam = __webpack_require__(1090);
+var _IPCam = __webpack_require__(1093);
var _IPCam2 = _interopRequireDefault(_IPCam);
-var _Wristband = __webpack_require__(1099);
+var _Wristband = __webpack_require__(1103);
var _Wristband2 = _interopRequireDefault(_Wristband);
@@ -80426,7 +80426,7 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _reactRouter = __webpack_require__(248);
@@ -81408,7 +81408,7 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _UnitItem = __webpack_require__(1032);
@@ -83654,7 +83654,7 @@ var _ScanForm = __webpack_require__(1048);
var _ScanForm2 = _interopRequireDefault(_ScanForm);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _SelectScan = __webpack_require__(1049);
@@ -83924,7 +83924,7 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _tools = __webpack_require__(151);
+var _tools = __webpack_require__(147);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -84708,7 +84708,7 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _tools = __webpack_require__(151);
+var _tools = __webpack_require__(147);
var _IOPanelListItem = __webpack_require__(1061);
@@ -85324,7 +85324,7 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -85562,7 +85562,7 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _tools = __webpack_require__(151);
+var _tools = __webpack_require__(147);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -85724,7 +85724,7 @@ var _DeviceList = __webpack_require__(1065);
var _DeviceList2 = _interopRequireDefault(_DeviceList);
-var _tools = __webpack_require__(151);
+var _tools = __webpack_require__(147);
var _reactDatetime = __webpack_require__(245);
@@ -86831,7 +86831,7 @@ var _react = __webpack_require__(0);
var _react2 = _interopRequireDefault(_react);
-__webpack_require__(23);
+__webpack_require__(22);
var _reactDatetime = __webpack_require__(245);
@@ -87081,7 +87081,7 @@ var _react = __webpack_require__(0);
var _react2 = _interopRequireDefault(_react);
-__webpack_require__(23);
+__webpack_require__(22);
var _reactDatetime = __webpack_require__(245);
@@ -87089,7 +87089,7 @@ var _reactDatetime2 = _interopRequireDefault(_reactDatetime);
var _semanticUiReact = __webpack_require__(8);
-var _tools = __webpack_require__(151);
+var _tools = __webpack_require__(147);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -87163,7 +87163,7 @@ var _react = __webpack_require__(0);
var _react2 = _interopRequireDefault(_react);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _reactDatetime = __webpack_require__(245);
@@ -87179,7 +87179,11 @@ var _TimeForm = __webpack_require__(1075);
var _TimeForm2 = _interopRequireDefault(_TimeForm);
-var _tools = __webpack_require__(151);
+var _TimezoneForm = __webpack_require__(1139);
+
+var _TimezoneForm2 = _interopRequireDefault(_TimezoneForm);
+
+var _tools = __webpack_require__(147);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -87226,6 +87230,10 @@ var SysInfo = function (_React$Component) {
var dstr = '' + m[2] + m[3] + (0, _tools.padding)(m[4], 2) + (0, _tools.padding)(m[5], 2) + m[1];
dispatch((0, _actions.set_system_time)(dstr));
+ }, _this.showDialog = function (msg) {
+ var dispatch = _this.props.dispatch;
+
+ dispatch((0, _actions.add_dialog_msg)(msg));
}, _temp), _possibleConstructorReturn(_this, _ret);
}
@@ -87256,6 +87264,12 @@ var SysInfo = function (_React$Component) {
_react2.default.createElement(_semanticUiReact.Header, { as: 'h2', content: i18n && 't' in i18n ? i18n.t('page.system_info.title.sysinfo') : '' }),
_react2.default.createElement(_NetForm2.default, { i18n: i18n, network: network, onSubmit: this.netSubmit })
),
+ _react2.default.createElement(
+ _semanticUiReact.Segment,
+ null,
+ _react2.default.createElement(_semanticUiReact.Header, { as: 'h2', content: 'Time Zone' }),
+ _react2.default.createElement(_TimezoneForm2.default, { i18n: i18n, showDialog: this.showDialog })
+ ),
_react2.default.createElement(
_semanticUiReact.Segment,
{ style: { marginBottom: '100px' } },
@@ -87445,7 +87459,7 @@ var _ListItem = __webpack_require__(1077);
var _ListItem2 = _interopRequireDefault(_ListItem);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _UserModal = __webpack_require__(1078);
@@ -87590,6 +87604,384 @@ exports.default = UList;
"use strict";
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+
+var _react = __webpack_require__(0);
+
+var _react2 = _interopRequireDefault(_react);
+
+var _semanticUiReact = __webpack_require__(8);
+
+var _tools = __webpack_require__(147);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var ListItem = function ListItem(_ref) {
+ var i18n = _ref.i18n,
+ data = _ref.data;
+
+
+ return _react2.default.createElement(
+ _semanticUiReact.Table.Row,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.mac
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.locname ? data.locname : data.last_locname
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.val3 ? parseInt(data.val3, 16) : ''
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.val4 ? parseInt(data.val4, 16) + '%' : ''
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.val2 ? '' + parseInt(data.val2, 16) : ''
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.val5 ? '' + parseInt(data.val5, 16) : ''
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.val6 ? '' + parseInt(data.val6, 16) : ''
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.val7 ? '' + parseInt(data.val7, 16) : ''
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Cell,
+ null,
+ data.timestamp ? (0, _tools.convertTime)(data.timestamp, true) : ''
+ )
+ );
+};
+
+exports.default = ListItem;
+
+/***/ }),
+/* 1081 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = __webpack_require__(0);
+
+var _react2 = _interopRequireDefault(_react);
+
+var _semanticUiReact = __webpack_require__(8);
+
+var _actions = __webpack_require__(22);
+
+var _ListItem = __webpack_require__(1080);
+
+var _ListItem2 = _interopRequireDefault(_ListItem);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var LocStatus = function (_React$Component) {
+ _inherits(LocStatus, _React$Component);
+
+ function LocStatus() {
+ var _ref;
+
+ var _temp, _this, _ret;
+
+ _classCallCheck(this, LocStatus);
+
+ for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+ args[_key] = arguments[_key];
+ }
+
+ return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = LocStatus.__proto__ || Object.getPrototypeOf(LocStatus)).call.apply(_ref, [this].concat(args))), _this), _this.state = {
+ autoRefresh: false,
+ list: []
+ }, _this.tick = null, _this.changeRefresh = function () {
+ _this.setState({
+ autoRefresh: !_this.state.autoRefresh
+ }, function () {
+ _this.checkRefresh();
+ });
+ }, _this.checkRefresh = function () {
+ if (_this.state.autoRefresh) {
+ _this.tick = setInterval(_this.runTick, 2000);
+ } else {
+ clearInterval(_this.tick);
+ }
+ }, _this.runTick = function () {
+ _this.getList();
+ }, _this.getList = function () {
+ var _this$props = _this.props,
+ toggleLoading = _this$props.toggleLoading,
+ showDialog = _this$props.showDialog;
+
+ fetch('/api/wristband/getstatus', (0, _actions.getRequest)()).then(function (response) {
+ return response.json();
+ }).then(function (json) {
+ if (json.status != 1) return showDialog(json.message);
+ _this.setState({
+ list: [].concat(_toConsumableArray(json.data.record || []))
+ });
+ });
+ }, _temp), _possibleConstructorReturn(_this, _ret);
+ }
+
+ _createClass(LocStatus, [{
+ key: 'componentDidMount',
+ value: function componentDidMount() {
+ this.getList();
+ }
+ }, {
+ key: 'componentWillUnmount',
+ value: function componentWillUnmount() {
+ clearInterval(this.tick);
+ }
+ }, {
+ key: 'render',
+ value: function render() {
+ var _this2 = this;
+
+ var i18n = this.props.i18n;
+
+ return _react2.default.createElement(
+ _semanticUiReact.Container,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Segment,
+ { className: 'clearfix' },
+ _react2.default.createElement(_semanticUiReact.Checkbox, { toggle: true, checked: this.state.autoRefresh, onChange: function onChange(e, d) {
+ _this2.changeRefresh();
+ }, label: '\u81EA\u52D5\u66F4\u65B0' }),
+ _react2.default.createElement(
+ _semanticUiReact.Table,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Table.Header,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Table.Row,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ '\u624B\u74B0ID'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ '\u5730\u9EDE'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ '\u6B65\u6578'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ '\u5269\u9918\u96FB\u91CF'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ 'HR'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ 'SBP'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ 'DBP'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ '\u5361\u8DEF\u91CC'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.HeaderCell,
+ null,
+ '\u6642\u9593'
+ )
+ )
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Table.Body,
+ null,
+ this.state.list.map(function (t, idx) {
+ return _react2.default.createElement(_ListItem2.default, { key: idx,
+ i18n: i18n,
+ data: t });
+ })
+ )
+ )
+ )
+ );
+ }
+ }]);
+
+ return LocStatus;
+}(_react2.default.Component);
+
+exports.default = LocStatus;
+
+/***/ }),
+/* 1082 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = __webpack_require__(0);
+
+var _react2 = _interopRequireDefault(_react);
+
+var _semanticUiReact = __webpack_require__(8);
+
+var _LocStatus = __webpack_require__(1102);
+
+var _LocStatus2 = _interopRequireDefault(_LocStatus);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var WristbandPage = function (_React$Component) {
+ _inherits(WristbandPage, _React$Component);
+
+ function WristbandPage() {
+ var _ref;
+
+ var _temp, _this, _ret;
+
+ _classCallCheck(this, WristbandPage);
+
+ for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+ args[_key] = arguments[_key];
+ }
+
+ return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = WristbandPage.__proto__ || Object.getPrototypeOf(WristbandPage)).call.apply(_ref, [this].concat(args))), _this), _this.state = {
+ page: ''
+ }, _this.changePage = function (page) {
+ _this.setState({
+ page: page
+ });
+ }, _this.getRenderPage = function () {
+ switch (_this.state.page) {
+ case 'locstatus':
+ return _react2.default.createElement(_LocStatus2.default, null);
+ default:
+ return null;
+ }
+ }, _temp), _possibleConstructorReturn(_this, _ret);
+ }
+
+ _createClass(WristbandPage, [{
+ key: 'render',
+ value: function render() {
+ var _this2 = this;
+
+ return _react2.default.createElement(
+ _semanticUiReact.Container,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Grid,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Grid.Column,
+ { width: 4 },
+ _react2.default.createElement(
+ _semanticUiReact.Menu,
+ { vertical: true },
+ _react2.default.createElement(
+ _semanticUiReact.Menu.Item,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Menu.Header,
+ null,
+ '\u4E3B\u9078\u55AE'
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Menu.Menu,
+ null,
+ _react2.default.createElement(
+ _semanticUiReact.Menu.Item,
+ { active: this.state.page == 'locstatus', onClick: function onClick() {
+ _this2.changePage('locstatus');
+ } },
+ '\u4F4D\u7F6E\u8CC7\u8A0A'
+ )
+ )
+ )
+ )
+ ),
+ _react2.default.createElement(
+ _semanticUiReact.Grid.Column,
+ { width: 12 },
+ this.getRenderPage()
+ )
+ )
+ );
+ }
+ }]);
+
+ return WristbandPage;
+}(_react2.default.Component);
+
+exports.default = WristbandPage;
+
+/***/ }),
+/* 1083 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
Object.defineProperty(exports, "__esModule", {
value: true
});
@@ -87634,7 +88026,7 @@ var AlertItem = function AlertItem(_ref) {
exports.default = AlertItem;
/***/ }),
-/* 1081 */
+/* 1084 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -87652,11 +88044,11 @@ var _react2 = _interopRequireDefault(_react);
var _semanticUiReact = __webpack_require__(8);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
-var _tools = __webpack_require__(151);
+var _tools = __webpack_require__(147);
-var _AlertItem = __webpack_require__(1080);
+var _AlertItem = __webpack_require__(1083);
var _AlertItem2 = _interopRequireDefault(_AlertItem);
@@ -87810,8 +88202,8 @@ var DashBoardUnit = function (_React$Component) {
exports.default = DashBoardUnit;
/***/ }),
-/* 1082 */,
-/* 1083 */
+/* 1085 */,
+/* 1086 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -87846,7 +88238,7 @@ var MItem = function MItem(_ref) {
exports.default = MItem;
/***/ }),
-/* 1084 */
+/* 1087 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -87864,7 +88256,7 @@ var _semanticUiReact = __webpack_require__(8);
var _reactRouter = __webpack_require__(248);
-var _Item = __webpack_require__(1083);
+var _Item = __webpack_require__(1086);
var _Item2 = _interopRequireDefault(_Item);
@@ -87975,7 +88367,7 @@ var MainMenu = function MainMenu(_ref) {
exports.default = MainMenu;
/***/ }),
-/* 1085 */
+/* 1088 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -87987,7 +88379,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _ActionLink = __webpack_require__(1029);
@@ -88033,7 +88425,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ActionLink2.default);
/***/ }),
-/* 1086 */
+/* 1089 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88045,7 +88437,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _ActionLinkAdd = __webpack_require__(1034);
@@ -88075,7 +88467,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ActionLinkAdd2.default);
/***/ }),
-/* 1087 */
+/* 1090 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88091,7 +88483,7 @@ var _DIO = __webpack_require__(1037);
var _DIO2 = _interopRequireDefault(_DIO);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -88128,7 +88520,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_DIO2.default);
/***/ }),
-/* 1088 */
+/* 1091 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88140,7 +88532,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _IOCmd = __webpack_require__(1039);
@@ -88186,7 +88578,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_IOCmd2.default);
/***/ }),
-/* 1089 */
+/* 1092 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88198,7 +88590,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _IOGroup = __webpack_require__(1043);
@@ -88259,7 +88651,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_IOGroup2.default);
/***/ }),
-/* 1090 */
+/* 1093 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88271,7 +88663,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _IPCam = __webpack_require__(1044);
@@ -88301,7 +88693,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_IPCam2.default);
/***/ }),
-/* 1091 */
+/* 1094 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88317,7 +88709,7 @@ var _LeOne = __webpack_require__(1051);
var _LeOne2 = _interopRequireDefault(_LeOne);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -88373,7 +88765,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_LeOne2.default);
/***/ }),
-/* 1092 */
+/* 1095 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88389,7 +88781,7 @@ var _Log = __webpack_require__(1053);
var _Log2 = _interopRequireDefault(_Log);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -88417,7 +88809,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Log2.default);
/***/ }),
-/* 1093 */
+/* 1096 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88429,7 +88821,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _Modbus = __webpack_require__(1063);
@@ -88494,7 +88886,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Modbus2.default);
/***/ }),
-/* 1094 */
+/* 1097 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88506,7 +88898,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _ModbusCmd = __webpack_require__(1064);
@@ -88536,7 +88928,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ModbusCmd2.default);
/***/ }),
-/* 1095 */
+/* 1098 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88548,7 +88940,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _ModbusLog = __webpack_require__(1069);
@@ -88589,7 +88981,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_ModbusLog2.default);
/***/ }),
-/* 1096 */
+/* 1099 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88601,7 +88993,7 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _Schedule = __webpack_require__(1073);
@@ -88666,7 +89058,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Schedule2.default);
/***/ }),
-/* 1097 */
+/* 1100 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88699,7 +89091,7 @@ var mapStateToProps = function mapStateToProps(state) {
exports.default = (0, _reactRedux.connect)(mapStateToProps)(_SystemInfo2.default);
/***/ }),
-/* 1098 */
+/* 1101 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88719,7 +89111,7 @@ var _UserList = __webpack_require__(1079);
var _UserList2 = _interopRequireDefault(_UserList);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -88756,7 +89148,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_UserList2.default);
/***/ }),
-/* 1099 */
+/* 1102 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88768,9 +89160,51 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
-var _Wristband = __webpack_require__(1135);
+var _LocStatus = __webpack_require__(1081);
+
+var _LocStatus2 = _interopRequireDefault(_LocStatus);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var mapStateToProps = function mapStateToProps(state) {
+ return {
+ i18n: state.i18n
+ };
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
+ return {
+ showDialog: function showDialog(msg) {
+ dispatch((0, _actions.add_dialog_msg)(msg));
+ },
+ toggleLoading: function toggleLoading() {
+ var flag = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+ dispatch((0, _actions.toggle_loading)(flag));
+ }
+ };
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_LocStatus2.default);
+
+/***/ }),
+/* 1103 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+
+var _reactRedux = __webpack_require__(25);
+
+var _actions = __webpack_require__(22);
+
+var _Wristband = __webpack_require__(1082);
var _Wristband2 = _interopRequireDefault(_Wristband);
@@ -88798,7 +89232,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_Wristband2.default);
/***/ }),
-/* 1100 */
+/* 1104 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88820,7 +89254,7 @@ var _reactDatetime = __webpack_require__(245);
var _reactDatetime2 = _interopRequireDefault(_reactDatetime);
-var _MenuControl = __webpack_require__(1102);
+var _MenuControl = __webpack_require__(1106);
var _MenuControl2 = _interopRequireDefault(_MenuControl);
@@ -88832,11 +89266,11 @@ var _DialogControl = __webpack_require__(460);
var _DialogControl2 = _interopRequireDefault(_DialogControl);
-var _DashBoard = __webpack_require__(1101);
+var _DashBoard = __webpack_require__(1105);
var _DashBoard2 = _interopRequireDefault(_DashBoard);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -88906,7 +89340,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(AdmPage);
/***/ }),
-/* 1101 */
+/* 1105 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88918,9 +89352,9 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
-var _DashBoard = __webpack_require__(1081);
+var _DashBoard = __webpack_require__(1084);
var _DashBoard2 = _interopRequireDefault(_DashBoard);
@@ -88951,7 +89385,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_DashBoard2.default);
/***/ }),
-/* 1102 */
+/* 1106 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88963,11 +89397,11 @@ Object.defineProperty(exports, "__esModule", {
var _reactRedux = __webpack_require__(25);
-var _MainMenu = __webpack_require__(1084);
+var _MainMenu = __webpack_require__(1087);
var _MainMenu2 = _interopRequireDefault(_MainMenu);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -89003,7 +89437,7 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_MainMenu2.default);
/***/ }),
-/* 1103 */
+/* 1107 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89065,7 +89499,7 @@ var loopAsync = exports.loopAsync = function loopAsync(turns, work, callback) {
};
/***/ }),
-/* 1104 */
+/* 1108 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89089,7 +89523,7 @@ Object.defineProperty(exports, 'go', {
}
});
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
@@ -89099,7 +89533,7 @@ var _DOMUtils = __webpack_require__(453);
var _DOMStateStorage = __webpack_require__(905);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -89207,7 +89641,7 @@ var replaceLocation = exports.replaceLocation = function replaceLocation(locatio
};
/***/ }),
-/* 1105 */
+/* 1109 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89233,7 +89667,7 @@ Object.defineProperty(exports, 'go', {
var _LocationUtils = __webpack_require__(244);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
var getCurrentLocation = exports.getCurrentLocation = function getCurrentLocation() {
return (0, _LocationUtils.createLocation)(window.location);
@@ -89250,7 +89684,7 @@ var replaceLocation = exports.replaceLocation = function replaceLocation(locatio
};
/***/ }),
-/* 1106 */
+/* 1110 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89270,7 +89704,7 @@ var _BrowserProtocol = __webpack_require__(536);
var BrowserProtocol = _interopRequireWildcard(_BrowserProtocol);
-var _RefreshProtocol = __webpack_require__(1105);
+var _RefreshProtocol = __webpack_require__(1109);
var RefreshProtocol = _interopRequireWildcard(_RefreshProtocol);
@@ -89349,7 +89783,7 @@ var createBrowserHistory = function createBrowserHistory() {
exports.default = createBrowserHistory;
/***/ }),
-/* 1107 */
+/* 1111 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89359,7 +89793,7 @@ exports.__esModule = true;
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
@@ -89371,7 +89805,7 @@ var _ExecutionEnvironment = __webpack_require__(537);
var _DOMUtils = __webpack_require__(453);
-var _HashProtocol = __webpack_require__(1104);
+var _HashProtocol = __webpack_require__(1108);
var HashProtocol = _interopRequireWildcard(_HashProtocol);
@@ -89502,7 +89936,7 @@ var createHashHistory = function createHashHistory() {
exports.default = createHashHistory;
/***/ }),
-/* 1108 */
+/* 1112 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89512,7 +89946,7 @@ exports.__esModule = true;
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-var _warning = __webpack_require__(149);
+var _warning = __webpack_require__(150);
var _warning2 = _interopRequireDefault(_warning);
@@ -89522,7 +89956,7 @@ var _invariant2 = _interopRequireDefault(_invariant);
var _LocationUtils = __webpack_require__(244);
-var _PathUtils = __webpack_require__(147);
+var _PathUtils = __webpack_require__(148);
var _createHistory = __webpack_require__(538);
@@ -89648,7 +90082,7 @@ var createMemoryHistory = function createMemoryHistory() {
exports.default = createMemoryHistory;
/***/ }),
-/* 1109 */
+/* 1113 */
/***/ (function(module, exports, __webpack_require__) {
var map = {
@@ -89883,16 +90317,16 @@ webpackContext.keys = function webpackContextKeys() {
};
webpackContext.resolve = webpackContextResolve;
module.exports = webpackContext;
-webpackContext.id = 1109;
+webpackContext.id = 1113;
/***/ }),
-/* 1110 */
+/* 1114 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var strictUriEncode = __webpack_require__(1132);
+var strictUriEncode = __webpack_require__(1136);
var objectAssign = __webpack_require__(16);
function encoderForArrayFormat(opts) {
@@ -90097,14 +90531,14 @@ exports.stringify = function (obj, opts) {
/***/ }),
-/* 1111 */
+/* 1115 */
/***/ (function(module, exports, __webpack_require__) {
var React = __webpack_require__(0),
- DaysView = __webpack_require__(1112),
- MonthsView = __webpack_require__(1113),
- YearsView = __webpack_require__(1115),
- TimeView = __webpack_require__(1114)
+ DaysView = __webpack_require__(1116),
+ MonthsView = __webpack_require__(1117),
+ YearsView = __webpack_require__(1119),
+ TimeView = __webpack_require__(1118)
;
var CalendarContainer = React.createClass({
@@ -90124,7 +90558,7 @@ module.exports = CalendarContainer;
/***/ }),
-/* 1112 */
+/* 1116 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90275,7 +90709,7 @@ module.exports = DateTimePickerDays;
/***/ }),
-/* 1113 */
+/* 1117 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90389,7 +90823,7 @@ module.exports = DateTimePickerMonths;
/***/ }),
-/* 1114 */
+/* 1118 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90624,7 +91058,7 @@ module.exports = DateTimePickerTime;
/***/ }),
-/* 1115 */
+/* 1119 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90736,7 +91170,7 @@ module.exports = DateTimePickerYears;
/***/ }),
-/* 1116 */
+/* 1120 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -90761,7 +91195,7 @@ var IndexLink = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony default export */ __webpack_exports__["a"] = IndexLink;
/***/ }),
-/* 1117 */
+/* 1121 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -90819,7 +91253,7 @@ var IndexRedirect = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony default export */ __webpack_exports__["a"] = IndexRedirect;
/***/ }),
-/* 1118 */
+/* 1122 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -90828,7 +91262,7 @@ var IndexRedirect = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__routerWarning__ = __webpack_require__(247);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_invariant__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_invariant___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_invariant__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__RouteUtils__ = __webpack_require__(149);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__InternalPropTypes__ = __webpack_require__(357);
@@ -90876,7 +91310,7 @@ var IndexRoute = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony default export */ __webpack_exports__["a"] = IndexRoute;
/***/ }),
-/* 1119 */
+/* 1123 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -90884,7 +91318,7 @@ var IndexRoute = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_invariant__ = __webpack_require__(48);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_invariant___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_invariant__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__RouteUtils__ = __webpack_require__(149);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__InternalPropTypes__ = __webpack_require__(357);
@@ -90932,7 +91366,7 @@ var Route = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony default export */ __webpack_exports__["a"] = Route;
/***/ }),
-/* 1120 */
+/* 1124 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -90943,7 +91377,7 @@ var Route = __WEBPACK_IMPORTED_MODULE_0_react___default.a.createClass({
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__createTransitionManager__ = __webpack_require__(1023);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__InternalPropTypes__ = __webpack_require__(357);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouterContext__ = __webpack_require__(815);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__RouteUtils__ = __webpack_require__(149);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__RouterUtils__ = __webpack_require__(1020);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__routerWarning__ = __webpack_require__(247);
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -91100,7 +91534,7 @@ var Router = __WEBPACK_IMPORTED_MODULE_1_react___default.a.createClass({
/* harmony default export */ __webpack_exports__["a"] = Router;
/***/ }),
-/* 1121 */
+/* 1125 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91258,7 +91692,7 @@ function runLeaveHooks(routes, prevState) {
}
/***/ }),
-/* 1122 */
+/* 1126 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91309,11 +91743,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
};
/***/ }),
-/* 1123 */
+/* 1127 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory__ = __webpack_require__(1106);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory__ = __webpack_require__(1110);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__createRouterHistory__ = __webpack_require__(1022);
@@ -91321,7 +91755,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
/* harmony default export */ __webpack_exports__["a"] = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__createRouterHistory__["a" /* default */])(__WEBPACK_IMPORTED_MODULE_0_history_lib_createBrowserHistory___default.a);
/***/ }),
-/* 1124 */
+/* 1128 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91400,7 +91834,7 @@ function computeChangedRoutes(prevState, nextState) {
/* harmony default export */ __webpack_exports__["a"] = computeChangedRoutes;
/***/ }),
-/* 1125 */
+/* 1129 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91442,7 +91876,7 @@ function getComponents(nextState, callback) {
/* harmony default export */ __webpack_exports__["a"] = getComponents;
/***/ }),
-/* 1126 */
+/* 1130 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91470,11 +91904,11 @@ function getRouteParams(route, params) {
/* harmony default export */ __webpack_exports__["a"] = getRouteParams;
/***/ }),
-/* 1127 */
+/* 1131 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory__ = __webpack_require__(1107);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory__ = __webpack_require__(1111);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__createRouterHistory__ = __webpack_require__(1022);
@@ -91482,7 +91916,7 @@ function getRouteParams(route, params) {
/* harmony default export */ __webpack_exports__["a"] = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__createRouterHistory__["a" /* default */])(__WEBPACK_IMPORTED_MODULE_0_history_lib_createHashHistory___default.a);
/***/ }),
-/* 1128 */
+/* 1132 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91635,7 +92069,7 @@ function isActive(_ref, indexOnly, currentLocation, routes, params) {
}
/***/ }),
-/* 1129 */
+/* 1133 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91645,7 +92079,7 @@ function isActive(_ref, indexOnly, currentLocation, routes, params) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_invariant___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_invariant__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__createMemoryHistory__ = __webpack_require__(1021);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__createTransitionManager__ = __webpack_require__(1023);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(149);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__RouterUtils__ = __webpack_require__(1020);
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -91704,7 +92138,7 @@ function match(_ref, callback) {
/* harmony default export */ __webpack_exports__["a"] = match;
/***/ }),
-/* 1130 */
+/* 1134 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -91712,7 +92146,7 @@ function match(_ref, callback) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__PromiseUtils__ = __webpack_require__(1018);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__PatternUtils__ = __webpack_require__(246);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__routerWarning__ = __webpack_require__(247);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(148);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__RouteUtils__ = __webpack_require__(149);
/* harmony export (immutable) */ __webpack_exports__["a"] = matchRoutes;
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -91964,7 +92398,7 @@ function matchRoutes(routes, location, callback, remainingPathname) {
}
/***/ }),
-/* 1131 */
+/* 1135 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -92036,7 +92470,7 @@ function withRouter(WrappedComponent, options) {
}
/***/ }),
-/* 1132 */
+/* 1136 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -92049,7 +92483,7 @@ module.exports = function (str) {
/***/ }),
-/* 1133 */
+/* 1137 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -92063,7 +92497,7 @@ var _react = __webpack_require__(0);
var _react2 = _interopRequireDefault(_react);
-var _reactDom = __webpack_require__(150);
+var _reactDom = __webpack_require__(151);
var _reactDom2 = _interopRequireDefault(_reactDom);
@@ -92085,7 +92519,7 @@ var _reduxThunk = __webpack_require__(451);
var _reduxThunk2 = _interopRequireDefault(_reduxThunk);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _i18next = __webpack_require__(456);
@@ -92164,8 +92598,8 @@ var PageRoot = function (_React$Component) {
_reactDom2.default.render(_react2.default.createElement(PageRoot, null), document.getElementById('app'));
/***/ }),
-/* 1134 */,
-/* 1135 */
+/* 1138 */,
+/* 1139 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -92181,11 +92615,9 @@ var _react = __webpack_require__(0);
var _react2 = _interopRequireDefault(_react);
-var _semanticUiReact = __webpack_require__(8);
+__webpack_require__(8);
-var _LocStatus = __webpack_require__(1137);
-
-var _LocStatus2 = _interopRequireDefault(_LocStatus);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -92195,394 +92627,61 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-var WristbandPage = function (_React$Component) {
- _inherits(WristbandPage, _React$Component);
+var TimezoneForm = function (_React$Component) {
+ _inherits(TimezoneForm, _React$Component);
- function WristbandPage() {
+ function TimezoneForm() {
var _ref;
var _temp, _this, _ret;
- _classCallCheck(this, WristbandPage);
+ _classCallCheck(this, TimezoneForm);
for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
args[_key] = arguments[_key];
}
- return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = WristbandPage.__proto__ || Object.getPrototypeOf(WristbandPage)).call.apply(_ref, [this].concat(args))), _this), _this.state = {
- page: ''
- }, _this.changePage = function (page) {
- _this.setState({
- page: page
- });
- }, _this.getRenderPage = function () {
- switch (_this.state.page) {
- case 'locstatus':
- return _react2.default.createElement(_LocStatus2.default, null);
- default:
- return null;
- }
- }, _temp), _possibleConstructorReturn(_this, _ret);
- }
-
- _createClass(WristbandPage, [{
- key: 'render',
- value: function render() {
- var _this2 = this;
-
- return _react2.default.createElement(
- _semanticUiReact.Container,
- null,
- _react2.default.createElement(
- _semanticUiReact.Grid,
- null,
- _react2.default.createElement(
- _semanticUiReact.Grid.Column,
- { width: 4 },
- _react2.default.createElement(
- _semanticUiReact.Menu,
- { vertical: true },
- _react2.default.createElement(
- _semanticUiReact.Menu.Item,
- null,
- _react2.default.createElement(
- _semanticUiReact.Menu.Header,
- null,
- '\u4E3B\u9078\u55AE'
- ),
- _react2.default.createElement(
- _semanticUiReact.Menu.Menu,
- null,
- _react2.default.createElement(
- _semanticUiReact.Menu.Item,
- { active: this.state.page == 'locstatus', onClick: function onClick() {
- _this2.changePage('locstatus');
- } },
- '\u4F4D\u7F6E\u8CC7\u8A0A'
- )
- )
- )
- )
- ),
- _react2.default.createElement(
- _semanticUiReact.Grid.Column,
- { width: 12 },
- this.getRenderPage()
- )
- )
- );
- }
- }]);
-
- return WristbandPage;
-}(_react2.default.Component);
-
-exports.default = WristbandPage;
-
-/***/ }),
-/* 1136 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _react = __webpack_require__(0);
-
-var _react2 = _interopRequireDefault(_react);
-
-var _semanticUiReact = __webpack_require__(8);
-
-var _actions = __webpack_require__(23);
-
-var _ListItem = __webpack_require__(1138);
-
-var _ListItem2 = _interopRequireDefault(_ListItem);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var LocStatus = function (_React$Component) {
- _inherits(LocStatus, _React$Component);
-
- function LocStatus() {
- var _ref;
-
- var _temp, _this, _ret;
-
- _classCallCheck(this, LocStatus);
-
- for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
- args[_key] = arguments[_key];
- }
-
- return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = LocStatus.__proto__ || Object.getPrototypeOf(LocStatus)).call.apply(_ref, [this].concat(args))), _this), _this.state = {
- autoRefresh: false,
- list: []
- }, _this.tick = null, _this.changeRefresh = function () {
- _this.setState({
- autoRefresh: !_this.state.autoRefresh
- }, function () {
- _this.checkRefresh();
- });
- }, _this.checkRefresh = function () {
- if (_this.state.autoRefresh) {
- _this.tick = setInterval(_this.runTick, 2000);
- } else {
- clearInterval(_this.tick);
- }
- }, _this.runTick = function () {
- _this.getList();
- }, _this.getList = function () {
- var _this$props = _this.props,
- toggleLoading = _this$props.toggleLoading,
- showDialog = _this$props.showDialog;
-
- fetch('/api/wristband/getstatus', (0, _actions.getRequest)()).then(function (response) {
+ return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = TimezoneForm.__proto__ || Object.getPrototypeOf(TimezoneForm)).call.apply(_ref, [this].concat(args))), _this), _this.state = {
+ zone: [],
+ zoneset: ''
+ }, _this.getZones = function () {
+ fetch('/api/system/gettimezonelist', (0, _actions.getRequest)()).then(function (response) {
return response.json();
}).then(function (json) {
- if (json.status != 1) return showDialog(json.message);
+ if (json.status != 1) return _this.props.showDialog(json.message);
_this.setState({
- list: [].concat(_toConsumableArray(json.data.record || []))
+ zone: json.data.record || []
+ });
+ });
+ }, _this.getZoneSet = function () {
+ fetch('/api/system/gettimezoneset', (0, _actions.getRequest)()).then(function (response) {
+ return response.json();
+ }).then(function (json) {
+ if (json.status != 1) return _this.props.showDialog(json.message);
+ _this.setState({
+ zoneset: json.data.record[0].value || ''
});
});
}, _temp), _possibleConstructorReturn(_this, _ret);
}
- _createClass(LocStatus, [{
+ _createClass(TimezoneForm, [{
key: 'componentDidMount',
value: function componentDidMount() {
- this.getList();
- }
- }, {
- key: 'componentWillUnmount',
- value: function componentWillUnmount() {
- clearInterval(this.tick);
+ this.getZones();
+ this.getZoneSet();
}
}, {
key: 'render',
value: function render() {
- var _this2 = this;
-
- var i18n = this.props.i18n;
-
- return _react2.default.createElement(
- _semanticUiReact.Container,
- null,
- _react2.default.createElement(
- _semanticUiReact.Segment,
- { className: 'clearfix' },
- _react2.default.createElement(_semanticUiReact.Checkbox, { toggle: true, checked: this.state.autoRefresh, onChange: function onChange(e, d) {
- _this2.changeRefresh();
- }, label: '\u81EA\u52D5\u66F4\u65B0' }),
- _react2.default.createElement(
- _semanticUiReact.Table,
- null,
- _react2.default.createElement(
- _semanticUiReact.Table.Header,
- null,
- _react2.default.createElement(
- _semanticUiReact.Table.Row,
- null,
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- '\u624B\u74B0ID'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- '\u5730\u9EDE'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- '\u6B65\u6578'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- '\u5269\u9918\u96FB\u91CF'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- 'HR'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- 'SBP'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- 'DBP'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- '\u5361\u8DEF\u91CC'
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.HeaderCell,
- null,
- '\u6642\u9593'
- )
- )
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Body,
- null,
- this.state.list.map(function (t, idx) {
- return _react2.default.createElement(_ListItem2.default, { key: idx,
- i18n: i18n,
- data: t });
- })
- )
- )
- )
- );
+ return null;
}
}]);
- return LocStatus;
+ return TimezoneForm;
}(_react2.default.Component);
-exports.default = LocStatus;
-
-/***/ }),
-/* 1137 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-
-var _reactRedux = __webpack_require__(25);
-
-var _actions = __webpack_require__(23);
-
-var _LocStatus = __webpack_require__(1136);
-
-var _LocStatus2 = _interopRequireDefault(_LocStatus);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var mapStateToProps = function mapStateToProps(state) {
- return {
- i18n: state.i18n
- };
-};
-
-var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
- return {
- showDialog: function showDialog(msg) {
- dispatch((0, _actions.add_dialog_msg)(msg));
- },
- toggleLoading: function toggleLoading() {
- var flag = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
- dispatch((0, _actions.toggle_loading)(flag));
- }
- };
-};
-
-exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_LocStatus2.default);
-
-/***/ }),
-/* 1138 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-
-var _react = __webpack_require__(0);
-
-var _react2 = _interopRequireDefault(_react);
-
-var _semanticUiReact = __webpack_require__(8);
-
-var _tools = __webpack_require__(151);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var ListItem = function ListItem(_ref) {
- var i18n = _ref.i18n,
- data = _ref.data;
-
-
- return _react2.default.createElement(
- _semanticUiReact.Table.Row,
- null,
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.mac
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.locname ? data.locname : data.last_locname
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.val3 ? parseInt(data.val3, 16) : ''
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.val4 ? parseInt(data.val4, 16) + '%' : ''
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.val2 ? '' + parseInt(data.val2, 16) : ''
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.val5 ? '' + parseInt(data.val5, 16) : ''
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.val6 ? '' + parseInt(data.val6, 16) : ''
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.val7 ? '' + parseInt(data.val7, 16) : ''
- ),
- _react2.default.createElement(
- _semanticUiReact.Table.Cell,
- null,
- data.timestamp ? (0, _tools.convertTime)(data.timestamp, true) : ''
- )
- );
-};
-
-exports.default = ListItem;
+exports.default = TimezoneForm;
/***/ })
/******/ ]);
\ No newline at end of file
diff --git a/public/js/index_bundle.js b/public/js/index_bundle.js
index 92d52aa..a77b4de 100644
--- a/public/js/index_bundle.js
+++ b/public/js/index_bundle.js
@@ -63,7 +63,7 @@
/******/ __webpack_require__.p = "";
/******/ // Load entry module and return exports
-/******/ return __webpack_require__(__webpack_require__.s = 1134);
+/******/ return __webpack_require__(__webpack_require__.s = 1138);
/******/ })
/************************************************************************/
/******/ ([
@@ -499,7 +499,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "HeaderContent", function() { return __WEBPACK_IMPORTED_MODULE_45__elements_Header_HeaderContent__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__elements_Header_HeaderSubheader__ = __webpack_require__(394);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "HeaderSubheader", function() { return __WEBPACK_IMPORTED_MODULE_46__elements_Header_HeaderSubheader__["a"]; });
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__elements_Icon__ = __webpack_require__(23);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Icon", function() { return __WEBPACK_IMPORTED_MODULE_47__elements_Icon__["a"]; });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__elements_Icon_IconGroup__ = __webpack_require__(395);
/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "IconGroup", function() { return __WEBPACK_IMPORTED_MODULE_48__elements_Icon_IconGroup__["a"]; });
@@ -1526,16 +1526,6 @@ module.exports = map;
/***/ }),
/* 22 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Icon__ = __webpack_require__(140);
-/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __WEBPACK_IMPORTED_MODULE_0__Icon__["a"]; });
-
-
-
-/***/ }),
-/* 23 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2404,6 +2394,16 @@ var clear_dashboard = exports.clear_dashboard = function clear_dashboard() {
};
};
+/***/ }),
+/* 23 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Icon__ = __webpack_require__(140);
+/* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __WEBPACK_IMPORTED_MODULE_0__Icon__["a"]; });
+
+
+
/***/ }),
/* 24 */
/***/ (function(module, exports, __webpack_require__) {
@@ -9327,7 +9327,7 @@ module.exports = setInnerHTML;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(23);
@@ -9827,7 +9827,8 @@ if ("development" !== 'production' && typeof isCrushed.name === 'string' && isCr
/* 147 */,
/* 148 */,
/* 149 */,
-/* 150 */
+/* 150 */,
+/* 151 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -9837,7 +9838,6 @@ module.exports = __webpack_require__(746);
/***/ }),
-/* 151 */,
/* 152 */
/***/ (function(module, exports, __webpack_require__) {
@@ -14471,7 +14471,7 @@ FeedExtra._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -14556,7 +14556,7 @@ FeedLabel._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -21367,7 +21367,7 @@ function warning(message) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -22328,7 +22328,7 @@ MenuHeader._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
@@ -24526,7 +24526,7 @@ SegmentGroup._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__StepContent__ = __webpack_require__(405);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__StepDescription__ = __webpack_require__(225);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__StepGroup__ = __webpack_require__(406);
@@ -25239,7 +25239,7 @@ DropdownDivider._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__elements_Icon__ = __webpack_require__(23);
@@ -25324,7 +25324,7 @@ DropdownHeader._meta = {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Flag__ = __webpack_require__(392);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__elements_Image__ = __webpack_require__(78);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__elements_Label__ = __webpack_require__(141);
@@ -28465,7 +28465,7 @@ var _Dialog = __webpack_require__(458);
var _Dialog2 = _interopRequireDefault(_Dialog);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -52392,7 +52392,7 @@ Confirm.handledProps = ['cancelButton', 'confirmButton', 'content', 'header', 'o
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_lodash_invoke___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_lodash_invoke__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6_react__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react_dom__ = __webpack_require__(150);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react_dom__ = __webpack_require__(151);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react_dom___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react_dom__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
@@ -53975,7 +53975,7 @@ Menu.handledProps = ['activeIndex', 'as', 'attached', 'borderless', 'children',
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__MessageContent__ = __webpack_require__(381);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__MessageHeader__ = __webpack_require__(382);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__MessageList__ = __webpack_require__(383);
@@ -54646,7 +54646,7 @@ Flag.create = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_3__lib__["i" /* cr
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__elements_Image__ = __webpack_require__(78);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__HeaderSubheader__ = __webpack_require__(394);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__HeaderContent__ = __webpack_require__(393);
@@ -54831,7 +54831,7 @@ Header.Subheader = __WEBPACK_IMPORTED_MODULE_8__HeaderSubheader__["a" /* default
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12_classnames___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_12_classnames__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__lib__ = __webpack_require__(2);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__elements_Button__ = __webpack_require__(220);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__elements_Label__ = __webpack_require__(141);
/* unused harmony export htmlInputPropNames */
@@ -57379,7 +57379,7 @@ var objectDiff = function objectDiff(source, target) {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_14_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__AccordionContent__ = __webpack_require__(409);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__AccordionTitle__ = __webpack_require__(410);
@@ -58087,7 +58087,7 @@ Dimmer.create = __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_8__lib__["i" /*
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_27_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__elements_Label__ = __webpack_require__(141);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__DropdownDivider__ = __webpack_require__(413);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__DropdownItem__ = __webpack_require__(415);
@@ -59353,7 +59353,7 @@ Dropdown.handledProps = ['additionLabel', 'additionPosition', 'allowAdditions',
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__elements_Icon__ = __webpack_require__(23);
@@ -59576,7 +59576,7 @@ Embed.handledProps = ['active', 'as', 'aspectRatio', 'autoplay', 'brandedUI', 'c
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_react___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_react__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__lib__ = __webpack_require__(2);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(22);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__elements_Icon__ = __webpack_require__(23);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__addons_Portal__ = __webpack_require__(138);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__ModalHeader__ = __webpack_require__(420);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__ModalContent__ = __webpack_require__(418);
@@ -62129,7 +62129,7 @@ var _i18next2 = _interopRequireDefault(_i18next);
var _semanticUiReact = __webpack_require__(8);
-var _Form = __webpack_require__(1082);
+var _Form = __webpack_require__(1085);
var _Form2 = _interopRequireDefault(_Form);
@@ -62137,7 +62137,7 @@ var _DialogControl = __webpack_require__(460);
var _DialogControl2 = _interopRequireDefault(_DialogControl);
-var _actions = __webpack_require__(23);
+var _actions = __webpack_require__(22);
var _reactRedux = __webpack_require__(25);
@@ -62318,7 +62318,10 @@ exports.default = (0, _reactRedux.connect)()(Root);
/* 1079 */,
/* 1080 */,
/* 1081 */,
-/* 1082 */
+/* 1082 */,
+/* 1083 */,
+/* 1084 */,
+/* 1085 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -62374,9 +62377,6 @@ var loginForm = function loginForm(_ref) {
exports.default = loginForm;
/***/ }),
-/* 1083 */,
-/* 1084 */,
-/* 1085 */,
/* 1086 */,
/* 1087 */,
/* 1088 */,
@@ -62425,7 +62425,11 @@ exports.default = loginForm;
/* 1131 */,
/* 1132 */,
/* 1133 */,
-/* 1134 */
+/* 1134 */,
+/* 1135 */,
+/* 1136 */,
+/* 1137 */,
+/* 1138 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -62435,7 +62439,7 @@ var _react = __webpack_require__(0);
var _react2 = _interopRequireDefault(_react);
-var _reactDom = __webpack_require__(150);
+var _reactDom = __webpack_require__(151);
var _reactDom2 = _interopRequireDefault(_reactDom);
diff --git a/route/api/modbus.js b/route/api/modbus.js
index 44d908a..53c49a5 100644
--- a/route/api/modbus.js
+++ b/route/api/modbus.js
@@ -423,7 +423,7 @@ router
if (row[0].count > 0) return n('ERR0054');
let q = "insert into ??.?? (`iouid`, `name`, `portnum`, `type`, `range_min`, `range_max`, `scale_min`, `scale_max`, `ctime`, `mtime`) values \
- (?, ?, ?, ?, ?, ?, ?, unix_timestamp(), unix_timestamp())";
+ (?, ?, ?, ?, ?, ?, ?, ?, unix_timestamp(), unix_timestamp())";
let p = [config.db.db5, 'aioset', arr.data.iouid, arr.data.name, arr.data.portnum, arr.data.type, arr.data.range_min, arr.data.range_max, arr.data.scale_min, arr.data.scale_max];
res.db.query(q, p, (err, row) => {
if (err) return n('ERR8001');
diff --git a/route/api/system.js b/route/api/system.js
index f56ab07..8b399e0 100644
--- a/route/api/system.js
+++ b/route/api/system.js
@@ -418,6 +418,39 @@ router
record: []
}
n();
+ })
+ .post('/gettimezonelist', (req,res,n) => {
+ exec('timedatectl list-timezones', (err, stdout, stderr) => {
+ if(err) return n("ERR8000");
+
+ let zones = stdout.split(/\n/);
+ let json = {
+ zone: []
+ };
+
+ for(let i in zones){
+ let str = zones[i].trim();
+ if(!str) continue;
+ let tz = str.split('/');
+ if(tz.length != 2) continue;
+ let flag = false;
+ for(let j in json.zone){
+ if(json.zone[j].name == tz[0]) {
+ flag = true;
+ json.zone[j].location.push(tz[1]);
+ }
+ }
+ if(!flag) json.zone.push({name: tz[0], location: [tz[1]]})
+ }
+
+ res.api_res = {
+ record: tool.checkArray(json.zone)
+ }
+ n();
+ })
+ })
+ .post('/gettimezoneset', (req,res,n) => {
+
})
.all('*', rt.send);
diff --git a/src/components/AdminPage/SystemInfo/index.js b/src/components/AdminPage/SystemInfo/index.js
index 0e43c02..f1eca15 100644
--- a/src/components/AdminPage/SystemInfo/index.js
+++ b/src/components/AdminPage/SystemInfo/index.js
@@ -4,6 +4,7 @@ import Datetime from 'react-datetime';
import {Container, Segment, Form, Header, Menu, Grid, Table, Input} from 'semantic-ui-react';
import NetForm from './NetForm';
import TimeForm from './TimeForm';
+import TimezoneForm from './TimezoneForm';
import {convertTime,padding} from '../../../tools';
class SysInfo extends React.Component {
@@ -37,6 +38,11 @@ class SysInfo extends React.Component {
dispatch(set_system_time(dstr));
}
+ showDialog = (msg) => {
+ let {dispatch} = this.props;
+ dispatch(add_dialog_msg(msg));
+ }
+
render() {
let {i18n, network, time} = this.props;
return (
@@ -45,6 +51,10 @@ class SysInfo extends React.Component {
+
+
+
+