diff --git a/kardia-app/modules/rcpt/gift_import.cmp b/kardia-app/modules/rcpt/gift_import.cmp index af1ba606..8c6e9248 100644 --- a/kardia-app/modules/rcpt/gift_import.cmp +++ b/kardia-app/modules/rcpt/gift_import.cmp @@ -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); } } @@ -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, @@ -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; } } @@ -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, @@ -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; } } diff --git a/kardia-app/modules/rcpt/gift_import_report.rpt b/kardia-app/modules/rcpt/gift_import_report.rpt index 63f40219..96e7ce7c 100644 --- a/kardia-app/modules/rcpt/gift_import_report.rpt +++ b/kardia-app/modules/rcpt/gift_import_report.rpt @@ -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, @@ -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; } diff --git a/kardia-app/modules/rcpt/plugin_rcpt_importprocess_100match.qy b/kardia-app/modules/rcpt/plugin_rcpt_importprocess_100match.qy index b484d6fc..0097f1ed 100644 --- a/kardia-app/modules/rcpt/plugin_rcpt_importprocess_100match.qy +++ b/kardia-app/modules/rcpt/plugin_rcpt_importprocess_100match.qy @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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