From 7d2a3863fd01bfdebe0c5470825d416d65306419 Mon Sep 17 00:00:00 2001 From: "kentsang.gds" Date: Thu, 16 Dec 2021 13:13:59 +0000 Subject: [PATCH] Update organogram js files to handle office region --- app/assets/javascripts/organograms/org-data-loader.js | 6 ++++-- app/assets/javascripts/organograms/orgvis.js | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/organograms/org-data-loader.js b/app/assets/javascripts/organograms/org-data-loader.js index 52f058c1..7e5dea2c 100644 --- a/app/assets/javascripts/organograms/org-data-loader.js +++ b/app/assets/javascripts/organograms/org-data-loader.js @@ -99,7 +99,8 @@ var OrgDataLoader = { 'profession' : post['Professional/Occupational Group'], 'email' : post['Contact E-mail'], 'phone' : post['Contact Phone'], - 'notes' : post['Notes'] + 'notes' : post['Notes'], + 'office_region': post['Office Region'] } } @@ -150,7 +151,8 @@ var OrgDataLoader = { 'profession_group': post['Professional/Occupational Group'], 'junior': true, 'nodeType': 'jp_child', - 'type': 'junior_posts' + 'type': 'junior_posts', + 'office_region': post['Office Region'] } }; } diff --git a/app/assets/javascripts/organograms/orgvis.js b/app/assets/javascripts/organograms/orgvis.js index aa9c2c6a..e1b36898 100644 --- a/app/assets/javascripts/organograms/orgvis.js +++ b/app/assets/javascripts/organograms/orgvis.js @@ -322,6 +322,9 @@ var Orgvis = { if(typeof nd.phone != 'undefined'){ html += '

Phone' + nd.phone + '

'; } + if(typeof nd.office_region != 'undefined'){ + html += '

Office Region' + nd.office_region + '

'; + } if(typeof nd.notes != 'undefined'){ html += '

Notes' + nd.notes + '

'; } @@ -400,6 +403,7 @@ var Orgvis = { html += '

Payband Salary Range'+nd.salaryrange+'

'; html += '

Reports To'+nd.reportsto+'

'; html += '

Unit'+nd.unit+'

'; + html += '

Office Region'+nd.office_region+'

'; html += ''; // end content html += ''; // end panel html += 'x';