webinno/monitolite
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing group name

Browse source
This commit is contained in:
Axel 2021-12-20 11:17:15 +01:00
parent 7ed25704e1
commit a6f26e0da1
4 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/ApiController.php
View file

@ -40,7 +40,13 @@ class ApiController extends Controller
$group_id = $t->group_id; $group_id = $t->group_id;
$group_name = $t->group_name; $group_name = $t->group_name;
} }
$tasks[$group_id]['tasks'][$t->id] = $t; $tasks[$group_id] = [
'id' => $group_id,
'name' => $group_name,
'tasks' => [
$t->id => $t
]
];
} }
return response()->json($tasks); return response()->json($tasks);

1
public/img/external.svg Normal file
View file

@ -0,0 +1 @@
<?xml version="1.0" ?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g><path d="M0 0h24v24H0z" fill="none"/><path d="M10 6v2H5v11h11v-5h2v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h6zm11-3v8h-2V6.413l-7.793 7.794-1.414-1.414L17.585 5H13V3h8z"/></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 273 B

4
public/js/app.js
View file

File diff suppressed because one or more lines are too long

10
resources/views/components/tasklist.vue
View file

@ -33,6 +33,7 @@
<img :src="'img/'+statusText(task.status)+'.svg'" width="16" alt="Status" /> <img :src="'img/'+statusText(task.status)+'.svg'" width="16" alt="Status" />
</td> </td>
<td> <td>
<img src="/img/external.svg" alt="View host" width="16">
<a :href="task.host" target="_blank">{{ task.host }}</a> <a :href="task.host" target="_blank">{{ task.host }}</a>
</td> </td>
<td> <td>
@ -51,11 +52,7 @@
Never Never
</span> </span>
<td>{{ task.frequency / 60 }}</td> <td>{{ task.frequency / 60 }}</td>
<td>{{ task.active == 1 ? 'Yes' : 'No' }}</td>
<td> <td>
<router-link :to="{ name: 'taskdetails', params: { id: task.id }}">
<img src="img/see.svg" alt="Details" width="20" />
</router-link>
<a <a
v-on:click.prevent="disableTask(task.id, task.active)" v-on:click.prevent="disableTask(task.id, task.active)"
href="#" href="#"
@ -64,6 +61,11 @@
<img :src="task.active == 1 ? '/img/on.svg' : '/img/off.svg'" alt="Disable" width="24" /> <img :src="task.active == 1 ? '/img/on.svg' : '/img/off.svg'" alt="Disable" width="24" />
</a> </a>
</td> </td>
<td>
<router-link :to="{ name: 'taskdetails', params: { id: task.id }}">
<img src="img/see.svg" alt="Details" width="20" />
</router-link>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>