Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Revert "Kevin/crit-path: profit table , open position, statement" #6438

Merged
virtualpowwa merged 1 commit into from
Mar 18, 2021
Merged

Revert "Kevin/crit-path: profit table , open position, statement" #6438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/javascript/app/base/clock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ const Clock = (() => {
}
};

const showLocalTimeOnHover = (selector, is_table) => {
const showLocalTimeOnHover = (selector) => {
document.querySelectorAll(selector || '.date').forEach((el) => {
const gmt_time_str = el.textContent.replace('\n', ' ');

const local_time = !is_table ? moment.utc(gmt_time_str, 'YYYY-MM-DD HH:mm:ss').local() : moment.utc(gmt_time_str, 'DD MMM YYYY HH:mm:ss').local() ;
const local_time = moment.utc(gmt_time_str, 'YYYY-MM-DD HH:mm:ss').local();
if (local_time.isValid()) {
el.setAttribute('data-balloon', local_time.format('YYYY-MM-DD HH:mm:ss Z'));
}
Expand Down
16 changes: 6 additions & 10 deletions src/javascript/app/pages/user/account/portfolio/portfolio.init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ const PortfolioInit = (() => {
};

const createPortfolioRow = (data, is_first) => {
const exclude_currency = true;
const new_class = is_first ? '' : 'new';
const $div = $('<div/>');
$div.append($('<tr/>', { class: `tr-first ${new_class} ${data.contract_id}`, id: data.contract_id })
.append($('<td/>', { class: 'contract', text: data.longcode }))
.append($('<td/>', { class: 'ref' }).append($(`<span ${GetAppDetails.showTooltip(data.app_id, oauth_apps[data.app_id])} data-balloon-position="right">${data.transaction_id}</span>`)))
.append($('<td/>', { class: 'currency', text: data.currency }))
.append($('<td/>', { class: 'purchase' }).append($('<strong/>', { html: formatMoney(data.currency, data.buy_price, exclude_currency) })))
.append($('<td/>', { class: 'payout' }).append($('<strong/>', { html: +data.payout ? formatMoney(data.currency, data.payout, exclude_currency) : '-' })))
.append($('<td/>', { class: 'payout' }).append($('<strong/>', { html: +data.payout ? formatMoney(data.currency, data.payout) : '-' })))
.append($('<td/>', { class: 'details', text: data.longcode }))
.append($('<td/>', { class: 'purchase' }).append($('<strong/>', { html: formatMoney(data.currency, data.buy_price) })))
.append($('<td/>', { class: 'indicative' }).append($('<strong/>', { class: 'indicative_price', text: '--.--' })))
.append($('<td/>', { class: 'button' }).append($('<button/>', { class: 'button open_contract_details nowrap', contract_id: data.contract_id, text: localize('View') }))))
.append($('<tr/>', { class: `tr-desc ${new_class} ${data.contract_id}` }).append($('<td/>', { colspan: '6', text: data.longcode })));
Expand Down Expand Up @@ -152,7 +150,6 @@ const PortfolioInit = (() => {
const old_indicative = values[proposal.contract_id].indicative || 0.00;
values[proposal.contract_id].indicative = proposal.bid_price;

const exclude_currency = true;
let status_class = '';
let no_resale_html = '';
if (+proposal.is_sold === 1) {
Expand All @@ -167,7 +164,7 @@ const PortfolioInit = (() => {
}
$td.removeClass('no_resale');
}
$td.html($('<strong/>', { class: `indicative_price ${status_class}`, html: formatMoney(proposal.currency, values[proposal.contract_id].indicative, exclude_currency) })
$td.html($('<strong/>', { class: `indicative_price ${status_class}`, html: formatMoney(proposal.currency, values[proposal.contract_id].indicative) })
.append(no_resale_html));
}

Expand Down Expand Up @@ -196,9 +193,8 @@ const PortfolioInit = (() => {
};

const updateFooter = () => {
const exclude_currency = true;
$('#cost-of-open-positions').html(formatMoney(currency, Portfolio.getSumPurchase(values), exclude_currency));
$('#value-of-open-positions').html(formatMoney(currency, Portfolio.getIndicativeSum(values), exclude_currency));
$('#cost-of-open-positions').html(formatMoney(currency, Portfolio.getSumPurchase(values)));
$('#value-of-open-positions').html(formatMoney(currency, Portfolio.getIndicativeSum(values)));
};

const errorMessage = (msg) => {
Expand Down
3 changes: 1 addition & 2 deletions src/javascript/app/pages/user/account/profit_table/profit_table.init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ const ProfitTableInit = (() => {

BinarySocket.send(req).then((response) => {
profitTableHandler(response);
const tableTimeTooltip = true;
showLocalTimeOnHover('td.buy-time,td.sell-time', tableTimeTooltip);
showLocalTimeOnHover('td.buy-date,td.sell-date');
$('.barspinner').setVisibility(0);
});
};
Expand Down
4 changes: 2 additions & 2 deletions src/javascript/app/pages/user/account/profit_table/profit_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const ProfitTable = (() => {
const sell_price = parseFloat(transaction.sell_price);

return {
buyDate : `${buy_moment.format('DD MMM YYYY')}\n${buy_moment.format('HH:mm:ss')} GMT`,
buyDate : `${buy_moment.format('YYYY-MM-DD')}\n${buy_moment.format('HH:mm:ss')} GMT`,
ref : transaction.transaction_id,
payout : +transaction.payout ? formatMoney(currency, parseFloat(transaction.payout), true) : '-',
buyPrice : formatMoney(currency, buy_price, true),
sellDate : `${sell_moment.format('DD MMM YYYY')}\n${sell_moment.format('HH:mm:ss')} GMT`,
sellDate : `${sell_moment.format('YYYY-MM-DD')}\n${sell_moment.format('HH:mm:ss')} GMT`,
sellPrice: formatMoney(currency, sell_price, true),
pl : formatMoney(currency, Number(sell_price - buy_price), true),
desc : transaction.longcode,
Expand Down
27 changes: 14 additions & 13 deletions src/javascript/app/pages/user/account/profit_table/profit_table.ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,25 @@ const ProfitTableUI = (() => {
let currency;

const profit_table_id = 'profit-table';
const cols = ['contract', 'ref', 'currency', 'buy-time', 'buy-price', 'sell-time', 'sell-price', 'pl', 'details'];
const cols = ['buy-date', 'ref', 'payout', 'contract', 'buy-price', 'sell-date', 'sell-price', 'pl', 'details'];

const createEmptyTable = () => {
const header = [
localize('Contract details'),
localize('Ref. ID'),
localize('Currency'),
localize('Buy time'),
localize('Buy price'),
localize('Sell time'),
localize('Sell price'),
localize('Date'),
localize('Ref.'),
localize('Potential Payout'),
localize('Contract'),
localize('Purchase Price'),
localize('Sale Date'),
localize('Sale Price'),
localize('Profit/Loss'),
localize('Details'),
];

currency = Client.get('currency');

header[7] += currency ? ` (${Currency.getCurrencyDisplayCode(currency)})` : '';

const footer = [localize('Total Profit/Loss'), '', '', '', '', '', '', '', ''];

const data = [];
Expand Down Expand Up @@ -67,10 +69,10 @@ const ProfitTableUI = (() => {
const pl_type = Number(transaction.sell_price - transaction.buy_price) >= 0 ? 'profit' : 'loss';

const data = [
'',
`<span ${showTooltip(profit_table_data.app_id, oauth_apps[profit_table_data.app_id])}>${profit_table_data.ref}</span>`,
currency,
profit_table_data.buyDate,
`<span ${showTooltip(profit_table_data.app_id, oauth_apps[profit_table_data.app_id])}>${profit_table_data.ref}</span>`,
/binaryico/i.test(profit_table_data.shortcode) ? '-' : profit_table_data.payout, // TODO: remove ico exception when all ico contracts are removed
'',
profit_table_data.buyPrice,
profit_table_data.sellDate,
profit_table_data.sellPrice,
Expand All @@ -81,8 +83,7 @@ const ProfitTableUI = (() => {

$row.children('.pl').addClass(pl_type);
$row.children('.contract').html(`${profit_table_data.desc}<br>`);
$row.children('.contract').css('width','200px');
$row.children('.buy-time, .sell-time').each(function () {
$row.children('.buy-date, .sell-date').each(function () {
$(this).wrapInner('<div class="new-width"></div>');
});

Expand Down
4 changes: 1 addition & 3 deletions src/javascript/app/pages/user/account/statement/statement.init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ const StatementInit = (() => {
// .on('click', () => { StatementUI.exportCSV(); });
}
}

const tableTimeTooltip = true;
showLocalTimeOnHover('td.transaction-time',tableTimeTooltip);
showLocalTimeOnHover('td.date');
};

const loadStatementChunkWhenScroll = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/javascript/app/pages/user/account/statement/statement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Statement = (() => {
const getStatementData = (statement, currency) => {
const date_obj = new Date(statement.transaction_time * 1000);
const moment_obj = moment.utc(date_obj);
const date_str = moment_obj.format('DD MMM YYYY');
const date_str = moment_obj.format('YYYY-MM-DD');
const time_str = `${moment_obj.format('HH:mm:ss')} GMT`;
const payout = parseFloat(statement.payout);
const amount = parseFloat(statement.amount);
Expand Down
33 changes: 17 additions & 16 deletions src/javascript/app/pages/user/account/statement/statement.ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,24 @@ const StatementUI = (() => {
let oauth_apps = {};

const table_id = 'statement-table';
const columns = ['contract','ref', 'currency', 'transaction-time', 'transaction', 'credit', 'bal', 'details'];
const columns = ['date', 'ref', 'payout', 'act', 'desc', 'credit', 'bal', 'details'];

const createEmptyStatementTable = () => {
const header = [
localize('Contract details'),
localize('Ref. ID'),
localize('Currency'),
localize('Transaction time'),
localize('Transaction'),
localize('Date'),
localize('Ref.'),
localize('Potential Payout'),
localize('Action'),
localize('Description'),
localize('Credit/Debit'),
localize('Balance'),
localize('Details'),
];

const currency = Client.get('currency');

header[6] += currency ? ` (${Currency.getCurrencyDisplayCode(currency)})` : '';

const metadata = {
id : table_id,
cols: columns,
Expand All @@ -47,32 +51,29 @@ const StatementUI = (() => {
}));
const credit_debit_type = (parseFloat(transaction.amount) >= 0) ? 'profit' : 'loss';

const currency = Client.get('currency');

const $statement_row = Table.createFlexTableRow([
'',
`<span ${showTooltip(statement_data.app_id, oauth_apps[statement_data.app_id])}>${statement_data.ref}</span>`,
currency,
statement_data.date,
`<span ${showTooltip(statement_data.app_id, oauth_apps[statement_data.app_id])}>${statement_data.ref}</span>`,
statement_data.payout,
statement_data.localized_action,
'',
statement_data.amount,
statement_data.balance,
'',
], columns, 'data');
$statement_row.children('.credit').addClass(credit_debit_type);
$statement_row.children('.transaction-time').addClass('pre');
$statement_row.children('.contract').html(`${statement_data.desc}<br>`);
$statement_row.children('.contract').css('width','200px');
$statement_row.children('.date').addClass('pre');
$statement_row.children('.desc').html(`<span>${statement_data.desc}</span>`);

// add processing time tooltip for withdrawal
if (transaction.action_type === 'withdrawal') {
$statement_row.children('.contract').find('span').attr('data-balloon', transaction.withdrawal_details);
$statement_row.children('.desc').find('span').attr('data-balloon', transaction.withdrawal_details);
}

// create view button and append
if (/^(buy|sell)$/i.test(statement_data.action_type)) {
const $view_button = $('<button/>', { class: 'button open_contract_details', text: localize('View'), contract_id: statement_data.id });
$statement_row.children('.contract,.details').append($view_button);
$statement_row.children('.desc,.details').append($view_button);
}

return $statement_row[0]; // return DOM instead of jquery object
Expand Down
4 changes: 0 additions & 4 deletions src/sass/_common/base/mixin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@
}

@mixin portfolio_second_row_description {
.contract {
display: none;
width: 0 !important;
}
.details {
display: table-column;
width: 0 !important;
Expand Down
7 changes: 2 additions & 5 deletions src/sass/_common/table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ table {
td {
overflow: initial;
}
td.desc, td.contract {
td.desc {
max-width: 30em;
overflow-wrap: break-word;
}
Expand All @@ -120,9 +120,6 @@ table {
padding: 8px 15px;
}
}
& > th.contract, & > td.contract {
display: none !important;
}
th, td {
font-size: $FONT_SIZE_XS;
}
Expand All @@ -139,7 +136,7 @@ table {
table-layout: auto;
}
#statement-table tr {
> th.desc, > td.desc, > th.contract > td.contract {
> th.desc, > td.desc {
display: none !important;
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/sass/app/portfolio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
}
}
th {
&.temp-column {
@media ( max-width: 600px ) {
display: none;
}
}
padding: 10px;
@include BIDIR_VALUE(text-align, left, right);

Expand Down
2 changes: 1 addition & 1 deletion src/templates/_common/_layout/header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const Header = () => (
],
},
{ text: it.L('Trade'), href: it.url_for('user/metatrader'), className: 'ico-only-hide client_logged_in invisible', dataShow: 'maltainvest' },
{ text: it.L('Open Positions'), href: it.url_for('user/portfoliows'), className: 'ico-only-hide client_logged_in invisible' },
{ text: it.L('Portfolio'), href: it.url_for('user/portfoliows'), className: 'ico-only-hide client_logged_in invisible' },
{ text: it.L('Profit Table'), href: it.url_for('user/profit_tablews'), className: 'ico-only-hide client_logged_in invisible wordwrap' },
{ text: it.L('Statement'), href: it.url_for('user/statementws'), className: 'client_logged_in invisible' },
{ text: it.L('Cashier'), href: it.url_for('cashier'), className: 'client_logged_in invisible', id: 'topMenuCashier' },
Expand Down
2 changes: 1 addition & 1 deletion src/templates/_common/_layout/mobile_menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const MobileMenu = () => (
]}
/>
<Li text={it.L('Trade')} href={it.url_for('user/metatrader')} className={'ico-only-hide client_logged_in invisible'} dataShow='maltainvest' />
<Li text={it.L('Open Positions')} href={it.url_for('user/portfoliows')} className='ico-only-hide client_logged_in invisible' />
<Li text={it.L('Portfolio')} href={it.url_for('user/portfoliows')} className='ico-only-hide client_logged_in invisible' />
<Li text={it.L('Profit Table')} href={it.url_for('user/profit_tablews')} className='ico-only-hide client_logged_in invisible' />
<Li text={it.L('Statement')} href={it.url_for('user/statementws')} className='client_logged_in invisible' />
<Li text={it.L('Cashier')} href={it.url_for('cashier')} className='client_logged_in invisible' id='topMenuCashier' />
Expand Down
20 changes: 9 additions & 11 deletions src/templates/app/user/portfolio.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Table } from '../../_common/components/elements.jsx';

const Portfolio = () => (
<div id='portfolio'>
<h1 className='portfolio-header-margin'>{it.L('Open Positions')}</h1>
<h1 className='portfolio-header-margin'>{it.L('Portfolio')}</h1>

<p className='notice-msg center-text invisible' id='error-msg' />

Expand Down Expand Up @@ -34,21 +34,19 @@ const Portfolio = () => (
data={{
thead: [
[
{ className: 'contract', text: it.L('Contract details') },
{ className: 'ref', text: it.L('Ref. ID') },
{ className: 'currency', text: it.L('Currency') },
{ className: 'purchase', text: it.L('Buy price') },
{ className: 'payout nowrap', text: it.L('Payout limit') },
{ className: 'indicative nowrap', text: it.L('Indicative price') },
{ className: 'button', text: it.L('Details') },
{ className: 'ref', text: it.L('Ref.') },
{ className: 'payout nowrap', text: it.L('Potential Payout') },
{ className: 'details', text: it.L('Contract Details') },
{ className: 'purchase', text: it.L('Purchase') },
{ className: 'indicative nowrap', text: it.L('Indicative') },
{ className: 'button', text: '' },
],
],
tfoot: [
[
{ text: it.L('Total') },
{ className: 'ref' },
{ className: 'temp-column' },
{ className: 'cost', id: 'cost-of-open-positions', attributes: { colSpan: 2 } },
{ className: 'ref', attributes: { colSpan: 2 } },
{ className: 'cost', id: 'cost-of-open-positions' },
{ className: 'value', id: 'value-of-open-positions', attributes: { colSpan: 2 } },
],
],
Expand Down