fuzi_fauzia/hemat_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perbaikan master

Browse Source
This commit is contained in:
Fuzi_fauzia
2024-07-10 16:38:19 +07:00
parent 2194d2f720
commit 8d9840acec
23 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/content/hemat-app/device/add-edit-device/add-edit-device.component.ts
View File

@@ -79,27 +79,27 @@ export class AddEditDeviceComponent implements OnInit{
const dataCategory = data.data.find(
(item) => item.name === "master_category"
).headerDetailParam;
this.dataMasterCategori = dataCategory.filter(item => item.status === "2")
this.dataMasterCategori = dataCategory.filter(item => item.statusName.toLowerCase() === "aktif")
const dataVoltage = data.data.find(
(item) => item.name === "master_voltage"
).headerDetailParam;
this.dataMasterVoltage = dataVoltage.filter(item => item.status === "2")
this.dataMasterVoltage = dataVoltage.filter(item => item.statusName.toLowerCase() === "aktif")
const dataType = data.data.find(
(item) => item.name === "master_type"
).headerDetailParam;
this.dataMasterType = dataType.filter(item => item.status === "2")
this.dataMasterType = dataType.filter(item => item.statusName.toLowerCase() === "aktif")
const dataDuration = data.data.find(
(item) => item.name === "master_duration"
).headerDetailParam;
this.dataMasterDuration = dataDuration.filter(item => item.status === "2")
this.dataMasterDuration = dataDuration.filter(item => item.statusName.toLowerCase() === "aktif")
const dataStatus = data.data.find(
(item) => item.name === "master_status"
).headerDetailParam;
this.dataMasterStatus = dataStatus.filter(item => item.status === "2")
this.dataMasterStatus = dataStatus.filter(item => item.statusName.toLowerCase() === "aktif")
});
}

4
src/app/content/hemat-app/device/device-control/device-control.component.ts
View File

@@ -91,9 +91,9 @@ export class DeviceControlComponent {
(item) => item.name === "master_status"
).headerDetailParam;
this.dataMasterCategori = dataCategory.filter(
(item) => item.status === "2"
(item) => item.statusName.toLowerCase() === "aktif"
);
this.dataMasterStatus = dataStatus.filter((item) => item.status === "2");
this.dataMasterStatus = dataStatus.filter((item) => item.statusName.toLowerCase() === "aktif");
});
}

4
src/app/content/hemat-app/device/device.component.html
View File

@@ -438,7 +438,7 @@
</p>
</ng-template>
</ngx-datatable-column>
<ngx-datatable-column
<!-- <ngx-datatable-column
name="statusName"
[flexGrow]="1"
[minWidth]="90"
@@ -454,7 +454,7 @@
{{ value }}
</p>
</ng-template>
</ngx-datatable-column>
</ngx-datatable-column> -->
<ngx-datatable-column
name="Actions"
[flexGrow]="1"

4
src/app/content/hemat-app/device/device.component.ts
View File

@@ -161,9 +161,9 @@ export class DeviceComponent implements OnInit {
(item) => item.name === "master_status"
).headerDetailParam;
this.dataMasterCategori = dataCategory.filter(
(item) => item.status === "2"
(item) => item.statusName.toLowerCase() === "aktif"
);
this.dataMasterStatus = dataStatus.filter((item) => item.status === "2");
this.dataMasterStatus = dataStatus.filter((item) => item.statusName.toLowerCase() === "aktif");
});
}