Skip to content

Commit 8ff305e

Browse files
Release 2021.08.1
1 parent 1917deb commit 8ff305e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2811
-2180
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ jobs:
2525
with:
2626
github_token: ${{ secrets.GITHUB_TOKEN }}
2727
publish_dir: ./docs/_build
28+
publish_branch: docs

.gitlab-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,12 @@ pages:
7777
- public
7878
only:
7979
- master
80-
- dev
8180

8281
deploy_test:
8382
image: alpine:latest
8483
stage: publish
85-
only:
86-
- master
84+
except:
85+
- public
8786
dependencies:
8887
- build_web
8988
needs: [build_web]

docs/atlas/readme.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ Key Features
5050
- Embedded report maintenance scheduling
5151
- Ability to run and open editors directly from Atlas
5252

53+
####
54+
Chat
55+
####
56+
57+
Chat on Discord `https://discord.gg/pAzSbMw259 <https://discord.gg/pAzSbMw259>`_.
58+
5359
#######
5460
Credits
5561
#######

docs/atlas/updates/changelog.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@
1919
Changelog
2020
*********
2121

22+
Version 2021.08.1
23+
-----------------
24+
25+
- Renamed Data Projects to Collections
26+
- Added details to search
27+
- Added thumbnail of screenshot in search
28+
- Modified search bar to always display
29+
- Fixed js bug within collections
30+
- Added feature to group reports by report type
31+
- Added report profile that combines usage information across all reports in a collection
32+
- Updated LDAP groups to show in Atlas
33+
- Fixed bug to let term links be removed
34+
2235
Version 2021.07.1
2336
-----------------
2437

readme.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
You should have received a copy of the GNU General Public License
1616
along with this program. If not, see <https://www.gnu.org/licenses/>.
1717

18-
|docs| |codacy| |codeql| |climate|
18+
|docs| |codacy| |codeql| |climate| |netlify|
1919

2020
Atlas of Information Management
2121
===============================
@@ -24,6 +24,8 @@ Atlas of Information Management is a business intelligence library and documenta
2424

2525
See the `project documentation <https://docs.atlas.bi>`_
2626

27+
Chat on Discord `https://discord.gg/pAzSbMw259 <https://discord.gg/pAzSbMw259>`_
28+
2729
Included Content
2830
----------------
2931

@@ -108,3 +110,7 @@ Atlas was created by the Riverside Healthcare Analytics team -
108110
.. |climate| image:: https://api.codeclimate.com/v1/badges/385f0450d811190e7e43/maintainability
109111
:target: https://codeclimate.com/github/Riverside-Healthcare/Atlas/maintainability
110112
:alt: Maintainability
113+
114+
.. |netlify| image:: https://api.netlify.com/api/v1/badges/ed758351-91b0-4df8-9b89-21792d1fd372/deploy-status
115+
:target: https://app.netlify.com/sites/hopeful-meninsky-c2b956/deploys
116+
:alt: netlify

web/Helpers/Extensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static string MilestoneFrequencyName(DpMilestoneTemplate content, string
247247
return "Every " + content.Interval + " " + name; ;
248248
}
249249

250-
public static List<TaskData> GetMilestoneTaskDates(Atlas_Web.Pages.Projects.IndexModel.MilestoneTasksData task)
250+
public static List<TaskData> GetMilestoneTaskDates(Atlas_Web.Pages.Collections.IndexModel.MilestoneTasksData task)
251251
{
252252
int counter;
253253
DateTime StartDate = DateTime.Now;
@@ -324,7 +324,7 @@ public static List<TaskData> GetMilestoneTaskDates(Atlas_Web.Pages.Projects.Inde
324324
return list;
325325
}
326326

327-
public static List<TaskData> GetMilestoneCalendar(List<Atlas_Web.Pages.Projects.IndexModel.MilestoneTasksData> Tasks)
327+
public static List<TaskData> GetMilestoneCalendar(List<Atlas_Web.Pages.Collections.IndexModel.MilestoneTasksData> Tasks)
328328
{
329329
var list = new List<TaskData>();
330330
foreach (var task in Tasks)
@@ -406,7 +406,7 @@ public static string ReportUrlFromParams(string Domain, HttpContext Context, str
406406

407407
if (((Url != "" && Url != null) || (ReportType != "SSRS Report" && ReportType != "SSRS File" && Epic && ReportType != "Source Radar Dashboard Component")) && ReportType != "Epic-Crystal Report")
408408
{
409-
if (EpicMasterFile == "HRX")
409+
if (EpicMasterFile == "HRX" && ReportType != "SlicerDicer Session")
410410
{
411411
NewUrl = "EpicAct:AC_RW_STATUS,RUNPARAMS:" + EpicReportTemplateId + "|" + EpicRecordId;
412412
}
@@ -429,7 +429,7 @@ public static string ReportUrlFromParams(string Domain, HttpContext Context, str
429429
{
430430
NewUrl = "EpicAct:WM_METRIC_EDITOR,INFONAME:IDNRECORDID,INFOVALUE:" + EpicRecordId;
431431
}
432-
else if (EpicMasterFile == "FDM" && EpicRecordId != null)
432+
else if ((EpicMasterFile == "FDM" || ReportType == "SlicerDicer Session") && EpicRecordId != null)
433433
{
434434
NewUrl = "EpicACT:BI_SLICERDICER,LaunchOptions:16,RunParams:StartingDataModelId=" + EpicRecordId;
435435
}

web/Models/Customizations/SearchResult.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public SearchResult() { }
3939
public string ReportServerPath { get; set; }
4040
public string Description { get; set; }
4141
public string ReportType { get; set; }
42+
public string Image { get; set; }
4243
public int Documented { get; set; }
4344
public string EpicReleased { get; set; }
4445
public string ReportUrl { get; set; }

web/Pages/Projects/Details/_Agreements.cshtml renamed to web/Pages/Collections/Details/_Agreements.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
*@
1818

19-
@model Atlas_Web.Pages.Projects.IndexModel
19+
@model Atlas_Web.Pages.Collections.IndexModel
2020

2121
<h3>Agreements</h3>
2222

2323

24-
@foreach (var a in Model.DataProject.Agreements)
24+
@foreach (var a in Model.Collection.Agreements)
2525
{
2626
<h4 class="drop" data-toggle="clps" data-target="collapse-agreement-editor-@(a.Id)">Edit <span class="text-green">@a.Description.Substring(0,Math.Min(30,@a.Description.Length)) ...</span> Agreement
2727
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"/></svg>

web/Pages/Projects/Details/_Attachments.cshtml renamed to web/Pages/Collections/Details/_Attachments.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
*@
1818

19-
@model Atlas_Web.Pages.Projects.IndexModel
19+
@model Atlas_Web.Pages.Collections.IndexModel
2020

2121
<h3>Attachments</h3>
2222

web/Pages/Projects/Details/_Comments.cshtml renamed to web/Pages/Collections/Details/_Comments.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
*@
1818

19-
@model Atlas_Web.Pages.Projects.IndexModel
19+
@model Atlas_Web.Pages.Collections.IndexModel
2020
<div class="comments">
2121
<h4 class="comments-title darken">@ViewBag.Comments.Count Comments</h4>
2222

0 commit comments

Comments
 (0)