Merge pull request #132 from cmu-delphi/development

Development

Author: dmytrotsko

src/assets/js/signal_sets.js

@@ -221,9 +221,20 @@ function format (signalSetId, relatedSignals, signalSetDescription) {
                     '<tbody>'
         signals.forEach((signal) => {
             checked = checkedSignalMembers.filter((obj) => obj.data_source == signal.source && obj.signal == signal.name).length;
+            console.log(signal);
+            var checkboxTitle = ""
             checked = checked ? "checked" : ""
+            var disabled = signal.endpoint ? "" : "disabled";
+            var restricted = signal.restricted != "No";
+            if (disabled === "disabled") {
+                checkboxTitle = "Visualization functionality for this endpoint is coming soon."
+            }
+            if (restricted) {
+                disabled = "disabled";
+                checkboxTitle = "Access to this data source is restricted. Contact [email protected] for more information."
+            }
             tableMarkup += '<tr>'+
-                                `<td><input 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>`+
+                                `<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>`+
                                 `<td>${signal.display_name}</td>`+
                                 `<td>${signal.member_name}</td>`+
                                 `<td>${signal.member_description}</td>`+

src/signal_sets/views.py

@@ -106,6 +106,7 @@ def get_related_signals(self, queryset):
                     "time_type": signal.time_type,
                     "description": signal.description,
                     "member_description": signal.member_description,
+                    "restricted": signal.signal_set.dua_required
                 }
             )
         return related_signals