djabsher
/
UIAngular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude goodsorservices; adjust contribution report

test
dan 2019-12-31 16:15:39 -07:00
parent 95e90279ee
commit 10115646e9
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.css
View File

@ -30,6 +30,10 @@
display: flex; display: flex;
} }
.flex-grow-1 {
flex-grow: 1;
}
.flex-direction-column { .flex-direction-column {
flex-direction: column; flex-direction: column;
} }
@ -90,6 +94,10 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.mr-40 {
margin-right: 40px;
}
.flex-direction-column { .flex-direction-column {
flex-direction: column; flex-direction: column;
} }

8
Client/src/app/components/contributor-yearly-report/contributor-yearly-report.component.html
View File

@ -29,7 +29,7 @@
<h2 class="text-center mt-20">Old Fashion Baptist Church Giving Statement {{taxYear}}</h2> <h2 class="text-center mt-20">Old Fashion Baptist Church Giving Statement {{taxYear}}</h2>
<hr class="mt-20"> <hr class="mt-20">
<div class="flex flex-align-stretch flex-justify-space-between"> <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"> <div class="mt-20">
<p><b>Name: </b>{{contributorName}}</p> <p><b>Name: </b>{{contributorName}}</p>
<p><b>Tax Year: </b>{{taxYear}}</p> <p><b>Tax Year: </b>{{taxYear}}</p>
@ -61,9 +61,9 @@
</div> </div>
</div> </div>
<div> <div>
Thank you for your contribution. The information provided in this statement reflects Thank you for your support. The information provided in this statement reflects
your contributions on record for tax year {{taxYear}}. your gifts on record for tax year {{taxYear}}.
No goods or services were provided in exchange for your contribution. No goods or services were provided in exchange for your contributions.
</div> </div>
</div> </div>

2
Client/src/app/services/user.service.ts
View File

@ -19,7 +19,7 @@ export class UserService {
getAll(){ getAll(){
return this.httpClient.get(USER_GET_ALL_URL, this.options) 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) { create(firstName: string, lastName: string, street: string, city: string, state: string, zip: string, country: string) {

2
Server/src/database/transactions.js
View File

@ -23,7 +23,7 @@ exports.getAll = async function() {
} }
exports.getByYear = async function(taxYear) { 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 = []; const result = [];
if (queryResult && queryResult.rows && queryResult.rows.length > 0) { if (queryResult && queryResult.rows && queryResult.rows.length > 0) {
for(var i = 0 ; i < queryResult.rows.length; i++) { for(var i = 0 ; i < queryResult.rows.length; i++) {