Skip to content

Commit 6c969bc

Browse files
christopherpickeringchristopherpickering
authored
Merge pull request #84 from atlas-bi/dev
Dev
2 parents 17d7b2b + 589e82f commit 6c969bc

File tree

7 files changed

+55
-28
lines changed

7 files changed

+55
-28
lines changed

‎gulpfile.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,19 @@ gulp.task('js:polyfill', function () {
216216
.pipe(gulp.dest('web/wwwroot/js/'));
217217
});
218218

219+
gulp.task('js:integrations:ssrs', function () {
220+
return gulp
221+
.src(['web/wwwroot/js/integrations/ssrs.js'])
222+
.pipe(concat('ssrs.min.js'))
223+
.pipe(
224+
babel({
225+
presets: ['@babel/preset-env'],
226+
}),
227+
)
228+
.pipe(uglify())
229+
.pipe(gulp.dest('web/wwwroot/js/integrations/'));
230+
});
231+
219232
gulp.task('js:shared', function () {
220233
return gulp
221234
.src('web/wwwroot/js/shared.js')
@@ -352,6 +365,7 @@ gulp.task(
352365
'js:settings',
353366
'js:search',
354367
'js:shared',
368+
'js:integrations:ssrs',
355369
gulp.series('iis:clean_logs', 'iis:run'),
356370
gulp.series('font:fontawesome', 'sass'),
357371
),
@@ -366,6 +380,7 @@ gulp.task(
366380
['web/wwwroot/**/*.js', '!web/wwwroot/**/*.min.js'],
367381
gulp.parallel(
368382
'js:settings',
383+
'js:integrations:ssrs',
369384
'js:shared',
370385
'js:editor',
371386
'js:utility',
@@ -417,6 +432,7 @@ gulp.task(
417432
['web/wwwroot/**/*.js', '!web/wwwroot/**/*.min.js'],
418433
gulp.parallel(
419434
'js:settings',
435+
'js:integrations:ssrs',
420436
'js:shared',
421437
'js:editor',
422438
'js:utility',

‎web/Pages/Reports/_Description.cshtml‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,41 @@
5858
</div>
5959

6060
@if(Model.Report.ReportObjectParameters.Any()){
61-
<h2 class="title is-2">Parameters</h2>
61+
<nav id="parameters" class="panel">
62+
<p class="panel-heading is-flex is-justify-content-space-between" data-action="collapse" data-target="parameter-data">
63+
<span>Parameters</span>
64+
<span class="icon">
65+
<i class="fas fa-chevron-down"></i>
66+
</span>
67+
</p>
68+
<div class="panel-block is-collapsible is-block py-0" id="parameter-data">
6269

63-
<div class="table-container mt-5">
64-
<table class="table is-narrow">
65-
<thead>
66-
<tr>
67-
<th>Name</th>
68-
@if(Model.Report.ReportObjectParameters.Any(x => x.ParameterValue != null))
69-
{
70-
<th>Value</th>
71-
}
70+
<div class="table-container m-5">
71+
<table class="table is-narrow">
72+
<thead>
73+
<tr>
74+
<th>Name</th>
75+
@if(Model.Report.ReportObjectParameters.Any(x => x.ParameterValue != null))
76+
{
77+
<th>Value</th>
78+
}
7279

73-
</tr>
74-
</thead>
75-
<tbody>
76-
@foreach(var param in Model.Report.ReportObjectParameters)
77-
{
78-
<tr>
79-
<td>@param.ParameterName</td>
80-
@if (Model.Report.ReportObjectParameters.Any(x => x.ParameterValue != null))
80+
</tr>
81+
</thead>
82+
<tbody>
83+
@foreach(var param in Model.Report.ReportObjectParameters)
8184
{
82-
<td>@param.ParameterValue</td>
85+
<tr>
86+
<td>@param.ParameterName</td>
87+
@if (Model.Report.ReportObjectParameters.Any(x => x.ParameterValue != null))
88+
{
89+
<td>@param.ParameterValue</td>
90+
}
91+
</tr>
8392
}
84-
</tr>
85-
}
86-
</tbody>
87-
</table>
88-
</div>
93+
</tbody>
94+
</table>
95+
</div>
96+
</div>
97+
</nav>
8998
}

‎web/Pages/Search/Index.cshtml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static string BuildExact(string wild, List<string> exact)
203203
}
204204

205205
return BuildExact(
206-
$"name:({search_string})^12 OR name:({Fuzzy})^7 OR name:({Wild})^6 OR ({search_string})^5 OR ({Fuzzy}) OR ({Wild})",
206+
$"name:({search_string})^12 OR name:({Fuzzy})^7 OR name:({Wild})^6 OR description:({search_string})^5 OR description:({Fuzzy})^4 OR description:({Wild})^3 OR ({search_string})^2 OR ({Fuzzy}) OR ({Wild})",
207207
ExactMatches
208208
);
209209
}
@@ -373,7 +373,7 @@ Microsoft.AspNetCore.Http.IQueryCollection query
373373
{ "rq", "{!rerank reRankQuery=$rqq reRankDocs=1000 reRankWeight=5}" },
374374
{
375375
"rqq",
376-
"(type:collections^3 OR type:reports^2 OR documented:Y^0.1 OR executive_visibility_text:Y^0.2 OR certification_text:\"Analytics Certified\"^0.4 OR certification_text:\"Analytics Reviewed\"^0.4)"
376+
"(type:collections^2.7 OR type:reports^2 OR documented:Y^0.1 OR executive_visibility_text:Y^0.2 OR certification_text:\"Analytics Certified\"^0.4 OR certification_text:\"Analytics Reviewed\"^0.4)"
377377
},
378378
{ "hl.fl", hl },
379379
{ "hl.requireFieldMatch", hl_match }

‎web/Pages/Shared/_Layout.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<section class="is-flex-grow-1">
204204
<div class="container is-relative mb-5">
205205
<div class="columns">
206-
<div class="column is-narrow side-links" style="z-index: 1;">
206+
<div class="column is-narrow side-links" style="z-index: 2;">
207207
@if (IsSectionDefined("SideBar"))
208208
{
209209
@RenderSection("SideBar") }

‎web/wwwroot/css/site.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/wwwroot/js/integrations/ssrs.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
alert('hi');

‎web/wwwroot/js/integrations/ssrs.min.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"use strict";alert("hi");

0 commit comments

Comments
 (0)