TRMM/tacticalrmm-web
1
0
Fork 0
mirror of https://github.com/jpros/tacticalrmm-web.git synced 2026-03-03 20:34:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from sadnub/develop

Browse Source 
some features, fixes, and tests
This commit is contained in:
wh1te909
2020-10-31 03:38:05 -07:00
committed by GitHub
parent dc7aaae4fa ebb0896587
commit 79322e35c5
2 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/automation/PolicyAutomatedTasksTab.vue
View File

@@ -74,24 +74,14 @@
</q-item-section>
<q-item-section>Edit</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="deleteTask(props.row.name, props.row.id)"
id="context-delete"
>
<q-item clickable v-close-popup @click="deleteTask(props.row.name, props.row.id)" id="context-delete">
<q-item-section side>
<q-icon name="delete" />
</q-item-section>
<q-item-section>Delete</q-item-section>
</q-item>
<q-separator />
<q-item
clickable
v-close-popup
@click="showStatus(props.row)"
id="context-status"
>
<q-item clickable v-close-popup @click="showStatus(props.row)" id="context-status">
<q-item-section side>
<q-icon name="sync" />
</q-item-section>
@@ -112,15 +102,14 @@
/>
</q-td>
<q-td>{{ props.row.name }}</q-td>
<q-td v-if="props.row.last_run">{{ props.row.last_run }}</q-td>
<q-td v-else>Has not run yet</q-td>
<q-td>{{ props.row.task_type }}</q-td>
<q-td>{{ props.row.schedule }}</q-td>
<q-td>
<span
style="cursor:pointer;color:blue;text-decoration:underline"
style="cursor: pointer; color: blue; text-decoration: underline"
@click="showStatus(props.row)"
class="status-cell"
>See Status</span>
>See Status</span
>
</q-td>
<q-td v-if="props.row.assigned_check">{{ props.row.assigned_check.readable_desc }}</q-td>
<q-td v-else></q-td>
@@ -136,11 +125,7 @@
<!-- policy task status -->
<q-dialog v-model="showPolicyTaskStatus">
<PolicyStatus
type="task"
:item="statusTask"
:description="`${statusTask.name} Agent Status`"
/>
<PolicyStatus type="task" :item="statusTask" :description="`${statusTask.name} Agent Status`" />
</q-dialog>
</div>
</template>
@@ -168,12 +153,6 @@ export default {
columns: [
{ name: "enabled", align: "left", field: "enabled" },
{ name: "name", label: "Name", field: "name", align: "left" },
{
name: "datetime",
label: "Last Run Time",
field: "last_run",
align: "left",
},
{
name: "schedule",
label: "Schedule",

39
src/components/modals/tasks/AddAutomatedTask.vue
View File

@@ -10,7 +10,7 @@
<p>Settings -> Script Manager</p>
</q-card-section>
</q-card>
<q-card v-else class="q-pa-xs" style="min-width: 30vw">
<q-card v-else class="q-pa-xs" style="min-width: 40vw">
<q-card-section class="row items-center">
<div class="text-h6">Add Automated Task</div>
<q-space />
@@ -68,6 +68,7 @@
<q-step :name="2" title="Choose Schedule" :done="step2Done" :error="!step2Done">
<q-radio v-model="autotask.task_type" val="scheduled" label="Scheduled" @input="clear" />
<q-radio v-model="autotask.task_type" val="runonce" label="Run Once" @input="clear" />
<q-radio v-model="autotask.task_type" val="checkfailure" label="On check failure" @input="clear" />
<q-radio v-model="autotask.task_type" val="manual" label="Manual" @input="clear" />
<div v-if="autotask.task_type === 'scheduled'" class="row q-pa-lg">
@@ -82,6 +83,36 @@
</div>
<div class="col-1"></div>
</div>
<div v-if="autotask.task_type === 'runonce'" class="row q-pa-lg">
<div class="col-11">
<q-input filled v-model="autotask.run_time_date" hint="Agent timezone will be used">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-date v-model="autotask.run_time_date" mask="YYYY-MM-DD HH:mm">
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-date>
</q-popup-proxy>
</q-icon>
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time v-model="autotask.run_time_date" mask="YYYY-MM-DD HH:mm">
<div class="row items-center justify-end">
<q-btn v-close-popup label="Close" color="primary" flat />
</div>
</q-time>
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<div class="q-gutter-sm">
<q-checkbox v-model="autotask.remove_if_not_scheduled" label="Delete task after schedule date" />
</div>
</div>
<div class="col-1"></div>
</div>
<div v-else-if="autotask.task_type === 'checkfailure'" class="q-pa-lg">
When Check Fails:
<q-select
@@ -136,6 +167,8 @@ export default {
name: null,
run_time_days: [],
run_time_minute: null,
run_time_date: null,
remove_if_not_scheduled: false,
task_type: "scheduled",
timeout: 120,
},
@@ -155,6 +188,8 @@ export default {
this.autotask.assigned_check = null;
this.autotask.run_time_days = [];
this.autotask.run_time_minute = null;
this.autotask.run_time_date = null;
this.autotask.remove_if_not_scheduled = false;
},
addTask() {
if (!this.step1Done || !this.step2Done) {
@@ -221,6 +256,8 @@ export default {
return this.autotask.assigned_check !== null ? true : false;
} else if (this.autotask.task_type === "manual") {
return true;
} else if (this.autotask.task_type === "runonce") {
return this.autotask.run_time_date !== null ? true : false;
} else {
return false;
}