Skip to content

Commit

Permalink
Merge pull request #1604 from mksglu/eg-improvements
Browse files Browse the repository at this point in the history 
[event-groups] improvements
  • Loading branch information
@ar2rsawseen
ar2rsawseen committed Nov 2, 2020
2 parents 863719a + a3870a7 commit 0128795
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 44 deletions.
26 changes: 9 additions & 17 deletions frontend/express/public/javascripts/countly/countly.event.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,15 @@
return _eventGroups;
};

countlyEvent.getEventGroupsTable = function() {
countlyEvent.getEventGroupsTable = function(getStatus) {
if (!!getStatus === getStatus) {
return _eventGroupsTable.filter(function(x) {
return x.status === getStatus;
});
}
return _eventGroupsTable;
};

countlyEvent.refreshEventGroupsTable = function() {
return $.when($.ajax({
type: "GET",
url: countlyCommon.API_PARTS.data.r,
data: {
"app_id": countlyCommon.ACTIVE_APP_ID,
"method": "get_event_groups"
},
dataType: "json",
success: function(groups_json) {
return groups_json;
}
}));
};

countlyEvent.getOverviewList = function() {
if (_activeEvents && _activeEvents.overview) {
return _activeEvents.overview;
Expand Down Expand Up @@ -756,6 +746,7 @@
}
if (eventMap[mapKey].is_visible || get_hidden) {
arrayToUse.push({
"order": _eventGroups[events[i]] ? i : null,
"key": events[i],
"name": _eventGroups[events[i]] ? _eventGroups[events[i]].label : (eventMap[mapKey].name || events[i]),
"description": eventMap[mapKey].description || "",
Expand All @@ -772,6 +763,7 @@
}
else {
arrayToUse.push({
"order": _eventGroups[events[i]] ? i : null,
"key": events[i],
"name": _eventGroups[events[i]] ? _eventGroups[events[i]].label : events[i],
"description": "",
Expand All @@ -791,7 +783,7 @@
return eventOrder.indexOf(event.key);
});
eventsWithoutOrder = _.sortBy(eventsWithoutOrder, function(event) {
return event.key;
return event.order || event.key;
});

return eventsWithOrder.concat(eventsWithoutOrder);
Expand Down
68 changes: 44 additions & 24 deletions frontend/express/public/javascripts/countly/countly.views.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5010,6 +5010,26 @@ window.EventsBlueprintView = countlyView.extend({
$(event.target).removeClass("active").addClass("disabled");
}
});
$(".eb-event-group-include-events-tooltip").tooltipster({
theme: ['tooltipster-borderless', 'tooltipster-borderless-customized'],
contentCloning: true,
interactive: true,
trigger: 'hover',
side: 'right',
zIndex: 10001,
maxWidth: 250,
content: $.i18n.map["events.blueprint-event-groups-include-events-tooltip"]
});
$(".eb-event-group-properties-events-tooltip").tooltipster({
theme: ['tooltipster-borderless', 'tooltipster-borderless-customized'],
contentCloning: true,
interactive: true,
trigger: 'hover',
side: 'right',
zIndex: 10001,
maxWidth: 250,
content: $.i18n.map["events.blueprint-event-groups-properties-tooltip"]
});
},
rightButtonsEvents: function() {
var self = this;
Expand All @@ -5022,11 +5042,6 @@ window.EventsBlueprintView = countlyView.extend({
//$(this).find(".cly-list-options").removeClass('cly-list-options-row');
$(this).find(".edit-event").css({"visibility": "hidden"});
});
self.dtable.find("tbody td .edit-box").click(function() {
self.setEventBlueprintDrawerSettings();
$(".cly-drawer").removeClass("open editing");
$("#events-blueprint-drawer").addClass("open");
});
},
rightButttonsEventGroups: function() {
var self = this;
Expand All @@ -5042,15 +5057,9 @@ window.EventsBlueprintView = countlyView.extend({
self.eventGroupsTable.find("tbody td .edit-box").click(function() {
self.eventGroupDrawer.resetForm();
self.eventGroupDrawer.open();

// var _id = "[CLY]_group_1b12f7ebfcabde5e8209630effd09f6a";
countlyEvent.getEventGroupById($(this).attr("data-event-group-id"), function(result) {
self.loadEventGroupDrawerSetting(result);
});
//Pass the settings variable here
// self.setEventBlueprintDrawerSettings();
// $(".cly-drawer").removeClass("open editing");
// $("#events-blueprint-drawer").addClass("open");
});
},
resetSelection: function() {
Expand Down Expand Up @@ -5547,15 +5556,16 @@ window.EventsBlueprintView = countlyView.extend({
for (var k = 0; k < $(this).data('event').omittedSegments.length; k++) {
omittedSegments.push({name: $(this).data('event').omittedSegments[k], value: $(this).data('event').omittedSegments[k]});
}
self.activeEvent.omittedSegments = $(this).data('event').omittedSegments;
$("#eb-multi-omit-segments-drop").clyMultiSelectSetItems(segments);
$("#eb-multi-omit-segments-drop").clyMultiSelectSetSelection(omittedSegments || []);

if ($(this).data('event').is_visible) {
$('#eb-event-visibility .on-off-switch input').attr('checked', 'checked');
$('#eb-event-visibility .on-off-switch input').attr('checked', true);
$('#eb-event-visibility > div.on-off-switch > span').html(jQuery.i18n.map["events.edit.event-visible"]);
}
else {
$('#eb-event-visibility .on-off-switch input').removeAttr('checked');
$('#eb-event-visibility .on-off-switch input').removeAttr('checked', false);
$('#eb-event-visibility > div.on-off-switch > span').html();
}

Expand Down Expand Up @@ -5606,7 +5616,7 @@ window.EventsBlueprintView = countlyView.extend({
event_map[settings.key] = settings;
var omitted_segments = {};
omitted_segments[settings.key] = settings.omit_list;
if (self.compare_arrays(omitted_segments[settings.key], self.activeEvent.omittedSegments) && omitted_segments[settings.key].length > 0) {
if (self.compare_arrays(omitted_segments[settings.key], self.activeEvent.omittedSegments || []) && omitted_segments[settings.key].length > 0) {
CountlyHelpers.confirm(jQuery.i18n.map["event.edit.omitt-warning"], "red", function(result) {
if (!result) {
return true;
Expand Down Expand Up @@ -5650,6 +5660,16 @@ window.EventsBlueprintView = countlyView.extend({
$(this).parent().find(".text").replaceWith('<span style="vertical-align: middle; margin-bottom: 0px;" class="text">' + jQuery.i18n.map["events.edit.event-invisible"] + '</span>');
}
});
$(".eb-event-properties-tooltip").tooltipster({
theme: ['tooltipster-borderless', 'tooltipster-borderless-customized'],
contentCloning: true,
interactive: true,
trigger: 'hover',
side: 'right',
zIndex: 10001,
maxWidth: 250,
content: $.i18n.map["events.blueprint-events-properties-tooltip"]
});
},
getEventBlueprintDrawerSettings: function() {
var keyName = $("#eb-key-name").val();
Expand Down Expand Up @@ -5806,17 +5826,17 @@ window.EventsBlueprintView = countlyView.extend({
}
});
CountlyHelpers.refreshTable(self.dtable, self.tableData);
countlyEvent.refreshEventGroupsTable(self.eventGroupFilter).then(function(res) {
if (!!self.eventGroupFilter === self.eventGroupFilter) {
res = res.filter(function(x) {
return x.status === self.eventGroupFilter;
});
CountlyHelpers.refreshTable(self.eventGroupsTable, countlyEvent.getEventGroupsTable(self.eventGroupFilter));
self.rightButttonsEventGroups();
self.eventGroupSettingMenu();
var events = countlyEvent.getEvents(true);
var tableData = [];
for (var i = 0; i < events.length; i++) {
if (!events[i].is_event_group && events[i].is_visible) {
tableData.push({value: events[i].key, name: events[i].name});
}
// self.rightButttonsEventGroups()
CountlyHelpers.refreshTable(self.eventGroupsTable, res);
self.rightButttonsEventGroups();
self.eventGroupSettingMenu();
});
}
$("#event-group-include-events-dropdown").clyMultiSelectSetItems(tableData);
$('#select-all-events').addClass("fa-square-o");
$('#select-all-events').removeClass("fa-check-square");

Expand Down
5 changes: 5 additions & 0 deletions frontend/express/public/localization/dashboard/dashboard.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,11 @@ events.blueprint-event-group-show.hidden = Hidden Groups
events.blueprint-events-show.all = All Events
events.blueprint-events-show.hidden = Hidden Events
events.blueprint-events-show.visible = Visible Events

events.blueprint-events-properties-tooltip = Edited properties of this event will be updated on All Events and other plugins.
events.blueprint-event-groups-include-events-tooltip = Select at least 2 events to create an Event Group. New Event Groups will automatically sum all the selected event properties and report them.
events.blueprint-event-groups-properties-tooltip = Edited properties in this Event Group will be updated across All Events and other plugins.

events.blueprint-event-group-included-events = INCLUDED EVENTS
events.blueprint-eventgroups-tab-title = EVENT GROUPS
events.blueprint-edit = Edit
Expand Down
6 changes: 3 additions & 3 deletions frontend/express/views/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
<div class="panel-heading">
<div class="left">
<div style="float: left" data-localize='events.edit.event-properties'></div>
<i style="margin-left:10px;float: left;opacity: 0.5" class="ion-information-circled show-tooltip"></i>
<i style="margin-left:10px;float: left;opacity: 0.5" class="eb-event-properties-tooltip ion-information-circled show-tooltip"></i>
</div>
<div style="clear: both" class="right">
<div data-localize=""></div>
Expand Down Expand Up @@ -1508,7 +1508,7 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
<div class="panel-heading">
<div class="left">
<div style="float: left" data-localize='events.group-include-events'></div>
<i style="margin-left:10px;float: left;opacity: 0.5" class="ion-information-circled show-tooltip"></i>
<i style="margin-left:10px;float: left;opacity: 0.5" class="eb-event-group-include-events-tooltip ion-information-circled show-tooltip"></i>
</div>
<div style="clear: both" class="right">
<div data-localize=""></div>
Expand Down Expand Up @@ -1549,7 +1549,7 @@ <h3 data-index="{{value.index}}">{{value.title}}</h3>
<div class="panel-heading">
<div class="left">
<div style="float: left" data-localize='events.group-properties'></div>
<i style="margin-left:10px;float: left;opacity: 0.5" class="ion-information-circled show-tooltip"></i>
<i style="margin-left:10px;float: left;opacity: 0.5" class="eb-event-group-properties-events-tooltip ion-information-circled show-tooltip"></i>
</div>
<div style="clear: both" class="right">
<div data-localize=""></div>
Expand Down

0 comments on commit 0128795

Please sign in to comment.