Revision 51030
Added by Panagiotis Kanakakis about 6 years ago
EventsSubscriptionForm.java | ||
---|---|---|
41 | 41 |
errorLabel.setDismissable(false); |
42 | 42 |
subscriptionFormPanel.add(errorLabel); |
43 | 43 |
|
44 |
subscriptionFormPanel.add(new HTML("<h4 class=\"uk-h4\">" + this.advQueryObject.getDatasource() + "</h4>" + |
|
45 |
"<div class=\"uk-text uk-text-small uk-text-secondary\">" + this.advQueryObject.getTopic().replace("/", " | ") + "</div>")); |
|
46 |
|
|
44 | 47 |
subscriptionFormPanel.add(subscriptionForm); |
45 | 48 |
|
46 | 49 |
HTML userEmail = new HTML(RepositoryManager.currentUser.getEmail()); |
... | ... | |
52 | 55 |
frequencyListBox.addItem(notificationFrequency.name(), notificationFrequency.name()); |
53 | 56 |
subscriptionForm.add(frequencyListFormGroup); |
54 | 57 |
|
55 |
modeListBox.addItem("-- none selected --", "noneSelected"); |
|
56 |
for(NotificationMode notificationMode : NotificationMode.values()) |
|
57 |
modeListBox.addItem(notificationMode.name(), notificationMode.name()); |
|
58 |
subscriptionForm.add(modeListFormGroup); |
|
58 |
// modeListBox.addItem("-- none selected --", "noneSelected");
|
|
59 |
// for(NotificationMode notificationMode : NotificationMode.values())
|
|
60 |
// modeListBox.addItem(notificationMode.name(), notificationMode.name());
|
|
61 |
// subscriptionForm.add(modeListFormGroup);
|
|
59 | 62 |
|
60 | 63 |
HTML options = new HTML(); |
61 | 64 |
options.setHTML(generateOptionsContent()); |
... | ... | |
72 | 75 |
|
73 | 76 |
errorLabel.setVisible(false); |
74 | 77 |
|
75 |
if(!frequencyListBox.getSelectedValue().equals("noneSelected") &&
|
|
76 |
!modeListBox.getSelectedValue().equals("noneSelected"))
|
|
78 |
if(!frequencyListBox.getSelectedValue().equals("noneSelected"))
|
|
79 |
// && !modeListBox.getSelectedValue().equals("noneSelected"))
|
|
77 | 80 |
return true; |
78 | 81 |
else { |
79 | 82 |
errorLabel.setVisible(true); |
... | ... | |
98 | 101 |
|
99 | 102 |
String optionsContent = "<table class=\"table table-bordered\">"; |
100 | 103 |
|
101 |
optionsContent += "<thead><tr><th>Name</th><th>Values</th></tr></thead>"; |
|
104 |
// optionsContent += "<thead><tr><th>Name</th><th>Values</th></tr></thead>";
|
|
102 | 105 |
optionsContent += "<tbody>"; |
103 | 106 |
|
104 |
if(advQueryObject.getDatasource()!=null && !advQueryObject.getDatasource().equals("")) |
|
105 |
optionsContent += "<tr><td>Datasource</td><td>" + advQueryObject.getDatasource() + "</td></tr>"; |
|
107 |
// if(advQueryObject.getDatasource()!=null && !advQueryObject.getDatasource().equals("")) |
|
108 |
// optionsContent += "<tr><td>Datasource</td><td>" + advQueryObject.getDatasource() + "</td></tr>"; |
|
109 |
// |
|
110 |
// if(advQueryObject.getTopic()!=null && !advQueryObject.getTopic().equals("")) |
|
111 |
// optionsContent += "<tr><td>Topic</td><td>" + advQueryObject.getTopic() + "</td></tr>"; |
|
106 | 112 |
|
107 |
if(advQueryObject.getTopic()!=null && !advQueryObject.getTopic().equals("")) |
|
108 |
optionsContent += "<tr><td>Topic</td><td>" + advQueryObject.getTopic() + "</td></tr>"; |
|
109 |
|
|
110 | 113 |
if(advQueryObject.getTrust()!=null) |
111 | 114 |
optionsContent += "<tr><td>Trust</td><td>[" + advQueryObject.getTrust().getMin() + ", " + advQueryObject.getTrust().getMax() + "]</td></tr>"; |
112 | 115 |
|
Also available in: Unified diff
1. Properties file changes.
2. Aggregation details / aggregation object add.
3. Other changes from stef