Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes #1220

Merged
merged 8 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 48 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"autoprefixer": "10.4.16",
"eslint": "8.51.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-prettier": "5.0.1",
"eslint-plugin-vue": "9.17.0",
"esm": "3.2.25",
"husky": "8.0.3",
Expand All @@ -73,7 +73,7 @@
"localStorage": "1.0.4",
"postcss": "8.4.31",
"prettier": "3.0.3",
"sass": "1.69.0",
"sass": "1.69.3",
"vite": "4.4.11",
"vite-plugin-eslint": "1.8.1",
"vitest": "0.34.6",
Expand Down
1 change: 0 additions & 1 deletion src/components/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ export default {
height: 100%;
display: flex;
flex-direction: column;
background: $white-grey;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { mapGetters, mapActions } from 'vuex'

export default {
name: 'task-status-name',
name: 'task-status-cell',
components: {},
props: {
entry: {
Expand Down
37 changes: 16 additions & 21 deletions src/components/cells/TimeSliderCell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,21 @@
</span>
<vue-slider
class="flexrow-item slider"
ref="slider"
v-model="value"
v-bind="options"
:max="maxHoursByDay"
/>
<button class="button flexrow-item" @click="setValue(1)">1</button>
<button class="button flexrow-item" @click="setValue(4)">4</button>
<button
class="button flexrow-item"
@click="setValue(organisation.hours_by_day || 8)"
>
{{ organisation.hours_by_day || 8 }}
<button class="button flexrow-item" @click="setValue(hoursByDay)">
{{ hoursByDay }}
</button>
</div>
</td>
</template>

<script>
import { mapGetters, mapActions } from 'vuex'
import { mapGetters } from 'vuex'
import VueSlider from 'vue-slider-component'

export default {
Expand All @@ -33,22 +30,15 @@ export default {
return {
value: this.duration,
options: {
show: true,
width: 400,
min: 0,
max: 10,
interval: 0.25,
lazy: true,
marks: true,
hideLabel: true,
piecewise: true,
tooltip: 'focus',
tooltipPlacement: 'bottom',
useKeyboard: true,
tooltip: 'hover',
processStyle: {
'background-color': '#8F91EB'
},
railStyle: {
background: '#CCC'
}
}
}
Expand All @@ -70,12 +60,18 @@ export default {
},

computed: {
...mapGetters(['organisation'])
...mapGetters(['organisation']),

hoursByDay() {
return this.organisation.hours_by_day || 8
},

maxHoursByDay() {
return Math.min(this.hoursByDay + 4, 24)
}
},

methods: {
...mapActions([]),

setValue(value) {
this.value = value
}
Expand All @@ -96,11 +92,10 @@ export default {
.value {
font-size: 1.5em;
font-weight: bold;
width: 30px;
width: 40px;
}

.slider {
cursor: pointer;
z-index: 0;
}
</style>
2 changes: 1 addition & 1 deletion src/components/lists/DepartmentList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import RowActionsCell from '@/components/cells/RowActionsCell'
import TableInfo from '@/components/widgets/TableInfo'

export default {
name: 'departments-list',
name: 'department-list',
props: ['entries', 'isLoading', 'isError'],
data() {
return {}
Expand Down
2 changes: 1 addition & 1 deletion src/components/lists/EntityTaskList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ import { mapGetters, mapActions } from 'vuex'

import { formatListMixin } from '@/components/mixins/format'

import TaskTypeCell from '@/components/cells/TaskTypeName'
import TaskTypeCell from '@/components/cells/TaskTypeCell'
import TableInfo from '@/components/widgets/TableInfo'
import ValidationTag from '@/components/widgets/ValidationTag'
import PeopleAvatar from '@/components/widgets/PeopleAvatar'
Expand Down
2 changes: 1 addition & 1 deletion src/components/lists/EpisodeStatsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ import StatsCell from '@/components/cells/StatsCell'
import TableInfo from '@/components/widgets/TableInfo'

export default {
name: 'episode-list',
name: 'episode-stats-list',
mixins: [entityListMixin],

components: {
Expand Down
10 changes: 5 additions & 5 deletions src/components/lists/PreviewFileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<td class="entity-name">
{{ previewFile.full_entity_name }}
</td>
<task-type-name
<task-type-cell
class="task-type"
:task-type="taskTypeMap.get(previewFile.task_type_id)"
/>
Expand All @@ -63,7 +63,7 @@
<td class="end-cell has-text-right">
<button-simple
class="mark-broken-button"
text="Mark as broken"
:text="$t('logs.preview_files.mark_broken')"
@click="$emit('mark-broken-clicked', previewFile.id)"
v-if="previewFile.status === 'processing'"
/>
Expand All @@ -84,17 +84,17 @@ import { getTaskPath } from '@/lib/path'
import ButtonSimple from '@/components/widgets/ButtonSimple'
import TableInfo from '@/components/widgets/TableInfo'
import ProductionNameCell from '@/components/cells/ProductionNameCell'
import TaskTypeName from '@/components/cells/TaskTypeName'
import TaskTypeCell from '@/components/cells/TaskTypeCell'

export default {
name: 'entity-task-list',
name: 'preview-file-list',
mixins: [formatListMixin],

components: {
ButtonSimple,
ProductionNameCell,
TableInfo,
TaskTypeName
TaskTypeCell
},

props: {
Expand Down
Loading