recurring tooltip added #1pbthq3

This commit is contained in:
Sevan Nerse 2021-11-11 12:02:47 +03:00
parent d624ad3f84
commit dfb77a8a29
3 changed files with 48 additions and 8 deletions

View File

@ -4,6 +4,15 @@
name="recurring_frequency" name="recurring_frequency"
:class="frequencyClasses" :class="frequencyClasses"
:error="frequencyError"> :error="frequencyError">
<template slot="label">
<label v-if="title" :class="labelClasses">
{{ title }}
<el-tooltip class="item" effect="dark" placement="top-start">
<div slot="content" v-html="tooltip"></div>
<i class="far fa-question-circle fa-xs" style="vertical-align: top;"></i>
</el-tooltip>
</label>
</template>
<el-select v-model="recurring_frequency" @input="change" filterable <el-select v-model="recurring_frequency" @input="change" filterable
:placeholder="placeholder"> :placeholder="placeholder">
<template slot="prefix"> <template slot="prefix">
@ -20,21 +29,19 @@
</el-select> </el-select>
</base-input> </base-input>
<base-input :label="''" <base-input :label="titleInterval"
name="recurring_interval" name="recurring_interval"
type="number" type="number"
:value="0" :value="0"
@input="change" @input="change"
class="recurring-single"
:class="invertalClasses" :class="invertalClasses"
:error="intervalError" :error="intervalError"
v-model="recurring_interval" v-model="recurring_interval"
> >
</base-input> </base-input>
<base-input :label="''" <base-input :label="titleFrequency"
name="recurring_custom_frequency" name="recurring_custom_frequency"
class="recurring-single"
:class="customFrequencyClasses" :class="customFrequencyClasses"
:error="customFrequencyError"> :error="customFrequencyError">
<el-select v-model="recurring_custom_frequency" @input="change" filterable <el-select v-model="recurring_custom_frequency" @input="change" filterable
@ -47,12 +54,11 @@
</el-select> </el-select>
</base-input> </base-input>
<base-input :label="''" <base-input :label="titleCount"
name="recurring_count" name="recurring_count"
type="number" type="number"
:value="0" :value="0"
@input="change" @input="change"
class="recurring-single"
:class="countClasses" :class="countClasses"
:error="countError" :error="countError"
v-model="recurring_count"> v-model="recurring_count">
@ -61,7 +67,7 @@
</template> </template>
<script> <script>
import { Select, Option } from 'element-ui' import { Select, Option, Tooltip } from 'element-ui'
export default { export default {
name: 'akaunting-recurring', name: 'akaunting-recurring',
@ -69,6 +75,7 @@ export default {
components: { components: {
[Select.name]: Select, [Select.name]: Select,
[Option.name]: Option, [Option.name]: Option,
[Tooltip.name]: Tooltip,
}, },
props: { props: {
@ -77,6 +84,26 @@ export default {
default: '', default: '',
description: "Modal header title" description: "Modal header title"
}, },
titleInterval: {
type: String,
default: '',
description: "Title of interval"
},
titleFrequency: {
type: String,
default: '',
description: "Title of frequency"
},
titleCount: {
type: String,
default: '',
description: "Title of count"
},
tooltip: {
type: String,
default: '',
description: "Tooltip message"
},
placeholder: { placeholder: {
type: String, type: String,
default: '', default: '',
@ -112,7 +139,12 @@ export default {
icon: { icon: {
type: String, type: String,
description: "Prepend icon (left)" description: "Prepend icon (left)"
} },
labelClasses: {
type: String,
description: "Input label css classes",
default: "form-control-label"
},
}, },
data() { data() {

View File

@ -3,6 +3,9 @@
return [ return [
'recurring' => 'Recurring', 'recurring' => 'Recurring',
'interval' => 'Interval',
'frequency' => 'Frequency',
'count' => 'Count',
'every' => 'Every', 'every' => 'Every',
'period' => 'Period', 'period' => 'Period',
'times' => 'Times', 'times' => 'Times',
@ -17,5 +20,6 @@ return [
'years' => 'Year(s)', 'years' => 'Year(s)',
'message' => 'This is a recurring :type and the next :type will be automatically generated on :date', 'message' => 'This is a recurring :type and the next :type will be automatically generated on :date',
'message_parent' => 'This :type was automatically generated from :link', 'message_parent' => 'This :type was automatically generated from :link',
'tooltip' => 'Besides the predefined periods, possible to adjust customized periods regarding the requirements. <br><b>Tip:</b> The count must be set to zero up to recur infinitely.',
]; ];

View File

@ -17,6 +17,10 @@
<akaunting-recurring <akaunting-recurring
:form-classes="[{'has-error': form.errors.get('recurring_frequency')}, '{{ $col }}']" :form-classes="[{'has-error': form.errors.get('recurring_frequency')}, '{{ $col }}']"
title="{{ trans('recurring.recurring') }}" title="{{ trans('recurring.recurring') }}"
title-interval="{{ trans('recurring.interval') }}"
title-frequency="{{ trans('recurring.frequency') }}"
title-count="{{ trans('recurring.count') }}"
tooltip="{{ trans('recurring.tooltip') }}"
placeholder="{{ trans('general.form.select.field', ['field' => trans('recurring.recurring')]) }}" placeholder="{{ trans('general.form.select.field', ['field' => trans('recurring.recurring')]) }}"
:frequency-options="{{ json_encode($recurring_frequencies) }}" :frequency-options="{{ json_encode($recurring_frequencies) }}"