+ Fixed Pledge Analytics to display business names (Fixes #1335).

SparkDevNetwork · Jan 9, 2016 · 19f9a8a · 19f9a8a
1 parent fc0676b
commit 19f9a8a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/RockWeb/Blocks/Finance/BusinessDetail.ascx b/RockWeb/Blocks/Finance/BusinessDetail.ascx
@@ -104,9 +104,7 @@
                 <Content>
                     <asp:HiddenField ID="hfModalOpen" runat="server" />
                     <asp:ValidationSummary ID="valSummaryAddContact" runat="server" HeaderText="Please Correct the Following" CssClass="alert alert-danger" ValidationGroup="AddContact"/>
-                    <div class="row col-md-12">
-                        <Rock:PersonPicker ID="ppContact" runat="server" Label="Contact" Required="true" ValidationGroup="AddContact" />
-                    </div>
+                    <Rock:PersonPicker ID="ppContact" runat="server" Label="Contact" Required="true" ValidationGroup="AddContact" />
                 </Content>
             </Rock:ModalDialog>
         </asp:Panel>

diff --git a/RockWeb/Blocks/Finance/PledgeAnalytics.ascx b/RockWeb/Blocks/Finance/PledgeAnalytics.ascx
@@ -57,7 +57,11 @@
                                         ExportSource="ColumnOutput" ExportFilename="PledgeAnalytics">
                                         <Columns>
                                             <Rock:SelectField />
-                                            <Rock:RockBoundField DataField="PersonName" HeaderText="Person" SortExpression="LastName,NickName" />
+                                            <Rock:RockTemplateField HeaderText="Person" SortExpression="LastName,NickName">
+                                                <ItemTemplate>
+                                                    <%# FormatName( Eval("LastName"), Eval("NickName") ) %>
+                                                </ItemTemplate>
+                                            </Rock:RockTemplateField>
                                             <Rock:RockBoundField DataField="Email" HeaderText="Email" SortExpression="Email" Visible="false" ExcelExportBehavior="AlwaysInclude" />
                                             <Rock:CurrencyField DataField="PledgeAmount" HeaderText="Pledge Total" SortExpression="PledgeAmount" />
                                             <Rock:CurrencyField DataField="GiftAmount" HeaderText="Total Giving Amount" SortExpression="GiftAmount" />

diff --git a/RockWeb/Blocks/Finance/PledgeAnalytics.ascx.cs b/RockWeb/Blocks/Finance/PledgeAnalytics.ascx.cs
@@ -244,6 +244,34 @@ private void LoadSettingsFromUserPreferences()
             }
         }
 
+        /// <summary>
+        /// Formats the name.
+        /// </summary>
+        /// <param name="lastname">The lastname.</param>
+        /// <param name="nickname">The nickname.</param>
+        /// <returns></returns>
+        protected string FormatName( object lastname, object nickname )
+        {
+            string result = string.Empty;
+
+            if ( nickname != null )
+            {
+                result = nickname.ToString();
+            }
+
+            if ( lastname != null )
+            {
+                if ( !string.IsNullOrWhiteSpace( result ) )
+                {
+                    result += " ";
+                }
+
+                result += lastname;
+            }
+
+            return result;
+        }
+
         #endregion