Skip to content

Updated gift import to match on i_eg_trx_uuid and to display the value more places #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nboard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated gift import to match on i_eg_trx_uuid and to display the value more places #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions kardia-app/modules/rcpt/gift_import.cmp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ gift_import "widget/component-decl"
cx__case_insensitive=1;
//use_having=1;
objname=runclient("eg");
field_list="*i_eg_donor_name*,*i_eg_desig_name*,*i_eg_desig_notes*,p_donor_partner_key,*i_eg_donor_email*,i_eg_donor_city*,i_eg_donor_state";
field_list="*i_eg_donor_name*,*i_eg_desig_name*,*i_eg_desig_uuid*,*i_eg_desig_notes*,p_donor_partner_key,*i_eg_donor_email*,i_eg_donor_city*,i_eg_donor_state";
query=runclient(:search_eb:content);
}
}
Expand Down Expand Up @@ -286,7 +286,7 @@ gift_import "widget/component-decl"
kardia_donor_info = :eg:p_donor_partner_key + isnull(' ' + :p:p_org_name, '') + isnull(' ' + :p:p_given_name,'') + isnull(' ' + :p:p_surname,'') + isnull(' (' + :l:p_city + isnull(', ' + :l:p_state_province, '') + ')', ''),
kardia_donor_name = isnull(' ' + :p:p_org_name, '') + isnull(' ' + :p:p_given_name,'') + isnull(' ' + :p:p_surname,''),
has_donor_rec = (select count(1) from /apps/kardia/data/Kardia_DB/p_donor/rows d where :d:a_gl_ledger_number = :eg:a_ledger_number and :d:p_partner_key = :eg:p_donor_partner_key),
gs_desig_info = :eg:i_eg_desig_name,
gs_desig_info = :eg:i_eg_desig_uuid + isnull(' ' + :eg:i_eg_desig_name, ''),
kardia_desig_info = :eg:a_fund + isnull(' ' + :c:a_fund_desc,''),
amount = :eg:i_eg_gift_amount,
:eg:p_donor_partner_key,
Expand Down Expand Up @@ -467,7 +467,9 @@ gift_import "widget/component-decl"

gs_email "widget/component" { height=16; path="/sys/cmp/smart_field.cmp"; field=i_eg_donor_email; ctl_type=label; text="Email:"; label_width=60; label_valign=top; }
gs_phone "widget/component" { height=16; path="/sys/cmp/smart_field.cmp"; field=i_eg_donor_phone; ctl_type=label; text="Phone:"; label_width=60; label_valign=top; }
gs_desig "widget/component" { height=22; path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_name; ctl_type=label; text="Desig.:"; label_width=60; label_valign=top; }
gs_desig_name "widget/component" { height=16; path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_name; ctl_type=label; text="Desig.:"; label_width=60; label_valign=top; }
gs_desig_uuid "widget/component" { height=22; path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_uuid; ctl_type=label; text=""; label_width=60; label_valign=top; }

gs_notes "widget/component" { height=70; path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_notes; ctl_type=label; text="Notes:"; label_width=60; label_valign=top; }
}

Expand Down Expand Up @@ -1075,7 +1077,7 @@ gift_import "widget/component-decl"
SELECT
trx_date = substring(convert(string,:eg:i_eg_gift_trx_date),1,11),
:eg:a_fund,
cctext = isnull(:eg:a_fund + ' - ' + isnull(:c:a_fund_desc, '**INVALID**'), 'Needs QA: ' + :eg:i_eg_desig_name),
cctext = isnull(:eg:a_fund + ' - ' + isnull(:c:a_fund_desc, '**INVALID**'), 'Needs QA: ' + :eg:i_eg_desig_uuid + isnull(' ' + :eg:i_eg_desig_name, '')),
:eg:i_eg_gift_amount,
:eg:i_eg_net_amount,
:eg:a_batch_number,
Expand Down Expand Up @@ -1290,7 +1292,8 @@ gift_import "widget/component-decl"
id_settdate "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_gift_settlement_date; text="Settlement:"; ctl_type=label; }
id_depdate "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_deposit_date; text="Deposited:"; ctl_type=label; }
id_depid "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_deposit_uuid; text="Deposit ID:"; ctl_type=label; }
id_desig "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_name; text="Designation:"; ctl_type=label; }
id_desig_name "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_name; text="Designation:"; ctl_type=label; }
id_desig_uuid "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_uuid; text=""; ctl_type=label; }
id_anon "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_anonymous; text="Anonymous?"; ctl_type=label; }
id_notes "widget/component" { path="/sys/cmp/smart_field.cmp"; field=i_eg_desig_notes; text="Notes:"; ctl_type=label; }
}
Expand Down
3 changes: 2 additions & 1 deletion kardia-app/modules/rcpt/gift_import_report.rpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ gift_import_report "system/report"
donor_name = condition(char_length(rtrim(:p:p_org_name)) > 1, :p:p_org_name, :p:p_given_name + ' ' + :p:p_surname),
:eg:i_eg_donor_name,
:eg:i_eg_desig_name,
:eg:i_eg_desig_uuid,
:c:a_fund,
:c:a_fund_desc,
this_period = :period_qy:a_period,
Expand Down Expand Up @@ -195,7 +196,7 @@ gift_import_report "system/report"

g_date "report/table-cell" { value=runserver(:gift_qy:i_eg_gift_trx_date); font=courier; dateformat = "dd-MMM"; }
g_donor "report/table-cell" { value=runserver(isnull(:gift_qy:p_donor_partner_key + ' ' + :gift_qy:donor_name, :gift_qy:i_eg_donor_name)); }
g_desig "report/table-cell" { value=runserver(isnull(:gift_qy:a_fund + ' ' + :gift_qy:a_fund_desc, :gift_qy:i_eg_desig_name)); }
g_desig "report/table-cell" { value=runserver(isnull(:gift_qy:a_fund + ' ' + :gift_qy:a_fund_desc, :gift_qy:i_eg_desig_uuid + isnull(' '+:gift_qy:i_eg_desig_name, ''))); }
g_method "report/table-cell" { value=runserver(:gift_qy:card_number); }
g_freq "report/table-cell" { value=runserver(lower(:gift_qy:i_eg_gift_interval)); }
g_amount "report/table-cell" { value=runserver(:gift_qy:i_eg_gift_amount); font=courier; align=right; }
Expand Down
12 changes: 6 additions & 6 deletions kardia-app/modules/rcpt/plugin_rcpt_importprocess_100match.qy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ plugin_rcpt_importprocess_100match "system/query"
from
/apps/kardia/data/Kardia_DB/i_eg_gift_import/rows e2
where
upper(:e1:i_eg_desig_name) = upper(:e2:i_eg_desig_name) and
upper(:e1:i_eg_desig_uuid) = upper(:e2:i_eg_desig_uuid) and
:e1:a_ledger_number = :e2:a_ledger_number and
:e2:i_eg_fundmap_future = 1 and
:e2:i_eg_fundmap_confidence = 2 and
Expand All @@ -77,7 +77,7 @@ plugin_rcpt_importprocess_100match "system/query"
from
/apps/kardia/data/Kardia_DB/i_eg_gift_import/rows e2
where
upper(:e1:i_eg_desig_name) = upper(:e2:i_eg_desig_name) and
upper(:e1:i_eg_desig_uuid) = upper(:e2:i_eg_desig_uuid) and
:e1:a_ledger_number = :e2:a_ledger_number and
:e2:i_eg_fundmap_future = 1 and
:e2:i_eg_fundmap_confidence = 2 and
Expand Down Expand Up @@ -108,7 +108,7 @@ plugin_rcpt_importprocess_100match "system/query"
from
/apps/kardia/data/Kardia_DB/i_eg_gift_import/rows e2
where
upper(:e1:i_eg_desig_name) = upper(:e2:i_eg_desig_name) and
upper(:e1:i_eg_desig_uuid) = upper(:e2:i_eg_desig_uuid) and
:e1:a_ledger_number = :e2:a_ledger_number and
:e1:a_fund = :e2:a_fund and
:e2:i_eg_acctmap_future = 1 and
Expand All @@ -125,7 +125,7 @@ plugin_rcpt_importprocess_100match "system/query"
from
/apps/kardia/data/Kardia_DB/i_eg_gift_import/rows e2
where
upper(:e1:i_eg_desig_name) = upper(:e2:i_eg_desig_name) and
upper(:e1:i_eg_desig_uuid) = upper(:e2:i_eg_desig_uuid) and
:e1:a_ledger_number = :e2:a_ledger_number and
:e1:a_fund = :e2:a_fund and
:e2:i_eg_acctmap_future = 1 and
Expand Down Expand Up @@ -156,7 +156,7 @@ plugin_rcpt_importprocess_100match "system/query"
from
/apps/kardia/data/Kardia_DB/i_eg_gift_import/rows e2
where
upper(:e1:i_eg_desig_name) = upper(:e2:i_eg_desig_name) and
upper(:e1:i_eg_desig_uuid) = upper(:e2:i_eg_desig_uuid) and
:e1:a_ledger_number = :e2:a_ledger_number and
:e1:a_fund = :e2:a_fund and
:e2:i_eg_acctmap_future = 1 and
Expand All @@ -172,7 +172,7 @@ plugin_rcpt_importprocess_100match "system/query"
from
/apps/kardia/data/Kardia_DB/i_eg_gift_import/rows e2
where
upper(:e1:i_eg_desig_name) = upper(:e2:i_eg_desig_name) and
upper(:e1:i_eg_desig_uuid) = upper(:e2:i_eg_desig_uuid) and
:e1:a_ledger_number = :e2:a_ledger_number and
:e1:a_fund = :e2:a_fund and
:e2:i_eg_acctmap_future = 1 and
Expand Down