Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Placeholder pull request from Valley Health #509

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gulpfile.js/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ gulp.task('css:build', function () {
'editor-liveEditorPrev',
'analytics-reviewed',
'epic-released',
'documentation-pending',
'legacy',
'high-risk',
'self-service',
Expand Down
41 changes: 33 additions & 8 deletions web/Pages/Index/About.cshtml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions web/Pages/Profile/Partials/_Subscriptions.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<th>Subscription Description</th>
<th>Last Run</th>
<th>Message</th>
<th>Subscribed As</th>
<!--<th>Subscribed As</th>-->
</tr>
</thead>
<tbody>
Expand All @@ -35,7 +35,7 @@
<td>@d.Description</td>
<td>@d.LastRunDisplayString</td>
<td>@d.LastStatus.Replace(";", "; ")</td>
<td>@d.SubscriptionTo.Replace(";", "; ")</td>
@* <td>@d.SubscriptionTo.Replace(";", "; ")</td>*@
</tr>
}
</tbody>
Expand Down
6 changes: 4 additions & 2 deletions web/Pages/Reports/Index.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ public async Task<IActionResult> OnGetAsync(int id)
)
.Where(x => x.ReportObjectTypeId != 12) //Personal dashboard
.Where(x => x.EpicMasterFile != "IDK")
.Where(x => x.DefaultVisibilityYn == "Y")
//let's show parent even if it is has default visibility set to N
//.Where(x => x.DefaultVisibilityYn == "Y")
.Where(x => (x.ReportObjectDoc.Hidden ?? "N") == "N")
.Include(x => x.ReportObjectDoc)
.Include(x => x.ReportObjectType)
Expand All @@ -258,7 +259,8 @@ public async Task<IActionResult> OnGetAsync(int id)
)
)
.Where(x => x.EpicMasterFile == "IDB")
.Where(x => x.DefaultVisibilityYn == "Y")
//let's show parent even if it is has default visibility set to N
//.Where(x => x.DefaultVisibilityYn == "Y")
.Where(x => (x.ReportObjectDoc.Hidden ?? "N") == "N")
.Include(x => x.ReportObjectDoc)
.Include(x => x.ReportObjectType)
Expand Down
8 changes: 8 additions & 0 deletions web/Pages/Reports/_Details.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
<td>Report Type</td>
<td>@Model.Report.ReportObjectType.Name</td>
</tr>
@* if it is a tableau workbook or project.. Let's show the parent project in the details *@
@if ((@Model.Report.ReportObjectType.Name == "Tableau Workbook" || @Model.Report.ReportObjectType.Name == "Tableau Project") && @Model.Parents.Count() > 0 )
{
<tr>
<td>Project</td>
<td> @Model.Parents.First().Name </td>
</tr>
}

@if (@Model.Report.LastLoadDate != null)
{
Expand Down
9 changes: 9 additions & 0 deletions web/Pages/Reports/_Relationships.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,17 @@


@if (Model.Parents.Count() > 0)
{
@if (@Model.Report.ReportObjectType.Name == "Tableau Workbook" || @Model.Report.ReportObjectType.Name == "Tableau Project")
{

<h3 class="title is-3">Projects this @Model.Report.ReportObjectType.Name is in.</h3>

}
else
{
<h3 class="title is-3">Reports that include this report.</h3>
}
<div class="columns is-multiline">
@foreach (var parent in Model.Parents.ToList())
{
Expand Down
4 changes: 2 additions & 2 deletions web/Pages/Search/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@
else
{
<div class="has-text-centered p-5">
<h5>Not finding what you are looking for?<br><a href="http://reports.riversidehealthcare.net/" target="_blank">Request a New Report here.</a></h5>
<!--<h5>Not finding what you are looking for?<br><a href="http://reports.riversidehealthcare.net/" target="_blank">Request a New Report here.</a></h5>-->
<h5>Not finding what you are looking for?<br /> <a href="mailto: [email protected]">Request a New Report here.</a></h5>
<p>
<hr />
A few things to consider -<br><br>
Are you searching for a private or hidden report? Try out the advanced search filters!<br><br>
Is it a new Hyperspace Report? Hyperspace reports typically are not imported until the following business day.<br>
Is it a new SSRS Report? SSRS reports typically take two hours to be loaded into the search results.
</p>
</div>
}
Expand Down
5 changes: 4 additions & 1 deletion web/Pages/Search/Index.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,12 @@ IDictionary<string, ICollection<KeyValuePair<string, int>>> facetResults
{
"epic_master_file_text",
"organizational_value_text",
"certification_text",
"estimated_run_frequency_text",
"maintenance_schedule_text",
"fragility_text",
"executive_visiblity_text",
"visible_text",
"certification_text",
"report_type_text",
"type"
};
Expand Down Expand Up @@ -730,6 +730,9 @@ public ActionResult OnPostValueList(string s)
case "ro-fragility":
index_type = "fragility_tag";
break;
case "Tags":
index_type = "Tags";
break;

case "maint-log-stat":
index_type = "maintenance_log_status";
Expand Down
4 changes: 2 additions & 2 deletions web/Pages/Tasks/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div class="tab-dta" id="newundocumented">
<div data-ajax="yes" data-url="/Tasks?handler=NewUndocumented"></div>
</div>
<div class="tab-dta" id="canmakereports">
<div data-ajax="yes" data-url="/Tasks?handler=CanMakeReports"></div>
<!-- <div class="tab-dta" id="canmakereports">
<div data-ajax="yes" data-url="/Tasks?handler=CanMakeReports"></div> -->
</div>
</div>
24 changes: 13 additions & 11 deletions web/Pages/Tasks/Index.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,17 @@ from m in _context.MaintenanceLogs
public async Task<IActionResult> OnGetUnused()
{
ViewData["Dead"] = await (
from r in _context.ReportObjects.Where(x =>
(
x.ReportObjectTypeId == 3
|| x.ReportObjectTypeId == 17
|| x.ReportObjectTypeId == 20
|| x.ReportObjectTypeId == 28
)
&& x.DefaultVisibilityYn == "Y"
&& x.OrphanedReportObjectYn == "N"
from r in _context.ReportObjects.Where(
x =>
(
//x.ReportObjectTypeId == 3 --don't include epic-crystal
// ||
x.ReportObjectTypeId == 17
|| x.ReportObjectTypeId == 20
|| x.ReportObjectTypeId == 28
)
&& x.DefaultVisibilityYn == "Y"
&& x.OrphanedReportObjectYn == "N"
)
join d in _context.ReportObjectRunDataBridges
on r.ReportObjectId equals d.ReportObjectId
Expand Down Expand Up @@ -461,7 +463,7 @@ orderby r.ReportObjectId

public ActionResult OnGetTopUndocumented()
{
int[] rpts = { 17, 28, 3, 20 };
int[] rpts = { 17, 28, 20 };
ViewData["Undocumented"] = (
from r in _context.ReportObjects
join t in _context.ReportObjectTypes
Expand Down Expand Up @@ -518,7 +520,7 @@ from p in rs.DefaultIfEmpty()

public ActionResult OnGetNewUndocumented()
{
int[] rpts = { 17, 28, 3, 20 };
int[] rpts = { 17, 28, 20 };
ViewData["NewUndocumented"] = (
from r in _context.ReportObjects
join t in _context.ReportObjectTypes
Expand Down
4 changes: 2 additions & 2 deletions web/Pages/Tasks/_Links.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<li>
<a class="tab-lnk" href="#newundocumented">New Undocumented</a>
</li>
<li>
<!-- <li>
<a class="tab-lnk" href="#canmakereports">Users with Create</a>
</li>
</li>-->
</ul>
</nav>

Expand Down
3 changes: 2 additions & 1 deletion web/Pages/Users/Sections/_Activity.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
</tr>
</thead>
<tbody>
@foreach (var u in ViewBag.TopRunReports)
@foreach (var u in (ViewBag.TopRunReports)
.Orderby(ViewBag.TopRunReports.LastRun).ThenBy(ViewBag.TopRunReports.Hits))
{
<tr>
<td><a href="@u.Url">@u.Name</a></td>
Expand Down
1 change: 1 addition & 0 deletions web/Pages/Users/Stars.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<span class="icon js-modal-trigger" data-target="favorite-folder-new"><i class="fas fa-plus"></i></span>
</div>
<script>
console.log("at function");
(function(){
document.querySelector('body').insertAdjacentHTML('beforeend', '<div class="modal" id="favorite-folder-new"> \
<div class="modal-background"></div> \
Expand Down
2 changes: 1 addition & 1 deletion web/wwwroot/css/email.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 20 additions & 9 deletions web/wwwroot/css/page.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
.title .legacy,
.title .epic-released {
border: 2px solid #ffc107;
border-radius: $radius;
color: #ffc107;
padding: 0 5px;
border: 2px solid #ffc107;
border-radius: $radius;
color: #ffc107;
padding: 0 5px;
}
.title .documentation-pending {
border: 2px solid #12a39c;
border-radius: $radius;
color: #12a39c;
padding: 0 5px;
}
.title .epic-released {
border: 2px solid #6cb5f9;
border-radius: $radius;
color: #6cb5f9;
padding: 0 5px;
}

.title .high-risk {
border: 2px solid #ff6961;
border-radius: $radius;
color: #ff6961;
padding: 0 5px;
border: 2px solid #ff6961;
border-radius: $radius;
color: #ff6961;
padding: 0 5px;
}

.title .analytics-reviewed {
Expand Down
17 changes: 12 additions & 5 deletions web/wwwroot/css/search.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
@import '../../../node_modules/bulma/sass/utilities/initial-variables';

.tag.epic-released,
.tag.epic-released {
background-color: #6cb5f9;
color: #212529;
}
.tag.legacy {
background-color: #ffc107;
color: #212529;
background-color: #ffc107;
color: #212529;
}

.tag.analytics-certified {
Expand All @@ -22,10 +25,14 @@
}

.tag.high-risk {
background-color: #ff6961 !important;
color: #212529;
background-color: #ff6961 !important;
color: #212529;
}

.tag.documentation-pending {
background-color: #12a39c !important;
color: #212529;
}
// .pagination {
// .page-item{
// .page-link {
Expand Down
2 changes: 1 addition & 1 deletion web/wwwroot/css/site.min.css

Large diffs are not rendered by default.

Binary file modified web/wwwroot/favicon.ico
Binary file not shown.
Binary file modified web/wwwroot/img/atlas-logo-smooth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/wwwroot/img/atlas-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/wwwroot/img/thinking-face-text-133x40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified web/wwwroot/img/thinking-face-text-white-133x40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading