Skip to content
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.

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

fixes CQM source of payment for ins search #5350

Merged
merged 6 commits into from
May 17, 2022

Conversation

stephenwaite
Copy link
Sponsor Member

Fixes #5349

Short description of what this resolves:

fixes above issue
also restores ability to search by fixing SQL query that failed to match if no phone number was entered for an insurance
also fixes ct_key in database.sql and reverts the change made in find_code_popup.php to circumvent
also adds order to order_types for QRDA I Procedure performed

Changes proposed in this pull request:

@@ -1158,9 +1158,7 @@ class='text'>(<?php echo xlt('Browse'); ?>)</a>
var fval = $('#form_' + flds[i]).val();
duplicateFieldsArray['#form_' + flds[i]] = fval;
}
$(".sel2").select2({
<?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
});
Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty sure this require is satisfied when select2 is brought in with the core header

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Select2 may have several instances each requiring its own library. That's why you see the way it is. So this is a no no!:)

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also may have different setups.

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand. You're removing the lines the permalink points to. What you're doing is removing the class link to select2 and the translations. Where is the class sel2 already inited?

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see your confusion. Each instance of select2 needs the translations pulled in by the required. Otherwise the select2 defaults untranslated would be used plus, all the html tags where the sel2 class is used prob won't work.

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I'll revert and start another issue for it, try to figure out why that is breaking the returned entry from appearing in the select label

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most likely the styling. I noticed this is the only select2 that is not using the bootstrap stylings. Checkout one of my select2's and emulate setup.
I should have done that when I was putting in the new ones. The one we are looking at was the only select2 when I put in the others. It has been there for awhile.

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you have a screen shot of issue?

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about it @stephenwaite , do we need select2 for the two places it is used(sel2 class that is). It was put in for searching

Comment on lines 672 to 673
INSERT INTO list_options ( list_id, option_id, title, seq, is_default ) VALUES ('order_type','order','Order',90,0);
#EndIf
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs new line at end of file. There are several reason for this one being it helps ensure our upgrade parser get the last item. Most times it may work but, I wouldn't count on it!

@@ -256,7 +257,8 @@ public function insert($data)
$data["ins_type_code"],
$data["x12_receiver_id"],
$data["x12_default_partner_id"] ?? '',
$data["alt_cms_id"]
$data["alt_cms_id"],
$data["cqm_sop"] ?? null,
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a new column. If so, Do I need to change import destination for payer. Also payer cqm service.

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay. please remind me when merged.

@stephenwaite stephenwaite merged commit 2463b06 into openemr:master May 17, 2022
@stephenwaite stephenwaite deleted the iss5349 branch May 17, 2022 23:18
Comment on lines 1161 to 1163
$(".sel2").select2({
<?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
});
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could try:

$(".sel2").select2({
    theme: "bootstrap4",
    dropdownAutoWidth: true,
    width: 'resolve',
<?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
});

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works like a champ 🥊
pushed it to #5352 and now passing cms147v11
sheep

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

munchkin-wizard-of-oz

@sjpadgett
Copy link
Sponsor Member

@stephenwaite Are we okay on licensing on this https://github.com/openemr/openemr/pull/5350/files#diff-506f53abf55f1b6a8944c6c5042520a5d630b24a5c108d4f89b5bae12d013c35 i.e. contrib/cqm_valueset/ep_ec_only_cms_20210506.xml.zip

@stephenwaite
Copy link
Sponsor Member Author

thanks @sjpadgett , just removed it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CQM source of payment for demographics ins search
3 participants