add import xlsx file

michael2to3 · michael2to3 · commit fee398f21e39 · 2023-11-26T18:27:15.000+03:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# moodle2xlsx
+# moodle-qformat_xlsx
 
-`moodle2xlsx` is a plugin for Moodle that provides seamless integration for importing and exporting XLSX files. This plugin enhances the functionality of Moodle by allowing users to easily upload and download XLSX files, which can be particularly useful for managing course data, student information, grades, and more.
+`moodle-qformat_xlsx` is a plugin for Moodle that provides seamless integration for importing and exporting XLSX files. This plugin enhances the functionality of Moodle by allowing users to easily upload and download XLSX files, which can be particularly useful for managing course data, student information, grades, and more.
 
 ## Features
 
@@ -13,21 +13,21 @@
 
 1. **Download the Plugin**: Clone this repository or download the ZIP file.
     ```
-    git clone https://github.com/michael2to3/moodle2xlsx.git
+    git clone https://github.com/michael2to3/moodle-qformat_xlsx.git
     ```
 2. **Install the Plugin on Moodle**:
    - Navigate to your Moodle installation's `admin/tool/installaddon/index.php` page.
    - Upload the downloaded plugin ZIP file.
    - Follow the on-screen instructions to complete the installation.
 
 3. **Verify Installation**:
-   - After installation, 'moodle2xlsx' should be listed under the Plugins section in Moodle.
+   - After installation, 'moodle-qformat_xlsx' should be listed under the Plugins section in Moodle.
 
 ## Usage
 
 ### Importing XLSX Files
 
-1. Navigate to the `moodle2xlsx` import section in Moodle.
+1. Navigate to the `moodle-qformat_xlsx` import section in Moodle.
 2. Choose the XLSX file you want to import.
 3. Map the columns in your XLSX file to the corresponding fields in Moodle.
 4. Click on 'Import' to complete the process.
@@ -45,7 +45,7 @@ No additional configuration is needed after installation. However, you can modif
 
 ## Support
 
-For issues, feature requests, or contributions, please use the [Issues](https://github.com/michael2to3/moodle2xlsx/issues) section of this repository.
+For issues, feature requests, or contributions, please use the [Issues](https://github.com/michael2to3/moodle-qformat_xlsx/issues) section of this repository.
 
 ## License
 
diff --git a/format.php b/format.php
@@ -6,12 +6,27 @@
 require_once "$CFG->dirroot/lib/uploadlib.php";
 require_once "$CFG->dirroot/question/format/xml/format.php";
 require_once "$CFG->dirroot/lib/excellib.class.php";
+use moodle_exception;
 
-class qformat_xlsxtable extends qformat_xml
+class qformat_xlsxtable extends qformat_default
 {
     private $lessonquestions = [];
 
 
+    public function provide_import()
+    {
+        return true;
+
+    }//end provide_import()
+
+
+    public function provide_export()
+    {
+        return true;
+
+    }//end provide_export()
+
+
     public function mime_type()
     {
         return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
@@ -30,10 +45,39 @@ public function validate_file(stored_file $file): string
     }//end validate_file()
 
 
-    public function importpreprocess()
+    public function readquestions($data)
     {
+        $qa = [];
+        foreach ($data as $i => $question) {
+            $name         = $question[0];
+            $questiontext = $question[1];
+            $answer       = $question[2];
+            if (empty($name) || empty($questiontext) || empty($answer)) {
+                debugging('Skipping question '.$i, DEBUG_DEVELOPER);
+                continue;
+            }
+
+            $q               = $this->defaultquestion();
+            $q->id           = $i;
+            $q->name         = $name;
+            $q->questiontext = $questiontext;
+            $q->qtype        = 'shortanswer';
+            $q->feedback     = [
+                0 => [
+                    'text'   => ' ',
+                    'format' => FORMAT_HTML,
+                ]
+            ];
 
-    }//end importpreprocess()
+            $q->fraction = [1];
+            $q->answer   = [$answer];
+            $qa[]        = $q;
+        }//end foreach
+
+        debugging('qa: '.print_r($qa, true), DEBUG_DEVELOPER);
+        return $qa;
+
+    }//end readquestions()
 
 
     public function export_file_extension()
@@ -59,11 +103,12 @@ public function presave_process($content)
 
         $workbook  = new MoodleExcelWorkbook($this->filename);
         $worksheet = $workbook->add_worksheet('Questions');
-        $answers   = $question->options->answers;
         foreach ($this->lessonquestions as $rowIndex => $question) {
-            $worksheet->write($rowIndex, 0, $question->questiontext);
-            foreach ($answers as $answer) {
-                $worksheet->write($rowIndex, 1, $answer->answer);
+            $worksheet->write($rowIndex, 0, $question->name);
+            $worksheet->write($rowIndex, 1, $question->questiontext);
+            $answers = $question->options->answers;
+            foreach ($answers as $a) {
+                $worksheet->write($rowIndex, 2, $a->answer);
             }
         }
 
@@ -93,13 +138,21 @@ public function readdata($filename)
         $data = [];
         foreach ($worksheet->getRowIterator() as $row) {
             $cellIterator = $row->getCellIterator();
-            $cellIterator->setIterateOnlyExistingCells(false);
-            $rowData = [];
+            $cellIterator->setIterateOnlyExistingCells(true);
+            $rowData  = [];
+            $rowEmpty = true;
             foreach ($cellIterator as $cell) {
-                $rowData[] = $cell->getValue();
+                $value = $cell->getValue();
+                if (!empty($value)) {
+                    $rowEmpty = false;
+                }
+
+                $rowData[] = $value;
             }
 
-            $data[] = $rowData;
+            if (!$rowEmpty) {
+                $data[] = $rowData;
+            }
         }
 
         return $data;
diff --git a/lang/en/qformat_xlsxtable.php b/lang/en/qformat_xlsxtable.php
@@ -7,15 +7,15 @@
 $string['htmldocnotsupported'] = 'Incorrect XLSX format: please use <i>File>Save As...</i> to save <b>{$a}</b> in native XLSX 2010 (.xlsx) format and import again';
 $string['htmlnotsupported'] = 'Files in HTML format not supported: <b>{$a}</b>';
 $string['noquestions'] = 'No questions to export';
-$string['pluginname'] = 'Microsoft XLSX 2008 table format (xlsxtable)';
-$string['pluginname_help'] = 'This is a front-end for converting Microsoft XLSX 2008 files into Moodle Question XML format for import, and converting Moodle Question XML format into a format suitable for editing in Microsoft XLSX.';
+$string['pluginname'] = 'Microsoft XLSX table format';
+$string['pluginname_help'] = 'This is a front-end for converting Microsoft XLSX files into Moodle Question XML format for import, and converting Moodle Question XML format into a format suitable for editing in Microsoft XLSX.';
 $string['pluginname_link'] = 'qformat/xlsxtable';
 $string['preview_question_not_found'] = 'Preview question not found, name / course ID: {$a}';
 $string['privacy:metadata'] = 'The XLSXTable question format plugin does not store any personal data.';
 $string['stylesheetunavailable'] = 'XSLT Stylesheet <b>{$a}</b> is not available';
 $string['transformationfailed'] = 'XSLT transformation failed (<b>{$a}</b>)';
-$string['xlsxtable'] = 'Microsoft XLSX 2008 table format (xlsxtable)';
-$string['xlsxtable_help'] = 'This is a front-end for converting Microsoft XLSX 2008 files into Moodle Question XML format for import, and converting Moodle Question XML format into an enhanced XHTML format for exporting into a format suitable for editing in Microsoft XLSX.';
+$string['xlsxtable'] = 'Microsoft XLSX table format';
+$string['xlsxtable_help'] = 'This is a front-end for converting Microsoft XLSX files into Moodle Question XML format for import, and converting Moodle Question XML format into an enhanced XHTML format for exporting into a format suitable for editing in Microsoft XLSX.';
 $string['xmlnotsupported'] = 'Files in XML format not supported: <b>{$a}</b>';
 $string['xsltunavailable'] = 'You need the XSLT library installed in PHP to save this XLSX file';
 
@@ -41,7 +41,7 @@
 $string['xlsx_import'] = 'Import';
 $string['xlsx_multiple_answer'] = 'Multiple answer';
 $string['xlsx_new_question_file'] = 'New Question File';
-$string['xlsx_new_question_file_screentip'] = 'Questions must be saved in XLSX 2008 (.xlsx) format';
+$string['xlsx_new_question_file_screentip'] = 'Questions must be saved in XLSX (.xlsx) format';
 $string['xlsx_new_question_file_supertip'] = 'Each XLSX file may contain multiple categories';
 $string['xlsx_setunset_assessment_view'] = 'Set/Unset Assessment View';
 $string['xlsx_showhide_assessment_screentip'] = 'Show question metadata to edit, hide to preview printed assessment';
diff --git a/lang/ru/qformat_xlsxtable.php b/lang/ru/qformat_xlsxtable.php
@@ -6,15 +6,15 @@
 $string['htmldocnotsupported'] = 'Неверный формат XLSX: пожалуйста, используйте <i>Файл>Сохранить как...</i> для сохранения <b>{$a}</b> в нативном формате XLSX 2010 (.xlsx) и повторно импортируйте';
 $string['htmlnotsupported'] = 'Файлы в формате HTML не поддерживаются: <b>{$a}</b>';
 $string['noquestions'] = 'Нет вопросов для экспорта';
-$string['pluginname'] = 'Формат таблицы Microsoft XLSX 2008 (xlsxtable)';
-$string['pluginname_help'] = 'Это интерфейс для конвертации файлов Microsoft XLSX 2008 в формат XML вопросов Moodle для импорта, а также для конвертации формата XML вопросов Moodle в формат, подходящий для редактирования в Microsoft XLSX.';
+$string['pluginname'] = 'Формат таблицы Microsoft XLSX 2008';
+$string['pluginname_help'] = 'Это интерфейс для конвертации файлов Microsoft XLSX в формат XML вопросов Moodle для импорта, а также для конвертации формата XML вопросов Moodle в формат, подходящий для редактирования в Microsoft XLSX.';
 $string['pluginname_link'] = 'qformat/xlsxtable';
 $string['preview_question_not_found'] = 'Предварительный просмотр вопроса не найден, имя / ID курса: {$a}';
 $string['privacy:metadata'] = 'Плагин формата вопросов XLSXTable не хранит личных данных.';
 $string['stylesheetunavailable'] = 'Таблица стилей XSLT <b>{$a}</b> недоступна';
 $string['transformationfailed'] = 'Преобразование XSLT не удалось (<b>{$a}</b>)';
-$string['xlsxtable'] = 'Формат таблицы Microsoft XLSX 2008 (xlsxtable)';
-$string['xlsxtable_help'] = 'Это интерфейс для конвертации файлов Microsoft XLSX 2008 в формат XML вопросов Moodle для импорта, а также для конвертации формата XML вопросов Moodle в улучшенный формат XHTML для экспорта в формат, подходящий для редактирования в Microsoft XLSX.';
+$string['xlsxtable'] = 'Формат таблицы Microsoft XLSX 2008';
+$string['xlsxtable_help'] = 'Это интерфейс для конвертации файлов Microsoft XLSX в формат XML вопросов Moodle для импорта, а также для конвертации формата XML вопросов Moodle в улучшенный формат XHTML для экспорта в формат, подходящий для редактирования в Microsoft XLSX.';
 $string['xmlnotsupported'] = 'Файлы в формате XML не поддерживаются: <b>{$a}</b>';
 $string['xsltunavailable'] = 'Вам нужна библиотека XSLT, установленная в PHP, чтобы сохранить этот файл XLSX';
 
@@ -37,7 +37,7 @@
 $string['xlsx_import'] = 'Импорт';
 $string['xlsx_multiple_answer'] = 'Несколько ответов';
 $string['xlsx_new_question_file'] = 'Новый файл вопроса';
-$string['xlsx_new_question_file_screentip'] = 'Вопросы должны быть сохранены в формате XLSX 2008 (.xlsx)';
+$string['xlsx_new_question_file_screentip'] = 'Вопросы должны быть сохранены в формате XLSX (.xlsx)';
 $string['xlsx_new_question_file_supertip'] = 'Каждый файл XLSX может содержать несколько категорий';
 $string['xlsx_setunset_assessment_view'] = 'Установить/Снять режим оценки';
 $string['xlsx_showhide_assessment_screentip'] = 'Показать метаданные вопроса для редактирования, скрыть для предварительного просмотра напечатанной оценки';
