@windward/core 0.20.0 → 0.21.0

package/components/Settings/UserUploadSettings.vue

@@ -1,10 +1,17 @@
 <template>
     <div>
-        <v-container>
+        <v-container class="pa-0">
             <BaseContentBlockSettings
                 v-model="block.metadata.config"
                 :disabled="render"
             ></BaseContentBlockSettings>
+            <p>
+                {{
+                    $t(
+                        'windward.core.components.settings.user_upload.max_file_size'
+                    )
+                }}
+            </p>
         </v-container>
         <v-switch
             v-model="block.metadata.config.uploadSettings.multiple"
@@ -23,6 +30,7 @@
             item-value="value"
             outlined
             dense
+            style="z-index: 20"
             :label="
                 $t('windward.core.components.settings.user_upload.accept_types')
             "
@@ -31,8 +39,8 @@
     </div>
 </template>
 <script>
-import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import _ from 'lodash'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import Uuid from '~/helpers/Uuid'
 import BaseContentBlockSettings from '~/components/Content/Settings/BaseContentBlockSettings.vue'
 
@@ -45,44 +53,96 @@ export default {
             valid: true,
             debounce: null,
             loading: false,
-            acceptOptions: [
+            attrs: {
+                class: 'mb-6',
+                boilerplate: true,
+                elevation: 0,
+            },
+        }
+    },
+    computed: {
+        acceptOptions() {
+            const documents = [
+                { name: 'doc', value: 'application/msword' },
+                {
+                    name: 'docx',
+                    value: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                },
+                {
+                    name: 'odt',
+                    value: 'application/vnd.oasis.opendocument.text',
+                },
+                { name: 'pdf', value: 'application/pdf' },
+                { name: 'xls', value: 'application/vnd.ms-excel' },
+                {
+                    name: 'xlsx',
+                    value: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                },
+                { name: 'rtf', value: 'application/rtf' },
+                { name: 'pages', value: 'application/x-iwork-pages-sffpages' },
+                {
+                    name: 'numbers',
+                    value: 'application/x-iwork-numbers-sffnumbers',
+                },
+                { name: 'txt', value: 'text/plain' },
+                {
+                    name: 'ods',
+                    value: 'application/vnd.oasis.opendocument.spreadsheet',
+                },
+                {
+                    name: 'csv',
+                    value: 'text/csv',
+                },
+                {
+                    name: 'pptx',
+                    value: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                },
+                {
+                    name: 'ppt',
+                    value: 'application/vnd.ms-powerpoint',
+                },
+                {
+                    name: 'odp',
+                    value: 'application/vnd.oasis.opendocument.presentation',
+                },
+                {
+                    name: 'keynote',
+                    value: 'application/zip',
+                },
+            ]
+            return [
                 {
                     name: this.$t(
                         'windward.core.components.settings.user_upload.types.all'
                     ),
-                    value: 'image/jpeg,image/gif,image/png,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/zip',
+                    value: '*',
                 },
                 {
                     name: this.$t(
                         'windward.core.components.settings.user_upload.types.all_image'
                     ),
-                    value: 'image/jpeg,image/gif,image/png',
+                    value: 'image/*',
                 },
                 {
                     name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all_word'
+                        'windward.core.components.settings.user_upload.types.all_video_audio'
                     ),
-                    value: 'application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    value: 'video/*,audio/*',
                 },
                 {
                     name: this.$t(
-                        'windward.core.components.settings.user_upload.types.all_excel'
+                        'windward.core.components.settings.user_upload.types.all_word'
                     ),
-                    value: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    value: documents.map((type) => type.value).join(','),
                 },
                 {
                     name: this.$t(
                         'windward.core.components.settings.user_upload.types.all_zip'
                     ),
-                    value: 'application/zip',
+                    value: 'application/zip,application/gzip,application/x-gzip,application/x-tar,application/rar,application/x-rar-compressed,application/x-7z-compressed,application/x-bzip2,application/x-xz',
                 },
-            ],
-            attrs: {
-                class: 'mb-6',
-                boilerplate: true,
-                elevation: 0,
-            },
-        }
+            ]
+        },
     },
     beforeMount() {
         if (_.isEmpty(this.block)) {

package/components/utils/FillInBlank/FillInBlankInput.vue

@@ -1,6 +1,6 @@
 <template>
     <span class="fib">
-        <v-dialog v-model="show" max-width="300">
+        <v-dialog v-model="show" max-width="500" width="90%">
             <v-card>
                 <v-card-text class="pt-6">
                     <div>
@@ -20,6 +20,16 @@
                                 )
                             }}
                         </p>
+                        <div v-if="hasExplanation" class="mt-3">
+                            <p class="font-weight-bold mb-1">
+                                {{
+                                    $t(
+                                        'windward.core.components.utils.fill_in_the_blank.fill_in_blank_input.explanation'
+                                    )
+                                }}:
+                            </p>
+                            <div v-html="decodedDescription"></div>
+                        </div>
                     </div>
                 </v-card-text>
                 <v-card-actions>
@@ -141,6 +151,19 @@ export default {
             }
             return ''
         },
+        hasExplanation() {
+            return this.description && this.description.trim() !== '' && this.description !== 'empty'
+        },
+        decodedDescription() {
+            if (!this.hasExplanation) {
+                return ''
+            }
+            try {
+                return atob(this.description)
+            } catch (e) {
+                return this.description
+            }
+        },
     },
     watch: {
         // set focus on the action button when dialog loaded for accessibility

package/components/utils/FillInBlank/FillInTheBlanksManager.vue

@@ -19,6 +19,11 @@
                 <TextEditor
                     :key="key"
                     v-model="feedback"
+                    :label="
+                        $t(
+                            'windward.core.components.utils.fill_in_the_blank.fill_in_the_blank_manager.explanation'
+                        )
+                    "
                     @input="submit"
                 ></TextEditor>
             </v-col>

package/components/utils/GenerateAIQuestionButton.vue

@@ -44,7 +44,7 @@
                 </div>
             </v-col>
             <v-col
-                v-if="isFlashcardType"
+                v-if="isFlashcardType || isMatchingGameType || isSortingGameType"
                 cols="auto"
                 class="d-flex align-center"
             >
@@ -124,14 +124,32 @@ export default {
         isBucketGameType() {
             return this.questionType === 'bucket_game'
         },
+        isMatchingGameType() {
+            return this.questionType === 'matching_game'
+        },
+        isSortingGameType() {
+            return this.questionType === 'sorting_game'
+        },
         replaceExistingLabel() {
             if (this.isBucketGameType) {
                 return this.$t(
                     'windward.games.components.settings.bucket_game.form.replace_existing'
                 )
+                return this.$t(
+                    'windward.games.components.settings.bucket_game.form.replace_existing'
+                )
+            }
+            if (this.isMatchingGameType) {
+                return this.$t(
+                'windward.games.components.settings.matching_game.form.replace_existing')
+            }
+            if (this.isSortingGameType) {
+                return this.$t(
+                'windward.games.components.settings.sorting_game.form.replace_existing')
             }
             return this.$t(
                 'windward.games.components.settings.flashcard.form.replace_existing'
+            
             )
         },
         flattenedContent() {
@@ -192,14 +210,18 @@ export default {
             ]
 
             // Only add higher-level Bloom's taxonomy for supported question types
-            // Flashcards and bucket games use only basic levels
-            if (
+            const supportsAdvancedTaxonomy = 
+                this.isSortingGameType ||
+                ([
+                    'multi_choice_single_answer',
+                    'multi_choice_multi_answer',
+                    'ordering'
+                ].includes(this.questionType) &&
                 !this.isFlashcardType &&
                 !this.isBucketGameType &&
-                (this.questionType === 'multi_choice_single_answer' ||
-                    this.questionType === 'ordering' ||
-                    this.questionType === 'multi_choice_multi_answer')
-            ) {
+                !this.isMatchingGameType)
+
+            if (supportsAdvancedTaxonomy) {
                 const multiBlooms = [
                     {
                         value: 'Analyze',
@@ -227,6 +249,14 @@ export default {
                 return this.$t(
                     'windward.core.components.content.blocks.generate_questions.button_label_bucket_game'
                 )
+            } else if (this.questionType === 'matching_game') {
+                return this.$t(
+                    'windward.core.components.content.blocks.generate_questions.button_label_matching_game'
+                )
+            } else if (this.questionType === 'sorting_game') {
+                return this.$t(
+                    'windward.core.components.content.blocks.generate_questions.button_label_sorting_game'
+                )
             } else {
                 return this.$t(
                     'windward.core.components.content.blocks.generate_questions.button_label'
@@ -249,9 +279,8 @@ export default {
                 }
 
                 const course = new Course(this.course)
-                const content = new Content(
-                    this.selectedContent || this.content
-                )
+                const contentData = this.selectedContent || this.content
+                const content = new Content(contentData)
 
                 let response
                 if (this.questionType === 'flashcard') {
@@ -347,6 +376,96 @@ export default {
                             'Invalid response from bucket game generation'
                         )
                     }
+                } else if (this.questionType === 'matching_game') {
+                    // MATCHING GAME GENERATION
+                    const activity = new Activity()
+
+                    const endpoint = `suggest/matching_game${bloomsRequest}`;
+
+                    response = await Activity.custom(
+                        course,
+                        content,
+                        activity,
+                        endpoint
+                    ).get()
+
+                    let activityData = null
+
+                    if (response && response.activity) {
+                        activityData = response.activity
+                    } else if (
+                        response &&
+                        response.length > 0 &&
+                        response[0] &&
+                        response[0].activity
+                    ) {
+                        activityData = response[0].activity
+                    } else if (Array.isArray(response) && response.length > 0) {
+                        activityData = response[0]
+                    }
+
+                    if (activityData && activityData.metadata &&
+                        activityData.metadata.config &&
+                        activityData.metadata.config.answerObjects &&
+                        activityData.metadata.config.prompts
+                    ) {
+                        // We pass the activity data and the replace flag to the parent component
+                        this.$emit(
+                            'click:generate',
+                            activityData,
+                            this.replaceExisting
+                        )
+                    } else {
+                        throw new Error(
+                            'Invalid response from matching game generation'
+                        )
+                    }
+                } else if (this.questionType === 'sorting_game') {
+                    // SORTING GAME GENERATION
+                    const activity = new Activity()
+
+                    const endpoint = `suggest/sorting_game${bloomsRequest}`;
+
+                    response = await Activity.custom(
+                        course,
+                        content,
+                        activity,
+                        endpoint
+                    ).get()
+
+                    let activityData = null
+
+                    if (response && response.activity) {
+                        activityData = response.activity
+                    } else if (
+                        response &&
+                        response.length > 0 &&
+                        response[0] &&
+                        response[0].activity
+                    ) {
+                        activityData = response[0].activity
+                    } else if (Array.isArray(response) && response.length > 0) {
+                        activityData = response[0]
+                    } else if (response) {
+                        activityData = response
+                    }
+
+                    if (activityData && activityData.metadata &&
+                        activityData.metadata.config &&
+                        activityData.metadata.config.answer &&
+                        Array.isArray(activityData.metadata.config.answer)
+                    ) {
+                        // We pass the activity data and the replace flag to the parent component
+                        this.$emit(
+                            'click:generate',
+                            activityData,
+                            this.replaceExisting
+                        )
+                    } else {
+                        throw new Error(
+                            'Invalid response from sorting game generation'
+                        )
+                    }
                 } else {
                     // ASSESSMENT QUESTION GENERATION
                     const assessment = new Assessment({ id: this.block.id })
@@ -392,6 +511,28 @@ export default {
                         this.$t(
                             `${basePath}.content_mismatch_bucket_game_support`
                         )
+                } else if (
+                    (errorMessage === 'activity.error.content_mismatch' ||
+                        errorType === 'content_mismatch') &&
+                    this.questionType === 'matching_game'
+                ) {
+                    errorText =
+                        this.$t(`${basePath}.content_mismatch_matching_game`) +
+                        '\n\n' +
+                        this.$t(
+                            `${basePath}.content_mismatch_matching_game_support`
+                        )
+                } else if (
+                    (errorMessage === 'activity.error.content_mismatch' ||
+                        errorType === 'content_mismatch') &&
+                    this.questionType === 'sorting_game'
+                ) {
+                    errorText =
+                        this.$t(`${basePath}.content_mismatch_sorting_game`) +
+                        '\n\n' +
+                        this.$t(
+                            `${basePath}.content_mismatch_sorting_game_support`
+                        )
                 } else {
                     errorText =
                         this.$t(`${basePath}.${errorType}`) +
@@ -429,5 +570,4 @@ export default {
     border-radius: 15px;
 }
 </style>
-}
-</style>
+

package/components/utils/TinyMCEWrapper.vue

@@ -36,10 +36,15 @@
                 <label v-if="hint" class="editor-hint">{{ hint }}</label>
             </slot>
         </div>
-        <v-btn-toggle dense multiple class="pt-1 d-flex justify-end">
+        <v-btn-toggle
+            v-if="allowRead && !render"
+            dense
+            multiple
+            class="pt-1 d-flex justify-end"
+        >
             <slot name="actions-prepend" :render="render"></slot>
             <slot name="actions" :render="render">
-                <v-btn-toggle v-if="allowRead && !render" dense>
+                <v-btn-toggle dense>
                     <v-btn color="primary" outlined @click="read">
                         <v-icon> mdi-play</v-icon>
                     </v-btn>
@@ -61,7 +66,6 @@ import _ from 'lodash'
 import 'tinymce'
 import Editor from '@tinymce/tinymce-vue'
 import { getTinymce } from '@tinymce/tinymce-vue/lib/cjs/main/ts/TinyMCE'
-import GlossaryVerification from '../Glossary/GlossaryVerification.vue'
 /* Required TinyMCE components */
 import 'tinymce/icons/default/icons.min.js'
 import 'tinymce/themes/silver/theme.min.js'
@@ -112,6 +116,7 @@ import 'tinymce/skins/content/dark/content.js'
 
 import { Synthesizer } from 'speechreader'
 import Crypto from '~/helpers/Crypto'
+import GlossaryVerification from '../Glossary/GlossaryVerification.vue'
 import MathHelper from '../../helpers/MathHelper'
 import { WindwardPlugins } from '../../helpers/tinymce/WindwardPlugins'
 

package/i18n/en-US/components/content/blocks/generate_questions.ts

@@ -16,6 +16,14 @@ export default {
         content_mismatch_bucket_game_support:
             "Consider adding content with clear categories and multiple sortable items that can be grouped into 2-4 distinct buckets.",
 
+        content_mismatch_matching_game: "Content not suitable for matching games.",
+        content_mismatch_matching_game_support:
+            "Consider adding content that explicitly defines relationships between terms, concepts, or categories that students can match.",
+
+        content_mismatch_sorting_game: "Content not suitable for sorting games.",
+        content_mismatch_sorting_game_support:
+            "Consider adding content with sequential steps, chronological events, or items that have a clear logical order for students to arrange.",
+
         llm_unavailable: 'Question generation temporarily unavailable.',
         llm_unavailable_support:
             "We're unable to connect to our AI service at the moment. Please try again in a few minutes or contact support if the issue persists.",
@@ -27,6 +35,8 @@ export default {
     button_label: 'Generate Question',
     button_label_flashcard: 'Generate Flashcards',
     button_label_bucket_game: 'Generate Buckets',
+    button_label_matching_game: 'Generate Matches',
+    button_label_sorting_game: 'Generate Items',
     selected_pages: 'Selected Page',
     ai_assistance: 'AI Assistance',
     blooms: {

package/i18n/en-US/components/settings/open_response_collate.ts

@@ -1,6 +1,6 @@
 export default {
-    instructions:
-        'Check off open response items to collate into a document.',
+    instructions: 'Check off open response items to collate into a document.',
     include_prompts: 'Include Prompts',
     filename: 'Filename (Blank for current page name)',
+    additional_text: 'Additional text to display in downloaded document',
 }

package/i18n/en-US/components/settings/user_upload.ts

@@ -3,10 +3,12 @@ export default {
     accept_types: 'Allowed File Types',
     types: {
         all: 'All File Types',
-        all_image: 'Images - .jpg, .png, .gif',
-        all_word: 'Documents - .doc and .docx',
-        all_excel: 'Spreadsheets - .xls and .xlsx',
-        all_zip: 'Compressed - .zip',
+        all_image: 'Images',
+        all_word: 'Documents (Text, Spreadsheets, Presentations)',
+        all_zip: 'Compressed',
+        all_video_audio: 'Video/Audio',
+        file: 'file',
     },
+    max_file_size: 'Maximum file size: 100MB',
     instructions: 'Drag or click here to upload files.',
 }

package/i18n/en-US/components/utils/FillInBlank/FillInBlankInput.ts

@@ -12,4 +12,5 @@ export default {
     try_again: 'Try Again',
     user_input: 'Your answer: {0}',
     correct_answer: 'Correct answer: {0}',
+    explanation: 'Explanation',
 }

package/i18n/en-US/components/utils/FillInBlank/FillInTheBlanksManager.ts

@@ -8,4 +8,5 @@ export default {
     add_answer: 'Add Answer',
     default_description: 'default description',
     answer: 'Answer',
+    explanation: 'Explanation',
 }

package/i18n/en-US/shared/settings.ts

@@ -26,4 +26,6 @@ export default {
     upload_file: 'Upload File',
     alt_image: 'Alternate text for image',
     aria_described: 'Aria described by',
+    top: 'top',
+    bottom: 'bottom',
 }

package/i18n/es-ES/components/content/blocks/generate_questions.ts

@@ -18,6 +18,14 @@ export default {
         content_mismatch_bucket_game_support:
             'Considera agregar contenido con categorías claras y múltiples elementos clasificables que se puedan agrupar en 2-4 categorías distintas.',
 
+        content_mismatch_matching_game: 'El contenido no es adecuado para juegos de emparejamiento.',
+        content_mismatch_matching_game_support:
+            'Considera agregar contenido que defina explícitamente relaciones entre términos, conceptos o categorías que los estudiantes puedan emparejar.',
+
+        content_mismatch_sorting_game: 'El contenido no es adecuado para juegos de ordenamiento.',
+        content_mismatch_sorting_game_support:
+            'Considera agregar contenido con pasos secuenciales, eventos cronológicos o elementos que tengan un orden lógico claro para que los estudiantes los organicen.',
+
         llm_unavailable:
             'La generación de preguntas no está disponible temporalmente.',
         llm_unavailable_support:
@@ -30,6 +38,8 @@ export default {
     button_label: 'Generar pregunta',
     button_label_flashcard: 'Generar tarjetas',
     button_label_bucket_game: 'Generar categorías',
+    button_label_matching_game: 'Generar coincidencias',
+    button_label_sorting_game: 'Generar elementos',
     selected_pages: 'Página seleccionada',
     ai_assistance: 'Asistencia de IA',
     blooms: {

package/i18n/es-ES/components/settings/open_response_collate.ts

@@ -4,4 +4,5 @@ export default {
     include_prompts: 'Incluir mensajes',
     filename:
         'Nombre de archivo (en blanco para el nombre de la página actual)',
+    additional_text: 'Texto adicional para mostrar en el documento descargado',
 }

package/i18n/es-ES/components/settings/user_upload.ts

@@ -3,10 +3,12 @@ export default {
     accept_types: 'Tipos de archivos permitidos ',
     types: {
         all: 'Todos los tipos de archivos',
-        all_image: 'Imágenes - .jpg, .png, .gif',
-        all_word: 'Documentos - .doc y .docx',
-        all_excel: 'Hojas de cálculo - .xls y .xlsx',
-        all_zip: 'Comprimido - .zip',
+        all_image: 'Imágenes',
+        all_word: 'Documentos (Texto, Hojas de cálculo, Presentaciones)',
+        all_zip: 'Comprimido',
+        all_video_audio: 'Video/Audio',
+        file: 'Archivo',
     },
+    max_file_size: 'Tamaño máximo de archivo: 100 MB',
     instructions: 'Arrastre o haga clic aquí para cargar archivos.',
 }

package/i18n/es-ES/components/utils/FillInBlank/FillInBlankInput.ts

@@ -2,14 +2,15 @@ export default {
     add_answer: 'Agregar respuesta',
     answer: 'Respuesta',
     check: 'Verificar',
-    check_answer: 'Haga clic para comprobar respuesta',
+    check_answer: 'Haga clic para verificar la respuesta',
     close: 'Cerrar',
     correct: 'Correcto',
     default_description: 'Su entrada es correcta',
     incorrect: 'Incorrecto',
     input_incorrect: "'{0}' es incorrecto",
-    reset: 'restablecer',
+    reset: 'reiniciar',
     try_again: 'Intentar de nuevo',
-    user_input: 'Tu respuesta: {0}',
+    user_input: 'Su respuesta: {0}',
     correct_answer: 'Respuesta correcta: {0}',
+    explanation: 'Explicación',
 }

package/i18n/es-ES/components/utils/FillInBlank/FillInTheBlanksManager.ts

@@ -3,9 +3,10 @@ export default {
     try_again: 'Intentar de nuevo',
     correct: 'Correcto',
     incorrect: 'Incorrecto',
-    reset: 'restablecer',
+    reset: 'reiniciar',
     check: 'Verificar',
     add_answer: 'Agregar respuesta',
     default_description: 'descripción predeterminada',
     answer: 'Respuesta',
+    explanation: 'Explicación',
 }

package/i18n/es-ES/shared/settings.ts

@@ -27,4 +27,6 @@ export default {
     upload_file: 'Subir Archivo',
     alt_image: 'Texto alternativo para imagen',
     aria_described: 'Aria descrita por',
+    top: 'Arriba',
+    bottom: 'Abajo',
 }

package/i18n/sv-SE/components/content/blocks/generate_questions.ts

@@ -16,6 +16,14 @@ export default {
         content_mismatch_bucket_game_support:
             'Överväg att lägga till innehåll med tydliga kategorier och flera sorterbara objekt som kan grupperas i 2-4 distinkta kategorier.',
 
+        content_mismatch_matching_game: 'Innehållet är inte lämpligt för matchningsspel.',
+        content_mismatch_matching_game_support:
+            'Överväg att lägga till innehåll som uttryckligen definierar relationer mellan termer, koncept eller kategorier som elever kan matcha.',
+
+        content_mismatch_sorting_game: 'Innehållet är inte lämpligt för sorteringsspel.',
+        content_mismatch_sorting_game_support:
+            'Överväg att lägga till innehåll med sekventiella steg, kronologiska händelser eller objekt som har en tydlig logisk ordning för elever att arrangera.',
+
         llm_unavailable: 'Frågegenerering tillfälligt otillgänglig.',
         llm_unavailable_support:
             'Vi kan inte ansluta till vår AI-tjänst för tillfället. Försök igen om några minuter.',
@@ -27,6 +35,8 @@ export default {
     button_label: 'Generera fråga',
     button_label_flashcard: 'Generera flashkort',
     button_label_bucket_game: 'Generera kategorier',
+    button_label_matching_game: 'Generera matchningar',
+    button_label_sorting_game: 'Generera objekt',
     selected_pages: 'Vald sida',
     ai_assistance: 'AI-hjälp',
     blooms: {

package/i18n/sv-SE/components/settings/open_response_collate.ts

@@ -3,4 +3,6 @@ export default {
         'Bocka av öppna svarsobjekt för att sortera till ett dokument.',
     include_prompts: 'Inkludera uppmaningar',
     filename: 'Filnamn (tomt för nuvarande sidnamn)',
+    additional_text:
+        'Ytterligare text som ska visas i det nedladdade dokumentet',
 }