New erx 6 #1017

juggernautsei · 2017-08-18T17:01:03Z

Posting PR as requested

Up for grabs demo here:
http://www.open-emr.org/wiki/index.php/Development_Demo#192.168.1.135

with minor code adjustments by brady

bradymiller · 2017-08-18T17:11:48Z

@juggernautsei ,
I think this is getting close :)
Is this code testing well?

juggernautsei · 2017-08-18T17:30:16Z

I am going to test a fresh install from scratch and see if the code works. I will update you later.

bradymiller · 2017-08-24T10:32:02Z

Just created an up for grabs demo for this PR here:
http://www.open-emr.org/wiki/index.php/Development_Demo#192.168.1.135

juggernautsei · 2017-08-29T12:07:47Z

This is not testing well right now. The provider data is not populating. I feel like I am troubleshooting someone else's code. Trying to figure out how the doc info gets populated. Update you as soon as I get this fixed.

Got most everything back in working order. The clues were there just had to follow them. Waiting on Tina to update our account info. Right now the return is
Open Med Practice|2017-08-29|16:08:33|||600|IP is not registered.
Once that is corrected, will test again and report back.

…n made and the confirm script had a phpstorm suggestion that was updated to the suggestion.

juggernautsei · 2017-08-31T02:00:16Z

The system is testing well now.
Weno Exchange LLC|2017-08-31|01:55:49.56314Z|001|Transaction successful||

Anyone that follows the instructions for testing should receive this type of message.

bradymiller · 2017-09-02T21:17:38Z

interface/weno/formularyInsert.php

+ echo text($lines). "<br>";
+
+ $i = 2;
+


To drastically speed up this import of data, place the following lines here:

// Settings to drastically speed up import with InnoDB sqlStatementNoLog("SET autocommit=0"); sqlStatementNoLog("START TRANSACTION");

still need to address this here
(also note the note I'll repost below that should be done after below code snippet)
(this will drastically increases the speed of this large import)

@juggernautsei ,
Still need to address this. see my post below for details.

bradymiller · 2017-09-02T21:19:19Z

interface/weno/formularyInsert.php

+    echo xlt("Inserted") . " " . text($drugName) . "<br> ";
+
+    $i++;
+} while ($i < $lines);


To close out the above setting, then do the following her (after importing above data):

// Settings to drastically speed up import with InnoDB sqlStatementNoLog("COMMIT"); sqlStatementNoLog("SET autocommit=1");

bradymiller · 2017-09-02T21:20:26Z

interface/weno/formularyInsert.php

+    $price = $in[5];
+    $drugName = $in[8];
+
+    sqlStatement("INSERT INTO `erx_drug_paid` SET `drug_label_name` = ?, `NDC` = ?, `price_per_unit` = ? ", array($drugName,$ndc,$price));


Since do not need to log all these inserts, change to sqlStatementNoLog() function:

sqlStatementNoLog("INSERT INTO `erx_drug_paid` SET `drug_label_name` = ?, `NDC` = ?, `price_per_unit` = ? ", array($drugName,$ndc,$price));

bradymiller · 2017-09-02T21:25:24Z

interface/weno/formularyUpdate.php

+    } else {
+        sqlStatement("INSERT INTO `erx_drug_paid` SET `drug_label_name` = ?, `NDC` = ?, `price_per_unit` = ? ", array($drugName,$ndc,$price));
+        echo xlt("Inserted")."<br> ";
+    }


I am a bit confused on this code block from line 43-53.
There is no difference between these 2 different queries. Can this just all be changed to:

sqlStatementNoLog("INSERT INTO `erx_drug_paid` SET `drug_label_name` = ?, `NDC` = ?, `price_per_unit` = ? ", array($drugName,$ndc,$price)); echo xlt("Inserted")."<br> ";

If we can simply this, then can use the innodb strategy used above to drastically increase the speed of the update.

bradymiller · 2017-09-02T22:03:18Z

interface/weno/markTx.php

+    //See if the value is set
+    $check = "SELECT ntx FROM prescriptions WHERE id = ?";
+    $getVal = sqlStatement($check, array($e_script[1]));
+    $val = sqlFetchArray($getVal);


Since you are just grabbing one item, wouldn't sqlQuery be better? (then don't need the sqlFetchArray step)

Ok will do.

bradymiller · 2017-09-02T22:05:30Z

library/ajax/drug_autocomplete/search.php

+        while ($row = sqlFetchArray($res)) {
+            $return_arr[] =  $row['drug_label_name'] . " - ". $row['price_per_unit'];
+        }
+    } catch (PDOException $e) {


This seems odd since the database connector is not even PDO???

left over from the original code that was PDO.

then would completely remove this try/catch (note sqlStatement outputs errors already)
as an aside, does these even work since the S in sqlstatement is not capitalized??

bradymiller · 2017-09-02T22:05:54Z

library/ajax/pharmacy_autocomplete/search.php

+        while ($row = sqlFetchArray($res)) {
+            $return_arr[] =  $row['id'] . " - ".$row['Store_name'] . " ".$row['address_line_1']." ". $row['city'] ." " . $row['state'];
+        }
+    } catch (PDOException $e) {


This seems odd since the database connector is not even PDO???

It is a left over from the original code.

then would completely remove this try/catch (note sqlStatement outputs errors already)
as an aside, does these even work since the S in sqlstatement is not capitalized??

Will remove try catch blocks.

bradymiller · 2017-09-02T22:08:07Z

library/weno/src/AdminProperties.php

+
+        sqlInsert($sqlNarc);
+
+          return "Narcotic drugs imported<br>";


should use xlt() on the string here

bradymiller · 2017-09-02T22:08:56Z

library/weno/src/AdminProperties.php

+  */
+        $sqlNarc = file_get_contents('../../contrib/weno/narc.sql');
+
+        sqlInsert($sqlNarc);


how long does this import take?
If it takes awhile, let me know, and I can show you how to drastically reduce the time.

That statement was from the first round before switching to the SQL version. I don't know how long it takes now.

Are you saying this function is no longer used? If so, then would remove it.

No, I am saying the words "Be patient this can take a while" can be removed.

Use the sqlStatementNoLog() function here instead.

bradymiller · 2017-09-03T02:37:09Z

library/weno/src/TransmitData.php

+        return $res;
+    }
+
+    public function checkList($send)


This function doesn't appear to be used anywhere and is odd (to start with a sqlFetchArray). If it's not used, then would remove it.

bradymiller · 2017-09-03T04:20:58Z

templates/prescription/general_edit.html

@@ -256,10 +265,24 @@
 {$ENDING_JAVASCRIPT}
 </script>
 </form>
+<!-- Has to be loaded after the form -->


Why did you move these to the bottom? Rec moving them to the top where include the css stuff. This is likely why getting the following js errors when open the prescription Add gui:

I have not move anything in this area.

AAAARRRRRRR!!! I keep fixing this and it keeps getting broken :-(

jquery-ui.min.css
This file is missing.
Two version back, I placed this file in the library/js folder and now it is no longer there and the code needs it to run properly.

Moved to the top and it works still so leaving and removing the note.

bradymiller · 2017-09-03T04:23:49Z

templates/prescription/general_edit.html

+$(function() {
+
+    //Drug form autocomplete to text box.
+    $(".wDrug").autocomplete({


If this function is specific to weno rx, then would only output this if he weno rx feature is on.

Ok, will do.

I don't know how to do this. I have tried and

{php} if ($GLOBALS['weno_rx_enable']) { {/php}

{php} } {/php}

I think because of the {literal} function no matter what is typed in there will be output.

bradymiller · 2017-09-03T04:30:17Z

templates/prescription/general_edit.html

+  <td COLSPAN="1" class="text" ALIGN="right" VALIGN="MIDDLE" >{xl t='Starting Date'}</td>
+  <td COLSPAN="2" ALIGN="LEFT" VALIGN="MIDDLE" >
+    {html_select_date start_year="-10" end_year="+5" time=$prescription->start_date prefix="start_date_"}
+    <input type="hidden" name="start_date" value="{$prescription->start_date}">


Did you add the above line for a bug fix? This is a new line of code. Note it's easier to see these things when look at this code while ignoring whitespace which can do with following link(note the ?w=1 at end of link):
https://github.com/openemr/openemr/pull/1017/files?w=1

No, I did not add that line of code. I have not recently edited this file.

git is clearly showing the above line is not in main codebase, but is in your code. If you did not add that line, then rec removing it.
If you want to get a clearer idea of what code you added to this file, check out this diff which ignores whitespace changes:
https://github.com/openemr/openemr/pull/1017/files?w=1

Here is my proof that I did not add the lines 159-162. In the image below, I went back to where I did the dragndrop mod which has been untouched since then. The window on the left shows the file date. Look at the top of the editor, you can see that I am in the dragdrop folder. In the editor are the same lines from April of this year. This is from the main code base. I always fetch before creating a new branch. That code has been there long before April and I did not add it. Can you be clear for me, you want me to remove lines 159-162?

only 1 line at 162. don't worry about this; it's minor and i'll fix it up when get this into the codebase (have fingers crossed that it will get into the codebase tonight :) )

bradymiller · 2017-09-03T04:32:21Z

Hi @juggernautsei ,
Just finished code review and testing. This is getting very close. Let me know when it's ready for the next review (guessing it will be ready for the main codebase at that point).
-brady

juggernautsei · 2017-09-04T02:55:36Z

New updates are ready for inspection.

bradymiller · 2017-09-06T08:54:47Z

interface/weno/formularyInsert.php

+    echo xlt("Inserted") . " " . text($drugName) . "<br> ";
+
+    $i++;
+} while ($i < $lines);


below while code, do the following:

// Settings to drastically speed up import with InnoDB sqlStatementNoLog("COMMIT"); sqlStatementNoLog("SET autocommit=1");

I usually just do what you ask no questions and try to understand later. Sometimes it is obvious after I read the instructions and I add it to my skills.
This one is over my head enough that I want to ask a question. Placing the statements after the while loop means they will only execute after the loop is finished. How is that going to speed up the insert process?

In this case, we are wrapping the large insert with settings to increase the innodb performance. Note you also need to place the settings above the while loop in my other post above. For inserts, innodb touches the hard drive after every insert for log/robust issues. This can be very expensive when inserting hundreds of records(for example, the setup script in openemr could take up to 45 minutes because of 100,000+ translations), so we are basically turning this off temporarily before the insert, and then turning it back on after the insert.

understood.

bradymiller · 2017-09-06T08:58:42Z

library/weno/src/AdminProperties.php

+  *
+  */
+        $sqlNarc = file_get_contents('../../contrib/weno/narc.sql');
+


Above the sqlStatementNoLog, do the following:

// Settings to drastically speed up import with InnoDB sqlStatementNoLog("SET autocommit=0"); sqlStatementNoLog("START TRANSACTION");

bradymiller · 2017-09-06T08:59:27Z

library/weno/src/AdminProperties.php

+        $sqlNarc = file_get_contents('../../contrib/weno/narc.sql');
+
+        sqlInsert($sqlNarc);
+


below the sqlStatementNoLog(), do the following:

// Settings to drastically speed up import with InnoDB sqlStatementNoLog("COMMIT"); sqlStatementNoLog("SET autocommit=1");

bradymiller · 2017-09-08T08:19:33Z

hi @juggernautsei ,

I just brought in your feature into the codebase. thank you for your awesome contribution! I made a couple minor changes.

Here's your original code:
049d45a

Here are a couple PSR2 changes:
cec9566

And here were a couple of other changes/fixes. (Mostly needed to fix the autocomplete feature so it didn't break the original autocomplete from the drugs table. So, when not using weno, it will use original drugs table autocomplete, and when using weno, it will autocomplete from your formulary table):
04b6d41

-brady

juggernautsei and others added 3 commits August 11, 2017 22:49

Weno eRx feature build, take 4.

fb79a07

with minor code adjustments by brady

more changes from Sherwin most recent pull request

2e27ad2

gitignore set to ignore phpstorm project files

3436b34

bradymiller mentioned this pull request Aug 18, 2017

Sherwin's erx updated (temporary PR) #1007

Closed

bradymiller added the Status: Needs Review label Aug 19, 2017

Did some clean up on this page.

fee26d3

Made changes to the jsonScript to reflect other changes that have bee…

c4c9bbe

…n made and the confirm script had a phpstorm suggestion that was updated to the suggestion.

bradymiller self-assigned this Aug 31, 2017

Updated the drug list and pharmacy list

966e5a1

bradymiller reviewed Sep 2, 2017

View reviewed changes

bradymiller reviewed Sep 3, 2017

View reviewed changes

bradymiller added the Status: Needs Work label Sep 3, 2017

round of changes

05d3d7f

bradymiller removed the Status: Needs Work label Sep 5, 2017

bradymiller reviewed Sep 6, 2017

View reviewed changes

juggernautsei added 2 commits September 6, 2017 06:50

Updates as requested I believe.

2c345d5

Added the sqlStatementNoLog before loop

1d253e3

bradymiller closed this Sep 8, 2017

		$sqlNarc = file_get_contents('../../contrib/weno/narc.sql');

		sqlInsert($sqlNarc);

New erx 6 #1017

New erx 6 #1017

Conversation

juggernautsei commented Aug 18, 2017 • edited by bradymiller

bradymiller commented Aug 18, 2017

juggernautsei commented Aug 18, 2017

bradymiller commented Aug 24, 2017

juggernautsei commented Aug 29, 2017 • edited

juggernautsei commented Aug 31, 2017 • edited

bradymiller Sep 2, 2017 • edited

Choose a reason for hiding this comment

bradymiller Sep 6, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bradymiller Sep 2, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

juggernautsei Sep 4, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bradymiller Sep 6, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bradymiller commented Sep 3, 2017

juggernautsei commented Sep 4, 2017

bradymiller Sep 6, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bradymiller commented Sep 8, 2017

juggernautsei commented Aug 18, 2017 •

edited by bradymiller

juggernautsei commented Aug 29, 2017 •

edited

juggernautsei commented Aug 31, 2017 •

edited

bradymiller Sep 2, 2017 •

edited

bradymiller Sep 6, 2017 •

edited

bradymiller Sep 2, 2017 •

edited

juggernautsei Sep 4, 2017 •

edited

bradymiller Sep 6, 2017 •

edited

bradymiller Sep 6, 2017 •

edited