From 9270a2f0f3c09654d57eb3fe8ca62c4294e0629f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 15 Jul 2021 17:53:43 +0200 Subject: [PATCH] Bug Table Order Change changed Tabs Fixed --- .../Governance/UI/Spaces/Reports-Space/Referrals.js | 10 ++++++++-- .../UI/Spaces/Reports-Space/ReportsPage.js | 13 ++++++++++--- .../UI/Spaces/Reports-Space/ReportsSpace.js | 4 ++-- .../UI/Spaces/Reports-Space/UserProfiles.js | 10 ++++++++-- Projects/Governance/UI/Utilities/Tables.js | 10 ++++++++-- 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/Projects/Governance/UI/Spaces/Reports-Space/Referrals.js b/Projects/Governance/UI/Spaces/Reports-Space/Referrals.js index eddf22124..8bda1814d 100644 --- a/Projects/Governance/UI/Spaces/Reports-Space/Referrals.js +++ b/Projects/Governance/UI/Spaces/Reports-Space/Referrals.js @@ -15,7 +15,7 @@ function newGovernanceReportsReferrals() { } - function addHTML() { + function addHTML(tabIndex) { let tableRecords = [] let table = 'referrals' @@ -99,6 +99,12 @@ function newGovernanceReportsReferrals() { } sortingOrder = UI.projects.governance.spaces.reportsSpace.tablesSortingOrders[table] } - return UI.projects.governance.utilities.tables.addHTML(table, tableRecords, tableRecordDefinition, sortingOrder) + return UI.projects.governance.utilities.tables.addHTML( + table, + tableRecords, + tableRecordDefinition, + sortingOrder, + tabIndex + ) } } \ No newline at end of file diff --git a/Projects/Governance/UI/Spaces/Reports-Space/ReportsPage.js b/Projects/Governance/UI/Spaces/Reports-Space/ReportsPage.js index 4059aa0bb..9b4924daf 100644 --- a/Projects/Governance/UI/Spaces/Reports-Space/ReportsPage.js +++ b/Projects/Governance/UI/Spaces/Reports-Space/ReportsPage.js @@ -15,7 +15,7 @@ function newGovernanceReportsReportsPage() { } - function render() { + function render(tabIndex) { let resultsArary = [] let initialTime = new Date() @@ -49,13 +49,13 @@ function newGovernanceReportsReportsPage() { switch (tab) { case 'Profiles': { - let response = UI.projects.governance.spaces.reportsSpace.userProfiles.addHTML() + let response = UI.projects.governance.spaces.reportsSpace.userProfiles.addHTML(1) HTML = HTML + response.HTML resultCounter = response.resultCounter break } case 'Referrals': { - let response = UI.projects.governance.spaces.reportsSpace.referrals.addHTML() + let response = UI.projects.governance.spaces.reportsSpace.referrals.addHTML(2) HTML = HTML + response.HTML resultCounter = response.resultCounter break @@ -84,10 +84,17 @@ function newGovernanceReportsReportsPage() { } let docsContentDiv = document.getElementById('governance-content-div') + docsContentDiv.innerHTML = HTML + UI.projects.governance.spaces.reportsSpace.footer.addFooter() UI.projects.education.spaces.docsSpace.mainSearchPage.detectEnterOnSearchBox() UI.projects.education.spaces.docsSpace.mainSearchPage.setFocusOnSearchBox() + + // If there is a tabIndex we will switch to that tab here. + if (tabIndex !== undefined) { + let tab = document.getElementById('governance-tab' + tabIndex) + tab.checked = true + } } } } \ No newline at end of file diff --git a/Projects/Governance/UI/Spaces/Reports-Space/ReportsSpace.js b/Projects/Governance/UI/Spaces/Reports-Space/ReportsSpace.js index b70bc4dd8..15d7f8005 100644 --- a/Projects/Governance/UI/Spaces/Reports-Space/ReportsSpace.js +++ b/Projects/Governance/UI/Spaces/Reports-Space/ReportsSpace.js @@ -149,10 +149,10 @@ function newGobernanceReportsSpace() { } } - function changeTableSortingOrder(table, property, order) { + function changeTableSortingOrder(table, property, order, tabIndex) { thisObject.tablesSortingOrders[table].property = property thisObject.tablesSortingOrders[table].order = order - thisObject.reportsPage.render() + thisObject.reportsPage.render(tabIndex) } function onOpening() { diff --git a/Projects/Governance/UI/Spaces/Reports-Space/UserProfiles.js b/Projects/Governance/UI/Spaces/Reports-Space/UserProfiles.js index 6d3c99eaf..565805914 100644 --- a/Projects/Governance/UI/Spaces/Reports-Space/UserProfiles.js +++ b/Projects/Governance/UI/Spaces/Reports-Space/UserProfiles.js @@ -15,7 +15,7 @@ function newGovernanceReportsUserProfiles() { } - function addHTML() { + function addHTML(tabIndex) { let tableRecords = [] let table = 'userProfiles' @@ -80,6 +80,12 @@ function newGovernanceReportsUserProfiles() { } sortingOrder = UI.projects.governance.spaces.reportsSpace.tablesSortingOrders[table] } - return UI.projects.governance.utilities.tables.addHTML(table, tableRecords, tableRecordDefinition, sortingOrder) + return UI.projects.governance.utilities.tables.addHTML( + table, + tableRecords, + tableRecordDefinition, + sortingOrder, + tabIndex + ) } } \ No newline at end of file diff --git a/Projects/Governance/UI/Utilities/Tables.js b/Projects/Governance/UI/Utilities/Tables.js index 4cac4b916..fca6f0da4 100644 --- a/Projects/Governance/UI/Utilities/Tables.js +++ b/Projects/Governance/UI/Utilities/Tables.js @@ -5,7 +5,13 @@ function newGovernanceUtilitiesTables() { return thisObject - function addHTML(table, tableRecords, tableRecordDefinition, sortingOrder) { + function addHTML( + table, + tableRecords, + tableRecordDefinition, + sortingOrder, + tabIndex + ) { let HTML = '' let resultCounter = 0 /* @@ -92,7 +98,7 @@ function newGovernanceUtilitiesTables() { } } } - HTML = HTML + '' + '' + property.label + ' ' + orderArrow + '' + '' + HTML = HTML + '' + '' + property.label + ' ' + orderArrow + '' + '' } HTML = HTML + '' HTML = HTML + ''