Merge pull request #1255 from frankrousseau/master

[todos] Display the episodes where assets are casted

src/App.vue

@@ -779,6 +779,7 @@ h2 {
   border: 1px solid $blue;
   border-radius: 5px;
   color: $blue;
+  cursor: pointer;
   font-size: 0.9em;
   padding: 3px 4px;
 

src/components/lists/TaskList.vue

@@ -1036,6 +1036,10 @@ td.retake-count {
   }
 }
 
+.error {
+  color: $red;
+}
+
 input[type='number']::-webkit-outer-spin-button,
 input[type='number']::-webkit-inner-spin-button {
   -webkit-appearance: none;

src/components/lists/TodosList.vue

@@ -27,6 +27,10 @@
             >
               {{ $t('tasks.fields.entity') }}
             </th>
+            <th scope="col" class="episode" v-if="isEpisodeVisible">
+              {{ $t('assets.fields.episode') }}
+            </th>
+
             <th class="assignees" ref="th-assignees" v-if="isToCheck">
               {{ $t('tasks.fields.assignees') }}
             </th>
@@ -114,6 +118,13 @@
                 </router-link>
               </div>
             </td>
+
+            <td class="episode" v-if="isEpisodeVisible">
+              <div class="flexrow" :title="assetEpisodes(entry, true)">
+                {{ assetEpisodes(entry, false) }}
+              </div>
+            </td>
+
             <description-cell
               class="description"
               :entry="{ description: entry.entity_description }"
@@ -410,12 +421,42 @@ export default {
       return (
         Math.floor((this.timeEstimated ? this.timeEstimated : 0) / 60 / 8) <= 1
       )
+    },
+
+    isEpisodeVisible() {
+      return this.displayedTasks.some(
+        task => task.source_id || task.episode_names?.length > 0
+      )
     }
   },
 
   methods: {
     ...mapActions([]),
 
+    assetEpisodes(entry, full) {
+      if (
+        ['Episode', 'Sequence', 'Shot', 'Edit'].includes(entry.entity_type_name)
+      )
+        return ''
+      const mainEpisodeName = entry.episode_name || 'MP'
+      const episodeNames = (entry.episode_names || []).filter(
+        name => name !== mainEpisodeName
+      )
+      let episodeNameString = ''
+      if (episodeNames.length > 2) {
+        if (full) {
+          episodeNameString = episodeNames.join(', ')
+        } else {
+          episodeNameString = episodeNames.slice(0, 2).join(', ') + ', ...'
+        }
+      } else if (episodeNames.length > 0) {
+        episodeNameString = episodeNames.join(', ')
+      }
+      return episodeNames.length > 0
+        ? mainEpisodeName + ', ' + episodeNameString
+        : mainEpisodeName
+    },
+
     setScrollPosition(scrollPosition) {
       if (this.$refs.body) {
         this.$refs.body.scrollTop = scrollPosition
@@ -760,10 +801,16 @@ td.end-date {
 
 .empty-list img {
   max-width: 80vh;
+  -webkit-filter: brightness(103%);
 }
 
 .entity-name {
   color: var(--text);
   font-weight: bold;
 }
+
+.episode {
+  min-width: 130px;
+  width: 130px;
+}
 </style>

src/components/mixins/player.js

@@ -1295,26 +1295,15 @@ export const playerMixin = {
       return false
     },
 
-    onTimeCodeClicked({
-      versionRevision,
-      minutes,
-      seconds,
-      milliseconds,
-      frame
-    }) {
+    onTimeCodeClicked({ versionRevision, frame }) {
       const previews = this.currentEntity.preview_files[this.task.task_type_id]
       const previewFile = previews.find(
         p => p.revision === parseInt(versionRevision)
       )
       this.onPreviewChanged(this.currentEntity, previewFile)
-      const time =
-        parseInt(minutes) * 60 +
-        parseInt(seconds) +
-        parseInt(milliseconds) / 1000
       setTimeout(() => {
-        const frameNumber = time / this.frameDuration
-        this.rawPlayer.setCurrentFrame(frameNumber)
-        this.onFrameUpdate(frameNumber)
+        this.rawPlayer.setCurrentFrame(frame)
+        this.onFrameUpdate(frame)
         this.syncComparisonPlayer()
       }, 20)
     },

src/components/modals/EditCommentModal.vue

@@ -180,6 +180,14 @@ export default {
       type: Boolean,
       default: false
     },
+    frame: {
+      type: Number,
+      default: 0
+    },
+    commentToEdit: {
+      type: Object,
+      default: () => {}
+    },
     isLoading: {
       type: Boolean,
       default: false
@@ -188,10 +196,6 @@ export default {
       type: Boolean,
       default: false
     },
-    commentToEdit: {
-      type: Object,
-      default: () => {}
-    },
     team: {
       type: Array,
       default: () => []
@@ -203,10 +207,6 @@ export default {
     revision: {
       type: Number,
       default: 1
-    },
-    time: {
-      type: Number,
-      default: 0
     }
   },
 
@@ -302,10 +302,11 @@ export default {
 
     onAtTextChanged(input) {
       if (input.includes('@frame')) {
+        const time = this.frame / this.fps
         this.form.text = replaceTimeWithTimecode(
           input,
           this.revision,
-          this.time,
+          time,
           this.fps
         )
       }

src/components/pages/Breakdown.vue

@@ -416,6 +416,7 @@ export default {
     if (!this.isLoading) {
       this.reset()
     }
+    this.resetSequenceOption()
     this.setLastProductionScreen('breakdown')
     this.isTextMode = localStorage.getItem('breakdown:text-mode') === 'true'
     window.addEventListener('keydown', this.onKeyDown, false)
@@ -702,6 +703,7 @@ export default {
           } else {
             this.setCastingSequence(this.sequenceId || 'all')
           }
+          this.resetSequenceOption()
           this.resetSelection()
           if (
             (this.currentEpisode && this.currentEpisode.id === 'main') ||
@@ -713,6 +715,12 @@ export default {
       })
     },
 
+    resetSequenceOption() {
+      if (this.currentProduction.production_style === 'nft') {
+        this.sequenceId = this.castingSequencesOptions[1].value
+      }
+    },
+
     resetSelection() {
       const selection = {}
       if (this.isEpisodeCasting) {

src/components/pages/NotFound.vue

@@ -32,11 +32,18 @@ export default {
 }
 
 p {
+  color: var(--text);
   font-size: 1.3em;
   padding-bottom: 1em;
 
   a {
     text-decoration: underline;
   }
 }
+
+.title {
+  color: var(--text);
+  font-weight: bold;
+  font-size: 2.6em;
+}
 </style>

src/components/pages/ServerDown.vue

@@ -32,15 +32,13 @@ export default {
 
 <style lang="scss" scoped>
 .page {
-  background-color: var(--background);
 }
 
 .illustration {
   max-width: 1000px;
   margin: auto;
   img {
     border-radius: 3rem;
-    box-shadow: 0 0 2rem rgba(0, 0, 0, 0.1);
     margin-bottom: 2rem;
   }
 }
@@ -53,4 +51,10 @@ p {
     text-decoration: underline;
   }
 }
+
+.title {
+  color: var(--text);
+  font-weight: bold;
+  font-size: 2.4em;
+}
 </style>

src/components/pages/Task.vue

@@ -121,7 +121,7 @@
                   @change-current-preview="changeCurrentPreview"
                   @remove-extra-preview="onRemoveExtraPreviewClicked"
                   @previews-order-changed="onPreviewsOrderChanged"
-                  @time-updated="onTimeUpdated"
+                  @frame-updated="onFrameUpdated"
                   v-if="currentPreview"
                 />
               </div>
@@ -174,6 +174,7 @@
             <div>
               <add-comment
                 ref="add-comment"
+                :frame="currentFrame"
                 :is-error="errors.addComment"
                 :is-max-retakes-error="errors.addCommentMaxRetakes"
                 :is-loading="loading.addComment"
@@ -184,7 +185,6 @@
                 :task-status="taskStatusForCurrentUser"
                 :preview-forms="previewForms"
                 :fps="parseInt(currentFps)"
-                :time="currentTime"
                 :revision="currentRevision"
                 @add-comment="addComment"
                 @add-preview="onAddPreviewClicked"
@@ -205,20 +205,20 @@
                   <comment
                     :key="comment.id"
                     :comment="comment"
-                    :team="currentTeam"
-                    :task="task"
-                    :highlighted="false"
                     :current-user="user"
+                    :frame="currentFrame"
                     :editable="
                       (comment.person && user.id === comment.person.id) ||
                       isCurrentUserAdmin
                     "
                     :fps="parseInt(currentFps)"
-                    :time="currentTime"
-                    :revision="currentRevision"
+                    :highlighted="false"
                     :is-first="index === 0"
                     :is-last="index === pinnedCount"
                     :is-change="isStatusChange(index)"
+                    :revision="currentRevision"
+                    :team="currentTeam"
+                    :task="task"
                     @ack-comment="ackComment"
                     @duplicate-comment="onDuplicateComment"
                     @pin-comment="onPinComment"
@@ -276,12 +276,12 @@
 
       <edit-comment-modal
         :active="modals.editComment"
+        :frame="currentFrame"
         :is-loading="loading.editComment"
         :is-error="errors.editComment"
         :comment-to-edit="commentToEdit"
         :team="currentTeam"
         :fps="parseInt(currentFps)"
-        :time="currentTime"
         :revision="currentRevision"
         @confirm="confirmEditTaskComment"
         @cancel="onCancelEditComment"
@@ -359,7 +359,7 @@ export default {
   data() {
     return {
       previewForms: [],
-      currentTime: 0,
+      currentFrame: 0,
       selectedTab: 'validation',
       taskLoading: {
         isLoading: true,
@@ -1191,8 +1191,8 @@ export default {
       this.modals.deleteComment = false
     },
 
-    onTimeUpdated(time) {
-      this.currentTime = time
+    onFrameUpdated(frame) {
+      this.currentFrame = frame
     },
 
     onPreviewFormRemoved(previewForm) {

src/components/pages/playlists/PlaylistPlayer.vue

@@ -289,11 +289,12 @@
       <task-info
         ref="task-info"
         class="flexrow-item task-info-column"
-        :task="task"
+        :current-frame="parseInt(currentFrame)"
+        :current-parent-preview="currentPreview"
+        :fps="fps"
         :is-preview="false"
         :silent="isCommentsHidden"
-        :current-time-raw="currentTimeRaw"
-        :current-parent-preview="currentPreview"
+        :task="task"
         @time-code-clicked="onTimeCodeClicked"
         v-show="!isCommentsHidden"
       />

src/components/previews/PreviewPlayer.vue

@@ -98,7 +98,7 @@
           :task="task"
           :is-preview="false"
           :silent="isCommentsHidden"
-          :current-time-raw="currentTimeRaw"
+          :current-frame="currentFrame"
           :current-parent-preview="currentPreview"
           @comment-added="$emit('comment-added')"
           @time-code-clicked="timeCodeClicked"
@@ -992,6 +992,7 @@ export default {
         this.currentTimeRaw = time
         this.currentTime = this.formatTime(time)
         this.progress.updateProgressBar(frame)
+        this.$emit('frame-updated', frame)
 
         if (!this.isPlaying) {
           this.syncComparisonViewer()