Skip to content

Commit

Permalink
feat(tagstatistics): create 2nd screen.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucashimpens
lucashimpens committed Jul 26, 2024
1 parent f4bfddd commit 487b734
Show file tree
Hide file tree
Showing 3 changed files with 319 additions and 98 deletions.
8 changes: 8 additions & 0 deletions source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2811,12 +2811,20 @@ public ArrayList<String> getSqlDocumentation() {
b.append(",('page_campaignstatistics','labelFromPicker','','en','From','',NULL)");
b.append(",('page_campaignstatistics','labelToPicker','','fr','Au','',NULL)");
b.append(",('page_campaignstatistics','labelToPicker','','en','To','',NULL)");
b.append(",('page_campaignstatistics','labelEnvironmentSelect','','fr','Environnement','',NULL)");
b.append(",('page_campaignstatistics','labelEnvironmentSelect','','en','Environment','',NULL)");
b.append(",('page_campaignstatistics','labelCountrySelect','','fr','Pays','',NULL)");
b.append(",('page_campaignstatistics','labelCountrySelect','','en','Country','',NULL)");
b.append(",('page_campaignstatistics','buttonDetailByCountryEnv','','fr','Détail par environnement et pays','',NULL)");
b.append(",('page_campaignstatistics','buttonDetailByCountryEnv','','en','Detail by country and environment','',NULL)");
b.append(",('page_campaignstatistics','buttonLoad','','fr','Charger','',NULL)");
b.append(",('page_campaignstatistics','buttonLoad','','en','Load','',NULL)");
b.append(",('page_campaignstatistics','campaign_col','','fr','Campagne','',NULL)");
b.append(",('page_campaignstatistics','campaign_col','','en','Campaign','',NULL)");
b.append(",('page_campaignstatistics','environment_col','','fr','Environnement','',NULL)");
b.append(",('page_campaignstatistics','environment_col','','en','Environment','',NULL)");
b.append(",('page_campaignstatistics','country_col','','fr','Pays','',NULL)");
b.append(",('page_campaignstatistics','country_col','','en','Country','',NULL)");
b.append(",('page_campaignstatistics','systems_col','','fr','Systèmes','',NULL)");
b.append(",('page_campaignstatistics','systems_col','','en','Systems','',NULL)");
b.append(",('page_campaignstatistics','applications_col','','fr','Applications','',NULL)");
Expand Down
106 changes: 66 additions & 40 deletions source/src/main/webapp/ReportingCampaignStatistics.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,56 +37,78 @@
<div class="container-fluid center" id="page-layout">
<%@ include file="include/global/messagesArea.html"%>
<%@ include file="include/utils/modal-confirmation.html"%>

<h1 class="page-title-line" id="title">Campaign Statistics</h1>
<h1 class="page-title-line" id="title">Campaign Statistics </h1>
<div class="panel panel-default">
<div class="panel-body" id="filters">
<div class='col-md-4'>
<div class="form-group">
<label for="system-select" id="labelSystemSelect">Système</label>
<select id="system-select" class="form-control" multiple="multiple">
</select>
<div class="row" id="envCountryFilters" style="display: none;">
<div class='col-md-4'>
<div class="form-group">
<label for="environment-select" id="labelEnvironmentSelect">Environnement</label>
<select id="environment-select" class="form-control" multiple="multiple">
</select>
</div>
</div>
</div>
<div class='col-md-4'>
<div class="form-group">
<label for="application-select" id="labelApplicationSelect">Application</label>
<select id="application-select" class="form-control" multiple="multiple">
</select>
<div class='col-md-4'>
<div class="form-group">
<label for="country-select" id="labelCountrySelect">Pays</label>
<select id="country-select" class="form-control" multiple="multiple">
</select>
</div>
</div>
</div>
<div class='col-md-4'>
<div class="form-group">
<label for="group1-select" id="labelGroup1Select">Group 1</label>
<select id="group1-select" class="form-control" multiple="multiple">
</select>
<div class="row" id="systemAppGroup1Filters">
<div class='col-md-4'>
<div class="form-group">
<label for="system-select" id="labelSystemSelect">Système</label>
<select id="system-select" class="form-control" multiple="multiple">
</select>
</div>
</div>
</div>
<div class='col-md-4'>
<div class="form-group">
<label for="frompicker" id="labelFromPicker">From</label>
<div class='input-group date' id='frompicker'>
<input type='text' class="form-control" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
<div class='col-md-4'>
<div class="form-group">
<label for="application-select" id="labelApplicationSelect">Application</label>
<select id="application-select" class="form-control" multiple="multiple">
</select>
</div>
</div>
</div>
<div class='col-md-4'>
<div class="form-group">
<label for="topicker" id="labelToPicker">To</label>
<div class='input-group date' id='topicker'>
<input type='text' class="form-control" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
<div class='col-md-4'>
<div class="form-group">
<label for="group1-select" id="labelGroup1Select">Group 1</label>
<select id="group1-select" class="form-control" multiple="multiple">
</select>
</div>
</div>
</div>
<div class="col-sm-2 col-md-2">
<div class="input-group-btn ">
<button type="button" class="btn btn-primary btn-block marginTop20" id="loadbutton">Load</button>
<div class="row">
<div class='col-md-4'>
<div class="form-group">
<label for="frompicker" id="labelFromPicker">From</label>
<div class='input-group date' id='frompicker'>
<input type='text' class="form-control" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
<div class='col-md-4'>
<div class="form-group">
<label for="topicker" id="labelToPicker">To</label>
<div class='input-group date' id='topicker'>
<input type='text' class="form-control" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
<div class="col-sm-2 col-md-2">
<div class="input-group-btn ">
<button type="button" class="btn btn-primary btn-block marginTop20" id="loadbutton">Load</button>
</div>
<div class="input-group-btn " style="display: none;">
<button type="button" class="btn btn-primary btn-block marginTop20" id="loadDetailButton">Load</button>
</div>
</div>
</div>
</div>
Expand All @@ -99,6 +121,10 @@
<table id="tagStatisticTable" class="table table-bordered table-hover display" name="tagStatisticTable"></table>
<div class="marginBottom20"></div>
</div>
<div class="panel-body" id="tagStatisticDetailList" style="display: none;">
<table id="tagStatisticDetailTable" class="table table-bordered table-hover display" name="tagStatisticDetailTable"></table>
<div class="marginBottom20"></div>
</div>
</div>
<footer class="footer">
<div class="container-fluid" id="footer"></div>
Expand All @@ -107,4 +133,4 @@
<script>
</script>
</body>
</html>
</html>
Loading

0 comments on commit 487b734

Please sign in to comment.