Merge branch 'master' into develop

src/views/pages/KsVideos/KsNewVideoForm.vue

@@ -201,11 +201,12 @@ const groupDocType = ref('');
 const uploadPercentage = ref(0);
 
 const videoTypeOptions = ref([
-  { name: 'Functional video', value: 'functional_video' },
-  { name: 'Code Instruction video', value: 'code_instruction_video' },
-  { name: 'Specification video', value: 'specification_video' },
+  { name: 'Functional', value: 'functional_video' },
+  { name: 'Code Instruction', value: 'code_instruction_video' },
+  { name: 'Estimation', value: 'estimation_video' },
   { name: 'Other', value: 'other_video' }
 ]);
+
 const availableAppOptions = ref([
   { name: 'Cross', value: '' },
   ...userPrefStore.availableApp.map(app => ({ name: app.internal_name, value: app.internal_name }))

src/views/pages/ksDocuments/KsDocuments.vue

@@ -439,8 +439,7 @@ const mapDocType = (type) => {
 	const mapping = {
 		'functional': 'Functional',
 		'code_instruction': 'Code Instruction',
-		'specification': 'Specification',
-		'other': 'Other'
+		'estimation': 'Estimation'
 	};
 	return mapping[type] || type;
 };

src/views/pages/ksDocuments/KsNewDocumentForm.vue

@@ -222,8 +222,7 @@ const uploadPercentage = ref(0);
 const documentTypeOptions = ref([
   { name: 'Functional', value: 'functional' },
   { name: 'Code Instruction', value: 'code_instruction' },
-  { name: 'Specification', value: 'specification' },
-  { name: 'Other', value: 'other' }
+  { name: 'Estimation', value: 'estimation' }
 ]);
 const availableAppOptions = ref([
   { name: 'Cross', value: '' },