From 2da8cb8ce885f743af32a1cd003a15638745313f Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Fri, 2 Oct 2020 17:18:33 +0530 Subject: [PATCH] 0.0.50 --- index.html | 73 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index 4b65884..fc537cb 100644 --- a/index.html +++ b/index.html @@ -853,6 +853,7 @@

Activity

Sent + Received Deposits Withdrawals Paid through cashier @@ -863,6 +864,10 @@

You haven't sent any rupee yet.

+ +
+

You haven't sent any rupee yet.

+

You haven't deposited rupee yet.

@@ -1086,6 +1091,17 @@ className = 'withdrawn' transaction = 'Sent to' break; + case 'received': + icon = ` + + + + ` + sign = '+' + className = 'deposited' + transaction = 'Recieved from' + break; case 'deposit': icon = ` @@ -2013,6 +2029,15 @@ ` transaction = 'Sent to' break; + case 'received': + icon = ` + + + + ` + transaction = 'Received from' + break; case 'deposit': icon = ` @@ -11930,6 +11955,10 @@ transferTokensManually(); pay_through_cashier(); + + getSentRupeeList() + + getReceivedRupeeList() } this.retrieveLatestContent(); }, @@ -12821,6 +12850,7 @@ } const sentActivityContainer = document.getElementById('sent_activity_container'), + receivedActivityContainer = document.getElementById('received_activity_container'), depositActivityContainer = document.getElementById('deposit_activity_container'), withdrawActivityContainer = document.getElementById('withdraw_activity_container'), payCashierActivityContainer = document.getElementById('pay_cashier_activity_container'), @@ -13191,22 +13221,41 @@ } } - async function get_sent_rupee_list() { + async function getSentRupeeList() { try { - let senderIDs = [myFloID]; - floGlobals.appObjects[token_app.master_configurations.TYPE_SENT_TOKENS][flo_txid] = { - token_sender, token_receiver, token_amount, token_name_radio, - flo_txid, "datetime": + new Date() - }; - await floCloudAPI.requestObjectData(token_app.master_configurations.TYPE_SENT_TOKENS, - options = { myFloID, senderIDs }); + let data = await ajaxGet(`https://ranchimallflo.duckdns.org/api/v1.0/getTokenTransactions?token=rupee&senderFloAddress=${myFloID}`) + let transactions = data.transactions + let sortedTransactions = Object.values(transactions).sort((a,b) => b.transactionDetails.time - a.transactionDetails.time) + for(transaction of sortedTransactions){ + let {tokenAmount, flodata} = transaction.parsedFloData, + receiver = flodata.match(/\b\w{34,34}\b/), + timeStamp = transaction.transactionDetails.time * 1000 - const sent_tokens_list = Object.keys(floGlobals.appObjects - [token_app.master_configurations.TYPE_SENT_TOKENS]); + if(receiver === '' || typeof receiver === undefined || receiver === null) continue; + frag.append(render.activityCard({type: 'sent', amount: tokenAmount, receiver, timeStamp})) + } + sentActivityContainer.innerHTML = '' + sentActivityContainer.append(frag) + } catch (error) { + throw new Error(error); + } + } - console.log(sent_tokens_list); - // #todo: while displying validate senderIDs===myFloID + async function getReceivedRupeeList() { + try { + let data = await ajaxGet(`https://ranchimallflo.duckdns.org/api/v1.0/getTokenTransactions?token=rupee&destFloAddress=${myFloID}`) + let transactions = data.transactions + let sortedTransactions = Object.values(transactions).sort((a,b) => b.transactionDetails.time - a.transactionDetails.time) + for(transaction of sortedTransactions){ + let {tokenAmount, flodata} = transaction.parsedFloData, + receiver = flodata.match(/\b\w{34,34}\b/), + timeStamp = transaction.transactionDetails.time * 1000 + if(receiver === '' || typeof receiver === undefined || receiver === null) continue; + frag.append(render.activityCard({type: 'received', amount: tokenAmount, receiver, timeStamp})) + } + receivedActivityContainer.innerHTML = '' + receivedActivityContainer.append(frag) } catch (error) { throw new Error(error); }