diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a066217..6dd3cd4 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -93,11 +93,14 @@ import { FacturaCompraComponent } from './components/factura-compra/factura-comp
import { NuevoRenglonFacturaModalComponent } from './components/nuevo-renglon-factura-modal/nuevo-renglon-factura-modal.component';
import { ConfiguracionComponent } from './components/configuracion/configuracion.component';
import { NgChartsModule } from 'ng2-charts';
+import { FormsModule } from '@angular/forms';
import { DashboardComponent } from './components/dashboard/dashboard.component';
import { ChartStatisticsMonthComponent } from './components/chart-statistics-month/chart-statistics-month.component';
import { ChartStatisticsMonthSupplierComponent } from './components/chart-statistics-month-supplier/chart-statistics-month-supplier.component';
import { ChartStatisticsYearComponent } from './components/chart-statistics-year/chart-statistics-year.component';
import { ChartStatisticsYearSupplierComponent } from './components/chart-statistics-year-supplier/chart-statistics-year-supplier.component';
+import { ChartTableSupplierComponent } from './components/chart-table-supplier/chart-table-supplier.component';
+
registerLocaleData(localeEsAR, 'es-AR', localeEsARExtra);
@@ -193,7 +196,8 @@ registerLocaleData(localeEsAR, 'es-AR', localeEsARExtra);
ChartStatisticsMonthComponent,
ChartStatisticsMonthSupplierComponent,
ChartStatisticsYearComponent,
- ChartStatisticsYearSupplierComponent
+ ChartStatisticsYearSupplierComponent,
+ ChartTableSupplierComponent
],
imports: [
BrowserModule,
@@ -202,7 +206,8 @@ registerLocaleData(localeEsAR, 'es-AR', localeEsARExtra);
NgSelectModule,
AppRoutingModule,
ShareModule,
- NgChartsModule
+ NgChartsModule,
+ FormsModule
],
providers: [
{ provide: LOCALE_ID, useValue: 'es-AR' },
diff --git a/src/app/components/chart-statistics-month-supplier/chart-statistics-month-supplier.component.html b/src/app/components/chart-statistics-month-supplier/chart-statistics-month-supplier.component.html
index 3395966..1280cea 100644
--- a/src/app/components/chart-statistics-month-supplier/chart-statistics-month-supplier.component.html
+++ b/src/app/components/chart-statistics-month-supplier/chart-statistics-month-supplier.component.html
@@ -1,33 +1,12 @@
-
- {{ title }}
-
-
-
-
-
- No hay información disponible para este periodo. Seleccione un mes diferente
-
-
-
-
-
- | # |
- Proveedor |
- Monto $ |
-
-
-
-
- | {{i + 1}} |
- {{supplier.entidad}} |
- {{supplier.monto | currency:'ARS':'symbol':'1.0-2'}} |
-
-
-
-
- No hay información disponible para este periodo. Seleccione un mes diferente
-
-
-
-
-
- | # |
- Proveedor |
- Monto $ |
-
-
-
-
- | {{i + 1}} |
- {{supplier.entidad}} |
- {{supplier.monto | currency:'ARS':'symbol':'1.0-2'}} |
-
-
-
-
+
+
+
+
+ No hay información disponible para este periodo. Seleccione otro periodo
+
+
+
+
+
+ | # |
+ Proveedor |
+ Monto $ |
+
+
+
+
+ | {{i + 1}} |
+ {{supplier.entidad}} |
+ {{supplier.monto | currency:'ARS':'symbol':'1.0-2'}} |
+
+
+
+
@@ -57,18 +61,22 @@
diff --git a/src/app/components/dashboard/dashboard.component.ts b/src/app/components/dashboard/dashboard.component.ts
index 76f99c8..986bcf4 100644
--- a/src/app/components/dashboard/dashboard.component.ts
+++ b/src/app/components/dashboard/dashboard.component.ts
@@ -17,12 +17,12 @@ export class DashboardComponent implements OnInit {
allowedRolesToView = [Rol.ADMINISTRADOR, Rol.ENCARGADO];
constructor(private authService: AuthService,
- private router: Router,
- private cdr: ChangeDetectorRef,
- private chartService: ChartService,
- accordionConfig: NgbAccordionConfig) {
-
- accordionConfig.type = 'dark';
+ private router: Router,
+ private cdr: ChangeDetectorRef,
+ private chartService: ChartService,
+ accordionConfig: NgbAccordionConfig) {
+
+ accordionConfig.type = 'dark';
}
ngOnInit(): void {
diff --git a/src/app/directives/chart-directive.directive.ts b/src/app/directives/chart-directive.directive.ts
index 30f8e71..3f263f7 100644
--- a/src/app/directives/chart-directive.directive.ts
+++ b/src/app/directives/chart-directive.directive.ts
@@ -49,30 +49,59 @@ export abstract class ChartDirectiveDirective implements OnInit {
constructor(protected chartData: ChartService) { }
ngOnInit(): void {
-
this.years = this.generateYearData();
this.months = this.generateMonthsData();
- if (this.selectedYear && this.selectedMonth) {
- this.loadChartData(this.selectedYear, this.selectedMonth!);
+
+ this.selectedMonth = this.selectedMonth || (new Date().getMonth() + 1);
+
+ if (this.selectedYear && (this.selectedMonth || this.isMonthOptional())) {
+ this.loadChartData(this.selectedYear, this.selectedMonth);
}
}
- abstract loadChartData(year: number, month: number): void;
+ abstract loadChartData(year: number, month?: number | null): void;
- onYearChange($event: Event): void {
- const year = parseInt(($event.target as HTMLSelectElement).value, 10);
- this.selectedYear = year;
- this.selectedMonth = new Date().getMonth() + 1;
- if (this.selectedYear && this.selectedMonth) {
- this.loadChartData(this.selectedYear, this.selectedMonth!);
+ isMonthOptional(): boolean {
+ return true;
+ }
+
+ onYearChange(year: number | Event): void {
+ if (typeof year === 'number') {
+ this.selectedYear = year;
+ this.selectedMonth = this.selectedMonth || new Date().getMonth() + 1;
+ if (this.selectedYear && this.selectedMonth) {
+ this.loadChartData(this.selectedYear, this.selectedMonth!);
+ }
+ } else if (year instanceof Event) {
+ const target = (year.target as HTMLSelectElement);
+ if (target && target.value) {
+ const parsedYear = parseInt(target.value, 10);
+ this.selectedYear = parsedYear;
+ this.selectedMonth = this.selectedMonth || new Date().getMonth() + 1;
+ if (this.selectedYear && this.selectedMonth) {
+ this.loadChartData(this.selectedYear, this.selectedMonth!);
+ }
+ } else {
+ console.error("Error: El evento no tiene un valor válido", year);
+ }
+ } else {
+ console.error("Error: Tipo inesperado de parámetro en onYearChange", year);
}
}
- OnMonthChange($event: Event): void {
- const month = parseInt(($event.target as HTMLSelectElement).value, 10);
- this.selectedMonth = month;
+ onMonthChange(month: number | Event): void {
+ if (typeof month === 'number') {
+ this.selectedMonth = month;
+ } else if (month instanceof Event) {
+ const target = (month.target as HTMLSelectElement);
+ if (target && target.value) {
+ this.selectedMonth = parseInt(target.value, 10);
+ }
+ }
+ this.selectedMonth = this.selectedMonth || new Date().getMonth() + 1;
+
if (this.selectedYear && this.selectedMonth) {
- this.loadChartData(this.selectedYear, this.selectedMonth!);
+ this.loadChartData(this.selectedYear, this.selectedMonth);
}
}
@@ -84,6 +113,7 @@ export abstract class ChartDirectiveDirective implements OnInit {
generateMonthsData(): { value: number, name: string }[] {
const monthsNames = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'];
+
return monthsNames.map((name, index) => ({
value: index + 1, name
}))
@@ -106,4 +136,22 @@ export abstract class ChartDirectiveDirective implements OnInit {
};
}
+ protected handleChartData(data: any): void {
+ if (data && data.labels && data.datasets && data.datasets.length > 0) {
+ const labels = data.labels;
+ const datasetData = data.datasets[0].data;
+
+ if (labels.length === datasetData.length) {
+ this.suppliers = labels.map((label, index) => ({
+ entidad: label,
+ monto: datasetData[index],
+ }));
+ this.updateChart(data, labels);
+ } else {
+ console.log('Desajuste en la longitud de los datos');
+ this.suppliers = [];
+ }
+ }
+ }
+
}
diff --git a/src/app/services/chart.service.ts b/src/app/services/chart.service.ts
index 415a0bb..1e385e6 100644
--- a/src/app/services/chart.service.ts
+++ b/src/app/services/chart.service.ts
@@ -115,6 +115,7 @@ export class ChartService {
getChartDataSalesAnnualSupplier(year: number): Observable<{labels: string[], datasets:{data: number[], label: string }[] }> {
const idSucursal = this.sucursalesService.getIdSucursal();
const url = `${this.urlSalesStatistics}/rubros/monto-neto-anual/sucursales/${idSucursal}?anio=${year}`;
+
return this.http.get(url).pipe( map(data => {
const labels = data.map(item => item.entidad);
const dataset = data.map(item => item.monto);