Clinical Decision Rules Admin UI

system · July 12, 2014, 7:34pm

jansta23 wrote on Saturday, July 12, 2014:

Hi,

We are close to completing the UI for CDR Admin.

Please find the demo here:
http://demo.open-emr.org:2105/openemr
Credentials: admin/pass
UI Path: Administration > Rules > Plans Configuration-Go To

And source code here:

branch: cdr-plans-admin_gui

system · July 24, 2014, 3:09am

robertovasquez wrote on Thursday, July 24, 2014:

Thanks Jan
The Active and Deactive modules are not ready yet.
I tested the ADD NEW PLAN, I had to create ther rule for the plan and works good. The delete plan is working also.

system · July 28, 2014, 7:13pm

robertovasquez wrote on Monday, July 28, 2014:

Hi Jan
Is not ease to see if plan is active or inactive. In this case is inactive and took me some time to figure it out what is the plan status looking at the UI. Probably we can do a little change and give an eye candy to the users.

system · July 30, 2014, 5:13pm

robertovasquez wrote on Wednesday, July 30, 2014:

The error() method was deprecated in jQuery version 1.8.

http://api.jquery.com/category/deprecated/deprecated-1.8/

system · July 31, 2014, 2:27am

jansta23 wrote on Thursday, July 31, 2014:

I was thinking of replacing it with this:

system · July 31, 2014, 7:46pm

robertovasquez wrote on Thursday, July 31, 2014:

You will find the code that implement toggle active/inactive plans in this link:
1.switch case “togglePlanStatus”: get the data from /controllers/browse/view/plans_config.php
2. function togglePlanStatus($plan_id, $nm_flag) update clinical_plans table
I will apraciate your review.

github.com

robertogagliotta/openemr/blob/cdr-plans/interface/super/rules/library/RulesPlanMappingEventHandlers.php

<?php
//This version is working with the throw in the function togglePlanStatus() 
require_once( dirname(__FILE__) . "/../../../globals.php" );
require_once( $GLOBALS['srcdir'] . "/log.inc");
require_once( $GLOBALS['srcdir'] . "/sql.inc");

$action = $_GET["action"];
switch ($action) {
	case "getNonCQMPlans":
		$plans = getNonCQMPlans();

		echo json_encode($plans);
		
		break;
		
	case "getRulesOfPlan":
		$rules = getRulesInPlan($_GET["plan_id"]);
		
		$rules_list = array();
		foreach ($rules as $key => $value) {

This file has been truncated. show original

system · August 1, 2014, 1:41am

robertovasquez wrote on Friday, August 01, 2014:

Hi Jan
The on off Flip Switch looks good. But if you don’t mind I will like to do a css work to the actual buttons and we will see how it looks like.

system · August 1, 2014, 3:18am

jansta23 wrote on Friday, August 01, 2014:

Go for it Roberto! The jquery actions are already defined so you just need to call those methods when flipping the switch

system · August 2, 2014, 5:02pm

robertovasquez wrote on Saturday, August 02, 2014:

Here you are only one button visible and a label telling Status Active or Inactive.

system · August 3, 2014, 8:03pm

robertovasquez wrote on Sunday, August 03, 2014:

Hi Jan,

Thanks for your detailed review. Great work!

I’ve posted a revision that addresses the comments in the review.

system · August 10, 2014, 9:03pm

robertovasquez wrote on Sunday, August 10, 2014:

I just push origin with more code in interface/super/rules/controllers/browse/view/plans_config.php and /library/RulesPlanMappingEventHandlers.php
The piece of code does the functionality to the Activate and Deactivate buttons.
I will apreciate your review

system · August 25, 2014, 12:51am

robertovasquez wrote on Monday, August 25, 2014:

code added to modified UI fron two buttons to one button to change the plan status.

github.com

robertogagliotta/openemr/blob/cdr-plans/interface/super/rules/controllers/browse/view/plans_config.php

<?php
// Copyright (C) 2010-2011 Aron Racho <aron@mi-squred.com>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
?>

<link type="text/css" rel="stylesheet" href="<?php echo $GLOBALS['webroot'] . '/library/css/jquery-ui-1.8.21.custom.css'?>" />
<link type="text/css" rel="stylesheet" href="<?php css_src('cdr-multiselect/common.css') ?>" />
<link type="text/css" rel="stylesheet" href="<?php css_src('cdr-multiselect/ui.multiselect.css') ?>" />
<link type="text/css" rel="stylesheet" href="<?php css_src('cdr-multiselect/plans_config.css') ?>" />

<script language="javascript" src="<?php js_src('/cdr-multiselect/jquery.min.js') ?>"></script>
<script language="javascript" src="<?php js_src('/cdr-multiselect/jquery-ui.min.js') ?>"></script>
<script language="javascript" src="<?php js_src('/cdr-multiselect/plugins/localisation/jquery.localisation-min.js') ?>"></script>
<script language="javascript" src="<?php js_src('/cdr-multiselect/plugins/scrollTo/jquery.scrollTo-min.js') ?>"></script>
<script language="javascript" src="<?php js_src('/cdr-multiselect/ui.multiselect.js') ?>"></script>
<script language="javascript" src="<?php js_src('list.js') ?>"></script>

This file has been truncated. show original

system · August 28, 2014, 1:54am

jansta23 wrote on Thursday, August 28, 2014:

Merged and checked in all the changes. Updates should be reflected in the next refresh of the demo.

No more pending items from the developer’s side. We are just awaiting review from the community.

system · August 28, 2014, 4:08am

bradymiller wrote on Thursday, August 28, 2014:

Hi Jan,

Next goal is to flatten it all into one commit, which will take care of some issues I noted in the branch (for example, there are a couple duplicative commits from official openemr branch).

In this situation, I take a non-git shortcut:

First, always keep your original branch since you will be doing a diff on it with your new branch to ensure there isn’t any missing code.
In your current branch copy entire openemr directoroy somewhere and remove the .git directory from this copy (Do NOT remove the .git directory from your git repo though)
Now go back to your git repo.
Find the last openemr official commit you have in there, which I think is 63b296a
check out the official master branch
now make a new branch from this “git checkout -b rebase-cdr-plans-admin_gui_1”
now reset it to commit from step 4 (git reset --hard 63b296a)
now copy in entire openemr directory that you saved in step 2
now make your commit, which will contain all your new code.
Now do following to ensure nothing missing (git diff cdr-plans-admin_gui…rebase-cdr-plans-admin_gui_1). This should return nothing; if it returns something that means code has been left out.
Now get ready to bring in the official openemr commits after 63b296a
go to a new branch “git checkout -b rebase-cdr-plans-admin_gui_2”
now do “git rebase master” (ensure the master branch is up to date official codebase)
You should now have your one commit on top of the most recent official codebase.

-brady
OpenEMR

system · August 30, 2014, 4:18am

jansta23 wrote on Saturday, August 30, 2014:

Brady, I put all our changes into 1 commit:

system · August 30, 2014, 11:39pm

robertovasquez wrote on Saturday, August 30, 2014:

Hi Jan
My id does not show at the code I has made. Did you merge my code?

system · August 31, 2014, 11:03pm

jansta23 wrote on Sunday, August 31, 2014:

Roberto, I tried to combine all the check ins so that they can be reviewed easier. Your codes are included in the above check in.

system · August 31, 2014, 11:09pm

bradymiller wrote on Sunday, August 31, 2014:

Hi,

One bummer about git is that it only allows one author per commit. I am guessing that will change someday. So when I big project like this is initially brought into OpenEMR then only get to assign one author. We need to ensure other author’s, such as Roberto, get credit in the git commit comments. The nice thing is that all the following commits that happen to the code on this project (after you get the big initial commit in) generally don’t require doing this, so then can ensure proper author, per codeline, credit.

-brady
OpenEMR

system · September 1, 2014, 12:04am

robertovasquez wrote on Monday, September 01, 2014:

Thanks for clear my mind.
Git blame funtionality is not 100%.

system · September 1, 2014, 12:30am

bradymiller wrote on Monday, September 01, 2014:

Hi,

I placed a review on github. I recommend you continue your work on this branch and I’ll point the up for grabs demo to it.

-brady
OpenEMR