agrilink/frontend-smartfarming
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev smartfarming #1

Merged
agrilink merged 53 commits from development into main 2024-12-30 05:53:19 +00:00
Conversation 0 Commits 53 Files Changed 66 +5 -12
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 50c3ce7497 - Show all commits

4
agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.html
View File

@ -20,7 +20,7 @@
<div class="sensor-wrapper"> <div class="sensor-wrapper">
<div class="title-with-dropdown"> <div class="title-with-dropdown">
<div class="title">Sensor NPK 1</div> <div class="title">Sensor NPK 1</div>
<select class="form-select" style="margin-top: 10px" [(ngModel)]="selectedNPK1" (change)="updateCharts(); onResize()"> <select class="form-select" style="margin-top: 10px" [(ngModel)]="selectedNPK1" (change)="onResize()">
<option value="npk">NPK</option> <option value="npk">NPK</option>
<option value="others">Lainnya</option> <option value="others">Lainnya</option>
</select> </select>
@ -39,7 +39,7 @@
<div class="sensor-wrapper"> <div class="sensor-wrapper">
<div class="title-with-dropdown"> <div class="title-with-dropdown">
<div class="title">Sensor NPK 2</div> <div class="title">Sensor NPK 2</div>
<select class="form-select" style="margin-top: 10px" [(ngModel)]="selectedNPK2" (change)="updateCharts(); onResize()"> <select class="form-select" style="margin-top: 10px" [(ngModel)]="selectedNPK2" (change)=" onResize()">
<option value="npk">NPK</option> <option value="npk">NPK</option>
<option value="others">Lainnya</option> <option value="others">Lainnya</option>
</select> </select>

11
agrilink_vocpro/src/app/pages/dashboard/page/graph/graph.component.ts
View File

@ -82,15 +82,12 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy, OnChang
this.updateCharts(); this.updateCharts();
} }
ngOnChanges(changes: SimpleChanges): void { ngOnChanges(changes: SimpleChanges): void {
if (changes['interval'] && !changes['interval'].firstChange) { if (changes['interval'] && changes['interval'].previousValue !== changes['interval'].currentValue) {
this.selectedInterval = changes['interval'].currentValue; this.selectedInterval = changes['interval'].currentValue;
this.updateCharts();
} }
} }
ngAfterViewInit(): void { ngAfterViewInit(): void {
this.onResize(); this.onResize();
} }
@ -157,7 +154,6 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy, OnChang
fetchNPK2Data(savedTimeRange: string): void { fetchNPK2Data(savedTimeRange: string): void {
const startEnd = this.getDate(); const startEnd = this.getDate();
const timeRange = this.interval;
this.sensorService.getSensorData('npk2', this.selectedNPK2, startEnd, savedTimeRange).subscribe({ this.sensorService.getSensorData('npk2', this.selectedNPK2, startEnd, savedTimeRange).subscribe({
next: (response) => { next: (response) => {
console.log(savedTimeRange); console.log(savedTimeRange);
@ -177,7 +173,7 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy, OnChang
} }
updateCharts(): void { updateCharts(): void {
const interval = this.selectedInterval; const interval = this.selectedInterval;
Object.keys(this.charts).forEach(key => { Object.keys(this.charts).forEach(key => {
if (this.charts[key]) { if (this.charts[key]) {
@ -191,7 +187,6 @@ export class GraphComponent implements OnInit, AfterViewInit, OnDestroy, OnChang
this.fetchNPK2Data(interval); this.fetchNPK2Data(interval);
} }
createChart(canvas: HTMLCanvasElement, response: ApiResponse, sensor: string, selectedOption: string): void { createChart(canvas: HTMLCanvasElement, response: ApiResponse, sensor: string, selectedOption: string): void {
const ctx = canvas.getContext('2d'); const ctx = canvas.getContext('2d');

1
agrilink_vocpro/src/app/pages/dashboard/page/historygraph/historygraph.component.html
View File

@ -11,7 +11,6 @@
<button (click)="updateInterval('HOURLY')" [class.active-button]="selectedButton === 'hourly'">Hourly</button> <button (click)="updateInterval('HOURLY')" [class.active-button]="selectedButton === 'hourly'">Hourly</button>
<button (click)="updateInterval('DAILY')" [class.active-button]="selectedButton === 'daily'">Daily</button> <button (click)="updateInterval('DAILY')" [class.active-button]="selectedButton === 'daily'">Daily</button>
</div> </div>
<div class="graph"> <div class="graph">
<app-graph [interval]="selectedInterval"></app-graph> <app-graph [interval]="selectedInterval"></app-graph>

1
agrilink_vocpro/src/app/pages/dashboard/page/historygraph/historygraph.component.ts
View File

@ -42,7 +42,6 @@ export class HistorygraphComponent implements OnInit, OnDestroy {
} }
}, 300); }, 300);
} }
ngOnDestroy(): void { ngOnDestroy(): void {
if (this.intervalId) { if (this.intervalId) {