From 6061f4e58e22ff51c56a9f950457a8c4e809f9d2 Mon Sep 17 00:00:00 2001 From: Fuzi_fauzia Date: Mon, 3 Jun 2024 16:15:23 +0700 Subject: [PATCH] integrasi monitoring list --- .../horizontal/horizontal.component.html | 2 +- .../hemat-app/device/device.component.html | 52 +++--- .../add-edit-list/add-edit-list.component.css | 0 .../add-edit-list.component.html | 151 ++++++++++++++++ .../add-edit-list.component.spec.ts | 23 +++ .../add-edit-list/add-edit-list.component.ts | 165 ++++++++++++++++++ .../list-monitoring.component.html | 67 ++----- .../list-monitoring.component.ts | 17 +- .../list-monitoring/list-monitoring.module.ts | 20 ++- .../master-user/master-user.component.html | 39 ++++- .../service/monitoring-api.service.ts | 9 + .../user-access/user-access.component.html | 140 +++------------ src/app/login/login.component.html | 2 +- 13 files changed, 485 insertions(+), 202 deletions(-) create mode 100644 src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.css create mode 100644 src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.html create mode 100644 src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.spec.ts create mode 100644 src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.ts diff --git a/src/app/_layout/header/horizontal/horizontal.component.html b/src/app/_layout/header/horizontal/horizontal.component.html index 4d07c39..d9f69f7 100644 --- a/src/app/_layout/header/horizontal/horizontal.component.html +++ b/src/app/_layout/header/horizontal/horizontal.component.html @@ -12,7 +12,7 @@ src="../../../../assets/images/logo/logo.png"> -

Hemat - (V@2024.05.31.01)

+

Hemat - (V@2024.06.03.01)

  • + + + Category + + + {{ value.name }} + + - watt + Watt - typeId + Type - {{ value }} + {{ value.name }} - - roomBuildingId - - - {{ value }} - - - - voltageId + Voltage - {{ value }} + {{ value.name }} @@ -164,7 +164,7 @@ ngx-datatable-cell-template let-value="value" > - {{ value === 2 ? "Aktif" : "Tidak Aktif" }} + {{ value.name }} -
    + diff --git a/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.css b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.html b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.html new file mode 100644 index 0000000..348dedc --- /dev/null +++ b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.html @@ -0,0 +1,151 @@ +
    +
    +
    + +
    +
    +
    +
    +
    + + +

    + {{ + isEditMode() + ? "Edit List Monitoring" + : isViewMode() + ? "View List Monitoring" + : "Add New List Monitoring" + }} +

    +     + +
    +
    +

    + General Information +

    +
    +
    +
    + +
    + +
    + +
    + Building is required +
    +     +
    +
    +
    +
    + +
    + +
    + +
    + Room is required +
    +     +
    +
    +
    +
    +
    +
    + +
    + +
    + +
    + Building is required +
    +     +
    +
    +
    +
    +
    + + +
    +
    +     +     +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.spec.ts b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.spec.ts new file mode 100644 index 0000000..0b4dbfc --- /dev/null +++ b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AddEditListComponent } from './add-edit-list.component'; + +describe('AddEditListComponent', () => { + let component: AddEditListComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AddEditListComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(AddEditListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.ts b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.ts new file mode 100644 index 0000000..228b616 --- /dev/null +++ b/src/app/content/hemat-app/list-monitoring/add-edit-list/add-edit-list.component.ts @@ -0,0 +1,165 @@ +import { Component, ViewChild } from '@angular/core'; +import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; +import { BlockUI, NgBlockUI } from 'ng-block-ui'; +import { BuildingService } from '../../service/monitoring-api.service'; + +@Component({ + selector: 'app-add-edit-list', + templateUrl: './add-edit-list.component.html', + styleUrls: ['./add-edit-list.component.css'] +}) +export class AddEditListComponent { + @ViewChild("f", { read: true }) userProfileForm: NgForm; + + model: any = {}; + mode: string; + public breadcrumb: any; + projectInfo: FormGroup; + submitted = false; + + dataBuildingList: any; + dataRoomList: any; + dataMasterStatus: any + + @BlockUI("projectInfo") blockUIProjectInfo: NgBlockUI; + + constructor( + private formBuilder: FormBuilder, + private router: Router, + private route: ActivatedRoute, + private monitoringApiService: BuildingService, + ) {} + + ngOnInit() { + this.route.data.subscribe((data) => { + this.mode = data.mode; + }); + this.setBreadcrumb(); + this.dataListBuilding(); + this.dataListRoom(); + this.dataListMaster(); + + this.projectInfo = this.formBuilder.group({ + buildingId: ["", Validators.required], + roomId: ["", Validators.required], + statusId: ["", Validators.required], + }); + } + + setBreadcrumb() { + if (this.isAddMode()) { + this.breadcrumb = { + mainlabel: "Cost Management", + links: [ + { + name: "Home", + isLink: false, + }, + { + name: "Cost Management", + isLink: false, + }, + { + name: "Add New Cost Management", + isLink: false, + }, + ], + }; + } else if (this.isEditMode()) { + this.breadcrumb = { + mainlabel: "Cost Management", + links: [ + { + name: "Home", + isLink: false, + }, + { + name: "Cost Management", + isLink: false, + }, + { + name: "Edit New Cost Management", + isLink: false, + }, + ], + }; + } else if (this.isViewMode()) { + this.breadcrumb = { + mainlabel: "Cost Management", + links: [ + { + name: "Home", + isLink: false, + }, + { + name: "Cost Management", + isLink: false, + }, + { + name: "View New Cost Management", + isLink: false, + }, + ], + }; + } + } + + isEditMode() { + return this.mode === "edit"; + } + + isViewMode() { + return this.mode === "view"; + } + + isAddMode() { + return this.mode === "add"; + } + + get f() { + return this.projectInfo.controls; + } + + onProjectInfoSubmit() { + this.submitted = true; + if (this.projectInfo.invalid) { + return; + } + } + + keyPress(event: any) { + const pattern = /[0-9\+\-\ ]/; + const inputChar = String.fromCharCode(event.charCode); + if (event.keyCode !== 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } + + dataListBuilding() { + this.monitoringApiService.getBuildingList().subscribe(data => { + this.dataBuildingList = data.data + }); + } + + dataListRoom() { + this.monitoringApiService.getListRoomData().subscribe(data => { + this.dataRoomList = data.data + }); + } + + dataListMaster() { + this.monitoringApiService.getMasterListData().subscribe(data => { + const dataStatus = data.data.find( + (item) => item.name === "master_status" + ).headerDetailParam; + this.dataMasterStatus = dataStatus.filter(item => item.status === "2") + }); + } + + addData() {} + + cancel() { + this.router.navigate(["/list-monitoring"]); + } +} diff --git a/src/app/content/hemat-app/list-monitoring/list-monitoring.component.html b/src/app/content/hemat-app/list-monitoring/list-monitoring.component.html index d3e6ad3..e4619fa 100644 --- a/src/app/content/hemat-app/list-monitoring/list-monitoring.component.html +++ b/src/app/content/hemat-app/list-monitoring/list-monitoring.component.html @@ -29,7 +29,7 @@
    @@ -59,83 +59,41 @@ {{ rowIndex + 1 }} + - Estimasi Cost Name + Building - {{ value }} + {{ value.name }} + - Category + Room - {{ value }} + {{ value.name }} + - - Location - - - {{ value }} - - - - - Location Room - - - {{ value }} - - - - - Duration Use - - - {{ value }} - - - @@ -146,9 +104,10 @@ ngx-datatable-cell-template let-value="value" > - {{ value }} + {{ value.name }} + { - this.data = response; - this.filteredRows = this.data.rows; + this.monitoringApiService.getBuildingRoomList().subscribe((res) => { + console.log(res); + this.data = res; + this.filteredRows = this.data.results.data; + console.log(this.filteredRows); + }); } @@ -64,12 +69,12 @@ export class ListMonitoringComponent { viewRow(row) { console.log("View row:", row); - this.router.navigate(["/cost-management/view", row.name]); + this.router.navigate(["/list-monitoring/view", row.name]); } editRow(row) { console.log("Edit row:", row); - this.router.navigate(["/cost-management/edit", row.name]); + this.router.navigate(["/list-monitoring/edit", row.name]); } deleteRow(row) { diff --git a/src/app/content/hemat-app/list-monitoring/list-monitoring.module.ts b/src/app/content/hemat-app/list-monitoring/list-monitoring.module.ts index ce4523f..152b167 100644 --- a/src/app/content/hemat-app/list-monitoring/list-monitoring.module.ts +++ b/src/app/content/hemat-app/list-monitoring/list-monitoring.module.ts @@ -12,12 +12,14 @@ import { BlockUIModule } from 'ng-block-ui'; import { BlockTemplateComponent } from '../../../_layout/blockui/block-template.component'; import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; import { ListMonitoringComponent } from './list-monitoring.component'; +import { AddEditListComponent } from './add-edit-list/add-edit-list.component'; @NgModule({ declarations: [ - ListMonitoringComponent + ListMonitoringComponent, + AddEditListComponent ], imports: [ CommonModule, @@ -37,7 +39,21 @@ import { ListMonitoringComponent } from './list-monitoring.component'; path: '', component: ListMonitoringComponent }, - + { + path: 'add-row', + component: AddEditListComponent, + data: { mode: 'add' } + }, + { + path: 'edit/:id', + component: AddEditListComponent, + data: { mode: 'edit' } + }, + { + path: 'view/:id', + component: AddEditListComponent, + data: { mode: 'view' } + } ]) ] }) diff --git a/src/app/content/hemat-app/master/master-user/master-user.component.html b/src/app/content/hemat-app/master/master-user/master-user.component.html index 0ec3cd8..1eb31e0 100644 --- a/src/app/content/hemat-app/master/master-user/master-user.component.html +++ b/src/app/content/hemat-app/master/master-user/master-user.component.html @@ -1 +1,38 @@ -

    master-user works!

    +
    +
    +
    +
    +
    +
    +
    +
    + + logo + +
    +
    +

    This page is under maintenance

    +

    We're sorry for the inconvenience. +
    Please check back later.

    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + \ No newline at end of file diff --git a/src/app/content/hemat-app/service/monitoring-api.service.ts b/src/app/content/hemat-app/service/monitoring-api.service.ts index de03f2b..4a12c74 100644 --- a/src/app/content/hemat-app/service/monitoring-api.service.ts +++ b/src/app/content/hemat-app/service/monitoring-api.service.ts @@ -108,6 +108,15 @@ export class BuildingService { return this.http.get(url, { headers }); } + getBuildingList(): Observable { + const url = `https://kapi.absys.ninja/hemat/building/list`; + const headers = new HttpHeaders({ + 'Content-Type': 'application/json', + 'x-api-key': 'j2yaYvPSQcsEEmHh3NEobfiXyyXmmnHT' + }); + return this.http.get(url, { headers }); + } + getListRoomData(): Observable { const url = `https://kapi.absys.ninja/hemat/room/list`; const headers = new HttpHeaders({ diff --git a/src/app/content/hemat-app/user-access/user-access.component.html b/src/app/content/hemat-app/user-access/user-access.component.html index a05456d..cb9aa4f 100644 --- a/src/app/content/hemat-app/user-access/user-access.component.html +++ b/src/app/content/hemat-app/user-access/user-access.component.html @@ -1,119 +1,37 @@ -
    +
    -
    - -
    -
    -
    -
    - - - User Access Table - - -
    -
    - -
    -
    - -
    +
    +
    +
    +
    +
    + + logo +
    -
    - - - - {{ rowIndex + 1 }} - - - - - Category Name - - - {{ value }} - - - - - Status - - - {{ value }} - - - - - - - - - - +
    +

    This page is under maintenance

    +

    We're sorry for the inconvenience. +
    Please check back later.

    +
    - - +
    + +
    +
    -
    -
    +
    diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 5c34764..88e7d47 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -133,7 +133,7 @@

    - New to Modern ? (v@2024.05.31.01) + New to Modern ? (v@2024.06.03.01)