From 54f3009208d0bc21448dee396f70240ef59146b6 Mon Sep 17 00:00:00 2001 From: LeeWannacott Date: Fri, 15 Mar 2024 20:26:04 +1300 Subject: [PATCH] Updates --- asset-manifest.json | 6 +++--- index.html | 2 +- static/js/main.0dcd68c8.chunk.js | 2 ++ static/js/main.0dcd68c8.chunk.js.map | 1 + static/js/main.b5316d8e.chunk.js | 2 -- static/js/main.b5316d8e.chunk.js.map | 1 - table-sort.js | 6 +++++- 7 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 static/js/main.0dcd68c8.chunk.js create mode 100644 static/js/main.0dcd68c8.chunk.js.map delete mode 100644 static/js/main.b5316d8e.chunk.js delete mode 100644 static/js/main.b5316d8e.chunk.js.map diff --git a/asset-manifest.json b/asset-manifest.json index f0f931b..f00be64 100644 --- a/asset-manifest.json +++ b/asset-manifest.json @@ -1,8 +1,8 @@ { "files": { "main.css": "/table-sort-js/static/css/main.0f3f41ac.chunk.css", - "main.js": "/table-sort-js/static/js/main.b5316d8e.chunk.js", - "main.js.map": "/table-sort-js/static/js/main.b5316d8e.chunk.js.map", + "main.js": "/table-sort-js/static/js/main.0dcd68c8.chunk.js", + "main.js.map": "/table-sort-js/static/js/main.0dcd68c8.chunk.js.map", "runtime-main.js": "/table-sort-js/static/js/runtime-main.0ab85869.js", "runtime-main.js.map": "/table-sort-js/static/js/runtime-main.0ab85869.js.map", "static/js/2.6f1221a6.chunk.js": "/table-sort-js/static/js/2.6f1221a6.chunk.js", @@ -15,6 +15,6 @@ "static/js/runtime-main.0ab85869.js", "static/js/2.6f1221a6.chunk.js", "static/css/main.0f3f41ac.chunk.css", - "static/js/main.b5316d8e.chunk.js" + "static/js/main.0dcd68c8.chunk.js" ] } \ No newline at end of file diff --git a/index.html b/index.html index e8fea36..6820c37 100644 --- a/index.html +++ b/index.html @@ -1 +1 @@ -

Manual testing of table sort js

Last NameFirst NameBirth DateEmployee IDDepartmentRuntimeFile Sizedata-sort daysdates in dd/mm/yyyyfile version
FranklinBenjamin1706-1-171k-level1h 1m 17s10bTuesday17/6/19781.18.1
da VinciZarlo1452-4-15130001m 45s192038998987021bWednesday18/10/2027239.123.23
StathamJason1967-7-26HR11m 40s134809bFriday4/9/20083423.342.34
MichealAngelo1958-8-2154Marketing29s30980980bThursday2/3/1879890.93.908
Ben1994/9/23134Marketing41s902938402398bMonday8/6/19782/3/1879

Testing table containing colspan and data-sort and multiple tbodies

CategoryShowOverallOn Our DatesOn Our DatesFirst Sold Out
ComedyShow 118/2572%3/475%21999-7-30
MusicShow 26/1060%3/4875%1999-8-04
TheatreShow 37/1547%3/475%2.121999-7-19
Comedy410/1567%2/367%2.131999-7-19
Comedy59/1275%1/250%2.831999-7-29
Comedy616/2467%2/450%2.831999-7-26
Comedy716/2662%2/450%2.032022-7-31
Last NameFirst NameBirth DateEmployee IDDepartmentRuntimeFile Sizedata-sort daysdates in dd/mm/yyyy
FranklinBenjamin1706-1-171,000.00k-level1h 1m 17s10bTuesday17/6/1978
da VinciZarlo1452-4-15-9,000.211m 45s192038998987021bWednesday18/10/2027
StathamJason1967-7-2655,990.23HR11m 40s134809bFriday4/9/2008
MichealAngelo1958-8-211,000,000.23Marketing29s30980980bThursday2/3/1879
Ben1994/9/2390102Marketing41s902938402398bMonday8/6/1978
Last NameFirst NameBirth DateEmployee IDDepartmentRuntimeFile Sizedata-sort daysdates in dd/mm/yyyy
FranklinBenjamin1706-1-171k-level1h 1m 17s10bTuesday17/6/1978
da VinciZarlo1452-4-15130001m 45s192038998987021bWednesday18/10/2027
StathamJason1967-7-26HR11m 40s134809bFriday4/9/2008
MichealAngelo1958-8-2154Marketing29s30980980bThursday2/3/1879
Ben1994/9/23134Marketing41s902938402398bMonday8/6/1978
\ No newline at end of file +

Manual testing of table sort js

Last NameFirst NameBirth DateEmployee IDDepartmentRuntimeFile Sizedata-sort daysdates in dd/mm/yyyyfile version
FranklinBenjamin1706-1-171k-level1h 1m 17s10bTuesday17/6/19781.18.1
da VinciZarlo1452-4-15130001m 45s192038998987021bWednesday18/10/2027239.123.23
StathamJason1967-7-26HR11m 40s134809bFriday4/9/20083423.342.34
MichealAngelo1958-8-2154Marketing29s30980980bThursday2/3/1879890.93.908
Ben1994/9/23134Marketing41s902938402398bMonday8/6/19782/3/1879

Testing table containing colspan and data-sort and multiple tbodies

CategoryShowOverallOn Our DatesOn Our DatesFirst Sold Out
ComedyShow 118/2572%3/475%21999-7-30
MusicShow 26/1060%3/4875%1999-8-04
TheatreShow 37/1547%3/475%2.121999-7-19
Comedy410/1567%2/367%2.131999-7-19
Comedy59/1275%1/250%2.831999-7-29
Comedy616/2467%2/450%2.831999-7-26
Comedy716/2662%2/450%2.032022-7-31
Last NameFirst NameBirth DateEmployee IDDepartmentRuntimeFile Sizedata-sort daysdates in dd/mm/yyyy
FranklinBenjamin1706-1-171,000.00k-level1h 1m 17s10bTuesday17/6/1978
da VinciZarlo1452-4-15-9,000.211m 45s192038998987021bWednesday18/10/2027
StathamJason1967-7-2655,990.23HR11m 40s134809bFriday4/9/2008
MichealAngelo1958-8-211,000,000.23Marketing29s30980980bThursday2/3/1879
Ben1994/9/2390102Marketing41s902938402398bMonday8/6/1978
Last NameFirst NameBirth DateEmployee IDDepartmentRuntimeFile Sizedata-sort daysdates in dd/mm/yyyy
FranklinBenjamin1706-1-171k-level1h 1m 17s10bTuesday17/6/1978
da VinciZarlo1452-4-15130001m 45s192038998987021bWednesday18/10/2027
StathamJason1967-7-26HR11m 40s134809bFriday4/9/2008
MichealAngelo1958-8-2154Marketing29s30980980bThursday2/3/1879
Ben1994/9/23134Marketing41s902938402398bMonday8/6/1978
\ No newline at end of file diff --git a/static/js/main.0dcd68c8.chunk.js b/static/js/main.0dcd68c8.chunk.js new file mode 100644 index 0000000..19c382c --- /dev/null +++ b/static/js/main.0dcd68c8.chunk.js @@ -0,0 +1,2 @@ +(this["webpackJsonptable-sort-js"]=this["webpackJsonptable-sort-js"]||[]).push([[0],{52:function(t,e,s){},62:function(t,e,s){"use strict";s.r(e);var c=s(0),a=s(23),r=s.n(a),i=s(24),o=s(25),n=s(29),l=s(28),d=s(10),j=s.n(d),b=(s(52),s(1)),h=function(t){Object(n.a)(s,t);var e=Object(l.a)(s);function s(){var t;Object(i.a)(this,s);for(var c=arguments.length,a=new Array(c),r=0;r {\n const repos = res.data;\n this.setState({ repos });\n });\n axios\n .get(\n `https://api.github.com/users/leewannacott?client_id=${process.env.REACT_APP_GITHUB_CLIENT_ID}&client_secret${process.env.REACT_APP_GITHUB_CLIENT_SECRET}`\n )\n .then((res) => {\n const user = res.data;\n this.setState({ user });\n });\n axios\n .get(\n `https://api.github.com/users/leewannacott/starred?client_id=${process.env.REACT_APP_GITHUB_CLIENT_ID}&client_secret${process.env.REACT_APP_GITHUB_CLIENT_SECRET}`\n )\n .then((res) => {\n const stars = res.data;\n this.setState({ stars });\n });\n }\n\n render() {\n return (\n
\n
\n
\n
\n \n \n \n\n
\n \n

\n {\"Following: \" + this.state.user.following + \" \"}\n
\n {\"Followers: \" + this.state.user.followers + \" \"}\n
\n {\"Repositories: \" + this.state.user.public_repos}\n
\n {\"Stars: \" + this.state.stars.length + \" \"}\n

\n \n
\n \n
\n
\n
\n Statistics on public repositories pulled from the GitHub API v3:\n
\n
\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n {this.state.repos.map((repo) => (\n \n \n \n \n \n \n \n \n \n \n \n ))}\n \n
Repository NameLanguageCreatedDescriptionForksOpen issuesWatchersSktarsSize (MB)
\n {repo.name}\n {repo.language}\n {\" \"}\n {repo.created_at.split(\"-\")[0] +\n \"-\" +\n repo.created_at.split(\"-\")[1]}\n {repo.description} {repo.forks} {repo.open_issues} {repo.watchers} {repo.stargazers_count} {repo.size * 1000 + \"B\"}
\n
\n
\n
\n );\n }\n}\n\nexport default App;\n","import React from \"react\";\nimport ReactDOM from \"react-dom\";\nimport TestTable from \"./test-table\";\nimport { BrowserRouter, Route } from \"react-router-dom\";\n\nReactDOM.render(\n \n \n \n ,\n\n document.getElementById(\"display\")\n);\n"],"sourceRoot":""} \ No newline at end of file diff --git a/static/js/main.b5316d8e.chunk.js b/static/js/main.b5316d8e.chunk.js deleted file mode 100644 index dd1fa7d..0000000 --- a/static/js/main.b5316d8e.chunk.js +++ /dev/null @@ -1,2 +0,0 @@ -(this["webpackJsonptable-sort-js"]=this["webpackJsonptable-sort-js"]||[]).push([[0],{52:function(t,e,s){},62:function(t,e,s){"use strict";s.r(e);var c=s(0),a=s(23),r=s.n(a),i=s(24),o=s(25),n=s(29),l=s(28),d=s(10),j=s.n(d),b=(s(52),s(1)),h=function(t){Object(n.a)(s,t);var e=Object(l.a)(s);function s(){var t;Object(i.a)(this,s);for(var c=arguments.length,a=new Array(c),r=0;r {\n const repos = res.data;\n this.setState({ repos });\n });\n axios\n .get(\n `https://api.github.com/users/leewannacott?client_id=${process.env.REACT_APP_GITHUB_CLIENT_ID}&client_secret${process.env.REACT_APP_GITHUB_CLIENT_SECRET}`\n )\n .then((res) => {\n const user = res.data;\n this.setState({ user });\n });\n axios\n .get(\n `https://api.github.com/users/leewannacott/starred?client_id=${process.env.REACT_APP_GITHUB_CLIENT_ID}&client_secret${process.env.REACT_APP_GITHUB_CLIENT_SECRET}`\n )\n .then((res) => {\n const stars = res.data;\n this.setState({ stars });\n });\n }\n\n render() {\n return (\n
\n
\n
\n
\n \n \n \n\n
\n \n

\n {\"Following: \" + this.state.user.following + \" \"}\n
\n {\"Followers: \" + this.state.user.followers + \" \"}\n
\n {\"Repositories: \" + this.state.user.public_repos}\n
\n {\"Stars: \" + this.state.stars.length + \" \"}\n

\n \n
\n \n
\n
\n
\n Statistics on public repositories pulled from the GitHub API v3:\n
\n
\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n {this.state.repos.map((repo) => (\n \n \n \n \n \n \n \n \n \n \n \n ))}\n \n
Repository NameLanguageCreatedDescriptionForksOpen issuesWatchersSktarsSize (MB)
\n {repo.name}\n {repo.language}\n {\" \"}\n {repo.created_at.split(\"-\")[0] +\n \"-\" +\n repo.created_at.split(\"-\")[1]}\n {repo.description} {repo.forks} {repo.open_issues} {repo.watchers} {repo.stargazers_count} {repo.size * 1000 + \"B\"}
\n
\n
\n
\n );\n }\n}\n\nexport default App;\n","import React from \"react\";\nimport ReactDOM from \"react-dom\";\nimport TestTable from \"./test-table\";\nimport { BrowserRouter, Route } from \"react-router-dom\";\n\nReactDOM.render(\n \n \n \n ,\n\n document.getElementById(\"display\")\n);\n"],"sourceRoot":""} \ No newline at end of file diff --git a/table-sort.js b/table-sort.js index 345a4bf..54aca82 100644 --- a/table-sort.js +++ b/table-sort.js @@ -125,7 +125,11 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) { headers: [], }; for (let index of table.theads.keys()) { - table.headers.push(table.theads.item(index).querySelectorAll("th")); + if (table.theads.item(index).querySelectorAll("th").length == 0) { + table.headers.push(table.theads.item(index).querySelectorAll("td")); + } else { + table.headers.push(table.theads.item(index).querySelectorAll("th")); + } } for (let index of table.bodies.keys()) { if (table.bodies.item(index) == null) {