From 57208d8baab0dd1c882caee06b7439545a253eab Mon Sep 17 00:00:00 2001
From: Scott McDonnell <scottmcdonnell@users.noreply.github.com>
Date: Thu, 27 Jun 2024 16:18:07 +0100
Subject: [PATCH] [admin] add a short name field to Project / Asset Type /
 TaskType

* Add editable production code - useful in Ayon
* add TaskType short name
* add short_name to Asset Type
* add short_name to csv export for Asset Type
* add short_name to the locales
* AssetType set short_name on edit
* Set project code to Short Name for consistency
* add production.code for closed productions list
---
 src/components/lists/AssetTypeList.vue        |  6 +++++
 src/components/lists/ProductionList.vue       |  9 +++++++
 src/components/lists/TaskTypeList.vue         | 26 ++++++++++++++++++-
 src/components/modals/EditAssetTypeModal.vue  | 11 +++++++-
 src/components/modals/EditProductionModal.vue |  9 +++++++
 src/components/modals/EditTaskTypeModal.vue   |  8 ++++++
 src/components/pages/AssetTypes.vue           |  2 ++
 .../pages/production/ProductionParameters.vue |  9 +++++++
 .../pages/production/ProductionTaskType.vue   |  3 +++
 .../pages/production/ProductionTaskTypes.vue  | 10 +++++++
 src/locales/de.js                             |  4 ++-
 src/locales/en.js                             |  5 +++-
 src/locales/es.json                           |  1 +
 src/locales/fa.js                             |  6 +++--
 src/locales/fr.json                           |  1 +
 src/locales/hu.json                           |  3 ++-
 src/locales/ja.json                           |  1 +
 src/locales/ko.json                           |  1 +
 src/locales/nl.json                           |  1 +
 src/locales/pt.json                           |  3 ++-
 src/locales/ru.json                           |  1 +
 src/locales/zh.json                           |  1 +
 src/locales/zh_tw.json                        |  3 ++-
 src/store/api/assettypes.js                   |  2 ++
 src/store/api/productions.js                  |  1 +
 src/store/api/tasktypes.js                    |  2 ++
 26 files changed, 120 insertions(+), 9 deletions(-)

diff --git a/src/components/lists/AssetTypeList.vue b/src/components/lists/AssetTypeList.vue
index 3271be78df..b2d97106b0 100644
--- a/src/components/lists/AssetTypeList.vue
+++ b/src/components/lists/AssetTypeList.vue
@@ -7,6 +7,9 @@
             <th scope="col" class="name">
               {{ $t('asset_types.fields.name') }}
             </th>
+            <th scope="col" class="short-name">
+              {{ $t('asset_types.fields.short_name') }}
+            </th>
             <th scope="col" class="task-types">
               {{ $t('asset_types.fields.task_types') }}
             </th>
@@ -18,6 +21,9 @@
             <td class="name">
               {{ entry.name }}
             </td>
+            <td class="short-name">
+              {{ entry.short_name }}
+            </td>
             <td class="task-types" v-if="(entry.task_types || []).length > 0">
               <span
                 :key="taskType.id"
diff --git a/src/components/lists/ProductionList.vue b/src/components/lists/ProductionList.vue
index dbe3b98117..1052dd1b23 100644
--- a/src/components/lists/ProductionList.vue
+++ b/src/components/lists/ProductionList.vue
@@ -7,6 +7,9 @@
             <th scope="col" class="name datatable-row-header">
               {{ $t('productions.fields.name') }}
             </th>
+            <th scope="col" class="code">
+              {{ $t('productions.fields.code') }}
+            </th>
             <th scope="col" class="type">
               {{ $t('productions.fields.type') }}
             </th>
@@ -40,6 +43,9 @@
                   :last-production-screen="lastProductionScreen"
                 />
               </th>
+              <td class="code">
+                {{ entry.code }}
+              </td>
               <td class="type">
                 {{ $t(`productions.type.${entry.production_type || 'short'}`) }}
               </td>
@@ -99,6 +105,9 @@
                 :is-link="false"
               />
             </th>
+            <td class="code">
+              {{ entry.code }}
+            </td>
             <td class="type">
               {{ $t(`productions.type.${entry.production_type || 'short'}`) }}
             </td>
diff --git a/src/components/lists/TaskTypeList.vue b/src/components/lists/TaskTypeList.vue
index 4fb7875354..a975a4faff 100644
--- a/src/components/lists/TaskTypeList.vue
+++ b/src/components/lists/TaskTypeList.vue
@@ -7,7 +7,12 @@
             <th scope="col" class="department">
               {{ $t('task_types.fields.department') }}
             </th>
-            <th scope="col" class="name">{{ $t('task_types.fields.name') }}</th>
+            <th scope="col" class="name">
+              {{ $t('task_types.fields.name') }}
+            </th>
+            <th scope="col" class="short_name">
+              {{ $t('task_types.fields.short_name') }}
+            </th>
             <th scope="col" class="allow-timelog">
               {{ $t('task_types.fields.allow_timelog') }}
             </th>
@@ -42,6 +47,9 @@
               />
             </td>
             <task-type-cell class="name" :task-type="taskType" />
+            <td class="short_name">
+              {{ taskType.short_name }}
+            </td>
             <td class="allow-timelog">
               <boolean-rep :value="taskType.allow_timelog" />
             </td>
@@ -87,6 +95,9 @@
               />
             </td>
             <task-type-cell class="name" :task-type="taskType" />
+            <td class="short_name">
+              {{ taskType.short_name }}
+            </td>
             <td class="allow-timelog">
               <boolean-rep :value="taskType.allow_timelog" />
             </td>
@@ -132,6 +143,9 @@
               />
             </td>
             <task-type-cell class="name" :task-type="taskType" />
+            <td class="short_name">
+              {{ taskType.short_name }}
+            </td>
             <td class="allow-timelog">
               <boolean-rep :value="taskType.allow_timelog" />
             </td>
@@ -177,6 +191,9 @@
               />
             </td>
             <task-type-cell class="name" :task-type="taskType" />
+            <td class="short_name">
+              {{ taskType.short_name }}
+            </td>
             <td class="allow-timelog">
               <boolean-rep :value="taskType.allow_timelog" />
             </td>
@@ -222,6 +239,9 @@
               />
             </td>
             <task-type-cell class="name" :task-type="taskType" />
+            <td class="short_name">
+              {{ taskType.short_name }}
+            </td>
             <td class="allow-timelog">
               <boolean-rep :value="taskType.allow_timelog" />
             </td>
@@ -396,6 +416,10 @@ export default {
   min-width: 300px;
 }
 
+.short_name {
+  width: 200px;
+  min-width: 200px;
+}
 .priority {
   width: 80px;
   min-width: 80px;
diff --git a/src/components/modals/EditAssetTypeModal.vue b/src/components/modals/EditAssetTypeModal.vue
index a81855ca8d..790fd51670 100644
--- a/src/components/modals/EditAssetTypeModal.vue
+++ b/src/components/modals/EditAssetTypeModal.vue
@@ -25,7 +25,13 @@
             @enter="runConfirmation"
             v-focus
           />
-
+          <text-field
+            ref="shortNameField"
+            :label="$t('asset_types.fields.short_name')"
+            :maxlength="30"
+            v-model="form.short_name"
+            @enter="runConfirmation"
+          />
           <combobox-boolean
             :label="$t('main.archived')"
             @enter="runConfirmation"
@@ -121,6 +127,7 @@ export default {
     return {
       form: {
         name: '',
+        short_name: '',
         task_types: []
       }
     }
@@ -191,12 +198,14 @@ export default {
         const types = this.assetTypeToEdit.task_types || []
         this.form = {
           name: this.assetTypeToEdit.name,
+          short_name: this.assetTypeToEdit.short_name,
           task_types: [...types],
           archived: String(this.assetTypeToEdit.archived === true)
         }
       } else {
         this.form = {
           name: '',
+          short_name: '',
           task_types: [],
           archived: 'false'
         }
diff --git a/src/components/modals/EditProductionModal.vue b/src/components/modals/EditProductionModal.vue
index b1dd09eacc..280d54719f 100644
--- a/src/components/modals/EditProductionModal.vue
+++ b/src/components/modals/EditProductionModal.vue
@@ -24,6 +24,12 @@
             @enter="runConfirmation"
             v-focus
           />
+          <text-field
+            ref="codeField"
+            :label="$t('productions.fields.code')"
+            v-model="form.code"
+            @enter="runConfirmation"
+          />
           <combobox-styled
             class="field"
             :label="$t('productions.fields.status')"
@@ -143,6 +149,7 @@ export default {
     if (this.productionToEdit && this.productionToEdit.id) {
       data.form = {
         name: this.productionToEdit.name,
+        code: this.productionToEdit.code,
         project_status_id: this.productionToEdit.project_status_id,
         fps: this.productionToEdit.fps,
         ratio: this.productionToEdit.ratio,
@@ -153,6 +160,7 @@ export default {
     } else {
       data.form = {
         name: '',
+        code: '',
         project_status_id: this.productionStatus
           ? this.productionStatus[0].id
           : null,
@@ -203,6 +211,7 @@ export default {
       if (this.productionToEdit && this.productionToEdit.id) {
         this.form = {
           name: this.productionToEdit.name,
+          code: this.productionToEdit.code,
           project_status_id: this.productionToEdit.project_status_id,
           fps: this.productionToEdit.fps,
           ratio: this.productionToEdit.ratio,
diff --git a/src/components/modals/EditTaskTypeModal.vue b/src/components/modals/EditTaskTypeModal.vue
index bb8c71171d..13e94d2e73 100644
--- a/src/components/modals/EditTaskTypeModal.vue
+++ b/src/components/modals/EditTaskTypeModal.vue
@@ -24,6 +24,12 @@
             @enter="confirmClicked"
             v-focus
           />
+          <text-field
+            ref="shortNameField"
+            :label="$t('task_types.fields.short_name')"
+            v-model="form.short_name"
+            @enter="confirmClicked"
+          />
           <boolean-field
             :label="$t('task_types.fields.allow_timelog')"
             @enter="confirmClicked"
@@ -117,6 +123,7 @@ export default {
       if (this.taskTypeToEdit) {
         this.form = {
           name: this.taskTypeToEdit.name,
+          short_name: this.taskTypeToEdit.short_name,
           color: this.taskTypeToEdit.color,
           for_entity: this.taskTypeToEdit.for_entity || 'Asset',
           allow_timelog: String(this.taskTypeToEdit.allow_timelog === true),
@@ -131,6 +138,7 @@ export default {
     return {
       form: {
         name: '',
+        short_name: '',
         color: '$grey',
         for_entity: 'Asset',
         allow_timelog: 'false',
diff --git a/src/components/pages/AssetTypes.vue b/src/components/pages/AssetTypes.vue
index 41d5273b9c..ca01609a47 100644
--- a/src/components/pages/AssetTypes.vue
+++ b/src/components/pages/AssetTypes.vue
@@ -180,12 +180,14 @@ export default {
       const headers = [
         this.$t('main.type'),
         this.$t('asset_types.fields.name'),
+        this.$t('asset_types.fields.short_name'),
         this.$t('asset_types.fields.task_types')
       ]
       const entries = [headers].concat(
         this.assetTypes.map(assetType => [
           assetType.type,
           assetType.name,
+          assetType.short_name,
           assetType.task_types.length
             ? assetType.task_types
                 .map(taskTypeId => this.taskTypeMap.get(taskTypeId)?.name)
diff --git a/src/components/pages/production/ProductionParameters.vue b/src/components/pages/production/ProductionParameters.vue
index 5cd9af938c..1c619ad8e7 100644
--- a/src/components/pages/production/ProductionParameters.vue
+++ b/src/components/pages/production/ProductionParameters.vue
@@ -10,6 +10,12 @@
           v-focus
           v-model="form.name"
         />
+        <text-field
+          ref="codeField"
+          :label="$t('productions.fields.code')"
+          @enter="runConfirmation"
+          v-model="form.code"
+        />
         <div class="columns">
           <div class="mr1">
             <date-field
@@ -184,6 +190,7 @@ export default {
       homepageOptions: HOME_PAGE_OPTIONS,
       form: {
         name: '',
+        code: '',
         start_date: new Date(),
         end_date: new Date(),
         nb_episodes: 0,
@@ -258,6 +265,7 @@ export default {
       if (this.currentProduction) {
         this.form = {
           name: this.currentProduction.name,
+          code: this.currentProduction.code,
           start_date: parseSimpleDate(
             this.currentProduction.start_date
           ).toDate(),
@@ -285,6 +293,7 @@ export default {
       } else {
         this.form = {
           name: '',
+          code: '',
           start_date: new Date(),
           end_date: new Date(),
           production_type: 'short',
diff --git a/src/components/pages/production/ProductionTaskType.vue b/src/components/pages/production/ProductionTaskType.vue
index d83664480b..7c9faaf750 100644
--- a/src/components/pages/production/ProductionTaskType.vue
+++ b/src/components/pages/production/ProductionTaskType.vue
@@ -1,6 +1,9 @@
 <template>
   <tr class="datatable-row" :key="taskType.id">
     <task-type-cell :task-type="taskType" />
+    <td class="short-name">
+      {{ taskType.short_name }}
+    </td>
     <td class="remove">
       <button
         class="button"
diff --git a/src/components/pages/production/ProductionTaskTypes.vue b/src/components/pages/production/ProductionTaskTypes.vue
index c93c671320..2a4eda6f6d 100644
--- a/src/components/pages/production/ProductionTaskTypes.vue
+++ b/src/components/pages/production/ProductionTaskTypes.vue
@@ -48,6 +48,16 @@
                 taskListObject.entity === activeTab
               "
             >
+              <!--
+              <thead>
+                <tr>
+                  <th class="th-name">{{ $t('task_status.fields.name') }}</th>
+                  <th class="th-short-name">
+                    {{ $t('task_status.fields.short_name') }}
+                  </th>
+                </tr>
+              </thead>
+              -->
               <draggable
                 v-model="taskListObject.list"
                 draggable=".task-type"
diff --git a/src/locales/de.js b/src/locales/de.js
index d0c0a4eed0..0eec698cf0 100644
--- a/src/locales/de.js
+++ b/src/locales/de.js
@@ -39,7 +39,8 @@ export default {
     title: 'Vermögensarten',
     production_title: 'Vermögensarten Statistiken',
     fields: {
-      name: 'Name'
+      name: 'Name',
+      short_name: 'Kurzname'
     }
   },
 
@@ -455,6 +456,7 @@ export default {
       welcome: 'Willkommen bei Kitsu'
     },
     fields: {
+      code: 'Kurzname',
       fps: 'FPS',
       name: 'Name',
       ratio: 'Ratio',
diff --git a/src/locales/en.js b/src/locales/en.js
index 88958cf398..acbeac5962 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -49,6 +49,7 @@ export default {
     production_title: 'Asset Types Stats',
     fields: {
       name: 'Name',
+      short_name: 'Short Name',
       task_types: 'Workflow'
     }
   },
@@ -1010,6 +1011,7 @@ export default {
     },
 
     fields: {
+      code: 'Short Name',
       end_date: 'End date',
       episode_span: 'Episode spacing',
       fps: 'FPS',
@@ -1223,7 +1225,7 @@ export default {
       is_retake: 'Has retake value',
       is_default: 'Is default',
       name: 'Name',
-      short_name: 'Short name'
+      short_name: 'Short Name'
     }
   },
 
@@ -1241,6 +1243,7 @@ export default {
       department: 'Department',
       color: 'Color',
       name: 'Name',
+      short_name: 'Short Name',
       allow_timelog: 'Timelog',
       priority: 'Priority'
     }
diff --git a/src/locales/es.json b/src/locales/es.json
index c3bf147266..11677ca6d8 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -45,6 +45,7 @@
             "production_title": "Estadísticas de Assets",
             "fields": {
                 "name": "Nombre",
+                "short_name": "Denominación breve",
                 "task_types": "Tipos de tarea"
             },
             "include_all": "Incluir todos los tipos de recurso"
diff --git a/src/locales/fa.js b/src/locales/fa.js
index 22f2ce0068..5011dc0f41 100644
--- a/src/locales/fa.js
+++ b/src/locales/fa.js
@@ -39,7 +39,8 @@ export default {
     title: 'انواع منبع',
     production_title: 'آمار تمام منابع',
     fields: {
-      name: 'نام'
+      name: 'نام',
+      short_name: 'اسم کوتاه'
     }
   },
 
@@ -471,7 +472,8 @@ export default {
       ratio: 'نسبت تصویر',
       resolution: 'ابعاد تصویر',
       status: 'وضعیت',
-      type: 'نوع'
+      type: 'نوع',   
+      code: 'اسم کوتاه'
     },
     metadata: {
       add_explaination: 'Add specific data required by this project.',
diff --git a/src/locales/fr.json b/src/locales/fr.json
index eb9404492b..0047592806 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -45,6 +45,7 @@
             "production_title": "Stats types d'assets",
             "fields": {
                 "name": "Nom",
+                "short_name": "Nom court",
                 "task_types": "Workflow"
             },
             "include_all": "Inclure tous les types d'asset"
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 12081c969d..61aa384fb9 100644
--- a/src/locales/hu.json
+++ b/src/locales/hu.json
@@ -43,7 +43,8 @@
             "title": "Asset típusok",
             "production_title": "Asset típus statiszika",
             "fields": {
-                "name": "Név"
+                "name": "Név",
+                "short_name": "Rövid név"
             }
         },
         "breakdown": {
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 25bca58b6a..d924c3b260 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -45,6 +45,7 @@
             "production_title": "アセットタイプのステータス",
             "fields": {
                 "name": "名前",
+                "short_name": "略称",
                 "task_types": "ワークフロー"
             },
             "include_all": "すべてのアセットタスクタイプを含む"
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 8842820222..31664cca08 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -45,6 +45,7 @@
             "production_title": "어셋 유형 통계",
             "fields": {
                 "name": "이름",
+                "short_name": "짧은 이름",
                 "task_types": "작업 유형"
             },
             "include_all": "모든 자산 유형 포함"
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 7161f817a9..22419eee8e 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -45,6 +45,7 @@
             "production_title": "Assettypes Statistieken",
             "fields": {
                 "name": "Naam",
+                "short_name": "Korte naam",
                 "task_types": "Taak types"
             },
             "include_all": "Omvat alle soorten elementtaken"
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 37293bac5f..ef2bcd8401 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -39,7 +39,8 @@
             "title": "Tipos de Asset",
             "production_title": "Status Tipos de Assets",
             "fields": {
-                "name": "Nome"
+                "name": "Nome",
+                "short_name": "Nome do curta"
             }
         },
         "breakdown": {
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 958cf8935f..aefaacded2 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -45,6 +45,7 @@
             "production_title": "Статистика по типам ассетов",
             "fields": {
                 "name": "Название",
+                "short_name": "Краткое название",
                 "task_types": "Workflow"
             },
             "include_all": "Включить все типы задач"
diff --git a/src/locales/zh.json b/src/locales/zh.json
index f3a606f770..d36f6d9b0d 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -48,6 +48,7 @@
             "production_title": "资产类型统计",
             "fields": {
                 "name": "名称",
+                "short_name": "状态",
                 "task_types": "工作流程"
             },
             "include_all": "包括所有资产任务类型"
diff --git a/src/locales/zh_tw.json b/src/locales/zh_tw.json
index 1a969827d4..f9c7bf7ebf 100644
--- a/src/locales/zh_tw.json
+++ b/src/locales/zh_tw.json
@@ -43,7 +43,8 @@
             "title": "Asset類型(多種)",
             "production_title": "Asset類型統計",
             "fields": {
-                "name": "名稱"
+                "name": "名稱",
+                "short_name": "簡稱"
             }
         },
         "breakdown": {
diff --git a/src/store/api/assettypes.js b/src/store/api/assettypes.js
index daf2ec80b1..8356e2127c 100644
--- a/src/store/api/assettypes.js
+++ b/src/store/api/assettypes.js
@@ -12,6 +12,7 @@ export default {
   newAssetType(assetType) {
     const data = {
       name: assetType.name,
+      short_name: assetType.short_name,
       task_types: assetType.task_types
     }
     return client.ppost('/api/data/entity-types', data)
@@ -20,6 +21,7 @@ export default {
   updateAssetType(assetType) {
     const data = {
       name: assetType.name,
+      short_name: assetType.short_name,
       task_types: assetType.task_types,
       archived: assetType.archived === 'true'
     }
diff --git a/src/store/api/productions.js b/src/store/api/productions.js
index ebd1c7e24f..1d2fab3c5f 100644
--- a/src/store/api/productions.js
+++ b/src/store/api/productions.js
@@ -28,6 +28,7 @@ export default {
   updateProduction(production) {
     const data = {
       name: production.name,
+      code: production.code,
       description: production.description,
       project_status_id: production.project_status_id,
       production_type: production.production_type,
diff --git a/src/store/api/tasktypes.js b/src/store/api/tasktypes.js
index 903d022904..69ef56c5e1 100644
--- a/src/store/api/tasktypes.js
+++ b/src/store/api/tasktypes.js
@@ -8,6 +8,7 @@ export default {
   newTaskType(taskType) {
     const data = {
       name: taskType.name,
+      short_name: taskType.short_name,
       color: taskType.color,
       priority: Number(taskType.priority),
       for_entity: taskType.for_entity,
@@ -20,6 +21,7 @@ export default {
   updateTaskType(taskType) {
     const data = {
       name: taskType.name,
+      short_name: taskType.short_name,
       color: taskType.color,
       department_id: taskType.department_id
     }