Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@ngx-translate/http-loader": "^16.0.1",
"@swimlane/ngx-graph": "^10.0.0",
"@tailwindcss/forms": "^0.5.4",
"chart.js": "3.0.0-alpha",
"chart.js": "^4.5.1",
"d3": "^7.9.0",
"exceljs": "^4.4.0",
"html2canvas": "^1.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ import { ActivatedRoute } from '@angular/router';
import { HomeService } from '../../home.service';

/** Charting Imports */
import Chart from 'chart.js';
import { Chart, registerables } from 'chart.js';
import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgFor, NgStyle, NgIf } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';

// Register Chart.js components
Chart.register(...registerables);

/**
* Amount Collected Pie Chart Component
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ import { ActivatedRoute } from '@angular/router';
import { HomeService } from '../../home.service';

/** Charting Imports */
import Chart from 'chart.js';
import { Chart, registerables } from 'chart.js';
import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgFor, NgStyle, NgIf } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';

// Register Chart.js components
Chart.register(...registerables);

/**
* Amount Disbursed Pie Chart Component
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ import { HomeService } from '../../home.service';

/** Charting Imports */
import { Dates } from 'app/core/utils/dates';
import Chart from 'chart.js';
import { Chart, registerables } from 'chart.js';
import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgFor, NgStyle } from '@angular/common';
import { MatButtonToggleGroup, MatButtonToggle } from '@angular/material/button-toggle';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';

// Register Chart.js components
Chart.register(...registerables);

/**
* Client Trends Bar Chart Component.
*/
Expand Down Expand Up @@ -266,11 +269,11 @@ export class ClientTrendsBarComponent implements OnInit {
responsive: true,
scales: {
y: {
beginAtZero: true,
scaleLabel: {
min: 0,
title: {
display: true,
labelString: 'Values',
fontColor: '#1074B9'
text: 'Values',
color: '#1074B9'
}
}
}
Expand Down
35 changes: 20 additions & 15 deletions src/app/reports/run-report/chart/chart.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ import { ReportsService } from '../../reports.service';
import { ChartData } from '../../common-models/chart-data.model';

/** Charting Imports */
import Chart from 'chart.js';
import { Chart, registerables } from 'chart.js';
import { MatButtonToggleGroup, MatButtonToggle } from '@angular/material/button-toggle';
import { NgStyle } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';

// Register Chart.js components
Chart.register(...registerables);

/**
* Chart Component
*/
Expand Down Expand Up @@ -81,9 +84,11 @@ export class ChartComponent implements OnChanges {
]
},
options: {
title: {
display: true,
text: inputData.keysLabel
plugins: {
title: {
display: true,
text: inputData.keysLabel
}
}
}
});
Expand All @@ -110,19 +115,19 @@ export class ChartComponent implements OnChanges {
]
},
options: {
legend: { display: false },
plugins: {
legend: { display: false }
},
scales: {
xAxes: [
{
scaleLabel: {
display: true,
labelString: inputData.keysLabel
},
ticks: {
beginAtZero: true
}
x: {
title: {
display: true,
text: inputData.keysLabel
}
]
},
y: {
min: 0
}
}
}
});
Expand Down