diff --git a/src/app/content/hemat-app/cost-management/cost-management.component.css b/src/app/content/hemat-app/cost-management/cost-management.component.css index a99d931..1de4cf8 100644 --- a/src/app/content/hemat-app/cost-management/cost-management.component.css +++ b/src/app/content/hemat-app/cost-management/cost-management.component.css @@ -90,7 +90,6 @@ input[type="month"]::-webkit-calendar-picker-indicator { } -/* table */ :host ::ng-deep .ngx-datatable.bootstrap @@ -370,13 +369,15 @@ input[type="month"]::-webkit-calendar-picker-indicator { } :host ::ng-deep .ngx-datatable.bootstrap .datatable-footer { - background: #252525; - color: #ededed; + background: #DDE1E6; + color: #242222; margin-top: -1px; overflow: inherit; } :host ::ng-deep .ngx-datatable.bootstrap .datatable-header { + background: #DDE1E6; + color: #242222; font-weight: bold; height: unset !important; overflow: inherit; @@ -404,21 +405,38 @@ input[type="month"]::-webkit-calendar-picker-indicator { } :host ::ng-deep .ng-select .ng-select-container { - color: #ffffff !important; - background-color: #252525 !important; + color: #242222 !important; + background-color: #FBFBFB !important; height: 40px !important; + border-radius: 12px !important; + box-shadow: 0 2px 4px rgba(36, 34, 34, 0.2) !important; /* Bayangan lebih tipis */ +} + +:host ::ng-deep .ng-select .ng-select-container .ng-value-container .ng-input>input { + color: #242222 !important; } :host ::ng-deep .ngx-datatable.bootstrap .datatable-body-row { - background-color: rgba(190, 242, 100, 0.11); /* Black color for table rows */ + background-color: #FBFBFB; /* Black color for table rows */ } :host ::ng-deep .ngx-datatable.bootstrap .datatable-body-row:hover { - background-color: #1a1a1a; /* Darker black for hover effect */ + background-color: #DDE1E6; /* Darker black for hover effect */ } -.modal-open .content { - filter: blur(5px); - transition: filter 0.3s ease-in-out; +.text-custom-label{ + color: #242222 !important; + font-family: "Open Sans", sans-serif !important; + font-size: 16px; } +.text-custom-data{ + color: #242222 !important; + font-family: "Open Sans", sans-serif !important; + font-size: 24px; + font-weight: 700; +} + +.style-custom-label{ + color: #242222 !important; +} diff --git a/src/app/content/hemat-app/cost-management/cost-management.component.html b/src/app/content/hemat-app/cost-management/cost-management.component.html index 4b4eff2..8e5421f 100644 --- a/src/app/content/hemat-app/cost-management/cost-management.component.html +++ b/src/app/content/hemat-app/cost-management/cost-management.component.html @@ -7,21 +7,20 @@
-
+

Comparison of Previous Month Costs


@@ -36,21 +35,20 @@
-
+

Comparison of Actual Costs and Estimated Costs


@@ -67,7 +65,7 @@
-
+
@@ -115,19 +113,19 @@ class="btn btn-outline-success" (click)="doFilter()" style=" - background-color: #252525 !important; - border-color: #bef264 !important; + background-color: #DDE1E6 !important; + border-color: #DDE1E6 !important; " [disabled]="spinnerFilterActive" > @@ -148,13 +146,13 @@ />
Kwh
IDR @@ -270,7 +268,7 @@ ngx-datatable-cell-template let-rowIndex="rowIndex" > -

+

{{ rowIndex + 1 }}

@@ -281,10 +279,10 @@ [minWidth]="90" > - Building + Building -

{{ value }}

+

{{ value }}

- Category + Category -

{{ value }}

+

{{ value }}

- Room + Room -

{{ value }}

+

{{ value }}

- Estimation Cost -

+

{{ value.toLocaleString("id-ID", { style: "currency", @@ -338,10 +336,10 @@ [minWidth]="90" > - Total Kwh + Total Kwh -

{{ value }}

+

{{ value }}

kWh
@@ -351,10 +349,10 @@ [minWidth]="90" > - Tanggal + Tanggal -

+

{{ value | date : "MM/yyyy" }}

@@ -365,10 +363,10 @@ [minWidth]="90" > - Status + Status -

+

{{ value === 2 ? "Aktif" : "Tidak Aktif" }}

@@ -379,7 +377,7 @@ [minWidth]="150" > - Actions + Actions diff --git a/src/app/content/hemat-app/cost-management/cost-management.component.ts b/src/app/content/hemat-app/cost-management/cost-management.component.ts index 86f5264..9c32a27 100644 --- a/src/app/content/hemat-app/cost-management/cost-management.component.ts +++ b/src/app/content/hemat-app/cost-management/cost-management.component.ts @@ -164,7 +164,7 @@ export class CostManagementComponent implements OnInit { legend: false, // Add custom colors - color: ["#BEF264"], + color: ["#37A647"], // Horizontal axis xAxis: [ @@ -174,7 +174,7 @@ export class CostManagementComponent implements OnInit { axisLine: { show: true, lineStyle: { - color: "#BEF264", + color: "#37A647", width: 4, }, }, @@ -218,7 +218,7 @@ export class CostManagementComponent implements OnInit { label: { show: true, position: "top", - color: "#ffffff", + color: "#242222", formatter: function (params) { return `Rp. ${params.value.toLocaleString()}`; }, @@ -256,7 +256,7 @@ export class CostManagementComponent implements OnInit { legend: false, // Add custom colors - color: ["#BEF264"], + color: ["#37A647"], // Horizontal axis xAxis: [ @@ -266,7 +266,7 @@ export class CostManagementComponent implements OnInit { axisLine: { show: true, lineStyle: { - color: "#BEF264", + color: "#37A647", width: 4, }, }, @@ -310,7 +310,7 @@ export class CostManagementComponent implements OnInit { label: { show: true, position: "top", - color: "#ffffff", + color: "#242222", formatter: function (params) { return `Rp. ${params.value.toLocaleString()}`; }, diff --git a/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html b/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html index f530483..032b3a1 100644 --- a/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html +++ b/src/app/content/hemat-app/cost-management/modal-add-actual/modal-add-actual.component.html @@ -1,20 +1,20 @@ -