bootstrap+battery(add bootstr in angular.js)

This commit is contained in:
Unknown 2019-01-14 21:58:19 +01:00
parent ac833d8ab8
commit b772e06cce
2 changed files with 7 additions and 13 deletions

View File

@ -5,13 +5,7 @@
<img src="/assets/img/logo.png" routerLink="/" class="logo-img" alt="logo"> <img src="/assets/img/logo.png" routerLink="/" class="logo-img" alt="logo">
</a> </a>
</div> </div>
<div class="battery col-md-3 col-xs-3">
<img src="/assets/img/battery.png" class="battery-img" alt="battery">
<div class="battery-percent">
<span>98</span>
<span>%</span>
</div>
</div>
</div> </div>

View File

@ -32,7 +32,7 @@
? "Zajęte" ? "Zajęte"
: device.lastStatus == 0 : device.lastStatus == 0
? "Wolne" ? "Wolne"
: "Brak połączenia z czujnikiem" : "Rozładowana bateria"
}}</b> }}</b>
</div> </div>
</div> </div>
@ -59,18 +59,18 @@
? "Zajęte" ? "Zajęte"
: activeDevice.lastStatus == 0 : activeDevice.lastStatus == 0
? "Wolne" ? "Wolne"
: "Brak połączenia z czujnikiem" : "Rozładowana bateria"
}}</span> }}</span>
</p> </p>
<p class="machine-status2"> <p class="machine-status2">
{{ {{
activeDevice.lastStatus == 1 activeDevice.lastStatus == 1
? "Zajęte" ? "Zajęte od:"
: activeDevice.lastStatus == 0 : activeDevice.lastStatus == 0
? "Wolne" ? "Wolne od:"
: "Brak połączenia z czujnikiem" : "Rozładowana bateria"
}} }}
od:
<span <span
>{{ time > 60 ? this.Math.floor(time / 60) : this.Math.floor(time) }} >{{ time > 60 ? this.Math.floor(time / 60) : this.Math.floor(time) }}
{{ time > 60 ? "min" : "sek" }} {{ time > 60 ? "min" : "sek" }}