rightSide LastTransaction style, click name

This commit is contained in:
ogerly 2022-12-14 15:42:31 +01:00
parent 01e2763829
commit 1eea07ac70
6 changed files with 33 additions and 32 deletions

View File

@ -190,8 +190,8 @@ export default {
return Number(this.isThisMonth ? this.maxGddThisMonth : this.maxGddLastMonth)
},
validMaxTime() {
console.log(this.validMaxGDD)
console.log(this.validMaxGDD / 20)
// console.log(this.validMaxGDD)
// console.log(this.validMaxGDD / 20)
return Number(this.validMaxGDD / 20)
},
},

View File

@ -51,14 +51,14 @@ export default {
this.$emit('input', this.currentValue)
},
value() {
console.log('value', this.value)
console.log('value !== currentValue', this.value !== this.currentValue)
// console.log('value', this.value)
// console.log('value !== currentValue', this.value !== this.currentValue)
// this.value = Number(this.value)
if (Number(this.value) !== this.currentValue) this.currentValue = this.value
this.currentValue = Number(this.currentValue)
// this.value = Number(this.value)
console.log('value', typeof(this.value))
console.log('currentValue', typeof(this.currentValue))
// console.log('value', typeof(this.value))
// console.log('currentValue', typeof(this.currentValue))
},
},
methods: {

View File

@ -24,7 +24,7 @@
class="mr-3"
></b-avatar>
<span class="mr-auto">
{{ transaction.linkedUser.firstName }} {{ transaction.linkedUser.lastName }}
<name :linkedUser="transaction.linkedUser" />
</span>
<b-badge>{{ transaction.amount | GDD }}</b-badge>
</div>
@ -34,8 +34,13 @@
</div>
</template>
<script>
import Name from '@/components/TransactionRows/Name.vue'
export default {
name: 'LastTransactions',
components: {
Name,
},
props: {
transactions: {
default: () => [],

View File

@ -5,7 +5,7 @@
<b-link @click.stop="tunnelEmail">
{{ itemText }}
</b-link>
<span v-if="transactionLinkId">
<!-- <span v-if="transactionLinkId">
{{ $t('via_link') }}
<b-icon
icon="link45deg"
@ -13,7 +13,7 @@
class="m-mb-1"
:title="$t('gdd_per_link.redeemed-title')"
/>
</span>
</span> -->
</div>
<span v-else>{{ itemText }}</span>
</div>
@ -23,10 +23,6 @@
export default {
name: 'Name',
props: {
amount: {
type: String,
required: true,
},
linkedUser: {
type: Object,
required: false,
@ -35,11 +31,11 @@ export default {
type: String,
required: false,
},
transactionLinkId: {
type: Number,
required: false,
default: null,
},
// transactionLinkId: {
// type: Number,
// required: false,
// default: null,
// },
},
methods: {
tunnelEmail() {

View File

@ -8,9 +8,9 @@
</div>
</b-col>
</b-row> -->
<b-row class="mt-3 mt-lg-5">
<b-row>
<b-col>
<div class="p-4 h-100">
<div>
<last-transactions
:transactions="transactions"
:transactionCount="transactionCount"
@ -45,9 +45,9 @@
</div>
</b-col>
</b-row> -->
<b-row class="mt-3 mt-lg-5">
<b-row>
<b-col>
<div class="p-4 h-100">
<div>
<last-transactions
:transactions="transactions"
:transactionCount="transactionCount"
@ -65,9 +65,9 @@
</div>
</b-col>
</b-row> -->
<b-row class="mt-3 mt-lg-5">
<b-row>
<b-col>
<div class="p-4 h-100">
<div>
<last-transactions
:transactions="transactions"
:transactionCount="transactionCount"
@ -85,9 +85,9 @@
</div>
</b-col>
</b-row> -->
<b-row class="mt-3 mt-lg-5">
<b-row>
<b-col>
<div class="p-4 h-100">
<div>
<last-transactions
:transactions="transactions"
:transactionCount="transactionCount"

View File

@ -56,12 +56,12 @@ export const loadAllRules = (i18nCallback) => {
extend('gddCreationTime', {
validate(value, { min, max }) {
console.log(value)
console.log(min)
console.log(max)
console.log(typeof(value))
console.log(typeof(min))
console.log(typeof(max))
// console.log(value)
// console.log(min)
// console.log(max)
// console.log(typeof(value))
// console.log(typeof(min))
// console.log(typeof(max))
// value = value.replace(',', '.')
return Number(value) >= min && Number(value) <= max
},