Skip to content

Commit 689fe18

Browse files
charlesschaefercharlesschaefer
committed
Fixing the deprecated modules from primeng
1 parent 0ca4f14 commit 689fe18

10 files changed

Lines changed: 210 additions & 206 deletions

‎src/app/app.theme.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@ export const AppTheme = definePreset(Aura, {
2121
menu: {
2222
colorScheme: {
2323
light: {
24-
root: {
25-
submenuLabelColor: '{text.muted.color}'
24+
submenuLabel: {
25+
color: '{text.muted.color}'
2626
}
2727
}
2828
}
2929
},
3030
inputtext: {
31-
smFontSize: '0.8rem'
31+
root: {
32+
sm: {
33+
fontSize: '0.8rem'
34+
}
35+
}
3236
}
3337
}
3438
});

‎src/app/components/substance/record-substance-use.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ <h4 class="font-semibold text-gray-800 dark:text-gray-300 text-lg">
203203
<label for="dateTime" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1.5">
204204
{{ 'Date and time' | transloco }}
205205
</label>
206-
<p-calendar
206+
<p-datePicker
207207
id="dateTime"
208208
[(ngModel)]="datetime"
209209
name="date"

‎src/app/components/substance/record-substance-use.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { MessageService } from "primeng/api";
2121
import { UsageFillingService } from "../../services/usage-filling.service";
2222
import { UsageFillingAddDto } from "../../dto/usage-filling.dto";
2323
import { TranslocoModule } from "@jsverse/transloco";
24-
import { CalendarModule } from "primeng/calendar";
24+
import { DatePickerModule } from "primeng/datepicker";
2525

2626
/**
2727
* Angular component for recording substance use.
@@ -35,7 +35,7 @@ import { CalendarModule } from "primeng/calendar";
3535
FormsModule,
3636
SelectModule,
3737
SubstanceIconSelectComponent,
38-
CalendarModule,
38+
DatePickerModule,
3939
TranslocoModule
4040
],
4141
templateUrl: "./record-substance-use.component.html",

‎src/app/old/cost-add/cost-add.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<p-toast />
88
<form [formGroup]="costForm" novalidate (ngSubmit)="onSubmit()">
99
<div class="field">
10-
<p-dropdown
10+
<p-select
1111
[options]="substances"
1212
optionLabel="name"
1313
optionValue="id"
@@ -22,7 +22,7 @@
2222
</div>
2323
<div class="field">
2424
<p-floatLabel>
25-
<p-calendar
25+
<p-datePicker
2626
inputId="date"
2727
formControlName="date" />
2828
<label for="date">{{ 'Data da compra' | transloco }}</label>

‎src/app/old/cost-add/cost-add.component.ts‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
1-
import { Component, OnInit, inject } from '@angular/core';
2-
import { Router } from '@angular/router';
3-
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
4-
import { PanelModule } from 'primeng/panel';
5-
import { InputTextModule } from 'primeng/inputtext';
6-
import { ButtonModule } from 'primeng/button';
7-
import { FloatLabelModule } from 'primeng/floatlabel';
8-
import { DropdownModule } from 'primeng/dropdown';
9-
import { CalendarModule } from 'primeng/calendar';
10-
import { ToastModule } from 'primeng/toast';
11-
import { InputNumberModule } from 'primeng/inputnumber';
12-
import { InputMaskModule } from 'primeng/inputmask';
13-
import { MessageService } from 'primeng/api';
14-
import { JoyrideModule } from 'ngx-joyride';
15-
import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
16-
17-
import { SubstanceDto } from '../../dto/substance.dto';
18-
import { CostAddDto } from '../../dto/cost.dto';
19-
import { SubstanceService } from '../../services/substance.service';
20-
import { CostService } from '../../services/cost.service';
21-
22-
@Component({
23-
selector: 'app-cost-add',
24-
standalone: true,
25-
imports: [
26-
ReactiveFormsModule,
27-
PanelModule,
28-
InputTextModule,
29-
ButtonModule,
30-
FloatLabelModule,
31-
DropdownModule,
32-
CalendarModule,
33-
ToastModule,
34-
InputNumberModule,
35-
InputMaskModule,
36-
JoyrideModule,
37-
TranslocoModule,
38-
],
39-
providers: [MessageService],
40-
templateUrl: './cost-add.component.html',
41-
styleUrl: './cost-add.component.scss'
42-
})
1+
import { Component, OnInit, inject } from '@angular/core';
2+
import { Router } from '@angular/router';
3+
import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms';
4+
import { PanelModule } from 'primeng/panel';
5+
import { InputTextModule } from 'primeng/inputtext';
6+
import { ButtonModule } from 'primeng/button';
7+
import { FloatLabelModule } from 'primeng/floatlabel';
8+
import { SelectModule } from 'primeng/select';
9+
import { DatePickerModule } from 'primeng/datepicker';
10+
import { ToastModule } from 'primeng/toast';
11+
import { InputNumberModule } from 'primeng/inputnumber';
12+
import { InputMaskModule } from 'primeng/inputmask';
13+
import { MessageService } from 'primeng/api';
14+
import { JoyrideModule } from 'ngx-joyride';
15+
import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
16+
17+
import { SubstanceDto } from '../../dto/substance.dto';
18+
import { CostAddDto } from '../../dto/cost.dto';
19+
import { SubstanceService } from '../../services/substance.service';
20+
import { CostService } from '../../services/cost.service';
21+
22+
@Component({
23+
selector: 'app-cost-add',
24+
standalone: true,
25+
imports: [
26+
ReactiveFormsModule,
27+
PanelModule,
28+
InputTextModule,
29+
ButtonModule,
30+
FloatLabelModule,
31+
SelectModule,
32+
DatePickerModule,
33+
ToastModule,
34+
InputNumberModule,
35+
InputMaskModule,
36+
JoyrideModule,
37+
TranslocoModule,
38+
],
39+
providers: [MessageService],
40+
templateUrl: './cost-add.component.html',
41+
styleUrl: './cost-add.component.scss'
42+
})
4343
export class CostAddComponent implements OnInit {
4444
private substanceService = inject(SubstanceService);
4545
private costAddService = inject(CostService);
4646
private messageService = inject(MessageService);
4747
private router = inject(Router);
4848
private translateService = inject(TranslocoService);
49-
50-
private fb = inject(FormBuilder);
51-
costForm = this.fb.group({
52-
substance: [null, Validators.required],
53-
value: [null, Validators.required],
54-
date: [null, Validators.required],
55-
})
56-
substances: SubstanceDto[];
57-
58-
ngOnInit() {
59-
this.substanceService.list().then(substances => this.substances = substances as SubstanceDto[]);
60-
}
61-
62-
async onSubmit() {
63-
if (!this.costForm.valid) {
64-
this.messageService.add({
65-
severity: 'error',
66-
summary: this.translateService.translate('Erro'),
67-
detail: this.translateService.translate('Verifique todos os valores do formulário'),
68-
life: 3000
69-
});
70-
return;
71-
}
72-
const form = this.costForm.value;
73-
74-
const data: CostAddDto = {
75-
value: form.value || 0,
76-
substance: form.substance || 0,
77-
date: form.date || new Date()
78-
};
79-
80-
this.costAddService.add(data).then(async value => {
81-
this.costAddService.clearCache();
82-
this.messageService.add({
83-
severity: 'success',
84-
summary: this.translateService.translate('Tudo certo'),
85-
detail: this.translateService.translate('Gasto salvo com sucesso!'),
86-
life: 2000
87-
});
88-
89-
setTimeout(() => {
90-
this.router.navigate(['/cost']);
91-
}, 2000);
92-
}).catch(async error => {
93-
this.messageService.add({
94-
severity: 'error',
95-
summary: this.translateService.translate('Erro'),
96-
detail: this.translateService.translate('Houve um erro ao salvar o gasto!'),
97-
life: 2000
98-
});
99-
});
100-
}
101-
102-
}
49+
50+
private fb = inject(FormBuilder);
51+
costForm = this.fb.group({
52+
substance: [null, Validators.required],
53+
value: [null, Validators.required],
54+
date: [null, Validators.required],
55+
})
56+
substances: SubstanceDto[];
57+
58+
ngOnInit() {
59+
this.substanceService.list().then(substances => this.substances = substances as SubstanceDto[]);
60+
}
61+
62+
async onSubmit() {
63+
if (!this.costForm.valid) {
64+
this.messageService.add({
65+
severity: 'error',
66+
summary: this.translateService.translate('Erro'),
67+
detail: this.translateService.translate('Verifique todos os valores do formulário'),
68+
life: 3000
69+
});
70+
return;
71+
}
72+
const form = this.costForm.value;
73+
74+
const data: CostAddDto = {
75+
value: form.value || 0,
76+
substance: form.substance || 0,
77+
date: form.date || new Date()
78+
};
79+
80+
this.costAddService.add(data).then(async value => {
81+
this.costAddService.clearCache();
82+
this.messageService.add({
83+
severity: 'success',
84+
summary: this.translateService.translate('Tudo certo'),
85+
detail: this.translateService.translate('Gasto salvo com sucesso!'),
86+
life: 2000
87+
});
88+
89+
setTimeout(() => {
90+
this.router.navigate(['/cost']);
91+
}, 2000);
92+
}).catch(async error => {
93+
this.messageService.add({
94+
severity: 'error',
95+
summary: this.translateService.translate('Erro'),
96+
detail: this.translateService.translate('Houve um erro ao salvar o gasto!'),
97+
life: 2000
98+
});
99+
});
100+
}
101+
102+
}

0 commit comments

Comments
 (0)