Skip to content

Commit 2f85450

Browse files
trieutrieu
committed
fix bugs profile funnel report
1 parent 502dcd6 commit 2f85450

7 files changed

Lines changed: 22 additions & 11 deletions

File tree

‎leo-data-processing-starter-v_0.9.0.jar‎

3.99 KB
Binary file not shown.

‎leo-main-starter-v_0.9.0.jar‎

3.99 KB
Binary file not shown.

‎leo-observer-starter-v_0.9.0.jar‎

3.99 KB
Binary file not shown.

‎leo-scheduler-starter-v_0.9.0.jar‎

3.99 KB
Binary file not shown.

‎resources/app-templates/leocdp-admin/modules/analytics/event-data-dashboard.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ <h4> <i class="fa fa-bar-chart" aria-hidden="true"></i> Behavioral Report from <
1313
</div>
1414

1515
<!-- Date filter control -->
16-
<div class="col-lg-12 float-right">
17-
<div class='col-md-4 col-xs-12' style="border-right:1px solid #000;height: 60px;" >
16+
<div class="row float-right">
17+
<div class='col-md-12 col-xs-12' style="height:60px;" >
1818
<label for="journeyMapList">Data Journey Map</label>
1919
<div>
2020
<select id="journeyMapList" data-placeholder="Choose an Journey Map" class="select" > </select>
2121
</div>
2222
</div>
23-
<div class='col-md-3 col-xs-12' >
23+
<div class='col-md-5 col-xs-12' >
2424
<div class="form-group">
2525
<div class='input-group date' id='beginFilterDate'>
2626
<input type='text' class="form-control" autocomplete="off" /> <span class="input-group-addon">
@@ -29,7 +29,7 @@ <h4> <i class="fa fa-bar-chart" aria-hidden="true"></i> Behavioral Report from <
2929
</div>
3030
</div>
3131
</div>
32-
<div class='col-md-3 col-xs-12'>
32+
<div class='col-md-5 col-xs-12'>
3333
<div class="form-group">
3434
<div class='input-group date' id='endFilterDate'>
3535
<input type='text' class="form-control" autocomplete="off" /> <span class="input-group-addon">
@@ -38,7 +38,7 @@ <h4> <i class="fa fa-bar-chart" aria-hidden="true"></i> Behavioral Report from <
3838
</div>
3939
</div>
4040
</div>
41-
<div class='col-lg-2 col-xs-12 text-center'>
41+
<div class='col-md-2 col-xs-12 text-center'>
4242
<button id="btn_refresh_event_report" type="button" class="btn btn-goto-router" style="width: 90%" >
4343
<i class="fa fa-check" aria-hidden="true"></i> OK </button>
4444
</div>

‎resources/app-templates/leocdp-admin/modules/analytics/main-dashboard.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ <h4> <i class="fa fa-area-chart" aria-hidden="true"></i>
3636
</div>
3737

3838
<div class="row float-right">
39-
<div class='col-md-4 col-xs-12' style="border-right:1px solid #000;height: 60px;font-weight: bold;" >
39+
<div class='col-md-12 col-xs-12' style="height: 60px;font-weight: bold;" >
4040
<label for="journeyMapList">Data Journey Map</label>
4141
<div>
4242
<select id="journeyMapList" data-placeholder="Choose an Journey Map" class="select" > </select>
4343
</div>
4444
</div>
45-
<div class='col-md-3 col-xs-12' >
45+
<div class='col-md-5 col-xs-12' >
4646
<div class="form-group">
4747
<div class='input-group date' id='beginFilterDate'>
4848
<input type='text' class="form-control" autocomplete="off" /> <span class="input-group-addon">
@@ -51,7 +51,7 @@ <h4> <i class="fa fa-area-chart" aria-hidden="true"></i>
5151
</div>
5252
</div>
5353
</div>
54-
<div class='col-md-3 col-xs-12'>
54+
<div class='col-md-5 col-xs-12'>
5555
<div class="form-group">
5656
<div class='input-group date' id='endFilterDate'>
5757
<input type='text' class="form-control" autocomplete="off" /> <span class="input-group-addon">

‎resources/database/database-query-template.aql‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,9 +1271,20 @@ AQL_REVENUE_STATS_COLLECTOR =>
12711271

12721272
AQL_PROFILE_COLLECTOR_IN_DATE_RANGE =>
12731273
FOR d IN cdp_profile
1274-
FILTER (@journeyMapId == "" OR @journeyMapId IN d.inJourneyMaps[*].id) AND d.status > 0 AND (d.updatedAt >= @beginFilterDate AND d.updatedAt <= @endFilterDate)
1275-
COLLECT funnelStage = d.funnelStage WITH COUNT INTO length
1276-
RETURN { "collectorKey" : funnelStage, "collectorCount" : length }
1274+
FILTER d.status > 0 AND d.updatedAt >= @beginFilterDate AND d.updatedAt <= @endFilterDate
1275+
FOR jm IN d.inJourneyMaps
1276+
FILTER @journeyMapId == "" OR jm.id == @journeyMapId
1277+
LET stage = FIRST(
1278+
FOR s IN cdp_dataflowstage
1279+
FILTER s.orderIndex == jm.funnelIndex
1280+
RETURN s
1281+
)
1282+
FILTER stage != null
1283+
COLLECT collectorKey = stage._key WITH COUNT INTO collectorCount
1284+
RETURN {
1285+
collectorKey,
1286+
collectorCount
1287+
}
12771288
;
12781289

12791290
AQL_PROFILE_TIMESERIES_COLLECTOR =>

0 commit comments

Comments
 (0)