Chart fixes

This commit is contained in:
Douglas Barone 2022-12-08 15:15:06 -04:00
parent 18ef12f537
commit 6765b22170
6 changed files with 41 additions and 30 deletions

View File

@ -1,12 +1,12 @@
{ {
"name": "ifms-pti-svr", "name": "ifms-pti-svr",
"version": "3.4.0", "version": "3.4.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ifms-pti-svr", "name": "ifms-pti-svr",
"version": "3.4.0", "version": "3.4.1",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@prisma/client": "^4.7.1", "@prisma/client": "^4.7.1",

View File

@ -1,6 +1,6 @@
{ {
"name": "ifms-pti-svr", "name": "ifms-pti-svr",
"version": "3.4.0", "version": "3.4.1",
"description": "Servidor do Portal de TI do IFMS", "description": "Servidor do Portal de TI do IFMS",
"main": "src/index.js", "main": "src/index.js",
"prisma": { "prisma": {

View File

@ -49,7 +49,9 @@ async function generateStatsForNetwork(shortName) {
} }
export async function generateStatsForAllNetworks() { export async function generateStatsForAllNetworks() {
const networks = await prisma.network.findMany() const networks = await prisma.network.findMany({
orderBy: { name: 'asc' }
})
for (const network of networks) { for (const network of networks) {
await generateStatsForNetwork(network.shortName) await generateStatsForNetwork(network.shortName)

4
web/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "ifms-pti", "name": "ifms-pti",
"version": "3.4.0", "version": "3.4.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ifms-pti", "name": "ifms-pti",
"version": "3.4.0", "version": "3.4.1",
"dependencies": { "dependencies": {
"@mdi/font": "^6.9.96", "@mdi/font": "^6.9.96",
"apollo-link-ws": "^1.0.20", "apollo-link-ws": "^1.0.20",

View File

@ -1,6 +1,6 @@
{ {
"name": "ifms-pti", "name": "ifms-pti",
"version": "3.4.0", "version": "3.4.1",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

View File

@ -1,27 +1,36 @@
<template> <template>
<v-container> <div>
<v-row> <!-- <v-toolbar></v-toolbar> -->
<v-col v-for="subnet in subnets" :key="subnet.shortname" cols="4"> <v-container fluid>
<v-card> <v-row dense>
<v-card-title class="title font-weight-light text-sm-body-1"> <v-col
{{ subnet.name }} - {{ subnet.cidr }} v-for="subnet in subnets"
<v-spacer /> :key="subnet.shortname"
<v-icon left> mdi-devices </v-icon> sm="12"
{{ subnet.stats[0].clients }} md="6"
</v-card-title> lg="4"
<v-card-text> >
<ClientsChart <v-card flat>
:stats="subnet.stats" <v-card-title class="title font-weight-light text-sm-body-1">
:subnet="subnet" {{ subnet.name }} - {{ subnet.cidr }}
:suggested-max0="500" <v-spacer />
:suggested-max1="500000000000" <v-icon left> mdi-devices </v-icon>
:height="150" {{ subnet.stats[0].clients }}
/> </v-card-title>
</v-card-text> <v-card-text>
</v-card> <ClientsChart
</v-col> :stats="subnet.stats"
</v-row> :subnet="subnet"
</v-container> :suggested-max0="500"
:suggested-max1="100000000000"
:height="150"
/>
</v-card-text>
</v-card>
</v-col>
</v-row>
</v-container>
</div>
</template> </template>
<script> <script>