From 10115646e99048c81efb6c88bb457a575df99808 Mon Sep 17 00:00:00 2001
From: dan <ofbadmin@ofbbutte.com>
Date: Tue, 31 Dec 2019 16:15:39 -0700
Subject: [PATCH] Exclude goodsorservices; adjust contribution report

---
 .../contributor-yearly-report.component.css               | 8 ++++++++
 .../contributor-yearly-report.component.html              | 8 ++++----
 Client/src/app/services/user.service.ts                   | 2 +-
 Server/src/database/transactions.js                       | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.css b/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.css
index 212b9c3..b018a7c 100644
--- a/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.css
+++ b/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.css
@@ -30,6 +30,10 @@
       display: flex;
   }
 
+  .flex-grow-1 {
+      flex-grow: 1;
+  }
+
   .flex-direction-column {
       flex-direction: column;
   }
@@ -90,6 +94,10 @@
       margin-bottom: 20px;
   }
 
+  .mr-40 {
+      margin-right: 40px;
+  }
+
   .flex-direction-column {
       flex-direction: column;
   }
diff --git a/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.html b/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.html
index 9a21469..0218958 100644
--- a/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.html
+++ b/Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.html
@@ -29,7 +29,7 @@
   <h2 class="text-center mt-20">Old Fashion Baptist Church Giving Statement {{taxYear}}</h2>
   <hr class="mt-20">
   <div class="flex flex-align-stretch flex-justify-space-between">
-    <div class="mt-20 mb-20 flex flex-direction-column flex-justify-space-between">
+    <div class="mt-20 mb-20 mr-40 flex-grow-1 flex flex-direction-column flex-justify-space-between">
       <div class="mt-20">
         <p><b>Name: </b>{{contributorName}}</p>
         <p><b>Tax Year: </b>{{taxYear}}</p>
@@ -61,9 +61,9 @@
     </div>
   </div>
   <div>
-    Thank you for your contribution. The information provided in this statement reflects
-    your contributions on record for tax year {{taxYear}}. 
-    No goods or services were provided in exchange for your contribution.
+    Thank you for your support. The information provided in this statement reflects
+    your gifts on record for tax year {{taxYear}}. 
+    No goods or services were provided in exchange for your contributions.
   </div>
 </div>
 
diff --git a/Client/src/app/services/user.service.ts b/Client/src/app/services/user.service.ts
index eb1a624..b0ff2ad 100644
--- a/Client/src/app/services/user.service.ts
+++ b/Client/src/app/services/user.service.ts
@@ -19,7 +19,7 @@ export class UserService {
 
     getAll(){
         return this.httpClient.get(USER_GET_ALL_URL, this.options)
-        .pipe(tap(res => console.log(res)), catchError(this.handleError));
+        .pipe(catchError(this.handleError));
     }
 
     create(firstName: string, lastName: string, street: string, city: string, state: string, zip: string, country: string) {
diff --git a/Server/src/database/transactions.js b/Server/src/database/transactions.js
index 8cb867a..09c1fde 100644
--- a/Server/src/database/transactions.js
+++ b/Server/src/database/transactions.js
@@ -23,7 +23,7 @@ exports.getAll = async function() {
 }
 
 exports.getByYear = async function(taxYear) {
-    const queryResult = await connectionAsync.query('SELECT * FROM Transactions WHERE DeletedDate IS NULL AND TaxYear = ?;', taxYear);
+    const queryResult = await connectionAsync.query('SELECT * FROM Transactions WHERE DeletedDate IS NULL AND TaxYear = ? AND GoodsOrServices = 0;', taxYear);
     const result = [];
     if (queryResult && queryResult.rows && queryResult.rows.length > 0) {
         for(var i = 0 ; i < queryResult.rows.length; i++) {