Skip to content

Commit fa68aa1

Browse files
committed
resolves RED-95
1 parent af7d0e1 commit fa68aa1

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

web-app-vue/src/pages/configuracao/card-configuracoes.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
color="green"
99
variant="outlined"
1010
@click="(e) => (wantImport = true)"
11-
>Importar
11+
>Importar
1212
</v-btn>
1313
<v-form
1414
v-if="wantImport"
@@ -19,7 +19,7 @@
1919
<p class="item">Veja o <a href="dados.csv">arquivo de exemplo</a></p>
2020
<v-file-input
2121
v-model="csvFile"
22-
:rules="[requiredRule('Arquivo obrigatório'), lengthRule(1)]"
22+
:rules="[requiredRule('Arquivo obrigatório'), lengthRule(1,'Ao menos um arquivo deve ser selecionado')]"
2323
accept="text/plain, text/csv"
2424
class="item"
2525
label="Selecionar CSV"
@@ -51,7 +51,7 @@
5151
color="blue"
5252
variant="outlined"
5353
@click="wantExport = true"
54-
>Exportar
54+
>Exportar
5555
</v-btn>
5656
<v-form
5757
v-if="wantExport"
@@ -91,7 +91,7 @@
9191
</div>
9292
</v-form>
9393
<v-btn v-if="csvDownload" class="item" color="blue" variant="outlined" :href="csvDownload"
94-
>Baixar arquivo
94+
>Baixar arquivo
9595
</v-btn>
9696
<v-btn class="item" color="white" variant="outlined" @click="linkPerfil()">Editar perfil</v-btn>
9797
<v-btn class="item" color="orange" variant="outlined" @click="logout()">Desconectar</v-btn>
@@ -101,7 +101,7 @@
101101
color="red"
102102
variant="outlined"
103103
@click="wantDelete = true"
104-
>Excluir conta
104+
>Excluir conta
105105
</v-btn>
106106
<v-form
107107
v-if="wantDelete"
@@ -219,7 +219,7 @@ const closeExport = () => {
219219
}
220220
221221
const linkPerfil = async () => {
222-
alert("um email com o link de solicitação de alteração de dados foi enviado!")
222+
alert('um email com o link de solicitação de alteração de dados foi enviado!')
223223
// XXX remover depois que tiver o serviço de email configurado
224224
await router.push('/user-details/1234')
225225
}

web-app-vue/src/pages/conta/detalhe-conta.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@
2626
></v-text-field>
2727
<v-text-field
2828
v-if="contaEdit.tipo_conta_id == 3"
29-
:rules="[dayOfMonthRule]"
29+
:rules="[dayOfMonthRule('Dia inválido')]"
3030
v-model="contaEdit.dia_fechamento"
3131
label="Fechamento"
3232
prepend-inner-icon="mdi-calendar-check"
3333
></v-text-field>
3434
<v-text-field
3535
v-if="contaEdit.tipo_conta_id == 3"
36-
:rules="[dayOfMonthRule]"
36+
:rules="[dayOfMonthRule('Dia inválido')]"
3737
v-model="contaEdit.dia_vencimento"
3838
label="Vencimento"
3939
prepend-inner-icon="mdi-calendar-alert"
4040
></v-text-field>
4141
<v-text-field
4242
v-if="contaEdit.tipo_conta_id == 3 || contaEdit.tipo_conta_id == 2"
43-
:rules="[numberRule]"
43+
:rules="[numberRule('Inorme um valor numérico')]"
4444
type="number"
4545
v-model="contaEdit.limite"
4646
:label="contaEdit.tipo_conta_id == 2 ? 'Cheque especial' : 'Limite'"

web-app-vue/src/pages/movimentacao/editar-movimentacao.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!-- valor -->
2020
<v-text-field
2121
class="item"
22-
:rules="[requiredRule('Valor obrigatório'), numberRule]"
22+
:rules="[requiredRule('Valor obrigatório'), numberRule('Informe um valor numérico')]"
2323
type="number"
2424
v-model="movForm.valor"
2525
label="Valor"

web-app-vue/src/pages/pagamento/transferencia-form.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/>
2424
<v-text-field
2525
class="item"
26-
:rules="[requiredRule('Valor obrigatório'), numberRule]"
26+
:rules="[requiredRule('Valor obrigatório'), numberRule('Informe um valor numérico')]"
2727
type="number"
2828
v-model="formTransferencia.valor"
2929
label="Valor"

web-app-vue/src/pages/planejamento/detalhe-planejamento.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<v-row align="center">
4343
<v-text-field
4444
class="item"
45-
:rules="[requiredRule('Valor obrigatório'), numberRule]"
45+
:rules="[requiredRule('Valor obrigatório'), numberRule('Informe um valor numérico')]"
4646
type="number"
4747
v-model="plan.limite"
4848
label="Valor"

web-app-vue/src/pages/usuario/card-login.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
type="email"
1717
></v-text-field>
1818
<v-text-field
19-
:rules="[requiredRule('Senha obrigatória'), minSizeRule(6)]"
19+
:rules="[requiredRule('Senha obrigatória'), minSizeRule(6, 'Senha deve conter no mínimo 6 caracteres')]"
2020
v-model="senha"
2121
label="Senha"
2222
required

web-app-vue/src/pages/usuario/user-details.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
type="email"
1616
></v-text-field>
1717
<v-text-field
18-
:rules="[requiredRule('Senha obrigatória'), minSizeRule(6)]"
18+
:rules="[requiredRule('Senha obrigatória'), minSizeRule(6, 'Senha deve ter no mínimo 6 caracteres')]"
1919
v-model="userUpdate.senha"
2020
label="Senha"
2121
required

web-app-vue/src/services/basic-rules.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ export const requiredRule = (message = 'Required field') => (value) => {
22
return !!value || message
33
}
44

5-
export const lengthRule = (n, msg = `Minimum ${n} required`) => (value) => {
6-
return value.length >= n || msg
5+
export const lengthRule = (n, message = `Minimum ${n} required`) => (value) => {
6+
return value.length >= n || message
77
}
88

99
const dayOfMonth = [
1010
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
1111
28, 29, 30, 31
1212
]
1313

14-
export const dayOfMonthRule = (value) => {
15-
return dayOfMonth.includes(parseInt(value)) || 'Must provide a valid day'
14+
export const dayOfMonthRule = (message = 'Must provide a valid day') => (value) => {
15+
return dayOfMonth.includes(parseInt(value)) || message
1616
}
1717

18-
export const numberRule = (value) => {
19-
return !isNaN(value) || "Provide a valid number"
18+
export const numberRule = (message = 'Provide a valid number') => (value) => {
19+
return !isNaN(value) || message
2020
}
2121

22-
export const minValueRule = min => value => {
23-
return parseInt(value) >= parseInt(min) || `Value smaller than ${min}`
22+
export const minValueRule = (min, message = `Value smaller than ${min}`) => value => {
23+
return parseInt(value) >= parseInt(min) || message
2424
}
2525

26-
export const minSizeRule = min => value => {
27-
return parseInt(value.length) >= parseInt(min) || `Must have size of at least ${min}`
26+
export const minSizeRule = (min, message = `Must have size of at least ${min}`) => value => {
27+
return parseInt(value.length) >= parseInt(min) || message
2828
}

0 commit comments

Comments
 (0)