Skip to content

Commit 70d7da7

Browse files
committed
- linked page to ncoa process to match web forms pre-html
1 parent b8fa770 commit 70d7da7

4 files changed

Lines changed: 28 additions & 2 deletions

File tree

Rock.Blocks/Crm/NcoaResults.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,18 @@ namespace Rock.Blocks.Crm
4545

4646
#region Block Attributes
4747

48+
[LinkedPage( "NCOA Process Page",
49+
Description = "The page used to process NCOA data.",
50+
IsRequired = false,
51+
DefaultValue = Rock.SystemGuid.Page.NCOA_PROCESS + "," + Rock.SystemGuid.PageRoute.NCOA_PROCESS,
52+
Key = AttributeKey.NcoaProcessPage,
53+
Order = 0 )]
54+
4855
[IntegerField( "Result Count",
4956
Description = "How many results to show per page.",
5057
DefaultIntegerValue = 20,
51-
Key = AttributeKey.ResultCount )]
58+
Key = AttributeKey.ResultCount,
59+
Order = 1 )]
5260

5361
#endregion
5462

@@ -62,12 +70,14 @@ public class NcoaResults : RockBlockType
6270
private static class AttributeKey
6371
{
6472
public const string DetailPage = "DetailPage";
73+
public const string NcoaProcessPage = "NcoaProcessPage";
6574
public const string ResultCount = "ResultCount";
6675
}
6776

6877
private static class NavigationUrlKey
6978
{
7079
public const string DetailPage = "DetailPage";
80+
public const string NcoaProcessPage = "NcoaProcessPage";
7181
}
7282

7383
private static class PreferenceKey
@@ -184,7 +194,8 @@ private Dictionary<string, string> GetBoxNavigationUrls()
184194
{
185195
return new Dictionary<string, string>
186196
{
187-
[NavigationUrlKey.DetailPage] = this.GetLinkedPageUrl( AttributeKey.DetailPage, "NcoaRowId", "((Key))" )
197+
[NavigationUrlKey.DetailPage] = this.GetLinkedPageUrl( AttributeKey.DetailPage, "NcoaRowId", "((Key))" ),
198+
[NavigationUrlKey.NcoaProcessPage] = this.GetLinkedPageUrl( AttributeKey.NcoaProcessPage )
188199
};
189200
}
190201

Rock.JavaScript.Obsidian.Blocks/src/Crm/ncoaResults.obs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
type="block">
55
<template #headerActions>
66

7+
<a :href="processNcoaUrl" class="btn btn-default btn-xs">
8+
<i class="fa fa-upload"></i> Process NCOA
9+
</a>
710
<span class="label label-default">
811
Results: {{ totalCount }}
912
</span>
@@ -242,6 +245,8 @@
242245
{ deep: true }
243246
);
244247

248+
const processNcoaUrl = computed((): string => config.navigationUrls?.["NcoaProcessPage"] ?? "");
249+
245250
const hasSettingsFilters = computed((): boolean => {
246251
return (!!gridSettings.value.filterProcessed.length && gridSettings.value.filterProcessed !== Processed.ManualUpdateRequiredOrNotProcessed.toString())
247252
|| !!gridSettings.value.filterMoveDate

Rock/SystemGuid/Page.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,5 +2130,10 @@ public static class Page
21302130
/// The Group Placement page.
21312131
/// </summary>
21322132
public const string GROUP_PLACEMENT = "C1B0C21F-FF3B-4D79-A11A-75BF689A954A";
2133+
2134+
/// <summary>
2135+
/// The Ncoa Process Page
2136+
/// </summary>
2137+
public const string NCOA_PROCESS = "56EDE500-CEE6-41F4-B724-E44E66A4432F";
21332138
}
21342139
}

Rock/SystemGuid/PageRoute.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,10 @@ public static class PageRoute
106106
/// The Group Placement route 'GroupPlacement'
107107
/// </summary>
108108
public const string GROUP_PLACEMENT = "C00ECC2D-8067-44DE-8947-A87B2CC4D575";
109+
110+
/// <summary>
111+
/// The Ncoa Process route
112+
/// </summary>
113+
public const string NCOA_PROCESS = "20A7BA14-BC22-48B2-AF82-063F428B66E4";
109114
}
110115
}

0 commit comments

Comments
 (0)