groove/mikrofront
1
0
Fork 0
mirror of https://github.com/MikroWizard/mikrofront.git synced 2026-01-17 14:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some styling and view bugs,fix device filtering in devlogs

Browse source
This commit is contained in:
sepehr 2024-07-20 16:12:29 +03:30
parent d593919fc0
commit e18d9417c9
15 changed files with 63 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/app/views/device_logs/devlogs.component.html
View file

@ -119,9 +119,14 @@
Fixed</c-badge>
</ng-template>
</gui-grid-column>
<gui-grid-column header="eventtime" width='200' field="eventtime">
<gui-grid-column header="eventtime" width='220' field="eventtime">
<ng-template let-value="item.eventtime" let-item="item" let-index="index">
{{ value }}
<div *ngIf="item.fixtime" class="fixed_time"><span><c-badge *ngIf="item.status==true" color="danger" style="font-size: 0.65em!important;padding: 3px 5px;" size="sm"
shape="rounded-pill">Event</c-badge> {{value}}</span><span>
<c-badge *ngIf="item.status==true" color="success" style="font-size: 0.65em!important;padding: 3px 5px;" size="sm"
shape="rounded-pill">Fixed</c-badge> {{item.fixtime}}</span>
</div>
<div *ngIf="!item.fixtime"> {{ value }}</div>
</ng-template>
</gui-grid-column>
<gui-grid-column header="Device" width='200' field="name">

6
src/app/views/device_logs/devlogs.component.scss
View file

@ -106,6 +106,12 @@ padding: 0.5rem!important;
}
.fixed_time{
display:flex;
flex-direction: column-reverse;
padding: 1px 0px;
}
.example-form {
@include mat.button-density(-5);

10
src/app/views/device_logs/devlogs.component.ts
View file

@ -86,9 +86,9 @@ export class DevLogsComponent implements OnInit {
public campaignOneend: any;
rowDetail: GuiRowDetail = {
enabled: true,
template: (item) => {
template: (item) => {
return `
<div class='log-detail' style="color:#fff;background-color:${(() => {
<div class='log-detail' style="width: 355px;color:#fff;background-color:${(() => {
if (item.level == "Critical") return "#e55353";
else if (item.level == "Warning") return "#f9b115";
else item.level == "Info";
@ -223,6 +223,12 @@ export class DevLogsComponent implements OnInit {
_self.tz,
"yyyy-MM-dd HH:mm:ss XXX"
);
if (d.fixtime)
d.fixtime = formatInTimeZone(
d.fixtime.split(".")[0] + ".000Z",
_self.tz,
"yyyy-MM-dd HH:mm:ss XXX"
);
index += 1;
return d;
});