Skip to content
Snippets Groups Projects
Commit b5b93cde authored by Dominik Zappe's avatar Dominik Zappe
Browse files

Merge branch 'web_parser_encoding_change' into 'main' 

issue #11430 Zmenit kodovani u parseru

See merge request !63
parents 9dfe0c1c f549188d
No related branches found
No related tags found
1 merge request!63issue #11430 Zmenit kodovani u parseru
Pipeline #10045 passed
Stage: test
    Stage: deploy
      Hide whitespace changes
      Inline Side-by-side
      web/package-lock.json
      + 51
      − 8
      View file @ b5b93cde
      ......@@ -16,6 +16,7 @@
      "csv-parser": "^3.0.0",
      "dotenv": "^16.4.5",
      "express": "^4.19.1",
      "iconv-lite": "^0.6.3",
      "multer": "^1.4.5-lts.1",
      "react-dropzone": "^14.2.3",
      "react-query": "^3.39.3",
      ......@@ -4280,6 +4281,17 @@
      "npm": "1.2.8000 || >= 1.4.16"
      }
      },
      "node_modules/body-parser/node_modules/iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "dependencies": {
      "safer-buffer": ">= 2.1.2 < 3"
      },
      "engines": {
      "node": ">=0.10.0"
      }
      },
      "node_modules/bonjour-service": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
      ......@@ -6168,11 +6180,11 @@
      }
      },
      "node_modules/iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "version": "0.6.3",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
      "dependencies": {
      "safer-buffer": ">= 2.1.2 < 3"
      "safer-buffer": ">= 2.1.2 < 3.0.0"
      },
      "engines": {
      "node": ">=0.10.0"
      ......@@ -7655,6 +7667,17 @@
      "node": ">= 0.8"
      }
      },
      "node_modules/raw-body/node_modules/iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "dependencies": {
      "safer-buffer": ">= 2.1.2 < 3"
      },
      "engines": {
      "node": ">=0.10.0"
      }
      },
      "node_modules/react": {
      "version": "18.2.0",
      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
      ......@@ -12683,6 +12706,16 @@
      "raw-body": "2.5.2",
      "type-is": "~1.6.18",
      "unpipe": "1.0.0"
      },
      "dependencies": {
      "iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "requires": {
      "safer-buffer": ">= 2.1.2 < 3"
      }
      }
      }
      },
      "bonjour-service": {
      ......@@ -14073,11 +14106,11 @@
      "dev": true
      },
      "iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "version": "0.6.3",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
      "requires": {
      "safer-buffer": ">= 2.1.2 < 3"
      "safer-buffer": ">= 2.1.2 < 3.0.0"
      }
      },
      "ignore": {
      ......@@ -15145,6 +15178,16 @@
      "http-errors": "2.0.0",
      "iconv-lite": "0.4.24",
      "unpipe": "1.0.0"
      },
      "dependencies": {
      "iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "requires": {
      "safer-buffer": ">= 2.1.2 < 3"
      }
      }
      }
      },
      "react": {
      ......
      web/package.json
      + 1
      − 0
      View file @ b5b93cde
      ......@@ -24,6 +24,7 @@
      "csv-parser": "^3.0.0",
      "dotenv": "^16.4.5",
      "express": "^4.19.1",
      "iconv-lite": "^0.6.3",
      "multer": "^1.4.5-lts.1",
      "react-dropzone": "^14.2.3",
      "react-query": "^3.39.3",
      ......
      web/src/server/service/generateService.ts
      + 2
      − 1
      View file @ b5b93cde
      ......@@ -3,6 +3,7 @@ import { MulterFile } from 'multer'
      import { Question, Quiz, Student } from '../interface'
      import csv from 'csv-parser'
      import { Readable } from 'stream'
      import iconv from 'iconv-lite'
      const getValueFromHTMLString = (htmlString: string): string => {
      return htmlString
      ......@@ -72,7 +73,7 @@ export const generateArks = async (quiz: Quiz): Promise<Response> => {
      export const parseStudentCSVFile = async (
      file: MulterFile
      ): Promise<Student[]> => {
      const csvData = file.buffer.toString('utf-8')
      const csvData = iconv.decode(file.buffer, 'windows-1250')
      const results = []
      return new Promise((resolve, reject) => {
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment