Skip to content

Commit

Permalink
Merge pull request #1227 from NicoPennec/fix/various
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
NicoPennec authored Oct 25, 2023
2 parents cbd6b62 + a61fb7e commit f3be12d
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 80 deletions.
130 changes: 70 additions & 60 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"three": "0.157.0",
"uuid": "9.0.1",
"v-autocomplete": "1.8.2",
"vue": "2.7.14",
"vue": "2.7.15",
"vue-at": "2.5.1",
"vue-chartkick": "0.6.1",
"vue-drag-drop": "1.1.4",
Expand All @@ -59,13 +59,13 @@
},
"devDependencies": {
"@vitejs/plugin-vue2": "2.2.0",
"@vue/compiler-sfc": "2.7.14",
"@vue/compiler-sfc": "2.7.15",
"@vue/test-utils": "1.3.6",
"autoprefixer": "10.4.16",
"eslint": "8.51.0",
"eslint": "8.52.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-prettier": "5.0.1",
"eslint-plugin-vue": "9.17.0",
"eslint-plugin-vue": "9.18.0",
"esm": "3.2.25",
"husky": "8.0.3",
"jsdom": "22.1.0",
Expand All @@ -78,7 +78,7 @@
"vite-plugin-eslint": "1.8.1",
"vitest": "0.34.6",
"vitest-localstorage-mock": "0.0.1",
"vue-template-compiler": "2.7.14"
"vue-template-compiler": "2.7.15"
},
"engines": {
"node": ">=16.0"
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Breakdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ export default {
},
csvColumns() {
return this.isTVShow
return this.isTVShow && this.currentEpisode?.id !== 'all'
? ['Episode', 'Parent', 'Name', 'Asset Type', 'Asset', 'Occurences']
: ['Parent', 'Name', 'Asset Type', 'Asset', 'Occurences']
},
Expand Down
3 changes: 3 additions & 0 deletions src/components/pages/MainSchedule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ export default {
...mapActions(['editProduction', 'loadScheduleItems', 'saveScheduleItem']),
reset() {
if (!this.openProductions.length) {
return
}
this.scheduleItems = this.convertScheduleItems(this.openProductions)
this.startDate = getFirstStartDate(this.scheduleItems)
this.endDate = getLastEndDate(this.scheduleItems)
Expand Down
9 changes: 3 additions & 6 deletions src/components/pages/ProductionNewsFeed.vue
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ export default {
params() {
const params = {
productionId: this.currentProduction.id,
productionId: this.currentProduction?.id,
only_preview: this.previewMode === 'previews',
page_size: this.previewMode === 'previews' ? 6 : 50,
task_type_id: this.taskTypeId !== '' ? this.taskTypeId : undefined,
Expand Down Expand Up @@ -501,11 +501,8 @@ export default {
},
team() {
return sortPeople(
this.currentProduction.team.map(personId =>
this.personMap.get(personId)
)
)
const team = this.currentProduction?.team || []
return sortPeople(team.map(personId => this.personMap.get(personId)))
},
renderedStats() {
Expand Down
4 changes: 3 additions & 1 deletion src/components/pages/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@
<text-field
class="mt2"
:label="$t('settings.fields.name')"
:required="true"
v-model.trim="form.name"
/>
<text-field
:label="$t('settings.fields.hours_by_day')"
:min="1"
:max="24"
:required="true"
type="number"
v-model="form.hours_by_day"
/>
Expand Down Expand Up @@ -243,7 +246,6 @@ export default {
? 'true'
: 'false'
}
console.log(this.form.has_avatar)
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions src/components/pages/schedule/Schedule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@
/>
</span>
<span
class="filler flexrow-item root-element-name"
class="filler flexrow-item root-element-name ellipsis"
:title="rootElement.name"
v-if="!rootElement.route"
>
{{ rootElement.name }}
</span>
<router-link
class="filler flexrow-item root-element-name"
class="filler flexrow-item root-element-name ellipsis"
:title="rootElement.name"
:to="rootElement.route"
v-else
>
Expand Down
Loading

0 comments on commit f3be12d

Please sign in to comment.