Skip to content

T
toiletcoin
Commit 91c1620b by Chaiwith Santaweesuk
Options

update

parent 79f8a83b
Showing with 18 additions and 19 deletions
.firebase/hosting.YnVpbGQ.cache
asset-manifest.json,1584021115459,92d160e9cfd1fe147ea39b92123a7ecbb1e1bc34f1f57828b38148cd4ffeb8bd asset-manifest.json,1584364668633,ee35a980ed290acfbcb70890429f6d3f6cec219d28993be769589688c32be150
index.html,1584021115459,26f5390f705928b8b3dfcf2904431a1d75eb22aacc4f0f8e56d746681c5c20c9 index.html,1584364668633,b137f98e91edd894d5438704bf029cdf15c5a6816247b8c7cabf7647267fc588
precache-manifest.2fece0a698ac33382923cc26ea3e18f3.js,1584021115459,4f84a592fa87d05e1aee5f705dc879a986cb284378935c561d77f8cf9ed314e1
service-worker.js,1584021115459,65595514dd54194e727316b8eb5cf9e6dcc0b545061996c3c46cdf3306a89646
home.png,1581659498317,d3b21fd280b3304b29b980aab96dce3fb728c5a6c31f04c8dcf94480770e19ef
manifest.json,1581659498318,851311324495b7eadd44a9e70f013e60f6ac9965a5a155cb4734894fd0e7dd5f manifest.json,1581659498318,851311324495b7eadd44a9e70f013e60f6ac9965a5a155cb4734894fd0e7dd5f
static/css/2.38695c78.chunk.css,1584021115516,df7c74b70fea8b04fd0985d5d2a2a2e7d14eb9920dbd0f99d131abbaf3fd44ce precache-manifest.203e664641b15e172857f7324e09f547.js,1584364668633,1280b5c1657abba6ce9c0ea85173129668970583330282b6e0e6ac798419a4ce
static/css/2.38695c78.chunk.css.map,1584021115516,aee7adea8d3da5aba91a0208f66abdbbfcad0c53c36e3e69a24c51de68e4f62d home.png,1581659498317,d3b21fd280b3304b29b980aab96dce3fb728c5a6c31f04c8dcf94480770e19ef
static/js/runtime~main.a8a9905a.js,1584021115516,e1af5f94fdd13901b2e433d0d7607e27c01458151c35b1fe4b7feda2a32b7aa9 service-worker.js,1584364668633,fa6afd545ea5772fc5e7b3670bb66cc759fa0fe6afe01fd2bea991c37508f591
static/js/runtime~main.a8a9905a.js.map,1584021115516,c337bf8b58896da637a6e50ab8cfc779eb1ec42c55f8ec429030a03454a549db static/css/2.38695c78.chunk.css,1584364668697,df7c74b70fea8b04fd0985d5d2a2a2e7d14eb9920dbd0f99d131abbaf3fd44ce
static/js/main.bde3cddb.chunk.js,1584021115464,2b6275aeb1cbb956457cae1a9ee39b85df96fba96b50352870e54026ebdd847e static/css/2.38695c78.chunk.css.map,1584364668698,aee7adea8d3da5aba91a0208f66abdbbfcad0c53c36e3e69a24c51de68e4f62d
static/css/main.93c33a43.chunk.css,1584021115460,20bf61433c569ccd069908c4e498759cb46dfccb12d8bf1aba9ccb8e61bd8b86 static/js/runtime~main.a8a9905a.js,1584364668644,e1af5f94fdd13901b2e433d0d7607e27c01458151c35b1fe4b7feda2a32b7aa9
static/js/main.bde3cddb.chunk.js.map,1584021115516,a916b3571553588c1bbbfa345ecd3c312c7a5a5891a09ab144159d08e71b509a static/js/main.4df40e29.chunk.js,1584364668698,dec6cdeb0c079d62f8c61e93b4a826a8ab350239f3830ff2e586eac605f0d902
static/css/main.93c33a43.chunk.css.map,1584021115516,a48d1e6da1a0ce76bde9786f2a1e10b880e0c11d0a38b09e296cfe0c4ac41c87 static/js/runtime~main.a8a9905a.js.map,1584364668698,c337bf8b58896da637a6e50ab8cfc779eb1ec42c55f8ec429030a03454a549db
static/js/2.a00db17a.chunk.js,1584021115517,8fd3c3a6bfd7c93a5c61bdbd34e05b1ee97acebb97f05818a9246e567730bd37 static/css/main.93c33a43.chunk.css,1584364668635,20bf61433c569ccd069908c4e498759cb46dfccb12d8bf1aba9ccb8e61bd8b86
static/js/2.a00db17a.chunk.js.map,1584021115526,ba338a06f2175d8381a522b257a7afa1bc9ece3785a9b8680dad2823f1354f00 static/js/main.4df40e29.chunk.js.map,1584364668698,7636a8199fe4c0e4a553621ca178fb510b4a6b32540aaa03f5b804fb99e69440
static/css/main.93c33a43.chunk.css.map,1584364668698,a48d1e6da1a0ce76bde9786f2a1e10b880e0c11d0a38b09e296cfe0c4ac41c87
static/js/2.186a91dc.chunk.js,1584364668697,000d797529029197f835136af981e23d365d8765d9e6349a8c232d30d070e73f
static/js/2.186a91dc.chunk.js.map,1584364668704,6b57fb017c77e244464ce70b5ff3c1eb08354ce93ec43e08bc432220c2ebc135
src/Pages/Home.js
...@@ -287,7 +287,6 @@ class Home extends Component { ...@@ -287,7 +287,6 @@ class Home extends Component {
} }
else if (breakdown == "weeks") { else if (breakdown == "weeks") {
key = moment(parseInt(allValues[index][0])).startOf('week').hours(1).minutes(0); key = moment(parseInt(allValues[index][0])).startOf('week').hours(1).minutes(0);
} }
else if (breakdown == "months") { else if (breakdown == "months") {
key = moment(parseInt(allValues[index][0])).startOf('month').hours(1).minutes(0); key = moment(parseInt(allValues[index][0])).startOf('month').hours(1).minutes(0);
...@@ -324,7 +323,7 @@ class Home extends Component { ...@@ -324,7 +323,7 @@ class Home extends Component {
mapValues[timestamp] = [allValues[index][1]]; mapValues[timestamp] = [allValues[index][1]];
} }
else { else {
mapValues[timestamp] = [allValues[index][1]]; mapValues[timestamp] = [allValues[index][1], 0];
} }
} }
} }
......
src/redux/actions/feedDataAction.js
...@@ -29,7 +29,7 @@ export const getFeedData = () => async (dispatch, getState) => { ...@@ -29,7 +29,7 @@ export const getFeedData = () => async (dispatch, getState) => {
let metrics = []; let metrics = [];
devices.forEach(device => { devices.forEach(device => {
if (location == "eLNvYvm6YT8LTHrCA7Ne" || location == "fKtBvZyBArnTdlMRXOY0" || location == "yb1udKQSTGBFHKn1m5MQ" || location == "rJLbWBPZoJof30KCE07h" || location == "ZMfFDqiAJhXDqRVopTCT" || location == "hWHZMc1dbzjxDuNeIMYf" || location == "sfE95i3WDGy7W4k5pc9T" || location == "uX8Cq15AkjWgVXqWCbdf" || location == "yILqREcDQu85AD1wGyBP" || location == "1ppp1nJuBlNLOpl67dtZ") { if (location == "eLNvYvm6YT8LTHrCA7Ne" || location == "fKtBvZyBArnTdlMRXOY0" || location == "yb1udKQSTGBFHKn1m5MQ" || location == "rJLbWBPZoJof30KCE07h" || location == "ZMfFDqiAJhXDqRVopTCT" || location == "hWHZMc1dbzjxDuNeIMYf" || location == "sfE95i3WDGy7W4k5pc9T" || location == "uX8Cq15AkjWgVXqWCbdf" || location == "yILqREcDQu85AD1wGyBP" || location == "1ppp1nJuBlNLOpl67dtZ" || location == "9u2ATildmRThi3eA5zMz" || location == "MIenGAtMgckindwrPE6A" || location == "vP59HiIEhvDooBSV1klc") {
attrList = [ attrList = [
// { tag: "['Current Cash']", aggregator: 'last' }, // { tag: "['Current Cash']", aggregator: 'last' },
{ tag: "['Current Cash']", aggregator: 'max' }, { tag: "['Current Cash']", aggregator: 'max' },
...@@ -101,7 +101,7 @@ export const getFeedData = () => async (dispatch, getState) => { ...@@ -101,7 +101,7 @@ export const getFeedData = () => async (dispatch, getState) => {
let fingerPrintFeedList = []; let fingerPrintFeedList = [];
let keycardFeedList = []; let keycardFeedList = [];
response.data.queries.forEach(query => { response.data.queries.forEach(query => {
if (location == "eLNvYvm6YT8LTHrCA7Ne" || location == "fKtBvZyBArnTdlMRXOY0" || location == "yb1udKQSTGBFHKn1m5MQ" || location == "rJLbWBPZoJof30KCE07h" || location == "ZMfFDqiAJhXDqRVopTCT" || location == "hWHZMc1dbzjxDuNeIMYf" || location == "sfE95i3WDGy7W4k5pc9T" || location == "uX8Cq15AkjWgVXqWCbdf" || location == "yILqREcDQu85AD1wGyBP" || location == "1ppp1nJuBlNLOpl67dtZ") { if (location == "eLNvYvm6YT8LTHrCA7Ne" || location == "fKtBvZyBArnTdlMRXOY0" || location == "yb1udKQSTGBFHKn1m5MQ" || location == "rJLbWBPZoJof30KCE07h" || location == "ZMfFDqiAJhXDqRVopTCT" || location == "hWHZMc1dbzjxDuNeIMYf" || location == "sfE95i3WDGy7W4k5pc9T" || location == "uX8Cq15AkjWgVXqWCbdf" || location == "yILqREcDQu85AD1wGyBP" || location == "1ppp1nJuBlNLOpl67dtZ" || location == "9u2ATildmRThi3eA5zMz" || location == "MIenGAtMgckindwrPE6A" || location == "vP59HiIEhvDooBSV1klc") {
if (query.results[0].tags.attr == "['Current Cash']") { if (query.results[0].tags.attr == "['Current Cash']") {
currentFeedList.push({ deviceId: query.results[0].name, value: query.results[0].values }); currentFeedList.push({ deviceId: query.results[0].name, value: query.results[0].values });
let revenueFeed = { deviceId: query.results[0].name, value: [[query.results[0].values[0][0], 0]] } let revenueFeed = { deviceId: query.results[0].name, value: [[query.results[0].values[0][0], 0]] }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment