From 4bef00f4e14a7aac0da1309978e4b6b68ab09314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20PENHO=C3=8BT?= Date: Thu, 9 Sep 2021 12:59:24 +0200 Subject: [PATCH] Nouvelle compilation --- public/JS/firstExample.app.js | 6 +- src/build/firstExample.js | 30 +++++- src/build/freeDatas2HTML.js | 174 ++++++++++++++++++++++++++++++---- 3 files changed, 189 insertions(+), 21 deletions(-) diff --git a/public/JS/firstExample.app.js b/public/JS/firstExample.app.js index fb6d0e9..ad05226 100644 --- a/public/JS/firstExample.app.js +++ b/public/JS/firstExample.app.js @@ -37,7 +37,7 @@ eval("var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPAC /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _freeDatas2HTML__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./freeDatas2HTML */ \"./src/freeDatas2HTML.ts\");\nvar __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n};\nvar __generator = (undefined && undefined.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n};\n\nvar initialise = function () { return __awaiter(void 0, void 0, void 0, function () {\n var converter, e_1;\n return __generator(this, function (_a) {\n switch (_a.label) {\n case 0:\n _a.trys.push([0, 2, , 3]);\n converter = new _freeDatas2HTML__WEBPACK_IMPORTED_MODULE_0__.freeDatas2HTML();\n converter.datasViewElt = { id: \"datas\" };\n converter.datasSelectors = [{ datasFieldNb: 3, id: \"filtre1\" }, { datasFieldNb: 4, id: \"filtre2\" }, { datasFieldNb: 5, id: \"filtre3\", separator: \",\" }];\n converter.datasSortingColumns = [{ datasFieldNb: 0 }, { datasFieldNb: 1 }, { datasFieldNb: 2 }];\n converter.datasSourceUrl = \"http://localhost:8080/datas/elements-chimiques.csv\";\n return [4, converter.run()];\n case 1:\n _a.sent();\n return [3, 3];\n case 2:\n e_1 = _a.sent();\n console.error(e_1);\n if (document.getElementById(\"datas\") !== null)\n document.getElementById(\"datas\").innerHTML = \"Désolé, mais un problème technique empêche l'affichage des données.\";\n return [3, 3];\n case 3: return [2];\n }\n });\n}); };\ninitialise();\n\n\n//# sourceURL=webpack://freedatas2html/./src/firstExample.ts?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _freeDatas2HTML__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./freeDatas2HTML */ \"./src/freeDatas2HTML.ts\");\nvar __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n};\nvar __generator = (undefined && undefined.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n};\n\nvar initialise = function () { return __awaiter(void 0, void 0, void 0, function () {\n var converter, mySort, e_1;\n return __generator(this, function (_a) {\n switch (_a.label) {\n case 0:\n _a.trys.push([0, 2, , 3]);\n converter = new _freeDatas2HTML__WEBPACK_IMPORTED_MODULE_0__.freeDatas2HTML();\n converter.datasViewElt = { id: \"datas\" };\n converter.datasSelectors = [{ datasFieldNb: 3, id: \"filtre1\" }, { datasFieldNb: 4, id: \"filtre2\" }, { datasFieldNb: 5, id: \"filtre3\", separator: \",\" }];\n mySort = function (a, b, order) {\n if (order === void 0) { order = \"asc\"; }\n var values = [\"> 100000\", \"> 1 et < 100 000\", \"≤ 1\", \"Traces\", \"Inexistant\"];\n if (order === \"desc\")\n values.reverse();\n if (values.indexOf(a) > values.indexOf(b))\n return -1;\n else if (values.indexOf(a) < values.indexOf(b))\n return 1;\n else\n return 0;\n };\n converter.datasSortingColumns = [{ datasFieldNb: 0 }, { datasFieldNb: 1 }, { datasFieldNb: 2 }, { datasFieldNb: 4 }];\n converter.datasSortingFunctions = [{ datasFieldNb: 4, sort: mySort }];\n converter.pagination =\n {\n selectedValue: 10,\n options: {\n displayElement: { id: \"paginationOptions\" },\n values: [10, 20, 50, 500],\n name: \"Choix de pagination :\"\n },\n pages: {\n displayElement: { id: \"pages\" },\n name: \"Page à afficher :\"\n }\n };\n converter.datasSourceUrl = \"http://localhost:8080/datas/elements-chimiques.csv\";\n return [4, converter.run()];\n case 1:\n _a.sent();\n return [3, 3];\n case 2:\n e_1 = _a.sent();\n console.error(e_1);\n if (document.getElementById(\"datas\") !== null)\n document.getElementById(\"datas\").innerHTML = \"Désolé, mais un problème technique empêche l'affichage des données.\";\n return [3, 3];\n case 3: return [2];\n }\n });\n}); };\ninitialise();\n\n\n//# sourceURL=webpack://freedatas2html/./src/firstExample.ts?"); /***/ }), @@ -48,7 +48,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _fre /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ \"freeDatas2HTML\": () => (/* binding */ freeDatas2HTML)\n/* harmony export */ });\nvar __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n};\nvar __generator = (undefined && undefined.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n};\nvar Papa = __webpack_require__(/*! papaparse */ \"./node_modules/papaparse/papaparse.min.js\");\nvar errors = __webpack_require__(/*! ./errors.js */ \"./src/errors.js\");\nvar compare = __webpack_require__(/*! natural-orderby */ \"./node_modules/natural-orderby/esm/natural-orderby.js\").compare;\nvar freeDatas2HTML = (function () {\n function freeDatas2HTML() {\n this._datasViewElt = { id: \"\", eltDOM: undefined };\n this._datasSourceUrl = \"\";\n this._datasSelectors = [];\n this._datasSortingColumns = [];\n this.parseMeta = undefined;\n this.parseDatas = [];\n this.parseErrors = [];\n this.datasHTML = \"\";\n this.stopIfParseErrors = false;\n }\n Object.defineProperty(freeDatas2HTML.prototype, \"datasViewElt\", {\n set: function (elt) {\n var checkContainerExist = document.getElementById(elt.id);\n if (checkContainerExist === null)\n throw new Error(errors.elementNotFound + elt.id);\n else {\n this._datasViewElt.id = elt.id;\n this._datasViewElt.eltDOM = checkContainerExist;\n }\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSourceUrl\", {\n set: function (url) {\n if (url.trim().length === 0)\n throw new Error(errors.needUrl);\n else\n this._datasSourceUrl = url.trim();\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSelectors\", {\n get: function () {\n return this._datasSelectors;\n },\n set: function (selectionElts) {\n this._datasSelectors = [];\n var checkContainerExist;\n for (var i = 0; i < selectionElts.length; i++) {\n checkContainerExist = document.getElementById(selectionElts[i].id);\n if (checkContainerExist === null)\n console.error(errors.elementNotFound + selectionElts[i].id);\n else if (Number.isInteger(selectionElts[i].datasFieldNb) === false || selectionElts[i].datasFieldNb < 0)\n console.error(errors.needNaturalNumber);\n else {\n selectionElts[i].eltDOM = checkContainerExist;\n if (selectionElts[i].separator !== undefined && selectionElts[i].separator === \"\")\n selectionElts[i].separator = undefined;\n this._datasSelectors.push(selectionElts[i]);\n }\n }\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSortingColumns\", {\n get: function () {\n return this._datasSortingColumns;\n },\n set: function (sortingColumns) {\n this._datasSortingColumns = [];\n for (var i = 0; i < sortingColumns.length; i++) {\n if (Number.isInteger(sortingColumns[i].datasFieldNb) === false || sortingColumns[i].datasFieldNb < 0)\n console.error(errors.needNaturalNumber);\n else {\n sortingColumns[i].order = undefined;\n this._datasSortingColumns.push(sortingColumns[i]);\n }\n }\n },\n enumerable: false,\n configurable: true\n });\n freeDatas2HTML.prototype.parse = function () {\n return __awaiter(this, void 0, void 0, function () {\n var converter;\n return __generator(this, function (_a) {\n converter = this;\n return [2, new Promise(function (resolve, reject) {\n if (converter._datasSourceUrl !== \"\") {\n Papa.parse(converter._datasSourceUrl, {\n quoteChar: '\"',\n header: true,\n complete: function (results) {\n converter.parseErrors = results.errors;\n converter.parseDatas = results.data;\n var realFields = [];\n for (var i in results.meta.fields) {\n if (results.meta.fields[i].trim() !== \"\")\n realFields.push(results.meta.fields[i]);\n }\n results.meta.fields = realFields;\n converter.parseMeta = results.meta;\n resolve(true);\n },\n error: function (error) {\n reject(new Error(errors.parserFail));\n },\n download: true,\n skipEmptyLines: true,\n });\n }\n else\n reject(new Error(errors.needUrl));\n })];\n });\n });\n };\n freeDatas2HTML.prototype.run = function () {\n return __awaiter(this, void 0, void 0, function () {\n var converter_1, selectorsHTML, i, values, colName, row, checkedValue, checkedValues, i_1, checkedValue, j, selectElement, i;\n return __generator(this, function (_a) {\n switch (_a.label) {\n case 0:\n if (this._datasViewElt.eltDOM === undefined)\n throw new Error(errors.needDatasElt);\n if (this._datasSourceUrl === \"\")\n throw new Error(errors.needUrl);\n return [4, this.parse()];\n case 1:\n _a.sent();\n if (this.parseDatas.length === 0 || this.parseMeta.fields === undefined)\n throw new Error(errors.datasNotFound);\n else if (this.stopIfParseErrors && this.parseErrors.length !== 0)\n console.error(this.parseErrors);\n else {\n converter_1 = this;\n if (this._datasSelectors.length > 0) {\n selectorsHTML = [];\n for (i in this._datasSelectors) {\n if (this._datasSelectors[i].datasFieldNb > (this.parseMeta.fields.length - 1))\n throw new Error(errors.selectorFieldNotFound);\n else {\n values = [], colName = this.parseMeta.fields[this._datasSelectors[i].datasFieldNb];\n for (row in this.parseDatas) {\n if (this._datasSelectors[i].separator === undefined) {\n checkedValue = this.parseDatas[row][colName].trim();\n if (checkedValue !== \"\" && values.indexOf(checkedValue) === -1)\n values.push(checkedValue);\n }\n else {\n checkedValues = this.parseDatas[row][colName].split(this._datasSelectors[i].separator);\n for (i_1 in checkedValues) {\n checkedValue = checkedValues[i_1].trim();\n if (checkedValue !== \"\" && values.indexOf(checkedValue) === -1)\n values.push(checkedValue);\n }\n }\n }\n if (values.length > 0) {\n values.sort(compare());\n this._datasSelectors[i].name = colName;\n this._datasSelectors[i].values = values;\n selectorsHTML[i] = \"\";\n this._datasSelectors[i].eltDOM.innerHTML = selectorsHTML[i];\n selectElement = document.getElementById(\"freeDatas2HTMLSelector\" + i);\n selectElement.addEventListener('change', function (e) {\n converter_1.datasHTML = converter_1.createDatasHTML(converter_1.parseMeta.fields, converter_1.parseDatas);\n converter_1.refreshView();\n });\n }\n }\n }\n }\n for (i in this._datasSortingColumns) {\n if (this._datasSortingColumns[i].datasFieldNb > (this.parseMeta.fields.length - 1))\n throw new Error(errors.sortingColumnsFieldNotFound);\n }\n this.datasHTML = this.createDatasHTML(this.parseMeta.fields, this.parseDatas);\n this.refreshView();\n return [2, true];\n }\n return [2];\n }\n });\n });\n };\n freeDatas2HTML.prototype.refreshView = function () {\n if (this._datasViewElt.eltDOM !== undefined) {\n var converter_2 = this;\n this._datasViewElt.eltDOM.innerHTML = this.datasHTML;\n if (this._datasSortingColumns.length > 0) {\n var getTableTh = document.querySelectorAll(\"table th\");\n if (getTableTh !== null) {\n var _loop_1 = function (i) {\n var datasFieldNb = this_1._datasSortingColumns[i].datasFieldNb;\n var htmlContent = getTableTh[datasFieldNb].innerHTML;\n htmlContent = \"\" + htmlContent + \"\";\n getTableTh[datasFieldNb].innerHTML = htmlContent;\n var sortingElement = document.getElementById(\"freeDatas2HTMLSorting\" + datasFieldNb);\n sortingElement.addEventListener('click', function (e) {\n e.preventDefault();\n var order = converter_2.datasSortingColumns[i].order;\n if (order === undefined || order === \"desc\")\n converter_2.datasSortingColumns[i].order = \"asc\";\n else\n converter_2.datasSortingColumns[i].order = \"desc\";\n converter_2._datasSortedColumn = converter_2.datasSortingColumns[i];\n converter_2.datasHTML = converter_2.createDatasHTML(converter_2.parseMeta.fields, converter_2.parseDatas);\n converter_2.refreshView();\n });\n };\n var this_1 = this;\n for (var i in this._datasSortingColumns) {\n _loop_1(i);\n }\n }\n }\n }\n };\n freeDatas2HTML.prototype.createDatasHTML = function (fields, datas) {\n var checkSelectorExist, filters = [];\n for (var i in this._datasSelectors) {\n checkSelectorExist = document.querySelector(\"#\" + this._datasSelectors[i].id + \" select\");\n if (checkSelectorExist != null && checkSelectorExist.selectedIndex != 0)\n filters.push({ field: this._datasSelectors[i].name, value: this._datasSelectors[i].values[checkSelectorExist.selectedIndex - 1], separator: this._datasSelectors[i].separator });\n }\n if (this._datasSortedColumn !== undefined) {\n var col_1 = fields[this._datasSortedColumn.datasFieldNb];\n var colOrder_1 = this._datasSortedColumn.order;\n datas.sort(function (a, b) { return compare({ order: colOrder_1 })(a[col_1], b[col_1]); });\n }\n var datasHTML = \"\";\n for (var i in fields)\n datasHTML += \"\";\n datasHTML += \"\";\n for (var row in datas) {\n var visible = true;\n if (filters.length !== 0) {\n for (var i in filters) {\n if (filters[i].separator === undefined) {\n if (datas[row][filters[i].field].trim() != filters[i].value)\n visible = false;\n }\n else {\n var checkedValues = datas[row][filters[i].field].split(filters[i].separator), finded = false;\n for (var j in checkedValues) {\n if (checkedValues[j].trim() === filters[i].value) {\n finded = true;\n break;\n }\n }\n if (!finded)\n visible = false;\n }\n }\n }\n if (visible) {\n datasHTML += \"\";\n for (var field in datas[row]) {\n if (fields.indexOf(field) !== -1)\n datasHTML += \"\";\n }\n datasHTML += \"\";\n }\n }\n datasHTML += \"
\" + fields[i] + \"
\" + datas[row][field] + \"
\";\n return datasHTML;\n };\n return freeDatas2HTML;\n}());\n\n\n\n//# sourceURL=webpack://freedatas2html/./src/freeDatas2HTML.ts?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ \"freeDatas2HTML\": () => (/* binding */ freeDatas2HTML)\n/* harmony export */ });\nvar __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n};\nvar __generator = (undefined && undefined.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n};\nvar Papa = __webpack_require__(/*! papaparse */ \"./node_modules/papaparse/papaparse.min.js\");\nvar errors = __webpack_require__(/*! ./errors.js */ \"./src/errors.js\");\nvar compare = __webpack_require__(/*! natural-orderby */ \"./node_modules/natural-orderby/esm/natural-orderby.js\").compare;\nvar freeDatas2HTML = (function () {\n function freeDatas2HTML() {\n this._datasViewElt = { id: \"\", eltDOM: undefined };\n this.datasHTML = \"\";\n this._datasSelectors = [];\n this._datasSortingColumns = [];\n this._datasSortingFunctions = [];\n this._datasSourceUrl = \"\";\n this.parseMeta = undefined;\n this.parseDatas = [];\n this.parseErrors = [];\n this.stopIfParseErrors = false;\n }\n freeDatas2HTML.isPositiveInteger = function (nb) {\n return (Number.isInteger(nb) === false || nb <= 0) ? false : true;\n };\n freeDatas2HTML.isNaturalNumber = function (nb) {\n return (Number.isInteger(nb) === false || nb < 0) ? false : true;\n };\n Object.defineProperty(freeDatas2HTML.prototype, \"datasViewElt\", {\n set: function (elt) {\n var checkContainerExist = document.getElementById(elt.id);\n if (checkContainerExist === null)\n throw new Error(errors.elementNotFound + elt.id);\n else {\n this._datasViewElt.id = elt.id;\n this._datasViewElt.eltDOM = checkContainerExist;\n }\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSourceUrl\", {\n set: function (url) {\n if (url.trim().length === 0)\n throw new Error(errors.needUrl);\n else\n this._datasSourceUrl = url.trim();\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSelectors\", {\n get: function () {\n return this._datasSelectors;\n },\n set: function (selectionElts) {\n this._datasSelectors = [];\n var checkContainerExist;\n for (var i in selectionElts) {\n checkContainerExist = document.getElementById(selectionElts[i].id);\n if (checkContainerExist === null)\n console.error(errors.elementNotFound + selectionElts[i].id);\n else if (freeDatas2HTML.isNaturalNumber(selectionElts[i].datasFieldNb) === false)\n console.error(errors.needNaturalNumber);\n else {\n selectionElts[i].eltDOM = checkContainerExist;\n if (selectionElts[i].separator !== undefined && selectionElts[i].separator === \"\")\n selectionElts[i].separator = undefined;\n this._datasSelectors.push(selectionElts[i]);\n }\n }\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSortingColumns\", {\n get: function () {\n return this._datasSortingColumns;\n },\n set: function (sortingColumns) {\n this._datasSortingColumns = [];\n for (var i = 0; i < sortingColumns.length; i++) {\n if (freeDatas2HTML.isNaturalNumber(sortingColumns[i].datasFieldNb) === false)\n console.error(errors.needNaturalNumber);\n else {\n sortingColumns[i].order = undefined;\n this._datasSortingColumns.push(sortingColumns[i]);\n }\n }\n },\n enumerable: false,\n configurable: true\n });\n Object.defineProperty(freeDatas2HTML.prototype, \"datasSortingFunctions\", {\n set: function (sortingFunctions) {\n this._datasSortingFunctions = [];\n for (var i = 0; i < sortingFunctions.length; i++) {\n if (freeDatas2HTML.isNaturalNumber(sortingFunctions[i].datasFieldNb) === false)\n console.error(errors.needNaturalNumber);\n else\n this._datasSortingFunctions.push(sortingFunctions[i]);\n }\n },\n enumerable: false,\n configurable: true\n });\n freeDatas2HTML.prototype.getSortingFunctionForField = function (datasFieldNb) {\n for (var i in this._datasSortingFunctions) {\n if (this._datasSortingFunctions[i].datasFieldNb === datasFieldNb)\n return this._datasSortingFunctions[i];\n }\n return undefined;\n };\n Object.defineProperty(freeDatas2HTML.prototype, \"pagination\", {\n get: function () {\n return this._pagination;\n },\n set: function (config) {\n this._pagination = {};\n if (config.selectedValue !== undefined || config.options !== undefined) {\n if (config.pages === undefined)\n throw new Error(errors.needPagesSelectorElt);\n var checkContainerExist = document.getElementById(config.pages.displayElement.id);\n if (checkContainerExist === null)\n throw new Error(errors.elementNotFound + config.pages.displayElement.id);\n else {\n this.pagination.pages =\n {\n displayElement: {\n id: config.pages.displayElement.id,\n eltDOM: checkContainerExist\n },\n name: (config.pages.name) ? config.pages.name : \"Pages :\",\n selectedValue: 1,\n };\n }\n }\n if (config.options !== undefined) {\n var checkContainerExist = document.getElementById(config.options.displayElement.id);\n if (checkContainerExist === null)\n throw new Error(errors.elementNotFound + config.options.displayElement.id);\n else {\n for (var i = 0; i < config.options.values.length; i++) {\n if (freeDatas2HTML.isPositiveInteger(config.options.values[i]) === false)\n throw new Error(errors.needPositiveInteger);\n }\n this._pagination.options =\n {\n displayElement: { id: config.options.displayElement.id, eltDOM: checkContainerExist },\n name: (config.options.name) ? config.options.name : \"Pagination :\",\n values: config.options.values\n };\n }\n }\n if (config.selectedValue !== undefined) {\n if (config.options !== undefined && (config.options.values.indexOf(config.selectedValue) === -1))\n throw new Error(errors.needPaginationByDefaultBeInOptions);\n if (freeDatas2HTML.isPositiveInteger(config.selectedValue))\n this._pagination.selectedValue = config.selectedValue;\n else\n throw new Error(errors.needPositiveInteger);\n }\n },\n enumerable: false,\n configurable: true\n });\n freeDatas2HTML.prototype.parse = function () {\n return __awaiter(this, void 0, void 0, function () {\n var converter;\n return __generator(this, function (_a) {\n converter = this;\n return [2, new Promise(function (resolve, reject) {\n if (converter._datasSourceUrl !== \"\") {\n Papa.parse(converter._datasSourceUrl, {\n quoteChar: '\"',\n header: true,\n complete: function (results) {\n converter.parseErrors = results.errors;\n converter.parseDatas = results.data;\n var realFields = [];\n for (var i in results.meta.fields) {\n if (results.meta.fields[i].trim() !== \"\")\n realFields.push(results.meta.fields[i]);\n }\n results.meta.fields = realFields;\n converter.parseMeta = results.meta;\n resolve(true);\n },\n error: function (error) {\n reject(new Error(errors.parserFail));\n },\n download: true,\n skipEmptyLines: true,\n });\n }\n else\n reject(new Error(errors.needUrl));\n })];\n });\n });\n };\n freeDatas2HTML.prototype.run = function () {\n return __awaiter(this, void 0, void 0, function () {\n var converter_1, selectorsHTML, i, values, colName, row, checkedValue, checkedValues, i_1, checkedValue, j, selectElement, values_1, selectorsHTML, j, selectElement_1, indexSelectedValue, i;\n return __generator(this, function (_a) {\n switch (_a.label) {\n case 0:\n if (this._datasViewElt.eltDOM === undefined)\n throw new Error(errors.needDatasElt);\n if (this._datasSourceUrl === \"\")\n throw new Error(errors.needUrl);\n return [4, this.parse()];\n case 1:\n _a.sent();\n if (this.parseDatas.length === 0 || this.parseMeta.fields === undefined)\n throw new Error(errors.datasNotFound);\n else if (this.stopIfParseErrors && this.parseErrors.length !== 0)\n console.error(this.parseErrors);\n else {\n converter_1 = this;\n if (this._datasSelectors.length > 0) {\n selectorsHTML = [];\n for (i in this._datasSelectors) {\n if (this._datasSelectors[i].datasFieldNb > (this.parseMeta.fields.length - 1))\n throw new Error(errors.selectorFieldNotFound);\n else {\n values = [], colName = this.parseMeta.fields[this._datasSelectors[i].datasFieldNb];\n for (row in this.parseDatas) {\n if (this._datasSelectors[i].separator === undefined) {\n checkedValue = this.parseDatas[row][colName].trim();\n if (checkedValue !== \"\" && values.indexOf(checkedValue) === -1)\n values.push(checkedValue);\n }\n else {\n checkedValues = this.parseDatas[row][colName].split(this._datasSelectors[i].separator);\n for (i_1 in checkedValues) {\n checkedValue = checkedValues[i_1].trim();\n if (checkedValue !== \"\" && values.indexOf(checkedValue) === -1)\n values.push(checkedValue);\n }\n }\n }\n if (values.length > 0) {\n if (this.getSortingFunctionForField(this._datasSelectors[i].datasFieldNb) !== undefined)\n values.sort(this.getSortingFunctionForField(this._datasSelectors[i].datasFieldNb).sort);\n else\n values.sort(compare());\n this._datasSelectors[i].name = colName;\n this._datasSelectors[i].values = values;\n selectorsHTML[i] = \"\";\n this._datasSelectors[i].eltDOM.innerHTML = selectorsHTML[i];\n selectElement = document.getElementById(\"freeDatas2HTMLSelector\" + i);\n selectElement.addEventListener('change', function (e) {\n converter_1.datasHTML = converter_1.createDatasHTML(converter_1.parseMeta.fields, converter_1.parseDatas);\n converter_1.refreshView();\n });\n }\n }\n }\n }\n if (converter_1.pagination !== undefined && converter_1.pagination.options !== undefined && converter_1.pagination.options.values.length > 0) {\n values_1 = converter_1.pagination.options.values;\n selectorsHTML = \"\";\n converter_1.pagination.options.displayElement.eltDOM.innerHTML = selectorsHTML;\n selectElement_1 = document.getElementById(\"freeDatas2HTMLPaginationSelector\");\n if (converter_1.pagination.selectedValue !== undefined) {\n indexSelectedValue = converter_1.pagination.options.values.indexOf(converter_1.pagination.selectedValue) + 1;\n selectElement_1.value = \"\" + indexSelectedValue;\n }\n selectElement_1.addEventListener('change', function (e) {\n if (selectElement_1.value === \"0\")\n converter_1.pagination.selectedValue = undefined;\n else\n converter_1.pagination.selectedValue = values_1[Number(selectElement_1.value) - 1];\n converter_1.datasHTML = converter_1.createDatasHTML(converter_1.parseMeta.fields, converter_1.parseDatas);\n converter_1.refreshView();\n });\n }\n for (i in this._datasSortingColumns) {\n if (this._datasSortingColumns[i].datasFieldNb > (this.parseMeta.fields.length - 1))\n throw new Error(errors.sortingColumnsFieldNotFound);\n }\n this.datasHTML = this.createDatasHTML(this.parseMeta.fields, this.parseDatas);\n this.refreshView();\n return [2, true];\n }\n return [2];\n }\n });\n });\n };\n freeDatas2HTML.prototype.refreshView = function () {\n if (this._datasViewElt.eltDOM !== undefined) {\n var converter_2 = this;\n this._datasViewElt.eltDOM.innerHTML = this.datasHTML;\n if (this._datasSortingColumns.length > 0) {\n var getTableTh = document.querySelectorAll(\"table th\");\n if (getTableTh !== null) {\n var _loop_1 = function (i) {\n var datasFieldNb = this_1._datasSortingColumns[i].datasFieldNb;\n var htmlContent = getTableTh[datasFieldNb].innerHTML;\n htmlContent = \"\" + htmlContent + \"\";\n getTableTh[datasFieldNb].innerHTML = htmlContent;\n var sortingElement = document.getElementById(\"freeDatas2HTMLSorting\" + datasFieldNb);\n sortingElement.addEventListener(\"click\", function (e) {\n e.preventDefault();\n var order = converter_2.datasSortingColumns[i].order;\n if (order === undefined || order === \"desc\")\n converter_2.datasSortingColumns[i].order = \"asc\";\n else\n converter_2.datasSortingColumns[i].order = \"desc\";\n converter_2._datasSortedColumn = converter_2.datasSortingColumns[i];\n converter_2.datasHTML = converter_2.createDatasHTML(converter_2.parseMeta.fields, converter_2.parseDatas);\n converter_2.refreshView();\n });\n };\n var this_1 = this;\n for (var i in this._datasSortingColumns) {\n _loop_1(i);\n }\n }\n }\n }\n };\n freeDatas2HTML.prototype.createDatasHTML = function (fields, datas) {\n var checkSelectorExist, filters = [];\n for (var i in this._datasSelectors) {\n checkSelectorExist = document.querySelector(\"#\" + this._datasSelectors[i].id + \" select\");\n if (checkSelectorExist != null && checkSelectorExist.selectedIndex != 0)\n filters.push({ field: this._datasSelectors[i].name, value: this._datasSelectors[i].values[checkSelectorExist.selectedIndex - 1], separator: this._datasSelectors[i].separator });\n }\n if (this._datasSortedColumn !== undefined) {\n var col_1 = fields[this._datasSortedColumn.datasFieldNb];\n var colOrder_1 = this._datasSortedColumn.order;\n if (this.getSortingFunctionForField(this._datasSortedColumn.datasFieldNb) !== undefined) {\n var myFunction_1 = this.getSortingFunctionForField(this._datasSortedColumn.datasFieldNb);\n datas.sort(function (a, b) { return myFunction_1.sort(a[col_1], b[col_1], colOrder_1); });\n }\n else\n datas.sort(function (a, b) { return compare({ order: colOrder_1 })(a[col_1], b[col_1]); });\n }\n var firstData = 0;\n if (this.pagination !== undefined && this.pagination.selectedValue !== undefined && this.pagination.pages !== undefined && this.pagination.pages.selectedValue !== undefined)\n firstData = this.pagination.selectedValue * (this.pagination.pages.selectedValue - 1);\n var maxData = (this.pagination !== undefined && this.pagination.selectedValue !== undefined) ? this.pagination.selectedValue : datas.length + 1;\n var datasHTML = \"\";\n for (var i in fields)\n datasHTML += \"\";\n datasHTML += \"\";\n var nbVisible = 0, nbTotal = 0;\n for (var row in datas) {\n var visible = true;\n if (filters.length !== 0) {\n var i = 0;\n while (filters[i] !== undefined && visible === true) {\n if (filters[i].separator === undefined) {\n if (datas[row][filters[i].field].trim() !== filters[i].value)\n visible = false;\n }\n else {\n visible = false;\n var checkedValues = datas[row][filters[i].field].split(filters[i].separator);\n for (var j in checkedValues) {\n if (checkedValues[j].trim() === filters[i].value) {\n visible = true;\n break;\n }\n }\n }\n i++;\n }\n }\n if (visible && nbTotal >= firstData && nbVisible < maxData) {\n datasHTML += \"\";\n for (var field in datas[row]) {\n if (fields.indexOf(field) !== -1)\n datasHTML += \"\";\n }\n datasHTML += \"\";\n nbVisible++;\n nbTotal++;\n }\n else if (visible)\n nbTotal++;\n }\n datasHTML += \"
\" + fields[i] + \"
\" + datas[row][field] + \"
\";\n if (this.pagination !== undefined && this.pagination.selectedValue !== undefined && this.pagination.pages !== undefined && nbTotal > this.pagination.selectedValue) {\n var nbPages = Math.ceil(nbTotal / this.pagination.selectedValue);\n var selectorsHTML = \"\";\n this.pagination.pages.displayElement.eltDOM.innerHTML = selectorsHTML;\n var selectElement_2 = document.getElementById(\"freeDatas2HTMLPagesSelector\");\n if (this.pagination.pages.selectedValue !== undefined)\n selectElement_2.value = \"\" + this.pagination.pages.selectedValue;\n var converter_3 = this;\n this.pagination.pages.selectedValue = 1;\n selectElement_2.addEventListener('change', function (e) {\n converter_3.pagination.pages.selectedValue = Number(selectElement_2.value);\n converter_3.datasHTML = converter_3.createDatasHTML(converter_3.parseMeta.fields, converter_3.parseDatas);\n converter_3.refreshView();\n });\n }\n else if (this.pagination !== undefined && this.pagination.pages !== undefined)\n this.pagination.pages.displayElement.eltDOM.innerHTML = \"\";\n return datasHTML;\n };\n return freeDatas2HTML;\n}());\n\n\n\n//# sourceURL=webpack://freedatas2html/./src/freeDatas2HTML.ts?"); /***/ }), @@ -58,7 +58,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpac \***********************/ /***/ ((module) => { -eval("module.exports =\n{\n datasNotFound : \"Aucune donnée n'a été trouvée.\",\n elementNotFound : \"Aucun élément HTML n'a été trouvé ayant comme \\\"id\\\" : \",\n needDatasElt: \"Merci de fournir un id valide pour l'élément où afficher les données.\",\n needNaturalNumber: \"Merci de fournir un nombre entier supérieur ou égal à zéro pour désigner chaque colonne.\",\n needUrl: \"Merci de fournir une url valide pour le fichier CSV à parser.\",\n parserFail: \"La lecture des données du fichier a échoué.\",\n selectorFieldNotFound: \"Au moins une des colonnes devant servir à filtrer les données n'existe pas dans le fichier.\",\n sortingColumnsFieldNotFound: \"Au moins une des colonnes devant servir à classer les données n'existe pas dans le fichier.\",\n};\n\n//# sourceURL=webpack://freedatas2html/./src/errors.js?"); +eval("module.exports =\n{\n datasNotFound : \"Aucune donnée n'a été trouvée.\",\n elementNotFound : \"Aucun élément HTML n'a été trouvé ayant comme \\\"id\\\" : \",\n needDatasElt: \"Merci de fournir un id valide pour l'élément où afficher les données.\",\n needNaturalNumber: \"Merci de fournir un nombre entier supérieur ou égal à zéro pour désigner chaque colonne.\",\n needPagesSelectorElt: \"Merci de fournir l'id de l'élément où afficher le sélecteur de pages.\",\n needPaginationByDefaultBeInOptions: \"La valeur de pagination par défaut doit faire partie des options proposées.\",\n needPositiveInteger: \"Merci de fournir un nombre entier supérieur à zéro pour désigner chaque option de pagination.\",\n needUrl: \"Merci de fournir une url valide pour le fichier CSV à parser.\",\n parserFail: \"La lecture des données du fichier a échoué.\",\n selectorFieldNotFound: \"Au moins une des colonnes devant servir à filtrer les données n'existe pas dans le fichier.\",\n sortingColumnsFieldNotFound: \"Au moins une des colonnes devant servir à classer les données n'existe pas dans le fichier.\",\n};\n\n//# sourceURL=webpack://freedatas2html/./src/errors.js?"); /***/ }) diff --git a/src/build/firstExample.js b/src/build/firstExample.js index d7b471e..429fbac 100644 --- a/src/build/firstExample.js +++ b/src/build/firstExample.js @@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { }; import { freeDatas2HTML } from "./freeDatas2HTML"; var initialise = function () { return __awaiter(void 0, void 0, void 0, function () { - var converter, e_1; + var converter, mySort, e_1; return __generator(this, function (_a) { switch (_a.label) { case 0: @@ -44,7 +44,33 @@ var initialise = function () { return __awaiter(void 0, void 0, void 0, function converter = new freeDatas2HTML(); converter.datasViewElt = { id: "datas" }; converter.datasSelectors = [{ datasFieldNb: 3, id: "filtre1" }, { datasFieldNb: 4, id: "filtre2" }, { datasFieldNb: 5, id: "filtre3", separator: "," }]; - converter.datasSortingColumns = [{ datasFieldNb: 0 }, { datasFieldNb: 1 }, { datasFieldNb: 2 }]; + mySort = function (a, b, order) { + if (order === void 0) { order = "asc"; } + var values = ["> 100000", "> 1 et < 100 000", "≤ 1", "Traces", "Inexistant"]; + if (order === "desc") + values.reverse(); + if (values.indexOf(a) > values.indexOf(b)) + return -1; + else if (values.indexOf(a) < values.indexOf(b)) + return 1; + else + return 0; + }; + converter.datasSortingColumns = [{ datasFieldNb: 0 }, { datasFieldNb: 1 }, { datasFieldNb: 2 }, { datasFieldNb: 4 }]; + converter.datasSortingFunctions = [{ datasFieldNb: 4, sort: mySort }]; + converter.pagination = + { + selectedValue: 10, + options: { + displayElement: { id: "paginationOptions" }, + values: [10, 20, 50, 500], + name: "Choix de pagination :" + }, + pages: { + displayElement: { id: "pages" }, + name: "Page à afficher :" + } + }; converter.datasSourceUrl = "http://localhost:8080/datas/elements-chimiques.csv"; return [4, converter.run()]; case 1: diff --git a/src/build/freeDatas2HTML.js b/src/build/freeDatas2HTML.js index c848215..95fce9e 100644 --- a/src/build/freeDatas2HTML.js +++ b/src/build/freeDatas2HTML.js @@ -40,15 +40,22 @@ var compare = require('natural-orderby').compare; var freeDatas2HTML = (function () { function freeDatas2HTML() { this._datasViewElt = { id: "", eltDOM: undefined }; - this._datasSourceUrl = ""; + this.datasHTML = ""; this._datasSelectors = []; this._datasSortingColumns = []; + this._datasSortingFunctions = []; + this._datasSourceUrl = ""; this.parseMeta = undefined; this.parseDatas = []; this.parseErrors = []; - this.datasHTML = ""; this.stopIfParseErrors = false; } + freeDatas2HTML.isPositiveInteger = function (nb) { + return (Number.isInteger(nb) === false || nb <= 0) ? false : true; + }; + freeDatas2HTML.isNaturalNumber = function (nb) { + return (Number.isInteger(nb) === false || nb < 0) ? false : true; + }; Object.defineProperty(freeDatas2HTML.prototype, "datasViewElt", { set: function (elt) { var checkContainerExist = document.getElementById(elt.id); @@ -79,11 +86,11 @@ var freeDatas2HTML = (function () { set: function (selectionElts) { this._datasSelectors = []; var checkContainerExist; - for (var i = 0; i < selectionElts.length; i++) { + for (var i in selectionElts) { checkContainerExist = document.getElementById(selectionElts[i].id); if (checkContainerExist === null) console.error(errors.elementNotFound + selectionElts[i].id); - else if (Number.isInteger(selectionElts[i].datasFieldNb) === false || selectionElts[i].datasFieldNb < 0) + else if (freeDatas2HTML.isNaturalNumber(selectionElts[i].datasFieldNb) === false) console.error(errors.needNaturalNumber); else { selectionElts[i].eltDOM = checkContainerExist; @@ -103,7 +110,7 @@ var freeDatas2HTML = (function () { set: function (sortingColumns) { this._datasSortingColumns = []; for (var i = 0; i < sortingColumns.length; i++) { - if (Number.isInteger(sortingColumns[i].datasFieldNb) === false || sortingColumns[i].datasFieldNb < 0) + if (freeDatas2HTML.isNaturalNumber(sortingColumns[i].datasFieldNb) === false) console.error(errors.needNaturalNumber); else { sortingColumns[i].order = undefined; @@ -114,6 +121,79 @@ var freeDatas2HTML = (function () { enumerable: true, configurable: true }); + Object.defineProperty(freeDatas2HTML.prototype, "datasSortingFunctions", { + set: function (sortingFunctions) { + this._datasSortingFunctions = []; + for (var i = 0; i < sortingFunctions.length; i++) { + if (freeDatas2HTML.isNaturalNumber(sortingFunctions[i].datasFieldNb) === false) + console.error(errors.needNaturalNumber); + else + this._datasSortingFunctions.push(sortingFunctions[i]); + } + }, + enumerable: true, + configurable: true + }); + freeDatas2HTML.prototype.getSortingFunctionForField = function (datasFieldNb) { + for (var i in this._datasSortingFunctions) { + if (this._datasSortingFunctions[i].datasFieldNb === datasFieldNb) + return this._datasSortingFunctions[i]; + } + return undefined; + }; + Object.defineProperty(freeDatas2HTML.prototype, "pagination", { + get: function () { + return this._pagination; + }, + set: function (config) { + this._pagination = {}; + if (config.selectedValue !== undefined || config.options !== undefined) { + if (config.pages === undefined) + throw new Error(errors.needPagesSelectorElt); + var checkContainerExist = document.getElementById(config.pages.displayElement.id); + if (checkContainerExist === null) + throw new Error(errors.elementNotFound + config.pages.displayElement.id); + else { + this.pagination.pages = + { + displayElement: { + id: config.pages.displayElement.id, + eltDOM: checkContainerExist + }, + name: (config.pages.name) ? config.pages.name : "Pages :", + selectedValue: 1, + }; + } + } + if (config.options !== undefined) { + var checkContainerExist = document.getElementById(config.options.displayElement.id); + if (checkContainerExist === null) + throw new Error(errors.elementNotFound + config.options.displayElement.id); + else { + for (var i = 0; i < config.options.values.length; i++) { + if (freeDatas2HTML.isPositiveInteger(config.options.values[i]) === false) + throw new Error(errors.needPositiveInteger); + } + this._pagination.options = + { + displayElement: { id: config.options.displayElement.id, eltDOM: checkContainerExist }, + name: (config.options.name) ? config.options.name : "Pagination :", + values: config.options.values + }; + } + } + if (config.selectedValue !== undefined) { + if (config.options !== undefined && (config.options.values.indexOf(config.selectedValue) === -1)) + throw new Error(errors.needPaginationByDefaultBeInOptions); + if (freeDatas2HTML.isPositiveInteger(config.selectedValue)) + this._pagination.selectedValue = config.selectedValue; + else + throw new Error(errors.needPositiveInteger); + } + }, + enumerable: true, + configurable: true + }); freeDatas2HTML.prototype.parse = function () { return __awaiter(this, void 0, void 0, function () { var converter; @@ -151,7 +231,7 @@ var freeDatas2HTML = (function () { }; freeDatas2HTML.prototype.run = function () { return __awaiter(this, void 0, void 0, function () { - var converter_1, selectorsHTML, i, values, colName, row, checkedValue, checkedValues, i_1, checkedValue, j, selectElement, i; + var converter_1, selectorsHTML, i, values, colName, row, checkedValue, checkedValues, i_1, checkedValue, j, selectElement, values_1, selectorsHTML, j, selectElement_1, indexSelectedValue, i; return __generator(this, function (_a) { switch (_a.label) { case 0: @@ -191,7 +271,10 @@ var freeDatas2HTML = (function () { } } if (values.length > 0) { - values.sort(compare()); + if (this.getSortingFunctionForField(this._datasSelectors[i].datasFieldNb) !== undefined) + values.sort(this.getSortingFunctionForField(this._datasSelectors[i].datasFieldNb).sort); + else + values.sort(compare()); this._datasSelectors[i].name = colName; this._datasSelectors[i].values = values; selectorsHTML[i] = ""; + for (j in values_1) + selectorsHTML += ""; + selectorsHTML += ""; + converter_1.pagination.options.displayElement.eltDOM.innerHTML = selectorsHTML; + selectElement_1 = document.getElementById("freeDatas2HTMLPaginationSelector"); + if (converter_1.pagination.selectedValue !== undefined) { + indexSelectedValue = converter_1.pagination.options.values.indexOf(converter_1.pagination.selectedValue) + 1; + selectElement_1.value = "" + indexSelectedValue; + } + selectElement_1.addEventListener('change', function (e) { + if (selectElement_1.value === "0") + converter_1.pagination.selectedValue = undefined; + else + converter_1.pagination.selectedValue = values_1[Number(selectElement_1.value) - 1]; + converter_1.datasHTML = converter_1.createDatasHTML(converter_1.parseMeta.fields, converter_1.parseDatas); + converter_1.refreshView(); + }); + } for (i in this._datasSortingColumns) { if (this._datasSortingColumns[i].datasFieldNb > (this.parseMeta.fields.length - 1)) throw new Error(errors.sortingColumnsFieldNotFound); @@ -234,7 +338,7 @@ var freeDatas2HTML = (function () { htmlContent = "" + htmlContent + ""; getTableTh[datasFieldNb].innerHTML = htmlContent; var sortingElement = document.getElementById("freeDatas2HTMLSorting" + datasFieldNb); - sortingElement.addEventListener('click', function (e) { + sortingElement.addEventListener("click", function (e) { e.preventDefault(); var order = converter_2.datasSortingColumns[i].order; if (order === undefined || order === "desc") @@ -264,43 +368,81 @@ var freeDatas2HTML = (function () { if (this._datasSortedColumn !== undefined) { var col_1 = fields[this._datasSortedColumn.datasFieldNb]; var colOrder_1 = this._datasSortedColumn.order; - datas.sort(function (a, b) { return compare({ order: colOrder_1 })(a[col_1], b[col_1]); }); + if (this.getSortingFunctionForField(this._datasSortedColumn.datasFieldNb) !== undefined) { + var myFunction_1 = this.getSortingFunctionForField(this._datasSortedColumn.datasFieldNb); + datas.sort(function (a, b) { return myFunction_1.sort(a[col_1], b[col_1], colOrder_1); }); + } + else + datas.sort(function (a, b) { return compare({ order: colOrder_1 })(a[col_1], b[col_1]); }); } + var firstData = 0; + if (this.pagination !== undefined && this.pagination.selectedValue !== undefined && this.pagination.pages !== undefined && this.pagination.pages.selectedValue !== undefined) + firstData = this.pagination.selectedValue * (this.pagination.pages.selectedValue - 1); + var maxData = (this.pagination !== undefined && this.pagination.selectedValue !== undefined) ? this.pagination.selectedValue : datas.length + 1; var datasHTML = ""; for (var i in fields) datasHTML += ""; datasHTML += ""; + var nbVisible = 0, nbTotal = 0; for (var row in datas) { var visible = true; if (filters.length !== 0) { - for (var i in filters) { + var i = 0; + while (filters[i] !== undefined && visible === true) { if (filters[i].separator === undefined) { - if (datas[row][filters[i].field].trim() != filters[i].value) + if (datas[row][filters[i].field].trim() !== filters[i].value) visible = false; } else { - var checkedValues = datas[row][filters[i].field].split(filters[i].separator), finded = false; + visible = false; + var checkedValues = datas[row][filters[i].field].split(filters[i].separator); for (var j in checkedValues) { if (checkedValues[j].trim() === filters[i].value) { - finded = true; + visible = true; break; } } - if (!finded) - visible = false; } + i++; } } - if (visible) { + if (visible && nbTotal >= firstData && nbVisible < maxData) { datasHTML += ""; for (var field in datas[row]) { if (fields.indexOf(field) !== -1) datasHTML += ""; } datasHTML += ""; + nbVisible++; + nbTotal++; } + else if (visible) + nbTotal++; } datasHTML += "
" + fields[i] + "
" + datas[row][field] + "
"; + if (this.pagination !== undefined && this.pagination.selectedValue !== undefined && this.pagination.pages !== undefined && nbTotal > this.pagination.selectedValue) { + var nbPages = Math.ceil(nbTotal / this.pagination.selectedValue); + var selectorsHTML = ""; + this.pagination.pages.displayElement.eltDOM.innerHTML = selectorsHTML; + var selectElement_2 = document.getElementById("freeDatas2HTMLPagesSelector"); + if (this.pagination.pages.selectedValue !== undefined) + selectElement_2.value = "" + this.pagination.pages.selectedValue; + var converter_3 = this; + this.pagination.pages.selectedValue = 1; + selectElement_2.addEventListener('change', function (e) { + converter_3.pagination.pages.selectedValue = Number(selectElement_2.value); + converter_3.datasHTML = converter_3.createDatasHTML(converter_3.parseMeta.fields, converter_3.parseDatas); + converter_3.refreshView(); + }); + } + else if (this.pagination !== undefined && this.pagination.pages !== undefined) + this.pagination.pages.displayElement.eltDOM.innerHTML = ""; return datasHTML; }; return freeDatas2HTML;