Add some boxes.

This commit is contained in:
James Cole
2021-06-19 09:09:08 +02:00
parent 4ba55e8546
commit 3e31752a8f
3 changed files with 44 additions and 30 deletions

View File

@@ -383,8 +383,7 @@ export default {
linkDirection = 'outward'; linkDirection = 'outward';
} }
// add meta data to promise context. // add meta data to promise context.
promises.push(new Promise((resolve) => { promises.push(Promise.resolve(
resolve(
{ {
link: link, link: link,
journalId: journalId, journalId: journalId,
@@ -392,8 +391,8 @@ export default {
index: index, index: index,
direction: linkDirection direction: linkDirection
} }
); ));
}));
// get stuff from the API: // get stuff from the API:
promises.push(axios.get('./api/v1/transaction-journals/' + opposingId)); promises.push(axios.get('./api/v1/transaction-journals/' + opposingId));
@@ -700,9 +699,7 @@ export default {
// console.log(submission); // console.log(submission);
if (!shouldSubmit) { if (!shouldSubmit) {
// console.log('No need to submit transaction.'); // console.log('No need to submit transaction.');
return new Promise((resolve) => { return Promise.resolve({});
resolve({});
});
} }
const url = './api/v1/transactions/' + this.groupId; const url = './api/v1/transactions/' + this.groupId;
return axios.put(url, submission); return axios.put(url, submission);
@@ -733,21 +730,13 @@ export default {
} }
} }
journals = journals.reverse(); journals = journals.reverse();
return new Promise((resolve) => { return Promise.resolve({journals:journals});
resolve(
{
journals: journals,
}
);
});
}, },
submitLinks: function (shouldSubmit) { submitLinks: function (shouldSubmit) {
//console.log('submitLinks()'); //console.log('submitLinks()');
if (!shouldSubmit) { if (!shouldSubmit) {
//console.log('no need!'); //console.log('no need!');
return new Promise((resolve) => { return Promise.resolve({});
resolve({});
});
} }
return this.deleteAllOriginalLinks().then(() => this.submitNewLinks()); return this.deleteAllOriginalLinks().then(() => this.submitNewLinks());
}, },
@@ -756,9 +745,7 @@ export default {
if (!shouldSubmit) { if (!shouldSubmit) {
// console.log('no need!'); // console.log('no need!');
this.submittedAttachments = 1; this.submittedAttachments = 1;
return new Promise((resolve) => { return Promise.resolve({});
resolve({});
});
} }
//console.log('Do upload thing!'); //console.log('Do upload thing!');
//console.log(response); //console.log(response);
@@ -1074,9 +1061,7 @@ export default {
promises.push(this.deleteOriginalLinks(originalTransaction)); promises.push(this.deleteOriginalLinks(originalTransaction));
} }
} else { } else {
promises.push(new Promise((resolve) => { promises.push(Promise.resolve({}));
resolve({});
}));
} }
} }
} }

View File

@@ -21,7 +21,23 @@
<template> <template>
<div> <div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col">
<div class="card">
<div class="card-body">
Treemap categories?
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-body">
Treemap accounts?
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-8 col-md-6 col-sm-12 col-xs-12">
<b-pagination <b-pagination
v-model="currentPage" v-model="currentPage"
:total-rows="total" :total-rows="total"
@@ -29,19 +45,22 @@
aria-controls="my-table" aria-controls="my-table"
></b-pagination> ></b-pagination>
</div> </div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
(refresh)
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-8 col-md-12 col-sm-12 col-xs-12">
<div class="card"> <div class="card">
<div class="card-body p-0"> <div class="card-body p-0">
<b-table id="my-table" striped hover responsive="md" primary-key="key" :no-local-sorting="false" <b-table id="my-table" striped hover responsive="md" primary-key="key" :no-local-sorting="false"
:items="transactionRows" :fields="fields" :items="transactionRows"
:fields="fields"
:per-page="perPage" :per-page="perPage"
sort-icon-left sort-icon-left
ref="table" ref="table"
:current-page="currentPage" :current-page="currentPage"
:busy.sync="loading" :busy.sync="loading"
:sort-by.sync="sortBy"
:sort-desc.sync="sortDesc" :sort-desc.sync="sortDesc"
:sort-compare="tableSortCompare" :sort-compare="tableSortCompare"
> >
@@ -100,12 +119,12 @@
</div> </div>
<div class="btn btn-light btn-sm" v-if="data.item.split && data.item.split_parent === null && data.item.collapsed === true" <div class="btn btn-light btn-sm" v-if="data.item.split && data.item.split_parent === null && data.item.collapsed === true"
v-on:click="toggleCollapse(data.item)"> v-on:click="toggleCollapse(data.item)">
<i class="fa fa-caret-down"></i> <span class="fa fa-caret-down"></span>
{{ $t('firefly.transaction_expand_split') }} {{ $t('firefly.transaction_expand_split') }}
</div> </div>
<div class="btn btn-light btn-sm" v-else-if="data.item.split && data.item.split_parent === null && data.item.collapsed === false" <div class="btn btn-light btn-sm" v-else-if="data.item.split && data.item.split_parent === null && data.item.collapsed === false"
v-on:click="toggleCollapse(data.item)"> v-on:click="toggleCollapse(data.item)">
<i class="fa fa-caret-up"></i> <span class="fa fa-caret-up"></span>
{{ $t('firefly.transaction_collapse_split') }} {{ $t('firefly.transaction_collapse_split') }}
</div> </div>
</template> </template>
@@ -121,9 +140,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-4">
<div class="card">
<div class="card-body">
Box previous period
</div>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-8 col-md-6 col-sm-12 col-xs-12">
<b-pagination <b-pagination
v-model="currentPage" v-model="currentPage"
:total-rows="total" :total-rows="total"
@@ -131,6 +157,9 @@
aria-controls="my-table" aria-controls="my-table"
></b-pagination> ></b-pagination>
</div> </div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
(refresh)
</div>
</div> </div>
</div> </div>
</template> </template>