Change task id generation

Id must be generated sequentially
This commit is contained in:
2020-04-18 21:47:05 +03:00
parent 3614624aa0
commit a6cc1b5383
8 changed files with 55 additions and 22 deletions

View File

@ -4,13 +4,13 @@
<div class="container">
<table class="task-table">
<tr v-for="task in shared.taskList" class="task-item" :class="{ 'this-village': isThisVillageTask(task) }">
<td :title="formatDate(task.ts)">{{ formatDate(task.ts) }}</td>
<td :title="task.id">{{ task.id }}</td>
<td>
<td class="time-column" :title="formatDate(task.ts)">{{ formatDate(task.ts) }}</td>
<td class="id-column" :title="task.id">{{ task.id }}</td>
<td class="actions-column">
<a href="#" title="Remove task" class="remove-action" v-on:click.prevent="onRemove(task.id)">&times;</a>
</td>
<td :title="task.name">{{ task.name }}</td>
<td :title="JSON.stringify(task.args)">{{ JSON.stringify(task.args) }}</td>
<td class="name-column" :title="task.name">{{ task.name }}</td>
<td class="args-column" :title="JSON.stringify(task.args)">{{ JSON.stringify(task.args) }}</td>
</tr>
</table>
</div>
@ -66,8 +66,8 @@ export default {
}
.task-item > td {
border-top: 1px solid #ddd;
border-left: 1px solid #ddd;
padding: 2px 4px;
max-width: 25%;
}
.this-village {
color: blue;
@ -76,4 +76,23 @@ export default {
font-weight: bold;
color: red;
}
.time-column,
.actions-column {
max-width: 25%;
}
.id-column {
max-width: 80px;
overflow-x: hidden;
text-overflow: ellipsis;
}
.name-column {
max-width: 80px;
overflow-x: hidden;
text-overflow: ellipsis;
}
.args-column {
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;
}
</style>

View File

@ -51,11 +51,11 @@
<td></td>
</tr>
<tr class="required-line">
<td class="right">Необх:</td>
<td class="right" v-text="village.lumber_need - village.lumber || ''"></td>
<td class="right" v-text="village.clay_need - village.clay || ''"></td>
<td class="right" v-text="village.iron_need - village.iron || ''"></td>
<td class="right" v-text="village.crop_need - village.crop || ''"></td>
<td class="right">Профицит:</td>
<td class="right" v-text="village.lumber - village.lumber_need || ''"></td>
<td class="right" v-text="village.clay - village.clay_need || ''"></td>
<td class="right" v-text="village.iron - village.iron_need || ''"></td>
<td class="right" v-text="village.crop - village.crop_need || ''"></td>
<td></td>
<td></td>
</tr>