RESKC-1811: Totals fix.

kuali · Nov 10, 2016 · a4d9295 · a4d9295
1 parent 80bd776
commit a4d9295
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 2 deletions.
diff --git a/.../org/kuali/coeus/s2sgen/impl/generate/support/RRSubAwardBudget10_30_1_4V1_4Generator.java b/.../org/kuali/coeus/s2sgen/impl/generate/support/RRSubAwardBudget10_30_1_4V1_4Generator.java
@@ -238,7 +238,7 @@ private RRBudget1014Document getRRBudget1014(BudgetSubAwardsContract budgetSubAw
      */
     @Override
     public XmlObject getFormObject(ProposalDevelopmentDocumentContract proposalDevelopmentDocument) {
-        pdDoc=proposalDevelopmentDocument;
+        pdDoc = proposalDevelopmentDocument;
         try {
             return getRRSubawardBudgetDocument();
         } catch (IOException | XmlException e) {

diff --git a/...uali/coeus/s2sgen/impl/generate/support/stylesheet/RR_SubawardBudget10_30_1_4-V1.4.fo.xsl b/...uali/coeus/s2sgen/impl/generate/support/stylesheet/RR_SubawardBudget10_30_1_4-V1.4.fo.xsl
@@ -986,6 +986,23 @@
 												</fo:block>
 											</fo:table-cell>
 										</fo:table-row>
+                                        <fo:table-row>
+                                            <fo:table-cell hyphenate="true" language="en" padding-before="3pt" padding-after="3pt">
+                                                <fo:block font-weight="bold">Section K, Total Costs and Fee (I + J)</fo:block>
+                                            </fo:table-cell>
+                                            <fo:table-cell>
+                                                <fo:block/>
+                                            </fo:table-cell>
+                                            <fo:table-cell text-align="right">
+                                                <fo:block>
+                                                    <xsl:for-each select="RR_Budget10_1_4:CumulativeTotalCostsFee">
+                                                        <fo:inline font-weight="bold">
+                                                            <xsl:value-of select="format-number(., '#,##0.00')"/>
+                                                        </fo:inline>
+                                                    </xsl:for-each>
+                                                </fo:block>
+                                            </fo:table-cell>
+                                        </fo:table-row>
 										<!--============ ROWS End ================================-->
 									</xsl:for-each>
 								</fo:table-body>
@@ -3010,6 +3027,43 @@
 			<fo:block>
 				<fo:leader leader-pattern="space"/>
 			</fo:block>
+            <fo:table border-style="solid" border-color="black" width="100%" space-before.optimum="1pt" space-after.optimum="2pt" table-layout="fixed">
+                <fo:table-column column-width="proportional-column-width(85)"/>
+                <fo:table-column column-width="proportional-column-width(16)"/>
+                <fo:table-body>
+                    <fo:table-row>
+                        <fo:table-cell padding-start="1pt" padding-end="1pt" padding-before="1pt" padding-after="1pt" display-align="before" text-align="start">
+                            <fo:block>
+                                <fo:inline font-size="8pt" font-weight="bold">K. Total Costs and Fee</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell text-align="center" padding-start="1pt" padding-end="1pt" padding-before="1pt" padding-after="1pt" display-align="before">
+                            <fo:block>
+                                <fo:inline font-weight="bold" font-size="8pt">Funds Requested (&#36;)</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                        <fo:table-cell text-align="right" padding-start="1pt" padding-end="1pt" padding-before="1pt" padding-after="1pt" display-align="before">
+                            <fo:block>
+                                <fo:inline font-size="8pt" font-weight="bold">Total Costs and Fee (I + J)</fo:inline>
+                            </fo:block>
+                        </fo:table-cell>
+                        <fo:table-cell text-align="right" padding-start="1pt" padding-end="1pt" padding-before="1pt" padding-after="1pt" display-align="before">
+                            <fo:block>
+                                <xsl:for-each select="RR_Budget10_1_4:TotalCostsFee">
+                                    <fo:inline font-size="8pt" font-weight="bold">
+                                        <xsl:value-of select="format-number(., '#,##0.00')"/>
+                                    </fo:inline>
+                                </xsl:for-each>
+                            </fo:block>
+                        </fo:table-cell>
+                    </fo:table-row>
+                </fo:table-body>
+            </fo:table>
+            <fo:block>
+                <fo:leader leader-pattern="space"/>
+            </fo:block>
 			<fo:table border-style="solid" border-color="black" width="100%" space-before.optimum="1pt" space-after.optimum="2pt">
 				<fo:table-column/>
 				<fo:table-column/>
@@ -3018,7 +3072,7 @@
 					<fo:table-row>
 						<fo:table-cell padding-start="1pt" padding-end="1pt" padding-before="1pt" padding-after="1pt" display-align="before" text-align="start">
 							<fo:block>
-								<fo:inline font-size="8pt" font-weight="bold">K. * Budget Justification</fo:inline>
+								<fo:inline font-size="8pt" font-weight="bold">L. * Budget Justification</fo:inline>
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell padding-start="1pt" padding-end="1pt" padding-before="1pt" padding-after="1pt" display-align="before" text-align="start">