Skip to content

Commit d4db952

Browse files
committed
Changed disabled chackbox text depends on whether indicator set is disabled or restricted
1 parent 9ecd48e commit d4db952

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/assets/js/signal_sets.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,20 @@ function format (signalSetId, relatedSignals, signalSetDescription) {
221221
'<tbody>'
222222
signals.forEach((signal) => {
223223
checked = checkedSignalMembers.filter((obj) => obj.data_source == signal.source && obj.signal == signal.name).length;
224+
console.log(signal);
225+
var checkboxTitle = ""
224226
checked = checked ? "checked" : ""
225-
var disabled = signal.endpoint ? "" : "disabled title='Visualization functionality for this endpoint is coming soon'";
227+
var disabled = signal.endpoint ? "" : "disabled";
228+
var restricted = signal.restricted != "No";
229+
if (disabled === "disabled") {
230+
checkboxTitle = "Visualization functionality for this endpoint is coming soon."
231+
}
232+
if (restricted) {
233+
disabled = "disabled";
234+
checkboxTitle = "Access to this data source is restricted. Contact [email protected] for more information."
235+
}
226236
tableMarkup += '<tr>'+
227-
`<td><input ${disabled} type="checkbox" name="selectedSignal" onclick="addSelectedSignal(this)" data-signal-displayname='${signal.display_name}' data-endpoint="${signal.endpoint}" data-datasource="${signal.source}" data-signal="${signal.name}" data-time-type="${signal.time_type}" data-signal-set="${signal.signal_set_name}" data-signal-set-short-name="${signal.signal_set_short_name}" data-member-short-name="${signal.member_short_name}" ${checked}></td>`+
237+
`<td><input ${disabled} title="${checkboxTitle}" type="checkbox" name="selectedSignal" onclick="addSelectedSignal(this)" data-signal-displayname='${signal.display_name}' data-endpoint="${signal.endpoint}" data-datasource="${signal.source}" data-signal="${signal.name}" data-time-type="${signal.time_type}" data-signal-set="${signal.signal_set_name}" data-signal-set-short-name="${signal.signal_set_short_name}" data-member-short-name="${signal.member_short_name}" ${checked}></td>`+
228238
`<td>${signal.display_name}</td>`+
229239
`<td>${signal.member_name}</td>`+
230240
`<td>${signal.member_description}</td>`+

src/signal_sets/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def get_related_signals(self, queryset):
106106
"time_type": signal.time_type,
107107
"description": signal.description,
108108
"member_description": signal.member_description,
109+
"restricted": signal.signal_set.dua_required
109110
}
110111
)
111112
return related_signals

0 commit comments

Comments
 (0)